From 2d9c16d6ae91c441abd18bda72e8aedbbfb71667 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Wed, 30 Nov 2022 15:41:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ProcessMaterialWarehousingForm.vue | 27 +++++++------------ .../form/ProcessMaterialsAllotForm.vue | 15 ++++++++--- .../form/ProcessMaterialsDeliveryForm.vue | 21 ++++++++++----- src/views/activiti/historicDetail.vue | 2 +- 4 files changed, 36 insertions(+), 29 deletions(-) diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue index d195ca4..d2b699a 100644 --- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue +++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue @@ -703,24 +703,15 @@ import JSelectItem from '@/components/jeecgbiz/JSelectItem' }, popupCallback(company, row, puwwcid) { let res = JSON.parse(row) - let params = {} - params.id = puwwcid - let invisibleCode = null - getAction(this.url.puwwlist, params).then((rest) => { - if (rest.success) { - invisibleCode = rest.result.unit - } - let param = {} - param.createBy = res.username - param.company = company - param.departId = res.departIds - param.createTime = getCurrentTime() - this.data = param - console.log('获取我的数据', this.data) - let fieldval = pick(this.data, 'createBy', 'company', 'departId', 'createTime') - this.$nextTick(() => { - this.form.setFieldsValue(fieldval) - }) + let param = {} + param.createBy = res.username + param.company = company + param.departId = res.departIds + param.createTime = getCurrentTime() + this.data = param + let fieldval = pick(this.data, 'createBy', 'company', 'departId', 'createTime') + this.$nextTick(() => { + this.form.setFieldsValue(fieldval) }) }, getAssignees(v){ diff --git a/src/views/activiti/form/ProcessMaterialsAllotForm.vue b/src/views/activiti/form/ProcessMaterialsAllotForm.vue index 93420ce..3a23441 100644 --- a/src/views/activiti/form/ProcessMaterialsAllotForm.vue +++ b/src/views/activiti/form/ProcessMaterialsAllotForm.vue @@ -491,19 +491,28 @@ unit: item.materialsUnit, materialGroup: item.materialClassify, supplierName: item.supplierId, - price: item.materialPrice + price: item.materialPrice, + descriptionId: item.descriptionId, // number : item.residueNumber === undefined ? 0 : item.residueNumber, } } }) - console.log("materialName",materialName); + // console.log("materialName",materialName); if(Object.keys(materialName).length > 0){ + + + this.processMaterialsAllotListTable.columns[0].options.push({ + title: materialName.materialGroup, + value: materialName.descriptionId + }) + + let values = [ { rowKey: record.row.id, values: { 'equipment': record.row.equipment, - 'materialGroup': materialName.materialGroup, + 'materialGroup': materialName.descriptionId, 'materialName': materialName.name, 'materialUnit': materialName.unit, 'supplierId': materialName.supplierName, diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue index 88171de..7fffe01 100644 --- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue +++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue @@ -476,7 +476,7 @@ this.accountingAttributesVal = val this.hiegs = false if (this.deliveryType !== 1 ) { - console.log("执行账外") + // console.log("执行账外") //账外 await this.fetchMerchandiseNewsZW() } else { @@ -587,6 +587,7 @@ materialGroup: item.materialClassify, supplierName: item.supplierId, price: item.materialPrice, + descriptionId: item.descriptionId, residueNumber: item.residueNumber === undefined ? 0 : item.residueNumber } } @@ -595,12 +596,18 @@ // console.log("materialName",materialName); if (record.row.id !== undefined && Object.keys(materialName).length > 0) { // console.log("materialName",materialName); + + this.processMaterialsDeliveryListTable.columns[0].options.push({ + title: materialName.materialGroup, + value: materialName.descriptionId + }) + let values = [ { rowKey: record.row.id, values: { 'equipment': record.row.equipment, - 'materialGroup': materialName.materialGroup, + 'materialGroup': materialName.descriptionId, 'materialName': materialName.name, 'materialUnit': materialName.unit, 'supplierId': materialName.supplierName, @@ -813,7 +820,7 @@ id: res.departIds } let data=await getAction(this.url.queryPageDepare,de) - console.log(data.result); + // console.log(data.result); if(data.result.orgType === "3"){ // 查询大品类数据 账外库 par.departId = data.result.parentId; @@ -1181,7 +1188,7 @@ departId: this.data.departId } getAction(this.url.wasteMaterialsUrl, par).then((res) => { - console.log(res) + // console.log(res) if (res.success) { if (this.processMaterialsDeliveryListTable.columns[0].options.length > 0) { this.processMaterialsDeliveryListTable.columns[0].options = [] @@ -1202,7 +1209,7 @@ accountingAttributes: value } getAction(this.url.descriptionRake, par).then((res) => { - console.log('1231234123', res) + // console.log('1231234123', res) if (res.success) { if (this.processMaterialsDeliveryListTable.columns[0].options.length > 0) { this.processMaterialsDeliveryListTable.columns[0].options = [] @@ -1484,7 +1491,7 @@ } } - console.log('tab.dataSource', dataSource) + // console.log('tab.dataSource', dataSource) dataSource.forEach(item => { let par = { id: item.materialGroup } let param = { id: item.equipment } @@ -1499,7 +1506,7 @@ } }) getAction(this.url.queryByIdMerchandiseNews, param).then(res => { - console.log(res) + // console.log(res) if (res.success) { this.processMaterialsDeliveryListTable.columns[1].options = [{ title: res.result.materialsNumber, diff --git a/src/views/activiti/historicDetail.vue b/src/views/activiti/historicDetail.vue index 467842e..a099e2b 100644 --- a/src/views/activiti/historicDetail.vue +++ b/src/views/activiti/historicDetail.vue @@ -11,7 +11,7 @@ :dataSource="data" :pagination="false" ref="table"> - +