From 61d666b99f23c4137a1333c662d95b592c100881 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Fri, 15 Dec 2023 11:33:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/aftersales/aftersalesWorkOrder.vue | 210 ++++++++++++++++-- .../aftersales/aftersalesWorkOrderInfo.vue | 8 +- 2 files changed, 187 insertions(+), 31 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index d5ace207..1f95b6e6 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -83,7 +83,7 @@ 新 增 @@ -93,40 +93,31 @@ 批量打回 工单指派 申请仲裁 批量完结 申诉 @@ -1172,7 +1163,7 @@ const AppealStatus = ref(false); //申诉列表状态 const dialogModifyAmount = ref(false); //超时金额修改弹出状态 const UserPermissions = ref('仓库客服'); //客服权限 const TabPermissions = ref(0); //菜单权限 -const AppealStatusT=ref(false);//是否为申诉列表 +const AppealStatusT = ref(false); //是否为申诉列表 const TabList = ref([ { name: 0, label: '全部' }, { name: 1, label: '处理中' }, @@ -1304,10 +1295,181 @@ const { recorddata, } = toRefs(details); - -let s=[ - -] +// let tab = [ +// { label: '全部', value: 0 }, +// { label: '处理中', value: 1 }, +// { label: '待处理完毕', value: 2 }, +// { label: '待处理', value: 3 }, +// { label: '理赔金额未出', value: 4 }, +// { label: '仲裁中', value: 5 }, +// { label: '完结', value: 6 }, +// { label: '超时未处理', value: 7 }, +// ]; + + +// // 按钮配置 +// // 1.新增 2.批量打回 3.工单指派 4.申请仲裁 5.批量完结 6.申诉 + + +// // 角色配置 +// // 1.仓库客服 +// // 2.职能客服 +// // 3.客服经理 + +// // 在value == 0状态下的权限配置 +// 1.新增 只能仓库客服查看 +// 2.批量打回 只能职能客服查看 +// 3.工单指派 只能客服经理查看 +// 4.申请仲裁 只能仓库客服查看 +// 5.批量完结 只能职能客服查看 +// 6.申诉 隐藏 + +// // 在value==1状态下的权限配置 +// 1.新增 隐藏 +// 2.批量打回 只能仓库客服查看 +// 3.工单指派 隐藏 +// 4.申请仲裁 只能仓库客服查看 +// 5.批量完结 只能职能客服和客服经理查看 +// 6.申诉 隐藏 +// // 在value==2状态下的权限配置 +// 隐藏所有按钮 + + +// // 在value==3状态下的权限配置 +// 1.新增 隐藏 +// 2.批量打回 只能仓库客服查看 +// 3.工单指派 只能客服经理查看 +// 4.申请仲裁 隐藏 +// 5.批量完结 隐藏 +// 6.申诉 隐藏 + +// // 在value==4状态下的权限配置 +// 1.新增 隐藏 +// 2.批量打回 隐藏 +// 3.工单指派 隐藏 +// 4.申请仲裁 隐藏 +// 5.批量完结 隐藏 +// 6.申诉 仓库客服查看 + + +// // 在value==5状态下的权限配置 +// 1.新增 隐藏 +// 2.批量打回 隐藏 +// 3.工单指派 隐藏 +// 4.申请仲裁 隐藏 +// 5.批量完结 隐藏 +// 6.申诉 隐藏 + +// // 在value==6状态下的权限配置 +// 1.新增 隐藏 +// 2.批量打回 隐藏 +// 3.工单指派 隐藏 +// 4.申请仲裁 隐藏 +// 5.批量完结 隐藏 +// 6.申诉 隐藏 + + +// // 在value== 7 状态下的权限配置 +// 1.新增 隐藏 +// 2.批量打回 隐藏 +// 3.工单指派 隐藏 +// 4. 申请仲裁 隐藏 +// 5.批量完结 隐藏 +// 6.申诉 隐藏 + +// 角色通过 UserPermissions 变量控制 +// 菜单通过 TabPermissions变量 来控制 +// 例如： +// const UserPermissions = ref('仓库客服'); //客服权限 +// const TabPermissions = ref(0); //菜单权限 + +const ButtonPermissions = computed(() => { + // 根据 TabPermissions 的状态，决定每个按钮的显示隐藏逻辑 + switch (TabPermissions.value) { + case 0://全部 + return { + add: UserPermissions.value == '仓库客服', //新增按钮 + batchReject: UserPermissions.value == '职能客服',//批量打回 + assignment: UserPermissions.value == '客服经理',//工单指派 + applyArbitration: UserPermissions.value == '仓库客服',//申请仲裁 + batchFinish: UserPermissions.value == '职能客服',//批量完结 + appeal: false//申诉 + }; + case 1://处理中 + return { + add: false,//新增按钮 + batchReject: UserPermissions.value != '仓库客服',//批量打回 + assignment: false,//工单指派 + applyArbitration: UserPermissions.value == '仓库客服',//申请仲裁 + batchFinish:UserPermissions.value != '仓库客服',//批量完结 + appeal: false//申诉 + }; + case 2://处理完毕 + return { + add: false,//新增按钮 + batchReject: false,//批量打回 + assignment: false,//工单指派 + applyArbitration: false,//申请仲裁 + batchFinish:false,//批量完结 + appeal: UserPermissions.value == '仓库客服' && AppealStatusT.value//申诉 + }; + case 3://待处理 + return { + add: false,//新增按钮 + batchReject: UserPermissions.value == '仓库客服',//批量打回 + assignment:UserPermissions.value == '客服经理',//工单指派 + applyArbitration: false,//申请仲裁 + batchFinish:false,//批量完结 + appeal: false//申诉 + }; + case 4://理赔金额未出 + return { + add: false,//新增按钮 + batchReject: false,//批量打回 + assignment:false,//工单指派 + applyArbitration: false,//申请仲裁 + batchFinish:false,//批量完结 + appeal: UserPermissions.value == '仓库客服'//申诉 + }; + case 5://仲裁中 + return { + add: false,//新增按钮 + batchReject: false,//批量打回 + assignment:false,//工单指派 + applyArbitration: false,//申请仲裁 + batchFinish:false,//批量完结 + appeal:false//申诉 + }; + case 6://完结 + return { + add: false,//新增按钮 + batchReject: false,//批量打回 + assignment:false,//工单指派 + applyArbitration: false,//申请仲裁 + batchFinish:false,//批量完结 + appeal:false//申诉 + }; + case 7://超时未处理 + return { + add: false,//新增按钮 + batchReject: false,//批量打回 + assignment:false,//工单指派 + applyArbitration: false,//申请仲裁 + batchFinish:false,//批量完结 + appeal:false//申诉 + }; + // 其他任何情况下的默认情况 + default: + return { + add: false, + batchReject: false, + assignment: false, + applyArbitration: false, + batchFinish: false, + appeal: false + }; + } +}); const ProcessingResults = [ @@ -2141,7 +2303,7 @@ const appealFn = val => { // 申诉列表 const AppealTab = val => { if (val == 0) { - AppealStatusT.value=false;//申诉列表开启 + AppealStatusT.value = false; //申诉列表开启 Tableheaderswitching(columnList); //切换表头 console.log('处理完毕'); ProcessingPartyState.value = false; //关闭处理方 @@ -2154,8 +2316,8 @@ const AppealTab = val => { }; IndexTable(data); } else { - AppealStatusT.value=true;//申诉列表开启 - console.log(val,'切换申诉列表'); + AppealStatusT.value = true; //申诉列表开启 + console.log(val, '切换申诉列表'); Tableheaderswitching(AppealList); //切换表头 AppealList.forEach(item => { //清空搜索记录 @@ -2216,7 +2378,7 @@ const TimeoutHandling = val => { // 标签栏触发 const tabChenge = val => { TabPermissions.value = val; //记录当前点击的菜单 - AppealStatusT.value=false;//申诉列表开启 + AppealStatusT.value = false; //申诉列表开启 console.log(val, '触发了标签栏'); let data = {}; if (val == 0) { diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue index fa897fa7..5e351ba2 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfo.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue @@ -1421,16 +1421,10 @@ const EndJump = () => { .foot_btn { position: fixed; bottom: 0; - left: 50%; - transform: translate(0, -50%); - width: 100%; + left: 42%; height: 40px; - background-color: #ffffff; - border-top: 1px solid #fff; - box-shadow: 3px -1px 1px #ccc; display: flex; align-items: center; - padding-left: 10px; } :deep(.el-card__body) { margin-bottom: 50px; From 0ac6438abc40fe141c5fed844236de32e823038d Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 15 Dec 2023 11:39:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8C=85=E4=BB=B6=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parcelList/distributionParcelList.vue | 88 +++++++++++++++++-- 1 file changed, 83 insertions(+), 5 deletions(-) diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue index b7c34b3c..e6543f96 100644 --- a/src/views/warehouse/parcelList/distributionParcelList.vue +++ b/src/views/warehouse/parcelList/distributionParcelList.vue @@ -8,6 +8,9 @@ 导出 + 批量查看二维码 @@ -31,7 +34,8 @@ @selection="selectionChange" > @@ -125,6 +129,23 @@ :drawerShow="drawerShow" :columnList="columnList" > + + +
+
+
+ + + 打 印 + 取 消 + + +