From 8551d01fd18f592f53adaf6b0fe3af1c149bc372 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Tue, 7 Mar 2023 12:04:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...物资清单表12323123_1672369326884.xlsx | Bin 13036 -> 13184 bytes src/views/activiti/applyList.vue | 6 +- .../form/ProcessMaterialsAllotForm.vue | 6 +- .../form/ProcessMaterialsDeliveryForm.vue | 19 ++-- .../activiti/form/ProcessUdgetPlanForm.vue | 20 ++++- .../ProcessMerchandiseNewsList.vue | 33 +++++-- .../modules/ProcessMerchandiseNewsForm.vue | 29 +++++- .../costecharts/ItemCost.vue | 85 ++++++++++++++---- .../modules/ProcessWasteMaterialsForm.vue | 45 +++++++++- 9 files changed, 200 insertions(+), 43 deletions(-) diff --git a/public/static/excle/物资清单表12323123_1672369326884.xlsx b/public/static/excle/物资清单表12323123_1672369326884.xlsx index 1a821b07d7817d185a0403489f6c0c79e5b1e00a..80cdc565ae45209d1fb49d20be74d075ca508c38 100644 GIT binary patch delta 6380 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 xpa3ED-{heH07j?)0O`> delta 6237 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 Q#Gb0pNBg3V>+i7t0ccs91ONa4 diff --git a/src/views/activiti/applyList.vue b/src/views/activiti/applyList.vue index 5038f1b..2369424 100644 --- a/src/views/activiti/applyList.vue +++ b/src/views/activiti/applyList.vue @@ -241,11 +241,11 @@ } }, { - title: '标题', + title: '批次号', // align:"left", - dataIndex: 'title', + dataIndex: 'warehousingBatch', align:"center", - width: '150px', + width: '250px', scopedSlots: { customRender: 'logContent' }, sorter: true }, diff --git a/src/views/activiti/form/ProcessMaterialsAllotForm.vue b/src/views/activiti/form/ProcessMaterialsAllotForm.vue index edc8c5c..610d767 100644 --- a/src/views/activiti/form/ProcessMaterialsAllotForm.vue +++ b/src/views/activiti/form/ProcessMaterialsAllotForm.vue @@ -607,8 +607,8 @@ }, fetchMerchandiseNews(value) { //查询物料清单信息 - console.log("this.form=============================") - console.log(this.form) + // console.log("this.form=============================") + // console.log(this.form) //查询大品类数据 return new Promise((resolve, reject) => { @@ -624,7 +624,7 @@ this.processMaterialsAllotListTable.columns[1].options = [] } this.$refs.processMaterialsAllotList.getValues((a, b, c) => { - console.log(a, b, c) + // console.log(a, b, c) b.forEach(item => { if (item.equipment !== '' && item.equipment !== undefined && item.equipment !== null) { numberList.push(item.equipment) diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue index 85192e1..078dcca 100644 --- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue +++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue @@ -249,11 +249,12 @@ { title: '物料名称及规格型号', key: 'materialName', - type: FormTypes.input, + type: FormTypes.sel_search, dictCode: '', width: '200px', placeholder: '请输入${title}', - defaultValue: '', + // defaultValue: '', + options: [], disabled: this.disabled }, // { @@ -601,8 +602,8 @@ } }, async onSelect(record) { - console.log(record) - let isMA = true + console.log(record,"wer234") + let isMA = true; if (!record.row.equipment && !!record.row.materialGroup && !!record.row.materialName || !record.row.materialName && !!record.row.materialGroup && !!record.row.equipment ) { // console.log("select==清空数据",record.row); @@ -667,19 +668,22 @@ let b = false for (const res of this.bigIdMerchandiseNewsList) { if (res.merchandiseNewsId === record.row.equipment) { - b = true + b = true; } } + console.log(this.bigIdMerchandiseNewsList.length,"长度"); // console.log("执行materialNumber",b,record.row.materialGroup , this.materialGroupId) if (record.column.key == 'equipment' && isMA && record.row.equipment !== this.materialGroupId) { if (!b) { if (this.accountingAttributesVal === '1') { //账外 - await this.fetchMerchandiseNewsZW(record.row.equipment) + await this.fetchMerchandiseNewsZW(record.row.equipment); + console.log("账外") } else { //总库 await this.fetchMerchandiseNews(record.row.equipment) + console.log("总库") } } @@ -916,6 +920,9 @@ if (this.processMaterialsDeliveryListTable.columns[1].options.length > 0) { this.processMaterialsDeliveryListTable.columns[1].options = [] } + if (this.processMaterialsDeliveryListTable.columns[3].options.length > 0) { + this.processMaterialsDeliveryListTable.columns[3].options = [] + } this.$refs.processMaterialsDeliveryList.getValues((a, b, c) => { // console.log(a, b, c) b.forEach(item => { diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue index 64dba80..b4e5d0b 100644 --- a/src/views/activiti/form/ProcessUdgetPlanForm.vue +++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue @@ -721,11 +721,23 @@ this.isShifu = true }, bumen() { - this.putUnder = null; //归口部门 - this.form.setFieldsValue({ - putUnder: null + let bis= false; + this.$refs.processUdgetPlanMaterial.getValues((a, b, c) => { + // console.log(b.length,"==="); + if(b.length > 0){ + bis = true; + // console.log("进来了"); + } + if(!bis){ + this.putUnder = null; //归口部门 + this.form.setFieldsValue({ + putUnder: null + }) + this.fetchMerchandiseNews(); + } }) - this.fetchMerchandiseNews(); + + }, // handleChange(value, key, column) { diff --git a/src/views/merchandisenews/ProcessMerchandiseNewsList.vue b/src/views/merchandisenews/ProcessMerchandiseNewsList.vue index 1f1150a..b01af09 100644 --- a/src/views/merchandisenews/ProcessMerchandiseNewsList.vue +++ b/src/views/merchandisenews/ProcessMerchandiseNewsList.vue @@ -61,13 +61,21 @@ - + - - 一般类物资 - 资产类物资 - + + {{item.materialAttributes}} + + + + + + + + 一般类物资 + 资产类物资 + @@ -231,6 +239,7 @@ description: '物资清单表管理页面', bigId:[], bigIds:[], + MaterialAttributes:[], // 表头 columns: [ { @@ -330,7 +339,8 @@ exportXlsUrl: "/merchandisenews/processMerchandiseNews/exportXls", importExcelUrl: "merchandisenews/processMerchandiseNews/importExcel", supplierId: "/supplier/processSupplier/list", - getMaterialDepart: "/merchandisenews/processMerchandiseNews/getMaterialDepart" + getMaterialDepart: "/merchandisenews/processMerchandiseNews/getMaterialDepart", + getMaterialAttributes: "/merchandisenews/processMerchandiseNews/getMaterialAttributes" }, dictOptions:{}, @@ -338,6 +348,16 @@ } }, created() { + this.MaterialAttributes = []; + getAction(this.url.getMaterialAttributes,null).then((res)=>{ + if(res.success){ + // console.log(res.result,"==================="); + // this.bigId = res.result.records; + res.result.forEach( item => { + this.MaterialAttributes.push(item); + }) + } + }); this.getSuperFieldList(); }, computed: { @@ -385,6 +405,7 @@ }); + }, initDictConfig(){ }, diff --git a/src/views/merchandisenews/modules/ProcessMerchandiseNewsForm.vue b/src/views/merchandisenews/modules/ProcessMerchandiseNewsForm.vue index 49fa355..82742ac 100644 --- a/src/views/merchandisenews/modules/ProcessMerchandiseNewsForm.vue +++ b/src/views/merchandisenews/modules/ProcessMerchandiseNewsForm.vue @@ -82,7 +82,15 @@ - + + {{item.materialAttributes}} + + + + + + + 一般类物资 资产类物资 @@ -141,6 +149,7 @@ bigIder:[], bigIds:[], bigIdser:[], + MaterialAttributes:[], bigIdRake:[], bigIdRaker:[], form: this.$form.createForm(this), @@ -157,6 +166,7 @@ validatorRules: { materialType: { rules: [{ required: true, message: '请选择物资类型!' }] }, materialAttributes: { rules: [{ required: true, message: '请选择物资属性!' }] }, + materialNature: { rules: [{ required: true, message: '请选择资产类型!' }] }, merchandiseName: { rules: [{ required: true, message: '请输入物资名称!' }] }, supplierId: { rules: [{ required: true, message: '请输入供应商!' }] }, partyNumber: { rules: [{ required: true, message: '请输入第三方编号!' }] }, @@ -172,7 +182,8 @@ queryById: "/merchandisenews/processMerchandiseNews/queryById", supplierId: "/supplier/processSupplier/list", descriptionRake: "/description/processDescription/list", - getMaterialDepart: "/merchandisenews/processMerchandiseNews/getMaterialDepart" + getMaterialDepart: "/merchandisenews/processMerchandiseNews/getMaterialDepart", + getMaterialAttributes: "/merchandisenews/processMerchandiseNews/getMaterialAttributes" } } }, @@ -196,6 +207,16 @@ } }, created () { + this.MaterialAttributes = []; + getAction(this.url.getMaterialAttributes,null).then((res)=>{ + if(res.success){ + // console.log(res.result,"==================="); + // this.bigId = res.result.records; + res.result.forEach( item => { + this.MaterialAttributes.push(item); + }) + } + }); //如果是流程中表单，则需要加载流程表单data this.showFlowData(); this.fetchDataSupplier(); @@ -281,7 +302,7 @@ this.model = Object.assign({}, record); this.visible = true; this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model,'merchandiseName','supplierId','partyNumber','descriptionId','materialsNumber','materialsUnit','type','specification','synopsis','classify','materialDepart','materialType','materialAttributes')) + this.form.setFieldsValue(pick(this.model,'merchandiseName','supplierId','partyNumber','descriptionId','materialsNumber','materialsUnit','type','specification','synopsis','classify','materialDepart','materialType','materialAttributes','materialNature')) }) }, //渲染流程表单数据 @@ -350,7 +371,7 @@ }) }, popupCallback(row){ - this.form.setFieldsValue(pick(row,'merchandiseName','supplierId','partyNumber','descriptionId','materialsNumber','materialsUnit','type','specification','synopsis','classify','materialDepart','materialType','materialAttributes')) + this.form.setFieldsValue(pick(row,'merchandiseName','supplierId','partyNumber','descriptionId','materialsNumber','materialsUnit','type','specification','synopsis','classify','materialDepart','materialType','materialAttributes','materialNature')) }, } } diff --git a/src/views/statisticanalysis/costecharts/ItemCost.vue b/src/views/statisticanalysis/costecharts/ItemCost.vue index a10d0fc..97b54dd 100644 --- a/src/views/statisticanalysis/costecharts/ItemCost.vue +++ b/src/views/statisticanalysis/costecharts/ItemCost.vue @@ -3,7 +3,7 @@
项目部成本 - +
@@ -17,6 +17,7 @@