From be295cb353a87bde494979b630f7a438001bef16 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Fri, 18 Nov 2022 17:22:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ProcessMaterialWarehousingForm.vue | 81 ++++++++++--------- .../form/ProcessMaterialsDeliveryForm.vue | 41 +++++----- .../activiti/form/ProcessUdgetPlanForm.vue | 3 +- src/views/activiti/processInsManage.vue | 42 +++++----- .../ProcessSuppliesStrongerList.vue | 24 +++--- .../ProcessSuppliesStrongerLists.vue | 14 ++-- .../ProcessWasteMaterialsList.vue | 26 +++--- .../ProcessWasteMaterialsLists.vue | 16 ++-- 8 files changed, 125 insertions(+), 122 deletions(-) diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue index 3b3a3b0..21d9c09 100644 --- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue +++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue @@ -595,7 +595,7 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep' validateError(msg) { this.$message.error(msg) }, - getPlanList(val) { + async getPlanList (val) { console.log(val,"传值") let ids=[] if (!!val){ @@ -606,7 +606,7 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep' this.processUdgetPlanIds=ids.join(","); let params = {} params.ids = JSON.stringify(ids) - this.requestSubTableData(this.url.list, params, this.processMaterialWarehousingListTable) + await this.requestSubTableDatas(this.url.list, params, this.processMaterialWarehousingListTable) // getAction(this.url.list,params).then((res)=>{ // if(res.success){ // console.log('将要回填的数据',res.result) @@ -614,50 +614,51 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep' // }) }, /** 查询某个tab的数据 */ - requestSubTableData(url, params, tab, success) { + requestSubTableDatas(url, params, tab, success) { tab.loading = true - getAction(url, params).then(res => { - let { result } = res - let dataSource = [] - if (result) { - if (Array.isArray(result)) { - dataSource = result - } else if (Array.isArray(result.records)) { - dataSource = result.records - } - } - tab.dataSource = dataSource; - // console.log("tab.dataSource",tab.dataSource) - tab.dataSource.forEach(item =>{ - let par = { id : item.materialGroup,} - let param = {id : item.materialNumber,} - getAction(this.url.queryByIdDescription,par).then( res=>{ - // console.log(res); - if(res.success){ - this.processMaterialWarehousingListTable.columns[0].options= [{ - title : res.result.materialClassify, - value : item.materialGroup, - disabled : true }]; - } - }) - getAction(this.url.queryByIdMerchandiseNews,param).then( res=>{ - // console.log(res); - if(res.success){ - this.processMaterialWarehousingListTable.columns[1].options= [{ - title : res.result.materialsNumber, - value : item.materialNumber, - disabled : true }]; + getAction(url, params).then(res => { + let { result } = res + let dataSource = [] + if (result) { + if (Array.isArray(result)) { + dataSource = result + } else if (Array.isArray(result.records)) { + dataSource = result.records } - }) + } + // console.log("tab.dataSource",tab.dataSource) + dataSource.forEach(item =>{ + let par = { id : item.materialGroup,} + let param = {id : item.materialNumber,} + getAction(this.url.queryByIdDescription,par).then( res=>{ + // console.log(res); + if(res.success){ + this.processMaterialWarehousingListTable.columns[0].options= [{ + title : res.result.materialClassify, + value : item.materialGroup, + disabled : true }]; + } + }) + getAction(this.url.queryByIdMerchandiseNews,param).then( res=>{ + // console.log(res); + if(res.success){ + this.processMaterialWarehousingListTable.columns[1].options= [{ + title : res.result.materialsNumber, + value : item.materialNumber, + disabled : true }]; + } + }) + + }) + tab.dataSource = dataSource; + typeof success === 'function' ? success(res) : '' + }).finally(() => { + tab.loading = false }) + }, - typeof success === 'function' ? success(res) : '' - }).finally(() => { - tab.loading = false - }) - }, diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue index 7678750..5efbc58 100644 --- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue +++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue @@ -204,7 +204,7 @@ defaultValue: '' }, { - title: '物料名称', + title: '物料名称及规格型号', key: 'materialName', type: FormTypes.input, dictCode: '', @@ -212,23 +212,23 @@ placeholder: '请输入${title}', defaultValue: '' }, - { - title: '规格', - key: 'specification', - type: FormTypes.input, - dictCode: '', - width: '200px', - placeholder: '请输入${title}', - defaultValue: '' - }, { - title: '型号', - key: 'type', - type: FormTypes.input, - dictCode: '', - width: '200px', - placeholder: '请输入${title}', - defaultValue: '' - }, + // { + // title: '规格', + // key: 'specification', + // type: FormTypes.input, + // dictCode: '', + // width: '200px', + // placeholder: '请输入${title}', + // defaultValue: '' + // }, { + // title: '型号', + // key: 'type', + // type: FormTypes.input, + // dictCode: '', + // width: '200px', + // placeholder: '请输入${title}', + // defaultValue: '' + // }, { title: '单位', key: 'materialUnit', @@ -992,7 +992,7 @@ } res.result.forEach(item => { this.processMaterialsDeliveryListTable.columns[0].options.push({ - title: item.descriptionName, + title: item.materialClassify, value: item.descriptionId }) }) @@ -1006,13 +1006,14 @@ accountingAttributes: value } getAction(this.url.descriptionRake, par).then((res) => { + console.log("1231234123",res) if (res.success) { if (this.processMaterialsDeliveryListTable.columns[0].options.length > 0) { this.processMaterialsDeliveryListTable.columns[0].options = [] } res.result.forEach(item => { this.processMaterialsDeliveryListTable.columns[0].options.push({ - title: item.descriptionName, + title: item.materialClassify, value: item.descriptionId }) }) diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue index 0163883..cdc8bb0 100644 --- a/src/views/activiti/form/ProcessUdgetPlanForm.vue +++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue @@ -76,6 +76,7 @@ :action-button="true" :rowNumber="true" :disabled="hiegs" + :rowSelection="true" :isabled = "isabled" :actionButton="true" @descriptionFetch="descriptionFetchDatas" @@ -872,7 +873,7 @@ }); getAction(this.url.merchandiseNewsList,par).then((res)=>{ - console.log("12312",res.result); + // console.log("12312",res.result); if(res.success){ let newList = res.result; if(numberList.length > 0){ diff --git a/src/views/activiti/processInsManage.vue b/src/views/activiti/processInsManage.vue index 365b81d..ca3a4d6 100644 --- a/src/views/activiti/processInsManage.vue +++ b/src/views/activiti/processInsManage.vue @@ -17,16 +17,16 @@ /> - - - - - + + + + + + + + + + 搜索 @@ -46,37 +46,37 @@ @change="handleTableChange" ref="table" > - + - + - + - + - + - - - - + + + + + + diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue index 3ff4784..5e1e81a 100644 --- a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue +++ b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue @@ -141,7 +141,7 @@ { title:'物料组', align:"center", - dataIndex: 'descriptionName' + dataIndex: 'materialClassify' }, { title:'物料号', @@ -150,20 +150,20 @@ }, { - title:'物料名称', + title:'物料名称及规格型号', align:"center", dataIndex: 'merchandiseName' }, - { - title:'规格', - align:"center", - dataIndex: 'specification' - }, - { - title:'型号', - align:"center", - dataIndex: 'type' - }, + // { + // title:'规格', + // align:"center", + // dataIndex: 'specification' + // }, + // { + // title:'型号', + // align:"center", + // dataIndex: 'type' + // }, { title:'计量单位', diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue index acc5c48..4351219 100644 --- a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue +++ b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue @@ -152,7 +152,7 @@ - + @@ -264,7 +264,7 @@ title:'供应商', align:"center", scopedSlots: { customRender: 'supplierName' }, - dataIndex: 'supplierName' + dataIndex: 'supplierId' }, // { // title:'供应商描述', @@ -274,8 +274,8 @@ { title:'物料组', align:"center", - scopedSlots: { customRender: 'descriptionName' }, - dataIndex: 'descriptionName' + scopedSlots: { customRender: 'materialClassify' }, + dataIndex: 'materialClassify' }, { title:'物料编号', @@ -284,12 +284,12 @@ dataIndex: 'materialsNumber' }, { - title:'物料名称', + title:'物料名称及规格型号', align:"center", scopedSlots: { customRender: 'merchandiseName' }, dataIndex: 'merchandiseName' }, - { + /* { title:'规格', align:"center", scopedSlots: { customRender: 'specification' }, @@ -300,7 +300,7 @@ align:"center", scopedSlots: { customRender: 'type' }, dataIndex: 'type' - }, + },*/ { title:'计量单位', align:"center", diff --git a/src/views/wastematerials/ProcessWasteMaterialsList.vue b/src/views/wastematerials/ProcessWasteMaterialsList.vue index e262d83..a5b5d54 100644 --- a/src/views/wastematerials/ProcessWasteMaterialsList.vue +++ b/src/views/wastematerials/ProcessWasteMaterialsList.vue @@ -161,23 +161,23 @@ dataIndex: 'materialNumber' }, { - title:'物料名称', + title:'物料名称及规格型号', align:"center", scopedSlots: { customRender: 'materialDescription' }, dataIndex: 'materialDescription' }, - { - title:'型号', - align:"center", - scopedSlots: { customRender: 'type' }, - dataIndex: 'type' - }, - { - title:'规格', - align:"center", - scopedSlots: { customRender: 'specification' }, - dataIndex: 'specification' - }, + // { + // title:'型号', + // align:"center", + // scopedSlots: { customRender: 'type' }, + // dataIndex: 'type' + // }, + // { + // title:'规格', + // align:"center", + // scopedSlots: { customRender: 'specification' }, + // dataIndex: 'specification' + // }, { title:'计量单位', align:"center", diff --git a/src/views/wastematerials/ProcessWasteMaterialsLists.vue b/src/views/wastematerials/ProcessWasteMaterialsLists.vue index 142bba5..dc6a73b 100644 --- a/src/views/wastematerials/ProcessWasteMaterialsLists.vue +++ b/src/views/wastematerials/ProcessWasteMaterialsLists.vue @@ -189,7 +189,7 @@ // 表头 columns: [ { - title: '#', + title: '序号', dataIndex: '', key:'rowIndex', width:60, @@ -212,7 +212,7 @@ { title:'物料组', align:"center", - dataIndex: 'descriptionName' + dataIndex: 'materialClassify' }, { title:'物料号', @@ -229,13 +229,13 @@ title:'库存位置', align:"center", scopedSlots: { customRender: 'materialStorageId' }, - dataIndex: 'materialStorageId' - }, - { - title:'库存仓位', - align:"center", - dataIndex: 'freightSpace' + dataIndex: 'departName' }, + // { + // title:'库存仓位', + // align:"center", + // dataIndex: 'freightSpace' + // }, { title:'计量单位', align:"center",