From 3c349e9ea1bc4c909d01b78ad00fbbf9c7d06c7b Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Fri, 1 Dec 2023 11:07:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=B3=E9=97=AD=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/index/index.vue | 4 +- src/router/views/index.js | 13 +- src/views/aftersales/VueTemp.vue | 87 +-- src/views/aftersales/VueTempAdd.vue | 542 ++++++++++++++++++ .../checkInventoryTask/createTask.vue | 6 +- 5 files changed, 585 insertions(+), 67 deletions(-) create mode 100644 src/views/aftersales/VueTempAdd.vue diff --git a/src/page/index/index.vue b/src/page/index/index.vue index 5cd8b93f..8e0c7451 100644 --- a/src/page/index/index.vue +++ b/src/page/index/index.vue @@ -15,9 +15,9 @@
- + - +
diff --git a/src/router/views/index.js b/src/router/views/index.js index caa2983d..68ccd71c 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -1160,7 +1160,18 @@ export default [ }, ], }, - + { + path: '/aftersales/VueTempAdd', + component: Layout, + redirect: '/aftersales/VueTempAdd', + children: [ + { + path: '/aftersales/VueTempAdd', + name: '工单新增', + component: () => import('@/views/aftersales/VueTempAdd.vue'), + }, + ], + }, // { // path: '/distribution/turndelivery/devtmp', // component: Layout, diff --git a/src/views/aftersales/VueTemp.vue b/src/views/aftersales/VueTemp.vue index dfb3077f..bd87c2df 100644 --- a/src/views/aftersales/VueTemp.vue +++ b/src/views/aftersales/VueTemp.vue @@ -807,8 +807,9 @@ import { getDetailWarehouse, getDeptWarehouse } from '@/api/basicdata/basicdataW import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue'; import { columnList, recordList } from '@/option/aftersales/vueTvemp.js'; import { processRowProperty } from '@/utils/util'; +import { useRouter } from 'vue-router'; import dayjs from 'dayjs'; -import { join } from 'lodash'; +const $router = useRouter(); const currentPage = ref(1); // 默认页码 const pageSize = ref(30); // 默认每一页几条 const total = ref(0); //页码总页数 @@ -1405,6 +1406,7 @@ function updateDictionary(targetArray, dictionaryType) { } // 字典请求函数 const AddInfo = () => { + $router.push('/aftersales/VueTempAdd'); Indexform.value = {}; //清空表单 IndexException.value = []; DiscoveringNodes.value = []; @@ -1438,61 +1440,29 @@ const ConfirmForm = () => { FromDisabled.value = false; //启用输入框 let processorEntityList = []; - const matchingObjects = warehouseData.value.filter(obj => - Indexform.value.processor.includes(obj.value) - ); - let name = matchingObjects.map(item => item.label); - name = name.join(','); - - const matchingObjectsT = warehouseData.value.filter(obj => - Indexform.value.duty.includes(obj.value) - ); - let nameS = matchingObjectsT.map(item => item.label); - nameS = nameS.join(','); //处理方 - let ProcessingParty = { - businessName: name, - businessId: Indexform.value.processor.join(','), - conditions: 1, - typesOf: 2, - }; - processorEntityList.push(ProcessingParty); + Indexform.value.processor.forEach(item => { + let found = warehouseData.value.find(element => element.value == item.toString()); + processorEntityList.push({ + businessName: found ? found.label : '', + businessId: item, + conditions: 1, + typesOf: 2, + }); + }); + //责任方 - let ResponsibleParty = { - businessName: nameS, - businessId: Indexform.value.duty.join(','), - conditions: 1, - typesOf: 1, - }; - let a = [ - { - value: '1', - label: '张三', - }, - { - value: '2', - label: '张四', - }, - { - value: '3', - label: '张五', - }, - { - value: '4', - label: '张六', - }, - ]; - let Tc = [2, 4]; - Tc.forEach(item => { - console.log(item, '责任方'); + Indexform.value.duty.forEach(item => { + let found = warehouseData.value.find(element => element.value == item.toString()); processorEntityList.push({ - businessName: nameS, + businessName: found ? found.label : '', businessId: item, conditions: 1, typesOf: 1, }); }); - processorEntityList.push(ResponsibleParty); + + // processorEntityList.push(ResponsibleParty); console.log(processorEntityList, 'processorEntityList'); let DataSubmit = { ...Indexform.value }; //定义初始化 DataSubmit.processorEntityList = processorEntityList; @@ -1502,16 +1472,16 @@ const ConfirmForm = () => { console.log(warehouseData.value, 'warehouseData.value'); Indexdialog.value = false; //关闭表单弹窗 - // $_submit(DataSubmit).then(res => { - // if (res.data.code == 200) { - // ElMessage({ - // message: res.data.msg, - // type: 'success', - // }); - // Indexform.value = {}; //重置表单 - // IndexTable(); - // } - // }); + $_submit(DataSubmit).then(res => { + if (res.data.code == 200) { + ElMessage({ + message: res.data.msg, + type: 'success', + }); + Indexform.value = {}; //重置表单 + IndexTable(); + } + }); }; // 顶部搜索 const searchHide = () => { @@ -1982,7 +1952,6 @@ const changeProcessingResults = val => { } } .el_clzr { - margin-top: 24px; padding: 0 18px; padding-left: 8px; diff --git a/src/views/aftersales/VueTempAdd.vue b/src/views/aftersales/VueTempAdd.vue new file mode 100644 index 00000000..f33156e3 --- /dev/null +++ b/src/views/aftersales/VueTempAdd.vue @@ -0,0 +1,542 @@ + + + + + diff --git a/src/views/distribution/checkInventoryTask/createTask.vue b/src/views/distribution/checkInventoryTask/createTask.vue index df6f41ff..6dbabeee 100644 --- a/src/views/distribution/checkInventoryTask/createTask.vue +++ b/src/views/distribution/checkInventoryTask/createTask.vue @@ -2292,15 +2292,11 @@ const TcChenge = (event, val) => { console.log(event,'event'); if(event){ if (event.length==2 ) {//时间 - data.startTime = event[0]; data.endTime = event[1]; - delete data.inventoryDate; - + delete data.inventoryDate; } } - - console.log(DiskStatus.value, 'DiskStatus.value'); if (DiskStatus.value) { data.questStatus = 1; From bab8231d9ad26413fcd75b16496f4d405e1b1282 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 1 Dec 2023 14:54:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=85=8D=E9=80=81=E5=8F=B8=E6=9C=BA?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=90=9C=E7=B4=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverylist/distributionDeliveryListdis.vue | 14 ++++++++------ .../deliverylist/distributionDeliveryListmar.vue | 14 +++++++------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue index f783df38..4c80fda1 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue @@ -34,6 +34,7 @@ @@ -50,6 +51,7 @@ @@ -752,10 +754,10 @@ export default { }, getvehicleData() { return new Promise((rv, rev) => { - getVehicleList(1, 10, '').then(res => { + getVehicleList().then(res => { const data = res.data.data; let po = []; - data.records.forEach(item => { + data.forEach(item => { let a = { dictKey: item.id, dictValue: item.vehicleNub, @@ -764,16 +766,16 @@ export default { }); this.vehicleData = po; console.log('^^^^^^^^^^^^^^^^', res.data.data); - rv(res.data.data.records); + rv(res.data.data); }); }); }, getDriverData() { return new Promise((rv, rev) => { - getDriverList(1, 10, '').then(res => { + getDriverList().then(res => { const data = res.data.data; let po = []; - data.records.forEach(item => { + data.forEach(item => { let a = { dictKey: item.id, dictValue: item.name, @@ -782,7 +784,7 @@ export default { }); this.driverData = po; console.log('===============>', res.data.data); - rv(res.data.data.records); + rv(res.data.data); }); }); }, diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue index 9f69767f..ff79b4ef 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue @@ -645,11 +645,11 @@ export default { }, getvehicleData() { return new Promise((rv, rev) => { - getVehicleList(1, 10, '').then(res => { + getVehicleList().then(res => { const data = res.data.data; - if (!data.records) return + if (!data) return let po = []; - data.records.forEach(item => { + data.forEach(item => { let a = { dictKey: item.id, dictValue: item.vehicleNub, @@ -658,16 +658,16 @@ export default { }); this.vehicleData = po; console.log('^^^^^^^^^^^^^^^^', res.data.data); - rv(res.data.data.records); + rv(res.data.data); }); }); }, getDriverData() { return new Promise((rv, rev) => { - getDriverList(1, 10, '').then(res => { + getDriverList().then(res => { const data = res.data.data; let po = []; - data.records.forEach(item => { + data.forEach(item => { let a = { dictKey: item.id, dictValue: item.name, @@ -676,7 +676,7 @@ export default { }); this.driverData = po; console.log('===============>', res.data.data); - rv(res.data.data.records); + rv(res.data.data); }); }); },