feat：订单发货、线下订单

src/views/mallManagement/order/offline_order_list/index.vue

@@ -182,7 +182,7 @@
             </el-table-column>
             <el-table-column align="center" label="金额" prop="amount" min-width="120">
               <template slot-scope="scope">
-                {{scope.row.amount}}
+                {{scope.row.num * scope.row.price}}
               </template>
             </el-table-column>
             <el-table-column align="center" label="库存数量" prop="stockQty" min-width="120">
@@ -833,6 +833,9 @@ export default {
       this.goodsList[index].goodsName = item.goodsName;
       this.goodsList[index].specsName = item.specsName;
       this.goodsList[index].unit = item.unit;
+      this.goodsList[index].insideQty = item.insideQty;
+      this.goodsList[index].outQty = item.outQty;
+      this.goodsList[index].partsQty = item.partsQty;
       this.goodsList[index].stockQty = item.stockQty;
     },
 

src/views/mallManagement/order/order_list/index.vue

@@ -320,24 +320,41 @@
         <div v-if="activeKey == 'deliverGoods' || activeKey == 'editExpressage'" class="app-container">
           <el-form :model="logisticsForm" ref="logisticsForm" label-width="100px" label-position="left">
             <el-row :gutter="20">
-              <el-col :span="6">
-                <el-form-item label="快递单号" prop="logisticsNo" :rules="[{ required: true, message: '快递单号不能为空', trigger: 'blur' }]">
-                  <el-input v-model="logisticsForm.logisticsNo" placeholder="请输入快递单号"></el-input>
+              <el-col :span="24">
+                <el-form-item label="发货方式" prop="pickType">
+                  <el-radio-group v-model="logisticsForm.pickType">
+                    <el-radio :label="'YES'">自提/自送</el-radio>
+                    <el-radio :label="'NO'">快递物流</el-radio>
+                  </el-radio-group>
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="物流公司" prop="companyCode"
-                  :rules="[{ required: true, message: '请选择物流公司', trigger: 'change' }]">
+              <el-col :span="6" v-if="logisticsForm.pickType == 'YES'">
+                <el-form-item label="提货人" prop="pickName" :rules="[{ required: true, message: '提货人不能为空', trigger: 'blur' }]">
+                  <el-input v-model="logisticsForm.pickName" placeholder="请输入提货人"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6" v-if="logisticsForm.pickType == 'YES'">
+                <el-form-item label="提货人电话" prop="pickPhone" :rules="[{ required: true, message: '提货人电话不能为空', trigger: 'blur' }]">
+                  <el-input v-model="logisticsForm.pickPhone" placeholder="请输入提货人电话"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6" v-if="logisticsForm.pickType == 'NO'">
+                <el-form-item label="物流公司" prop="companyCode" :rules="[{ required: true, message: '请选择物流公司', trigger: 'change' }]">
                   <el-select v-model="logisticsForm.companyCode" placeholder="请选择物流公司" style="width: 100%;">
                     <el-option :label="item.name" :value="item.code" v-for="(item, index) in companyList"
                       :key="index"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="6" v-if="logisticsForm.pickType == 'NO'">
+                <el-form-item label="快递单号" prop="logisticsNo" :rules="[{ required: true, message: '快递单号不能为空', trigger: 'blur' }]">
+                  <el-input v-model="logisticsForm.logisticsNo" placeholder="请输入快递单号"></el-input>
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="仓储" prop="storageId" v-if="logisticsType === 'add'"
-                  :rules="[{ required: true, message: '请选择仓储', trigger: 'change' }]">
-                  <el-select v-model="logisticsForm.storageId" placeholder="请选择仓储" style="width: 100%;">
+                  :rules="[{ required: true, message: '请选择出货仓库', trigger: 'change' }]">
+                  <el-select v-model="logisticsForm.storageId" placeholder="请选择出货仓库" style="width: 100%;">
                     <el-option :label="item.storageName" :value="item.storageId" v-for="(item, index) in storageList"
                       :key="index"></el-option>
                   </el-select>
@@ -351,14 +368,7 @@
                   </el-radio-group>
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="是否退换单" prop="exchange" v-if="logisticsType === 'add'">
-                  <el-radio-group v-model="logisticsForm.exchange">
-                    <el-radio :label="true">是</el-radio>
-                    <el-radio :label="false">否</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-              </el-col>
+              
             </el-row>
           </el-form>
           <div slot="footer" class="dialog-footer">
@@ -520,6 +530,9 @@ export default {
       logisticsIdVisible: false,
       logisticsLoading: false,
       logisticsForm: {
+        pickType: 'YES',
+        pickName: '',
+        pickPhone: '',
         logisticsNo: '',
         storageId: '',
         companyCode: '',