no message

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

@@ -239,7 +239,7 @@
     <div v-if="deliverList.length > 0" style="margin-bottom: 30px;">
       <h3>发货记录</h3>
       <div class="order-detail">
-        <!-- 理赔表格 -->
+        <!-- 发货记录 -->
         <el-table :data="deliverList" style="width: 100%;" size="small" border>
           <el-table-column prop="deliveryId" align="center" label="发货单号" width="160"></el-table-column>
           <el-table-column prop="brandName" align="center" label="品牌"></el-table-column>
@@ -252,7 +252,7 @@
               {{scope.row.goodsMaterialUnit == 'C' ? '整套' : scope.row.goodsMaterialUnit == 'I' ? '单个' : ''}}
             </template>
           </el-table-column>
-          <el-table-column prop="num" align="center" label="发货数量"></el-table-column>
+          <el-table-column prop="sendNum" align="center" label="发货数量"></el-table-column>
           <el-table-column prop="insideCodeQty" align="center" label="内机数量"></el-table-column>
           <el-table-column prop="outCodeQty" align="center" label="外机数量"></el-table-column>
           <el-table-column prop="partsCodeQty" align="center" label="配件数量"></el-table-column>

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

@@ -401,7 +401,8 @@
 								<div class="table">
 									<!-- 发货数量 -->
 									<el-form v-show="typeIndex == 1" ref="formData1" :model="formData1" label-width="0" size="small" label-position="left">
-										<el-table :data="formData1.list" element-loading-text="Loading" border fit highlight-current-row stripe>
+										<el-table :data="formData1.list" element-loading-text="Loading" border fit highlight-current-row stripe @selection-change="deliverSelectionChange">
+                      <el-table-column type="selection" width="40"></el-table-column>
 											<el-table-column prop="brandName" align="center" label="品牌"></el-table-column>
 											<el-table-column prop="mainName" align="center" label="大类"></el-table-column>
 											<el-table-column prop="smallName" align="center" label="小类"></el-table-column>
@@ -418,6 +419,7 @@
                           <el-input v-model="scope.row.num" placeholder="请输入" type="number"></el-input>
                         </template>
                       </el-table-column>
+											<el-table-column prop="stockNum" align="center" label="库存数量"></el-table-column>
 											<el-table-column prop="insideNum" align="center" label="内机数量"></el-table-column>
 											<el-table-column prop="outNum" align="center" label="外机数量"></el-table-column>
 											<el-table-column prop="partNum" align="center" label="配件数量"></el-table-column>
@@ -567,7 +569,7 @@
 													{{scope.row.goodsMaterialUnit == 'C' ? '整套' : scope.row.goodsMaterialUnit == 'I' ? '单个' : ''}}
 												</template>
                       </el-table-column>
-											<el-table-column prop="num" align="center" label="发货数量"></el-table-column>
+											<el-table-column prop="sendNum" align="center" label="发货数量"></el-table-column>
 											<el-table-column prop="insideCodeQty" align="center" label="内机数量"></el-table-column>
 											<el-table-column prop="outCodeQty" align="center" label="外机数量"></el-table-column>
 											<el-table-column prop="partsCodeQty" align="center" label="配件数量"></el-table-column>
@@ -814,6 +816,8 @@ export default {
       printOrderId: '',
       payQrcode: JSON.parse(localStorage.getItem('greemall_user')).payQrcode,
       billTitle: JSON.parse(localStorage.getItem('greemall_user')).billTitle,//打印名称
+
+      deliverSelection: [],
     }
   },
   computed: {
@@ -1170,6 +1174,10 @@ export default {
       })
     },
 
+    deliverSelectionChange(val) {
+      this.deliverSelection = val;
+    },
+
     // 查看物流
     queryLogistics(order) {
       this.logisticsVisible = true
@@ -1217,6 +1225,8 @@ export default {
         if (valid) {
           // 发货
           if (this.logisticsType === 'add') {
+            if(this.deliverSelection.length < 1) return this.$errorMsg('请选择一个发货信息');
+
             orderDeliver({
               orderId: this.editOrderId,
               logisticsNo: this.logisticsForm.logisticsNo,

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

@@ -667,7 +667,7 @@ export default {
             this.formData.recePhone = oData.recePhone;
             this.formData.receAddress = oData.receAddress;
             oData.orderDetails.forEach(item => {
-              item.waitRefundNum = item.num;
+              item.waitRefundNum = item.refundNum;
               item.waitRefundPrice = item.price;
             })
             this.goodsList = oData.orderDetails;