diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index 4c5a5335..1c3f7d07 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -4598,14 +4598,15 @@ if($useStore.getters && $useStore.getters.permission){ return; } let temp = {}; - temp = this.LessThantruckloadListData.find(item => item.signingStatusName == '已签收'); - if(temp){ + temp= this.LessThantruckloadListData.every(item=>item.signingStatusName == '未签收') + if(!temp){ ElMessage({ - message: `${temp.orderCode}运单号已签收`, + message: `要都满足条件为‘未签收’才可以批量签收`, type: 'warning', }); return; } + console.log(temp,'temp'); this.$confirm('是否进行批量签收?') .then(() => { this.loading = true; //开启加载 diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue index 57010d3d..25166688 100644 --- a/src/views/distribution/turndelivery/deliveryDiscuss.vue +++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue @@ -2427,13 +2427,14 @@ const EditEvent = val => { console.log('触发了编辑事件', val); }; const MaxSUM = computed(() => { - let sum = 0; - isZeroTable.value.forEach(item => { - sum += item.deliveryQuantity; - }); - let max = dataInfo.value[dataId.value].handQuantity - sum; + // let sum = 0; + // isZeroTable.value.forEach(item => { + // sum += item.deliveryQuantity; + // }); + // let max = dataInfo.value[dataId.value].handQuantity - sum; + console.log(dataId.value,'dataId.value'); console.log(dataInfo.value, ' dataInfo.value['); - + let max = dataInfo.value[dataId.value].reservationNum; return max; }); const toggleSelection = options => { diff --git a/vite.config.js b/vite.config.js index 16f03886..f2375925 100644 --- a/vite.config.js +++ b/vite.config.js @@ -39,11 +39,10 @@ export default ({ mode, command }) => { changeOrigin: true, rewrite: path => path.replace(/^\/api/, ''), }, - '/imgapi': { + '/imgapi': { target: 'http://127.0.0.1:38088', changeOrigin: true, rewrite: path => path.replace(/^\/imgapi/, ''), - logLevel: 'debug', // 启用详细日志 }, }, },