From 8d4cb271b6ec95758198baadfc0ab43002be3915 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Mon, 29 Jul 2024 16:01:08 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/distributionStockArticleDetails.vue | 10 +++++----- src/views/mail/order/list.vue | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue index 8d0d3722..010a2ff1 100644 --- a/src/views/distribution/inventory/distributionStockArticleDetails.vue +++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue @@ -1477,11 +1477,11 @@ export default { } }, }, - async activated() { - if (this.pageId !== this.$route.query.id) return; - await this.$nextTick(); - this.$refs.tableNode.handleCheckSelect(this.selectionList); - }, + // async activated() { + // if (this.pageId !== this.$route.query.id) return; + // await this.$nextTick(); + // this.$refs.tableNode.handleCheckSelect(this.selectionList); + // }, }; diff --git a/src/views/mail/order/list.vue b/src/views/mail/order/list.vue index b0b513d6..96ed3113 100644 --- a/src/views/mail/order/list.vue +++ b/src/views/mail/order/list.vue @@ -1230,6 +1230,7 @@ export default { query: { id: row.row.id, name: '详情 - ' + row.row.orderCode, + isZero:row.row.isZero }, }); }, From 142b53582c802e8f5ca5987a483e754587c82983 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Mon, 29 Jul 2024 16:04:17 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?= =?UTF-8?q?=EF=BC=8C=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wel/index.vue | 1767 +++++--------------------------------- src/views/wel/index3.vue | 1767 +++++++++++++++++++++++++++++++++----- 2 files changed, 1767 insertions(+), 1767 deletions(-) diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue index 2b167503..9b2052f2 100644 --- a/src/views/wel/index.vue +++ b/src/views/wel/index.vue @@ -1,1592 +1,247 @@ - - + diff --git a/src/views/wel/index3.vue b/src/views/wel/index3.vue index 9b2052f2..2b167503 100644 --- a/src/views/wel/index3.vue +++ b/src/views/wel/index3.vue @@ -1,247 +1,1592 @@ - - - From b385766b41675c0b33d89ebb4d4cf43d98b58360 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Mon, 29 Jul 2024 16:15:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/inventory/distributionStockListDetails.vue | 2 +- src/views/mail/inventory/list.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/distribution/inventory/distributionStockListDetails.vue b/src/views/distribution/inventory/distributionStockListDetails.vue index 2e5d2207..9a190f54 100644 --- a/src/views/distribution/inventory/distributionStockListDetails.vue +++ b/src/views/distribution/inventory/distributionStockListDetails.vue @@ -1265,7 +1265,7 @@ export default { this.query.marketId = this.$route.query.marketId; this.query.materialId = this.$route.query.materialId; this.query.id = this.$route.query.id; - + this.query.incomingBatch=this.$route.query.incomingBatch // getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { // const data = res.data.data; // this.page.total = data.total; diff --git a/src/views/mail/inventory/list.vue b/src/views/mail/inventory/list.vue index 12f6859a..57d8cd71 100644 --- a/src/views/mail/inventory/list.vue +++ b/src/views/mail/inventory/list.vue @@ -874,6 +874,7 @@ export default { query: { id: row.row.id, name: row.row.descriptionGoods + ' — 明细', + incomingBatch:row.row.incomingBatch, }, }); }, From 7e9b5b28797ad4dcb40a32294101666f5d3dfe64 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Mon, 29 Jul 2024 18:45:43 +0800 Subject: [PATCH 4/4] =?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 --- .../driverArtery/basicdataDriverArtery.vue | 44 ++++++++++++++++--- .../driverArtery/basicdataDriverArteryAdd.vue | 8 ++-- 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue index 33b538fa..d84c3252 100644 --- a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue +++ b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue @@ -160,6 +160,7 @@ export default { search: false, query: {}, columnList: deepClone(columnList), + dataType:[], data: [], drawerShow: false, page: { @@ -250,20 +251,52 @@ export default { for (let _index = 0; _index < _value.checkarr.length; _index++) { const item = _value.checkarr[_index]; - + if (Number(value[_prop]) !== Number(item.value)) continue; value[_value.prop] = item.label; break; } } - // 仓库 value.warehouseNames = value.warehouses.map(val => val.warehouseName).join(','); } + + if(!this.dataType.length){ + let BizData=[] + BizData = await getDictionaryBiz('basic_driverjob_type'); + if(BizData.data.code ==200 && BizData.data.data.length){ + this.dataType= await BizData.data.data.map(res=>{ + return{ + label:res.dictValue, + value:res.dictKey + } + }) + } + } + this.data.forEach(items => { + let aValues; + // 检查 items.jobType 是否存在并且是字符串 + if (typeof items.jobType === 'string') { + if (items.jobType.split(',').length > 1) { + // 如果 jobType 包含逗号，则分隔并处理 + aValues = items.jobType.split(',').map(value => value.trim()); + } else { + // 否则，直接作为单个值处理 + aValues = [items.jobType.trim()]; + } + } else { + // 如果 items.jobType 不是字符串，设置空数组 + aValues = []; + } + // 根据 aValues 的值查找对应的 label + items.jobTypeName = this.dataType + .filter(item => aValues.includes(item.value)) // 过滤出匹配的项 + .map(item => item.label) // 提取对应的 label + .join(','); // 用逗号连接所有的 label + }); - console.log('this.data :>> ', this.data); - //查询车辆绑定情况 - this.getVehiclede(); + //查询车辆绑定情况 + // this.getVehiclede(); } catch (error) { console.log('error :>> ', error); } finally { @@ -484,6 +517,7 @@ export default { } value.checkarr = _data; } + } console.log('res :>> ', res); } catch (error) { diff --git a/src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue b/src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue index 25f29710..02b9629a 100644 --- a/src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue +++ b/src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue @@ -644,7 +644,7 @@ export default { this.form = { ..._data, }; - + this.form.jobType= this.form.jobTypeString this.form.bindVehicles = _data.bindVehicles && _data.bindVehicles.split(','); this.form.warehouseIds = _data.warehouses.map(val => val.warehouseId); console.log('_data :>> ', _data); @@ -657,7 +657,8 @@ export default { const submitData = { ...this.form }; submitData.bindVehicles = this.form.bindVehicles && this.form.bindVehicles.join(','); submitData.phone = this.form.phone.trim(); - + submitData.jobType = submitData.jobType.join(',') + const res = await add(submitData); const { code, msg } = res.data; if (code !== 200) return; @@ -670,6 +671,7 @@ export default { type: 'warning', }) .then(() => { + submitData.jobType=[] this.$refs.formRef.resetFields(); }) .catch(() => this.back()); @@ -687,7 +689,7 @@ export default { const submitData = { ...this.form }; submitData.bindVehicles = this.form.bindVehicles && this.form.bindVehicles.join(','); submitData.phone = this.form.phone.trim(); - + submitData.jobType = submitData.jobType.join(',') const res = await update(submitData); const { code, msg } = res.data; if (code !== 200) return;