Merge remote-tracking branch 'origin/dev' into dev

src/views/order/podCN/components/WeightDialog.vue

@@ -22,7 +22,7 @@
           placeholder=""
           placeholder=""
         >
         >
           <el-option label="跟踪号" value="trackingNumber"></el-option>
           <el-option label="跟踪号" value="trackingNumber"></el-option>
-          <el-option label="客户单号" value="shopNumber"></el-option>
+          <el-option label="交运单号" value="shopNumber"></el-option>
         </el-select>
         </el-select>
         <input
         <input
           ref="weighInput"
           ref="weighInput"
@@ -33,7 +33,7 @@
             weight.weightInput
             weight.weightInput
               ? selectType === 'trackingNumber'
               ? selectType === 'trackingNumber'
                 ? '请输入跟踪号'
                 ? '请输入跟踪号'
-                : '请输入客户单号'
+                : '请输入交运单号'
               : '请输入重量'
               : '请输入重量'
           "
           "
           @keyup.enter="weightChange"
           @keyup.enter="weightChange"

src/views/order/podCN/index.vue

@@ -196,10 +196,10 @@
             style="width: 150px"
             style="width: 150px"
           >
           >
             <ElOption
             <ElOption
-              v-for="(_, index) in ['否', '是','混合']"
+              v-for="(_, index) in ['否', '是', '混合']"
               :key="index"
               :key="index"
               :value="index"
               :value="index"
-              :label="['否', '是','混合'][index]"
+              :label="['否', '是', '混合'][index]"
             ></ElOption>
             ></ElOption>
           </ElSelect>
           </ElSelect>
         </ElFormItem>
         </ElFormItem>
@@ -591,9 +591,7 @@
                   ></ElOption>
                   ></ElOption>
                 </ElSelect>
                 </ElSelect>
               </ElFormItem>
               </ElFormItem>
-              <ElFormItem
-                label="规范素材"
-              >
+              <ElFormItem label="规范素材">
                 <ElSelect
                 <ElSelect
                   v-model="searchForm.newStandard"
                   v-model="searchForm.newStandard"
                   placeholder="请选择"
                   placeholder="请选择"
@@ -2052,10 +2050,18 @@
               <span
               <span
                 v-if="
                 v-if="
                   (row.replaceShipment === 1 &&
                   (row.replaceShipment === 1 &&
-                    ['CREATE_LOGISTICS', 'WAIT_SHIPMENT'].includes(status)) ||
+                    [
+                      'CREATE_LOGISTICS',
+                      'WAIT_SHIPMENT',
+                      'WAIT_WEIGHING',
+                    ].includes(status)) ||
                   (row.replaceShipment === 0 &&
                   (row.replaceShipment === 0 &&
                     row.shipmentType === 1 &&
                     row.shipmentType === 1 &&
-                    ['CREATE_LOGISTICS', 'WAIT_SHIPMENT'].includes(status))
+                    [
+                      'CREATE_LOGISTICS',
+                      'WAIT_SHIPMENT',
+                      'WAIT_WEIGHING',
+                    ].includes(status))
                 "
                 "
                 class="operate-item"
                 class="operate-item"
               >
               >
@@ -3977,7 +3983,8 @@ const tableColumns = computed(() => {
         prop: 'standardDesignImage',
         prop: 'standardDesignImage',
         slot: 'standardDesignImage',
         slot: 'standardDesignImage',
         align: 'center',
         align: 'center',
-      },{
+      },
+      {
         label: '失败原因',
         label: '失败原因',
         minWidth: 250,
         minWidth: 250,
         prop: 'failReason',
         prop: 'failReason',