Merge branch 'live' into edit

src/views/sellOut/salesOrder/components/out-order-add-model.vue

@@ -39,8 +39,8 @@
               </template>
             </el-table-column>
             <el-table-column prop="num" label="总下单数量" width="110" />
-             <el-table-column prop="send_num" label="已发货数量" width="110" />
-              <el-table-column prop="wsend_num" label="未发货数量" width="110" />
+            <el-table-column prop="send_num" label="已发货数量" width="110" />
+            <el-table-column prop="wsend_num" label="未发货数量" width="110" />
             <el-table-column prop="sale_price" label="销售价" width="110" />
           </el-table>
         </el-col>
@@ -63,7 +63,13 @@
               label="总数量"
               width="100"
             />
-            <el-table-column prop="arrive_time" label="最晚到货时间" width="145" />
+            <el-table-column prop="send_num" label="已发货数量" width="100" />
+            <el-table-column prop="wsend_num" label="未发货数量" width="100" />
+            <el-table-column
+              prop="arrive_time"
+              label="最晚到货时间"
+              width="145"
+            />
             <el-table-column prop="contactor" label="收件人" width="60" />
             <el-table-column prop="mobile" label="联系电话" width="105" />
             <el-table-column
@@ -269,7 +275,6 @@ export default {
     async submitForm() {
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
-          this.loading = true;
           const item = JSON.parse(JSON.stringify(this.ruleForm));
           if (this.list0.length === 0) {
             this.$message.warning("请选择发货仓库!");
@@ -287,17 +292,18 @@ export default {
             this.$message.warning("只能选择一个收货地址！");
             return;
           }
-          let cNum = parseInt(this.list0[0].num);
-          let aNum = parseInt(this.list1[0].send_num);
+          let cNum = parseInt(this.list0[0].wsend_num);
+          let aNum = parseInt(this.list1[0].wsend_num);
           let num = parseInt(this.ruleForm.send_num);
           if (num > cNum) {
-            this.$message.warning("发货数量不能大于仓库出货数量!");
+            this.$message.warning("发货数量不能大于仓库未发货数量!");
             return;
           }
           if (num > aNum) {
-            this.$message.warning("发货数量不能大于收货地址总数量!");
+            this.$message.warning("发货数量不能大于收货地址未发货数量!");
             return;
           }
+          this.loading = true;
           const res = await asyncRequest.saleout(item);
           this.loading = false;
           if (res && res.code === 0) {