From b910c9740a6b19c2228b2fcf3f3f8d03057ceebc Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Mon, 8 Jan 2024 21:20:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=9B=9E=E5=A4=8D=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/aftersales/aftersalesWorkOrder.vue | 10 ++--- .../aftersales/aftersalesWorkOrderAdd.vue | 40 +++++++++++++++---- vite.config.js | 4 +- 3 files changed, 39 insertions(+), 15 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 17871330..c7fe6697 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -1994,13 +1994,13 @@ const tabChenge = val => { } else if (val == 8) { // 待回复按钮 console.log('待回复'); - // ProcessingPartyState.value = true; //开启处理方 - data.workOrderStatus = '30'; - details.query.workOrderStatus = '30'; - // ArbitrationStatus.value = true; //可以申请仲裁 + if(UserPermissions.value=='仓库客服'){ + data.workOrderStatus = ''; + details.query.workOrderStatus = ''; Tableheaderswitching(columnList); empty(); - IndexTable(data); + ProcessingPartyFun(data); + } } }; /** diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue index cf0b637b..d4478fd9 100644 --- a/src/views/aftersales/aftersalesWorkOrderAdd.vue +++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue @@ -339,9 +339,9 @@ v-model="item.responsibilityRatio" placeholder="占比 " :min="0" - :max="100" + :max="ProportionMax" v-percentage - @input="CompanyProportionInput" + @change="CompanyProportionInput(item)" /> % @@ -614,7 +614,7 @@ const routerID = ref(null); //路由参数ID const routerState = ref(''); //路由状态 const personResponsibleList = ref([]); //责任人列表 const ZFdialog = ref(false); //支付方式弹出 -const companyProportion = ref(0); //公司占比 +const companyProportion = ref(100); //公司占比 const identifying = ref(1); //订单,零担状态 const dialogHistoricalPackage = ref(false); //历史包件弹窗 const HistoricalPackageList = ref([]); //历史包件数组 @@ -625,6 +625,7 @@ const amplifyurl = ref(''); //当前点击的图片 const amplifysrcList = ref([]); //图片循环列表 const ProcessingList = ref([]); //处理结果已经选择的列表 const Paymentmethod = ref([]); //支付方式 +const ProportionMax=ref(100);//公司占比最大值计算 const PackageInfo = ref([ //包件信息 @@ -940,6 +941,8 @@ const PackagRemoval = val => { PackageInfo.value.splice(val, 1); //移除当前点击的按钮 Statistics(); }; + + // 责任方添加 const responsibleParty = () => { FangAddList.value.push({ @@ -949,6 +952,7 @@ const responsibleParty = () => { responsibilityRatio: '', description: '', }); + }; // 责任移除 const ResponsibilityRemoval = val => { @@ -964,21 +968,41 @@ const TopChange = val => { identifying.value = 2; } }; + + +// 公司占比最大值计算 +const CalculateTheproportion=()=>{ +console.log( ProportionMax.value,'当前最大值'); +console.log( companyProportion.value,'当前公司占比'); + + ProportionMax.value= ProportionMax.value - companyProportion.value + console.log( ProportionMax.value,'当前还剩余的值'); +} + + // 公司占比计算 -const CompanyProportion = () => { - setInterval(() => { +const CompanyProportion = (item) => { + setTimeout(() => { console.log(FangAddList.value, ' FangAddList.value'); let proportion = 0; //责任比例之和 FangAddList.value.forEach(item => { console.log(item.responsibilityRatio); proportion += Number(item.responsibilityRatio); + ProportionMax.value=ProportionMax.value-Number(item.responsibilityRatio) }); - companyProportion.value = 100 - proportion; + if(!ProportionMax.value){ + return + }else{ + companyProportion.value = companyProportion.value-proportion + } + }, 0); + }; // 公司占比事件 -const CompanyProportionInput = () => { - CompanyProportion(); +const CompanyProportionInput = (item) => { + CompanyProportion(item); + }; // 表单校验规则 diff --git a/vite.config.js b/vite.config.js index 4e457a88..f9da57f9 100644 --- a/vite.config.js +++ b/vite.config.js @@ -23,9 +23,9 @@ export default ({ mode, command }) => { // 新zyc // target: 'http://192.168.6.116:8777', // target: 'http://192.168.6.122:8777', - target: 'http://192.168.10.25:13000', + // target: 'http://192.168.10.25:13000', // target: 'http://192.168.10.25:2888', - // target: 'http://192.168.6.162:9777',//CYZ + target: 'http://192.168.6.163:9777',//CYZ // target: 'http://192.168.10.57:13000', // target: 'http://192.168.10.200:13000', // target: 'http://192.168.10.29:13000',