From aad761c1417b3a85d6540c68f68577ff60c38c8d Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Mon, 16 Oct 2023 10:11:10 +0800 Subject: [PATCH 1/5] zengjia panduan --- src/views/basicdata/driverArtery/basicdataDriverArtery.vue | 3 +++ src/views/basicdata/vehicle/basicdataVehicle.vue | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue index 63199ae1..4cb6a662 100644 --- a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue +++ b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue @@ -621,6 +621,9 @@ export default { if (Array.isArray(row.bindVehicles) && row.bindVehicles.length > 0) { row.bindVehicles = row.bindVehicles.join(","); console.log(row.bindVehicles); + }else{ + row.bindVehicles = ''; + } add(row).then( diff --git a/src/views/basicdata/vehicle/basicdataVehicle.vue b/src/views/basicdata/vehicle/basicdataVehicle.vue index 4bf69508..5a06277d 100644 --- a/src/views/basicdata/vehicle/basicdataVehicle.vue +++ b/src/views/basicdata/vehicle/basicdataVehicle.vue @@ -915,6 +915,8 @@ export default { if (Array.isArray(row.vehicleOwners) && row.vehicleOwners.length > 0) { row.vehicleOwners = row.vehicleOwners.join(","); console.log(row.vehicleOwners); +}else{ + row.vehicleOwners = ''; } console.log(row.vehicleOwners, '=====1231231'); From 7b3ebc1f73dce16e03912e276532f9a9d524831f Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Mon, 16 Oct 2023 17:26:14 +0800 Subject: [PATCH 2/5] =?UTF-8?q?1.=E8=B5=84=E4=BA=A7=E7=AE=A1=E7=90=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/property/basicPropertyDetails.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/basic/property/basicPropertyDetails.vue b/src/views/basic/property/basicPropertyDetails.vue index f1c6a3bf..892f4be7 100644 --- a/src/views/basic/property/basicPropertyDetails.vue +++ b/src/views/basic/property/basicPropertyDetails.vue @@ -580,6 +580,7 @@ export default { this.option.column = this.option.column.filter((item, index, self) => { return index === self.findIndex(t => t.prop === item.prop); }); + this.getListvalues(masterId); this.loading = false; console.log('所有 Promise 都已完成>>>>>', this.option.column); // 执行后续操作，例如更新页面显示、关闭加载提示等 From 7d7afc479ef3be80336f360f3dcd9c02935a281b Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Mon, 16 Oct 2023 20:49:46 +0800 Subject: [PATCH 3/5] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basicdata/driverArtery/basicdataDriverArtery.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue index 4cb6a662..dcbd6bae 100644 --- a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue +++ b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue @@ -643,6 +643,12 @@ export default { }, rowUpdate(row, index, done, loading) { console.log('swx>>>>>>>>>>>>>>'); + if (Array.isArray(row.bindVehicles) && row.bindVehicles.length > 0) { + row.bindVehicles = row.bindVehicles.join(","); + console.log(row.bindVehicles); + }else{ + row.bindVehicles = ''; + } update(row).then( () => { this.onLoad(this.page); From 02b8366b65b652ca80e6aec26fec0b57193d4b71 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Mon, 16 Oct 2023 22:52:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=BD=A6=E8=BE=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../driverArtery/basicdataDriverArtery.vue | 29 +++++------- .../basicdata/vehicle/basicdataVehicle.vue | 45 ++++++++++--------- .../vehicle/basicdataVehicleform.vue | 5 +++ 3 files changed, 40 insertions(+), 39 deletions(-) diff --git a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue index dcbd6bae..93ab207b 100644 --- a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue +++ b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue @@ -274,12 +274,12 @@ export default { align: 'center', span: 11, multiple: true, - dicData: [], - // dicUrl: '/api/logpm-basicdata/vehicle/dictionary', - // props: { - // label: 'vehicleNub', - // value: 'id', - // }, + // dicData: [], + dicUrl: '/api/logpm-basicdata/vehicle/dictionary', + props: { + label: 'vehicleNub', + value: 'id', + }, // addDisplay: false, // editDisplay: false, // viewDisplay: false, @@ -618,12 +618,9 @@ export default { rowSave(row, done, loading) { console.log(row, 'row信息'); - if (Array.isArray(row.bindVehicles) && row.bindVehicles.length > 0) { - row.bindVehicles = row.bindVehicles.join(","); - console.log(row.bindVehicles); - }else{ - row.bindVehicles = ''; - + if (Array.isArray(row.bindVehicles)) { + row.bindVehicles = row.bindVehicles.join(","); + console.log(row.bindVehicles); } add(row).then( @@ -642,12 +639,10 @@ export default { ); }, rowUpdate(row, index, done, loading) { - console.log('swx>>>>>>>>>>>>>>'); - if (Array.isArray(row.bindVehicles) && row.bindVehicles.length > 0) { + + if (Array.isArray(row.bindVehicles)) { row.bindVehicles = row.bindVehicles.join(","); console.log(row.bindVehicles); - }else{ - row.bindVehicles = ''; } update(row).then( () => { @@ -783,7 +778,7 @@ export default { //查询车辆绑定情况 this.getVehiclede(); //查询人员信息 - this.getpeople(); + //this.getpeople(); // getVehicle().then(res => { // console.log("res.data.data>>>>>>>",res.data.data) // res.data.data.map(v=>{ diff --git a/src/views/basicdata/vehicle/basicdataVehicle.vue b/src/views/basicdata/vehicle/basicdataVehicle.vue index 0f79bd47..59485e31 100644 --- a/src/views/basicdata/vehicle/basicdataVehicle.vue +++ b/src/views/basicdata/vehicle/basicdataVehicle.vue @@ -218,16 +218,16 @@ export default { align: 'center', span: 11, multiple: true, - dicData: [], - // dicUrl: '/api/logpm-basicdata/vehicle/dictionary', - // props: { - // label: 'vehicleNub', - // value: 'id', - // }, - // addDisplay: false, - // editDisplay: false, - // viewDisplay: false, - // hide: true, + // dicData: [], + dicUrl: '/api/logpm-basicdata/vehicle/dictionary', + props: { + label: 'vehicleNub', + value: 'id', + }, + addDisplay: false, + editDisplay: false, + viewDisplay: false, + hide: true, }, { label: '车辆来源', @@ -908,19 +908,19 @@ export default { methods: { rowSave(row, done, loading) { - - - - -if (Array.isArray(row.vehicleOwners) && row.vehicleOwners.length > 0) { - row.vehicleOwners = row.vehicleOwners.join(","); - console.log(row.vehicleOwners); -}else{ - row.vehicleOwners='' -} +// if (Array.isArray(row.vehicleOwners) && row.vehicleOwners.length > 0) { +// row.vehicleOwners = row.vehicleOwners.join(","); +// console.log(row.vehicleOwners); +// }else{ +// row.vehicleOwners='' +// } + if (Array.isArray(row.vehicleOwners)) { + row.vehicleOwners = row.vehicleOwners.join(","); + console.log(row.vehicleOwners); + } console.log(row.vehicleOwners, '=====1231231'); - - console.log(row,'================================================================'); + + console.log('================================================================',row); add(row).then( () => { this.onLoad(this.page); @@ -955,6 +955,7 @@ if (Array.isArray(row.vehicleOwners) && row.vehicleOwners.length > 0) { this.edit = true; }, rowUpdate(row, index, done, loading) { + update(row).then( () => { this.onLoad(this.page); diff --git a/src/views/basicdata/vehicle/basicdataVehicleform.vue b/src/views/basicdata/vehicle/basicdataVehicleform.vue index f99fa65f..aac49ea6 100644 --- a/src/views/basicdata/vehicle/basicdataVehicleform.vue +++ b/src/views/basicdata/vehicle/basicdataVehicleform.vue @@ -862,6 +862,11 @@ export default { }, submitForm() { this.$refs.myForm.validate(valid => { + console.log('swx>>>>>>>>>>>>>>'); + if (Array.isArray(this.form.vehicleOwners)) { + this.form.vehicleOwners = this.form.vehicleOwners.join(","); + console.log(this.form.vehicleOwners); + } if (valid) { this.isDis = true; let row = this.form; From ada88f9529bc68fc1344edac167080c642f41a5e Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Mon, 16 Oct 2023 22:59:19 +0800 Subject: [PATCH 5/5] =?UTF-8?q?1.=E6=89=BF=E8=BF=90=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/vehicle/basicdataVehicle.vue | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/views/basicdata/vehicle/basicdataVehicle.vue b/src/views/basicdata/vehicle/basicdataVehicle.vue index 59485e31..c577c93c 100644 --- a/src/views/basicdata/vehicle/basicdataVehicle.vue +++ b/src/views/basicdata/vehicle/basicdataVehicle.vue @@ -197,18 +197,18 @@ export default { align: 'center', span: 11, }, - { - label: '承运商名称', - labelWidth: '150', - // width: 'fit-content', - width: '100px', - align: 'center', - span: 11, - prop: 'carrierName', - type: 'input', - editDisplay: false, - addDisplay: false, - }, + // { + // label: '承运商名称', + // labelWidth: '150', + // // width: 'fit-content', + // width: '100px', + // align: 'center', + // span: 11, + // prop: 'carrierName', + // type: 'input', + // editDisplay: false, + // addDisplay: false, + // }, { label: '绑定驾驶人', prop: 'vehicleOwners',