增加商配提交空订单,适配预约提交修复提交bug

src/views/Pricesystem/Price/PriceDelivery.vue

@@ -347,7 +347,7 @@
                   />
                 </el-form-item>
               </template>
-              <el-form-item label="加算价格" v-if="request.dispatchMinCostType == 1" class="el_row">
+              <el-form-item label="加算价格" v-if="request.dispatchMinCostType != 1" class="el_row">
                 <el-input-number
                   v-model="form.additionalCost"
                   :precision="2"
@@ -378,8 +378,8 @@
                 />
               </el-form-item>
             </template>
-
-            <el-form-item label="遗留加算" v-if="request.dispatchMinCostType == 1" class="el_row">
+ 
+            <el-form-item label="遗留加算" v-if="request.dispatchMinCostType != 1" class="el_row">
               <el-input-number
                 v-model="form.leaveBehindAdditionalCost"
                 :precision="2"
@@ -493,7 +493,7 @@ const form = ref({
       width: 'auto',
       disabled: true,
     },
-    {
+    { 
       label: '遗留件单价(元/件)',
       prop: 'leaveBehindPrice',
       type: 'number',

src/views/aftersales/DataSynchronization.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-card class="box-card" v-loading="loading" element-loading-text="正在执行中...">
+  <el-card class="box-card" v-loading="loading" element-loading-text="数据正在同步执行中...">
     <div class="content">
       <div>
         <h2 style="text-align: center">数据同步功能</h2>

src/views/distribution/reservation/reservationAddFrom.vue

@@ -2654,10 +2654,11 @@ export default {
             if (this.reservationId) {
               // 判断是否都没有选择包件
               const checkInfoValues = this.form.stockArticleList.every(
-                item => !item.packageListInfo || !item.packageListInfo.length
+                item => !item.reservationNum
               );
               if (checkInfoValues) {
-                ElMessageBox.prompt(
+               
+              await  ElMessageBox.prompt(
                   '当前所有订单都没有选择包件是否确认"取消本次计划"?',
                   '请填写取消原因',
                   {
@@ -2691,12 +2692,15 @@ export default {
                       });
                     console.log(data, '要提交的数据');
                   })
-                  .catch(() => {});
+                  .catch(() => {
+                    console.log('关闭弹窗');
+                 
+                  });
+                return
               } else {
                 for (let i = 0; i < this.form.stockArticleList.length; i++) {
                   if (
-                    !this.form.stockArticleList[i].packageListInfo ||
-                    !this.form.stockArticleList[i].packageListInfo.length
+                    !this.form.stockArticleList[i].reservationNum
                   ) {
                     ElMessageBox.confirm(
                       `订单自编号:${this.form.stockArticleList[i].orderCode}没有选择包件是否移除!`,
@@ -2711,7 +2715,9 @@ export default {
                         this.renderOrderData.splice(i, 1);
                         this.form.stockArticleList.splice(i, 1);
                       })
-                      .catch(() => {});
+                      .catch(() => {
+
+                      });
                     return;
                   }
                 }

src/views/distribution/turndelivery/deliveryDiscuss.vue

@@ -2986,6 +2986,13 @@ const handleBack = () => {
 
 // 最后提交订单
 const SubmitCommercial = async () => {
+  if(!dataInfo.value.length){
+    ElMessage({
+    message: '订单列表为空,请手动移除本次计划！',
+    type: 'warning',
+    })
+    return
+  }
   let code = null;
   try {
     //kind为假就说明目前是在外协页面

src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue

@@ -246,7 +246,7 @@ export default {
           prop: 'receiptBatch',
           type: 2,
           values: '',
-          width: '130',
+          width: '180',
           checkarr: [],
           fixed: true,
           sortable: true,
@@ -307,7 +307,7 @@ export default {
           prop: 'orderNumber',
           type: 2,
           values: '',
-          width: '130',
+          width: '220',
           checkarr: [],
           fixed: false,
           sortable: true,