From df6dae42a641bcc4c4ab163b6f2bafb5f0990c3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 10 May 2022 15:28:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?52725=20=E6=A0=87=E5=87=86=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=B5=B7=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=EF=BC=8C=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9=20?= =?UTF-8?q?=E6=A0=87=E5=87=86=E7=B1=BB=E5=88=AB=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index f2fe8347b..4165f147d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -43,8 +43,7 @@ > - - + Date: Tue, 10 May 2022 16:11:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82=20#52721?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbfs/common/formListStep2.vue | 735 ++++++++++++++++++ .../pages/creatProcess/qbfs/step1.vue | 50 +- .../pages/creatProcess/qbfs/step2.vue | 135 +++- 3 files changed, 886 insertions(+), 34 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep2.vue diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep2.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep2.vue new file mode 100644 index 000000000..554a012f7 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep2.vue @@ -0,0 +1,735 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue index 4697d037c..b378ecfe6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue @@ -86,20 +86,18 @@ min-width="120"> + + + - - - @@ -561,17 +559,31 @@ align="center"> + label="企标编号" + min-width="150"> + + + + + + {{ formatIssueDate(scope.row.reviewTime) }} + prop="qcrbuss" + label="起草人" + min-width="120"> + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue index 799da19dc..00062b106 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue @@ -10,9 +10,6 @@
- - - - - - - - - - + + + +
+ + + + + + + +
+
@@ -135,6 +152,7 @@ @checkedRole="checkedRole" :nodeList="nodeList2" > + 正在加载数据
@@ -143,18 +161,32 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process"; +import formList from './common/formListStep2.vue' export default { name: "qbfsStepSub1", components:{ ProcessHeader, ProcessFooter, - ProcessTitle + ProcessTitle, + formList }, data() { return { active: '1', fileList: [], + formKey:1, + dataLoading:true, + modalShowRoleFlag:false, + disabledState:true, + verifySarStandard:true, + FBGBUSSFileList: [], + BZSMBUSSFileList: [], + LSBBBUSSFileList: [], + QTWJBUSSFileList: [], + GLWJBUSSFileList: [], + LXDList: [], + FSDList: [], commentText: '', detailData: [], nodeList: [], @@ -200,6 +232,9 @@ export default { this.getData() }, methods:{ + emitDataLoading(boo){ + this.dataLoading = boo + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -227,13 +262,75 @@ export default { }) }) }, + getStandInfoUpdateById(standId) { + return new Promise((resolve, reject) => { + this.$http.get('lawss/sarBussionessStand/getStandInfoUpdateById', {id: standId}, { + _this: this + }, res => { + if(res && res.data){ + const history = res; + resolve(history) + } + }) + }) + }, + assemble(ids,names){ + let list= new Array(); + if(ids && ids !== '' && names && names !== ''){ + let idArray=ids.split(','); + let nameArray=names.split(','); + for(let i=0; i { - this.qbfsForm = JSON.parse(JSON.stringify(item)) - this.fileList = item.fileList + const bringData = standObj.data + const obj = { + reviewResultsContent:"", + reviewUserId:this.$store.getters.userInfo.userId, + reviewUserName:this.$store.getters.userInfo.userName, + draftTime:"", + releaseTime:"", + expirationDate:"", + LXDName:"", + LXD:"", + FSDName:"", + FSD:"", + } + const json = Object.assign(bringData, bringData.attrInfoMap,item,obj); + this.qbfsForm = JSON.parse(JSON.stringify(json)) + this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId + this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName + this.qbfsForm['id'] = bringData.id + this.qbfsForm['NYLXCLASS'] = this.filterObj(this.qbfsForm['NYLXCLASS']) + this.qbfsForm['SYCXCLASS'] = this.filterObj(this.qbfsForm['SYCXCLASS']) + this.qbfsForm['SYCPXCLASS'] = this.filterObj(this.qbfsForm['SYCPXCLASS']) + this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName); + this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName); + this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName); + this.QTWJBUSSFileList=this.assemble(this.qbfsForm.QTWJBUSS,this.qbfsForm.QTWJBUSSName); + this.GLWJBUSSFileList=this.assemble(this.qbfsForm.GLWJBUSS,this.qbfsForm.GLWJBUSSName); + this.standardDrawer = false + this.verifySarStandard = true + this.formKey++ + this.$forceUpdate() }) }, handleTabs(name) { From 86e9cd3ea8d962c080961d7b662a78504fe07e6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 10 May 2022 16:30:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?52723=20=E5=85=A5=E5=BA=93=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=BC=95=E7=94=A8=E6=96=87=E4=BB=B6=E3=80=81=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E5=90=8D=E7=A7=B0=E8=B0=83=E5=A4=A7=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=EF=BC=8C=E8=8B=B1=E6=96=87=E5=90=8D=E7=A7=B0?= =?UTF-8?q?100=E5=AD=97=E7=AC=A6=E9=99=90=E5=88=B6=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=EF=BC=8C=E6=94=B9=E6=88=90500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 68 ++++++++++--------- .../pages/creatProcess/bzrk/step2.vue | 38 ++++++----- .../pages/creatProcess/bzrk/step3.vue | 54 ++++++++------- .../pages/creatProcess/bzrk/step4.vue | 64 +++++++++-------- .../pages/creatProcess/bzrk/step5.vue | 54 ++++++++------- 5 files changed, 149 insertions(+), 129 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index d08d89a7e..65ac10fdb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -64,14 +64,6 @@ > - - - - + + + + +
@@ -930,29 +931,7 @@ >{{ '手动查找' }}
- - - - - - {{ '手动查找' }} - - + + + + + + + + {{ '手动查找' }} + + + @@ -3476,7 +3480,7 @@ export default { padding: 2px; } /deep/ .prc-content-border .form-item-disabled .el-form-item__content .el-input .el-input__inner { - width: 70%; + width: 100%; } /deep/ .search-area { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 4165f147d..4b8627a66 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -79,14 +79,6 @@ clearable >
- - - @@ -166,6 +158,16 @@ + + + + + @@ -620,21 +622,23 @@ clearable > + + diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index ade880e1a..49d53b1e9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -80,14 +80,6 @@ clearable > - - - @@ -166,6 +158,16 @@ + + + + + @@ -581,23 +583,6 @@ clearable > - - - - - - @@ -615,6 +600,25 @@ + + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index e1705e739..33b9bbc47 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -69,13 +69,6 @@ > - - - @@ -174,6 +167,15 @@ :nodeKey="nodeKey" @popoverHide="treeHide" @popoverHideCancel="treeHideCancel"> + + + + + @@ -1184,29 +1186,6 @@ >{{ '手动查找' }} - - - - - - {{ '手动查找' }} - - @@ -1229,6 +1208,31 @@ + + + + + + + {{ '手动查找' }} + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index a1104babb..80881c2e8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -65,14 +65,6 @@ clearable > - - - @@ -160,6 +152,16 @@ + + + + + @@ -540,23 +542,6 @@ clearable > - - - - - - @@ -574,6 +559,25 @@ + + + + + + + + From c31dffed8717cf6fddf8064cd03de6558c78b186 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 10 May 2022 16:43:47 +0800 Subject: [PATCH 4/4] feat: There is no way the, bug #52516 --- src/pages/processCenter/pages/phone/qbrk/step10.vue | 6 +++--- src/pages/processCenter/pages/phone/qbrk/step11.vue | 6 +++--- src/pages/processCenter/pages/phone/qbrk/step4.vue | 4 ++-- src/pages/processCenter/pages/phone/qbrk/step8.vue | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/pages/processCenter/pages/phone/qbrk/step10.vue b/src/pages/processCenter/pages/phone/qbrk/step10.vue index 75fa27312..6a3bb2506 100644 --- a/src/pages/processCenter/pages/phone/qbrk/step10.vue +++ b/src/pages/processCenter/pages/phone/qbrk/step10.vue @@ -32,10 +32,10 @@ :opinionsShow = "true" @emitDataLoading="emitDataLoading" > -
- +
+ -
+
-
- +
+ -
+
-
+
-
+
-
+
-
+