From 91c6769af004268b8bbb4dac6cf91f32adc6b039 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Tue, 18 Jun 2024 15:18:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=A7=9F=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aftersales/aftersalesWorkOrderend.vue | 84 +++++++++---------- .../aftersales/aftersalesWorkOrdermodify.vue | 17 ++-- src/views/system/tenant.vue | 19 +++++ 3 files changed, 68 insertions(+), 52 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue index 28005641..cfdf1b0c 100644 --- a/src/views/aftersales/aftersalesWorkOrderend.vue +++ b/src/views/aftersales/aftersalesWorkOrderend.vue @@ -413,6 +413,7 @@ placeholder="请输入处理结果说明" clearable :autosize="{ minRows: 3, maxRows: 4 }" + :disabled="$route.query.RouterState == 'end'" type="textarea" /> @@ -441,7 +442,7 @@
- + + + + @@ -470,15 +481,7 @@ /> - - - +
@@ -917,8 +920,6 @@ const groundlineType = ref(''); //责任方状态 const routerState = ref(''); //路由状态 const TotalamountCompensation = ref(0); //赔款金额合计 const fileDom=ref(null);//文件上传节点 -const TotalClaimAmount = ref(0); //理赔总金额 -const TotalamountReceived = ref(0); //收款金额合计 const personResponsibleList = ref([]); //责任人列表 const msgHight = ref(100); //聊天框消息高度 const msgTop = ref(10); //聊天框吸顶距离 @@ -947,6 +948,8 @@ const Mydata = ref(); //当前登录人信息 const DiscoveringNodes = ref([]); //发现节点 const IndexException = ref([]); //异常类型 const Pageloading = ref(false); //页面加载load +const TotalClaimAmount = ref(0); //理赔总金额 +const TotalamountReceived=ref(0);//收款金额合计 const userInfo = ref({}); //用户信息 const PackageInfo = ref([ //包件信息 @@ -979,6 +982,9 @@ const videoUrl = ref(null); //视频预览 const VideoPreviewStatus = ref(false); //视频预览状态 const Paymentmethodoptions = ref([]); //支付方式下拉菜单 const warehouseData = ref([]); //处理方 +const getClass=computed((item)=>{ + return item.state === 0 ? 'class-for-state-0' : 'class-for-other-state'; +}) const MessageContent = ref([]); const CompensationParty = ref([ { @@ -1354,6 +1360,7 @@ const onLoad = async () => { accounting: item.accounting ? item.accounting : '', warehouseId: item.warehouseId, //仓库 compensationPersonnel: item.compensationPersonnel, //赔款人员 + button:!index?false:true, }); }); } @@ -1370,6 +1377,7 @@ const onLoad = async () => { warehouseId: item.warehouseId, //仓库 cld: index + 1, id: item.id, + button:true }); }); } @@ -1718,8 +1726,7 @@ const AddCompensation = () => { ); }; // 添加受款方 -const AddPayee=()=>{ - console.log(warehouseData.value,'warehouseData'); +const AddPayee = () => { let data = { state: 1, //赔款方 warehouseId: '', //仓库 @@ -1728,12 +1735,15 @@ const AddPayee=()=>{ compensationPersonnel: '', //责任人 button: true, //按钮可移除 }; - CompensationParty.value.splice( - CompensationParty.value.map(item => item.state).lastIndexOf(1) + 1, - 0, - data - ); -} + + // 找到最后一个状态为假的条目索引 + let lastIndex = CompensationParty.value.reduce((acc, item, index) => { + return item.state === 0 ? index : acc; + }, -1); + + // 在最后一个状态为假的条目后面插入新的数据条目 + CompensationParty.value.splice(lastIndex + 1, 0, data); +}; // 添加赔款方 // const AddCompensation = () => { // console.log('添加赔款方'); @@ -1810,45 +1820,24 @@ const Totalamount = () => { .reduce((accumulator, currentValue) => accumulator + currentValue, 0); }; // 移除按钮 -const payremove =async (item, index) => { +const payremove = (item, index) => { console.log(item, 'item'); console.log(index, 'index'); const cleanedItem = item.state ? '受款方' : '赔款方'; // 尝试使用 HTML 字符串 const message = `是否移除当前${cleanedItem}?`; - await ElMessageBox.confirm(message, '提示', { + ElMessageBox.confirm(message, '提示', { dangerouslyUseHTMLString: true, // 如果组件支持，启用此选项以解析 HTML confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning', }) .then(() => { - - if (item.state) { - Totalamountreceived.value -= item.num; //受款总金额 - } else { - Totalamountcompensation.value -= item.num; //赔款总金额 - } CompensationParty.value.splice(index, 1); + amountMoney() + }) .catch(() => {}); - - return - // 判断赔付方，至少保留一条数据 - - if (CompensationParty.value.map(res => res.state == 0).length == 1) { - ElMessage({ - message: '赔款必填最少一条', - type: 'warning', - }); - return; - } - CompensationParty.value.splice(val, 1); - for (let i = val; i < CompensationParty.value.length; i++) { - CompensationParty.value[i].cld = CompensationParty.value[i - 1].cld + 1; // 更新后续对象的id值 - } - console.log('CompensationParty :>> ', CompensationParty); - amountMoney(); }; // 公司占比计算 const ProportionInput = val => { @@ -3516,4 +3505,9 @@ const CustomerServiceCompleted = () => { left: 12%; top: 10%; } +:deep(.payanindemnity_title){ + .el-form-item__label{ + color: #f00; + } +} diff --git a/src/views/aftersales/aftersalesWorkOrdermodify.vue b/src/views/aftersales/aftersalesWorkOrdermodify.vue index 2c95288c..03707727 100644 --- a/src/views/aftersales/aftersalesWorkOrdermodify.vue +++ b/src/views/aftersales/aftersalesWorkOrdermodify.vue @@ -697,6 +697,15 @@ /> + + + + + @@ -712,13 +721,7 @@ /> - - - +
diff --git a/src/views/system/tenant.vue b/src/views/system/tenant.vue index 34d8db08..5af35157 100644 --- a/src/views/system/tenant.vue +++ b/src/views/system/tenant.vue @@ -231,6 +231,25 @@ export default { addDisplay: false, editDisplay: false, }, + { + label: '租户类型', + prop: 'tenantType', + span: 24, + type: 'select', + rules: [ + { required: true, message: '请选择租户类型', trigger: 'blur' } + ], + dicData: [ + { + label: '干仓配', + value: 1, + }, + { + label: '商场', + value: 2, + }, + ], + }, { label: '绑定域名', prop: 'domainUrl', From b5e1cd2279ee79a41dcff6cb7f8f3d6c7244574f Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Tue, 18 Jun 2024 15:36:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aftersales/aftersalesWorkOrderInfo.vue | 30 +++++++++---------- .../aftersales/aftersalesWorkOrderend.vue | 3 +- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue index 337f3f3a..da2b1ed9 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfo.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue @@ -456,21 +456,8 @@ />
- -
- 原因 - - - -
-
- 金额 - - - -
- -
+ +
责任人 + 原因 + + + +
+
+ 金额 + + + +
+
diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue index cfdf1b0c..68adb910 100644 --- a/src/views/aftersales/aftersalesWorkOrderend.vue +++ b/src/views/aftersales/aftersalesWorkOrderend.vue @@ -459,12 +459,11 @@ - From 60c85036e529d4406c83c5ed74fd0bc6212c6363 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Tue, 18 Jun 2024 16:05:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=80=83=E6=A0=B8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/supervise/supervise.js | 11 +++++++++++ src/views/supervise/IndicatorList.vue | 10 ++++++++++ 2 files changed, 21 insertions(+) diff --git a/src/option/supervise/supervise.js b/src/option/supervise/supervise.js index 53b28e60..63fd6b55 100644 --- a/src/option/supervise/supervise.js +++ b/src/option/supervise/supervise.js @@ -296,6 +296,17 @@ export const IndicatorColumnList = [ sortable: true, head: false, }, + { + prop: 'remark', + label: '备注', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, // { // prop: 'assessUserName', // label: '考核人', diff --git a/src/views/supervise/IndicatorList.vue b/src/views/supervise/IndicatorList.vue index 4f1805a2..3f29b3c0 100644 --- a/src/views/supervise/IndicatorList.vue +++ b/src/views/supervise/IndicatorList.vue @@ -214,6 +214,16 @@ placeholder="暂无" /> + + + + +