0221

src/views/business/outsourcedOrder/index.vue

@@ -87,7 +87,9 @@ const { proxy } = getCurrentInstance()
 /** 字典数组区 */
 const { delivery_method } = proxy.useDict('delivery_method')
 const { settlement_type } = proxy.useDict('settlement_type')
-const { packaging_method } = proxy.useDict('packaging_method')
+const packaging_method = ref([{label: '原厂蓝箱', value: '0', elTagType: 'primary', elTagClass: undefined}
+,{label: '外协新箱', value: '1', elTagType: 'success', elTagClass: undefined},
+{label: '无箱', value: '2', elTagType: 'warning', elTagClass: undefined}])
 
 const orderList = ref([])
 const loading = ref(true)

src/views/business/outsourcedOrderDetails/index.vue

@@ -48,7 +48,7 @@
 					<el-table-column label="产品描述" align="center" prop="productDescription" />
 					<el-table-column label="箱号" align="center" prop="newCarrierName">
 						<template #default="scope">
-							<div v-if="scope.row.isFirstProcess === 0">{{ scope.row.newCarrierName }}</div>
+							<div v-if="scope.row.isFirstProcess === 0 || scope.row.packagingMethod === '2'">{{ scope.row.newCarrierName }}</div>
 							<el-tooltip v-else-if="scope.row.newCarrierName != ''" effect="dark" :content="scope.row.newCarrierName"
 								placement="top-start">
 								<el-button link type="primary" @click="handleChoiceCarrier(scope.row)">{{ scope.row.newCarrierName

src/views/business/returnReceipt/form.vue

@@ -247,11 +247,11 @@ function submitForm() {
         flag = false
         proxy.$modal.msgError(checkRes.msg)
       }
-      const checkMore = await checkAllowMore(form.value.detailInfo);
-      if (!checkMore.data) {
-        flag = false
-        proxy.$modal.msgError(checkMore.msg)
-      }
+      // const checkMore = await checkAllowMore(form.value.detailInfo);
+      // if (!checkMore.data) {
+      //   flag = false
+      //   proxy.$modal.msgError(checkMore.msg)
+      // }
       // 判断是否一箱多批
       if (flag) {
         form.value.isSubmit = 1;