From 397a78f0f23a87a9e3bd16c3c8d1309f347b3993 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Thu, 10 Nov 2022 14:01:58 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activiti/form/ProcessUdgetPlanForm.vue | 14 ++++++++----- .../ProcessMerchandiseNewsList.vue | 20 +++++++++---------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue index eef3a00..39fb637 100644 --- a/src/views/activiti/form/ProcessUdgetPlanForm.vue +++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue @@ -487,7 +487,7 @@ this.descriptionFetchDatas(); }, mounted() { - console.log( this.$refs.processUdgetPlanMaterial); + // console.log( this.$refs.processUdgetPlanMaterial); // this.form.setFieldsValue("materialGroup",123123); }, methods: { @@ -600,7 +600,7 @@ let isEr = true; if(record.row.materialGroup !== '' && record.row.materialGroup !== undefined){ if( record.row.id !== undefined && record.row.id !== '' && this.isBu !== record.row.materialGroup ){ - // console.log("1出发了",record.row); + console.log("1出发了",record.row); this.fetchMerchandiseNews(record.row.materialGroup); this.isBu = record.row.materialGroup; let values = [ @@ -620,10 +620,13 @@ this.$refs.processUdgetPlanMaterial.setValues(values); isEr = false; } + // if( record.row.id !== undefined && record.row.id !== '' || record.row.materialNumber === '' || record.row.materialNumber === undefined){ + // console.log("11出发了",record.row); + // } } // console.log("5555出发了",record.row); if(record.row.materialGroup !== '' && record.row.materialGroup !== undefined && record.row.materialNumber !== '' && record.row.materialNumber !== undefined && isEr){ - // console.log("2出发了",record.row); + console.log("2出发了",record.row); let materialName = { } // console.log("this.bigIdMerchandiseNewsList",this.bigIdMerchandiseNewsList) this.bigIdMerchandiseNewsList.forEach( item => { @@ -659,7 +662,7 @@ if(record.row.materialQuantity !== '' && record.row.materialPrice !== '' && record.row.materialQuantity !== undefined && record.row.materialPrice !== undefined){ // record.row.materialAmount = record.row.materialQuantity * record.row.materialPrice; - // console.log("3出发了",record.row); + console.log("3出发了",record.row); //如果单价大于5万 if(record.row.materialPrice>50000){ this.materialPrice=record.row.materialPrice @@ -707,7 +710,7 @@ }); }); getAction(this.url.merchandiseNewsList,par).then((res)=>{ - console.log(res.result); + console.log("12312",res.result); if(res.success){ let newList = res.result; if(numberList.length > 0){ @@ -820,6 +823,7 @@ }) } }); + this.isBu = undefined; }, /*回显数据*/ init(){ diff --git a/src/views/merchandisenews/ProcessMerchandiseNewsList.vue b/src/views/merchandisenews/ProcessMerchandiseNewsList.vue index 81aedf6..d9ca692 100644 --- a/src/views/merchandisenews/ProcessMerchandiseNewsList.vue +++ b/src/views/merchandisenews/ProcessMerchandiseNewsList.vue @@ -237,16 +237,16 @@ align:"center", dataIndex: 'specification' }, - { - title:'简介概要', - align:"center", - dataIndex: 'synopsis' - }, - { - title:'分类', - align:"center", - dataIndex: 'classify' - }, + // { + // title:'简介概要', + // align:"center", + // dataIndex: 'synopsis' + // }, + // { + // title:'分类', + // align:"center", + // dataIndex: 'classify' + // }, { title: '操作', dataIndex: 'action', From ebcf7250a0166e2c565d75df827f4178fb5f61c5 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Thu, 10 Nov 2022 14:16:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statement/ProcessMaterialWarehousingStatement.vue | 4 ++-- src/views/activiti/form/ProcessUdgetPlanForm.vue | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/views/accessrecords/statement/ProcessMaterialWarehousingStatement.vue b/src/views/accessrecords/statement/ProcessMaterialWarehousingStatement.vue index a66abf9..e3fdb3d 100644 --- a/src/views/accessrecords/statement/ProcessMaterialWarehousingStatement.vue +++ b/src/views/accessrecords/statement/ProcessMaterialWarehousingStatement.vue @@ -51,8 +51,8 @@ name: "ProcessMaterialWarehousingStatement", }, mounted() { // this.showSessionId = window.location.search; - this.srcHtml = '../static/废旧电缆台账.html'; - this.sendMesFroIframe(); + // this.srcHtml = '../static/废旧电缆台账.html'; + // this.sendMesFroIframe(); }, created() { // this.loadData(); diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue index 39fb637..938d4af 100644 --- a/src/views/activiti/form/ProcessUdgetPlanForm.vue +++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue @@ -803,6 +803,14 @@ // }, descriptionFetchDatas(value){ //查询物料组 + + + + + + + + //查询大品类数据 let par = { delFlag: 0, @@ -824,6 +832,7 @@ } }); this.isBu = undefined; + }, /*回显数据*/ init(){ From 46dd4fcb9c26ab1bc7c358c85f84c727322351dc Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Thu, 10 Nov 2022 16:23:56 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/jeecg/PEditableTable.vue | 8 +++++- .../activiti/form/ProcessUdgetPlanForm.vue | 26 ++++++++++++------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/components/jeecg/PEditableTable.vue b/src/components/jeecg/PEditableTable.vue index 4cbea60..a4fd7c7 100644 --- a/src/components/jeecg/PEditableTable.vue +++ b/src/components/jeecg/PEditableTable.vue @@ -11,7 +11,8 @@
- 新增 + 新增 + 新增 \ No newline at end of file