From e2045c7c1100a1024398d958e4d77a3fd26f146c Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Wed, 23 Oct 2024 19:08:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=9C=8D?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AE=8C=E7=BB=93=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/aftersales/vueTvemp.js | 12 +- src/views/aftersales/aftersalesWorkOrder.vue | 2 + .../aftersales/aftersalesWorkOrderAdd.vue | 60 +++--- .../aftersales/aftersalesWorkOrderInfo.vue | 10 + .../aftersales/aftersalesWorkOrderend.vue | 197 +++++++++++++++--- 5 files changed, 219 insertions(+), 62 deletions(-) diff --git a/src/option/aftersales/vueTvemp.js b/src/option/aftersales/vueTvemp.js index 7b67802d..0532734a 100644 --- a/src/option/aftersales/vueTvemp.js +++ b/src/option/aftersales/vueTvemp.js @@ -317,7 +317,17 @@ export const columnList = [ sortable: true, head: false, }, - + { + prop: 'createTime', + label: '录入时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, { prop: 'remarks', diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 9022cff2..64bf9867 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -1816,6 +1816,8 @@ const IndexTable = (val, Refresh) => { } else { TabList.value.find(res => res.name == '9').state = false; } + }else{ + TabList.value.find(res => res.name == '9').state = false; } console.log(UserPermissions.value, '当前角色权限'); let data = { diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue index 0a597cf3..9fb464c1 100644 --- a/src/views/aftersales/aftersalesWorkOrderAdd.vue +++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue @@ -807,41 +807,41 @@ const form = ref({ const myData = ref({}); //用户信息记录 const ruleForm = reactive({ basis: { - workOrderType: [{ required: true, message: '请选择异常类型', trigger: ['bulr', 'change'] }], - discoveryNode: [{ required: true, message: '请选择发现节点', trigger: ['bulr', 'change'] }], - trainNumber: [{ required: true, message: '请选择车次号', trigger: ['bulr', 'change'] }], - deliveryTime: [{ required: true, message: '请输入配送时间', trigger: ['bulr', 'change'] }], - deliveryDriver: [{ required: true, message: '请输入配送司机', trigger: ['bulr', 'change'] }], - vehicleRoute: [{ required: true, message: '请输入车辆线路', trigger: ['bulr', 'change'] }], - deliverGoodsTime: [{ required: true, message: '请输入发货时间', trigger: ['bulr', 'change'] }], - warehousingTime: [{ required: true, message: '请选择入库时间', trigger: ['bulr', 'change'] }], - discoveryTime: [{ required: true, message: '请选择发现时间', trigger: ['bulr', 'change'] }], - waybillMall: [{ required: true, message: '请输入运单商场', trigger: ['bulr'] }], - typeServiceName: [{ required: false, message: '请输入合作模式', trigger: ['bulr', 'change'] }], + workOrderType: [{ required: true, message: '请选择异常类型', trigger: ['blur', 'change'] }], + discoveryNode: [{ required: true, message: '请选择发现节点', trigger: ['blur', 'change'] }], + trainNumber: [{ required: true, message: '请选择车次号', trigger: ['blur', 'change'] }], + deliveryTime: [{ required: true, message: '请输入配送时间', trigger: ['blur', 'change'] }], + deliveryDriver: [{ required: true, message: '请输入配送司机', trigger: ['blur', 'change'] }], + vehicleRoute: [{ required: true, message: '请输入车辆线路', trigger: ['blur', 'change'] }], + deliverGoodsTime: [{ required: true, message: '请输入发货时间', trigger: ['blur', 'change'] }], + warehousingTime: [{ required: true, message: '请选择入库时间', trigger: ['blur', 'change'] }], + discoveryTime: [{ required: true, message: '请选择发现时间', trigger: ['blur', 'change'] }], + waybillMall: [{ required: true, message: '请输入运单商场', trigger: ['blur'] }], + typeServiceName: [{ required: false, message: '请输入合作模式', trigger: ['blur', 'change'] }], investigationProcess: [ - { required: true, message: '请输入调查经过', trigger: ['bulr', 'change'] }, + { required: true, message: '请输入调查经过', trigger: ['blur', 'change'] }, ], - result: [{ required: false, message: '请输选择处理结果', trigger: ['bulr'] }], - processor: [{ required: true, message: '请选择处理方', trigger: ['bulr'] }], - processorEntityList: [{ required: true, message: '请选择责任方', trigger: ['bulr'] }], + result: [{ required: false, message: '请输选择处理结果', trigger: ['blur'] }], + processor: [{ required: true, message: '请选择处理方', trigger: ['blur'] }], + processorEntityList: [{ required: true, message: '请选择责任方', trigger: ['blur'] }], }, - packageCode: [{ required: true, message: '请输入包条码', trigger: ['bulr', 'change'] }], - waybillNumber: [{ required: true, message: '请输入运单号', trigger: ['bulr', 'change'] }], - orderCode: [{ required: true, message: '请输入订单自编号', trigger: ['bulr', 'change'] }], - first: [{ required: false, message: '请输入一级品', trigger: ['bulr', 'change'] }], - secondary: [{ required: false, message: '请输入二级品', trigger: ['bulr', 'change'] }], - brandName: [{ required: false, message: '请输入品牌', trigger: ['bulr', 'change'] }], - businessId: [{ required: true, message: '请选择责任方', trigger: ['bulr', 'change'] }], - personResponsibleId: [{ required: true, message: '请输入责任人', trigger: ['bulr', 'change'] }], - responsibilityRatio: [{ required: false, message: '请输入占比', trigger: ['bulr', 'change'] }], - tripartite: [{ required: false, message: '请输入三方责任人', trigger: ['bulr', 'change'] }], - description: [{ required: true, message: '请输入说明', trigger: ['bulr', 'change'] }], - money: [{ required: true, message: '请输入金额', trigger: ['bulr', 'change'] }], - paymentUnit: [{ required: false, message: '请输入支付单位', trigger: ['bulr', 'change'] }], + packageCode: [{ required: true, message: '请输入包条码', trigger: ['blur', 'change'] }], + waybillNumber: [{ required: true, message: '请输入运单号', trigger: ['blur', 'change'] }], + orderCode: [{ required: true, message: '请输入订单自编号', trigger: ['blur', 'change'] }], + first: [{ required: false, message: '请输入一级品', trigger: ['blur', 'change'] }], + secondary: [{ required: false, message: '请输入二级品', trigger: ['blur', 'change'] }], + brandName: [{ required: false, message: '请输入品牌', trigger: ['blur', 'change'] }], + businessId: [{ required: true, message: '请选择责任方', trigger: ['blur', 'change'] }], + personResponsibleId: [{ required: true, message: '请输入责任人', trigger: ['blur', 'change'] }], + responsibilityRatio: [{ required: false, message: '请输入占比', trigger: ['blur', 'change'] }], + tripartite: [{ required: false, message: '请输入三方责任人', trigger: ['blur', 'change'] }], + description: [{ required: true, message: '请输入说明', trigger: ['blur', 'change'] }], + money: [{ required: true, message: '请输入金额', trigger: ['blur', 'change'] }], + paymentUnit: [{ required: false, message: '请输入支付单位', trigger: ['blur', 'change'] }], compensationTime: [ - { required: false, message: '请选择理赔支付时间', trigger: ['bulr', 'change'] }, + { required: false, message: '请选择理赔支付时间', trigger: ['blur', 'change'] }, ], - compensationMethod: [{ required: false, message: '请选择支付方式', trigger: ['bulr', 'change'] }], + compensationMethod: [{ required: false, message: '请选择支付方式', trigger: ['blur', 'change'] }], }); const ResponsibleParty = ref([]); //提货责任方 const ruleFormRef = ref(); //表单示例 diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue index 503a7e43..ed708daf 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfo.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue @@ -567,6 +567,9 @@ 处理结果 + 处理结果提交 + @@ -1336,6 +1339,12 @@ const isProcessingResults = () => { } return false; }; +const isProcessingResultssub=()=>{ + if (workOrderStatus == '90') { + return true; + } + return false; +} //完结工单权限 const isWorkOrderCompletion = () => { @@ -1438,6 +1447,7 @@ const Appealrejection = () => { const PermissionButton = computed(() => ({ reply: true, // 回复 Processing_results: isProcessingResults(), //处理结果 + Processing_resultsSub: isProcessingResultssub(), //处理结果提交 work_order_completion: isWorkOrderCompletion(), //完结工单 repulse: isRepulse(), //打回 result_returned: Resultreturned(), //处理结果打回 diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue index 594a0dd4..197a1b81 100644 --- a/src/views/aftersales/aftersalesWorkOrderend.vue +++ b/src/views/aftersales/aftersalesWorkOrderend.vue @@ -7,7 +7,7 @@ - +
@@ -445,11 +445,13 @@ {{ PayeeNum }}
-
- - + + @@ -520,7 +533,13 @@
- +