From 133323a15892bc591a2a96b6373f28c3b9e2bf8d Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Mon, 1 Aug 2022 14:54:25 +0800 Subject: [PATCH 01/19] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E2=80=8556507=20=E6=9F=A5=E7=9C=8B=E6=B5=81=E7=A8=8B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=9A=E5=A4=96=E9=83=A8=E6=A0=87=E5=87=86=E5=8C=96?= =?UTF-8?q?=E5=8D=8F=E4=BC=9A=E5=8F=82=E4=BC=9A=E6=B5=81=E7=A8=8B=EF=BC=8C?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzhHy-ch/step1.vue | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 578fbad19..2bde97c30 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -126,6 +126,7 @@ - 计划内 - 计划外 + 计划内 + 计划外 @@ -190,7 +191,7 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form"> - +

标准法规工程师

@@ -201,7 +202,7 @@ - +

分委会主任/部门中心主任

@@ -213,7 +214,7 @@ - +

责任工程师

@@ -225,7 +226,7 @@ - +

参会人员所在部门中心主任

@@ -237,7 +238,7 @@ - +

标准法规部人员

@@ -285,7 +286,7 @@ - +

院长

@@ -519,9 +520,9 @@ export default { bpnId: this.$route.query.bpnId }).then(res => { let mes = JSON.parse(res.mes) - this.ch_pageData = mes.ch_pageData - this.commentInfo = mes.commentInfo - this.roleForm = mes.roleForm + this.ch_pageData = mes.json.ch_pageData + this.commentInfo = mes.json.commentInfo + this.roleForm = mes.json.roleForm }); }, From d1e7fcfc27e0b480ca7b581596e56fd1e292a599 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 2 Aug 2022 14:28:06 +0800 Subject: [PATCH 02/19] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E2=80=8556582=20=E6=B5=B7=E5=A4=96=E6=B3=95=E8=A7=84-=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=B5=81=E7=A8=8B=E5=AD=97=E6=AE=B5=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E8=87=B3=E6=B5=81=E7=A8=8B=E4=B8=AD=E5=BF=83=20=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E6=9F=A5=E7=9C=8B=E6=B5=81=E7=A8=8B=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=20=E7=95=8C=E9=9D=A2=E6=97=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 2 +- src/pages/processCenter/pages/creatProcess/zcrk/step1.vue | 2 +- src/pages/processCenter/pages/processDetail/index.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 6ba476e28..195975f54 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1110,7 +1110,7 @@ - - Date: Tue, 2 Aug 2022 15:44:24 +0800 Subject: [PATCH 03/19] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E2=80=85=20=E5=BB=B6=E6=9C=9F=E4=BC=81=E6=A0=87=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=8C=E6=89=93=E5=9B=9E=E4=B9=8B=E5=90=8E=E5=86=8D?= =?UTF-8?q?=E6=AC=A1=E5=8F=91=E8=B5=B7=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E7=B1=BB=E5=88=AB=E5=B8=A6=E4=B8=8D=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbzxdjhgk/component/cancel.vue | 4 ++++ .../creatProcess/qbzxdjhgk/component/delay.vue | 4 ++++ .../qbzxdjhgk/component/establish.vue | 4 ++++ .../creatProcess/qbzxdjhgk/component/merge.vue | 4 ++++ .../qbzxdjhgk/component/rename.vue | 4 ++++ .../pages/creatProcess/qbzxdjhgk/step1.vue | 18 ++++++++++++++++++ 6 files changed, 38 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 7e61bc13f..15b32174e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -324,6 +324,7 @@ 带入 + 数据加载中... @@ -338,6 +339,7 @@ export default { props: ['message'], data(){ return{ + formLoading: false, disabledXX:!!this.$route.query.disabledXX, formRules: { bussSort: [ @@ -390,9 +392,11 @@ export default { // this.qbfsForm = {} // } //查询下拉框数据 + this.formLoading = true this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this }, res => { + this.formLoading = false this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 this.BZList = res.data.ENERGYTYPES //标准范围 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 4a24b253c..eeb1fcd78 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -340,6 +340,7 @@ 带入 + 数据加载中... @@ -354,6 +355,7 @@ export default { props: ['message'], data(){ return{ + formLoading:false, disabledXX:!!this.$route.query.disabledXX, BZList: [], cbcdOptions: [], @@ -412,9 +414,11 @@ export default { // this.qbfsForm = {} // } //查询下拉框数据 + this.formLoading = true this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this }, res => { + this.formLoading = false this.BZList = res.data.ENERGYTYPES //标准范围 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index 239930b36..8c07b88aa 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -410,6 +410,7 @@ :nodeList="nodeListZRBM" @checkedRole="drawerCheckZRBM" /> + 数据加载中... @@ -443,6 +444,7 @@ export default { }; return { disabledXX:!!this.$route.query.disabledXX, + formLoading:false, workModel: false, workSearch: { workGroupName: "", @@ -572,9 +574,11 @@ export default { // this.qbfsForm = {} // } //查询下拉框数据 + this.formLoading = true this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this }, res => { + this.formLoading = false this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 this.BZList = res.data.ENERGYTYPES //适用车型 // this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index 51a26c8ba..afb14dd3b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -561,6 +561,7 @@ @checkedRole="checkedRole" :nodeList="nodeList" > + 数据加载中... @@ -582,6 +583,7 @@ export default { data(){ return { disabledXX:!!this.$route.query.disabledXX, + formLoading:false, workModel: false, workSearch: { workGroupName: "", @@ -721,9 +723,11 @@ export default { // this.qbfsForm = {} // } //查询下拉框数据 + this.formLoading = true this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this }, res => { + this.formLoading = false this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 this.BZList = res.data.ENERGYTYPES //适用车型 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index 4a2982a74..901b0228e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -331,6 +331,7 @@ 带入 + 数据加载中... @@ -346,6 +347,7 @@ export default { data(){ return{ disabledXX:!!this.$route.query.disabledXX, + formLoading:false, formRules: { bussSort: [ { required: true, message: "请选择企标类别", trigger: "blur" } @@ -399,9 +401,11 @@ export default { // if(this.qbfsForm.passFlag){ // this.qbfsForm = {} // } + this.formLoading = true this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this }, res => { + this.formLoading = false this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 this.BZList = res.data.ENERGYTYPES //标准范围 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index 942bc57f8..be8ba25dc 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -409,6 +409,24 @@ export default { break } this.qbfsForm = item.qbfsForm || item; + if (this.qbfsForm.bussSort) { + if(this.qbfsForm.bussSort instanceof Array){ + this.qbfsForm.bussSort = this.qbfsForm.bussSort[0] + }else { + let val = this.qbfsForm.bussSort.replace('//',"").replace('["',"").replace('"]',"").toString() + if (val !== '' && val !== null && typeof (val) !== 'undefined') { + if (val instanceof Array) { + this.qbfsForm.bussSort = this.form.bussSort.join(",")[0]; + } else { + this.qbfsForm.bussSort = val + } + } else if (val === '') { + this.qbfsForm.bussSort = "" + } + } + } else { + this.qbfsForm.bussSort = "" + } this.formLoading = false; this.commentText = item.commentText this.roleForm.dockUser = item.dockUser || item.roleForm.dockUser; From 44cdefb61d25a2255d976af780616b02476f4736 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 2 Aug 2022 16:20:57 +0800 Subject: [PATCH 04/19] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E2=80=8556851=20=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81=E7=A8=8B-?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=A0=87=E5=87=86=EF=BC=8C=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E8=8A=82=E7=82=B9=EF=BC=8C=E6=8F=90=E4=BA=A4=E4=B8=8D=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/qbrk-product/step13.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index f72cdae74..2fd742551 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -1003,6 +1003,7 @@ {validator: validateStandNumber, trigger: 'change'} ], + standNumNotRule: [], standYear: [ { required: true, message: '请输入标准年份'}, ], @@ -2494,6 +2495,10 @@ // } else if (val === '') { // this.form.country = [] // } + if(this.form.standStatus !== '1'){ + this.rules.standNum[0].required = false; + } + this.fileInfoHandle() this.$refs['form'].validate((valid) => { if (valid) { From b5e14509247ea7de19f5bcac46100a040e4f5e46 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 2 Aug 2022 18:01:35 +0800 Subject: [PATCH 05/19] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E2=80=8556827=20=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E6=B5=81=E7=A8=8B-=E9=A1=B9=E7=9B=AE=E5=88=86?= =?UTF-8?q?=E5=8F=91=E8=8A=82=E7=82=B9=EF=BC=8C=E9=80=89=E6=8B=A9=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E9=80=BB=E8=BE=91=20=E5=BA=94=E8=AF=A5=E6=98=AF?= =?UTF-8?q?=E2=80=9C=E5=B7=B2=E7=BB=B4=E6=8A=A4=E2=80=9D+=E2=80=9C?= =?UTF-8?q?=E6=9C=AA=E7=BB=B4=E6=8A=A4=E2=80=9D=EF=BC=8C=E7=8E=B0=E5=9C=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=8C=BA=E4=B9=B1=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzpg/step3.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue index b2f0db364..732580c42 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue @@ -565,6 +565,8 @@ export default { }, //查询项目群下的项目 getProductData() { + // 已维护 状态 1 , 为维护 状态 0 + this.projectSearch.flag = '1' this.$http.get("sarStandProjectLibrary/queryProjects", { projectGroup: this.projectGroup, current: this.pageNo, From 7dfe95a1aadeaacd5daaf82b455dca74869adbc6 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Wed, 3 Aug 2022 15:36:06 +0800 Subject: [PATCH 06/19] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E2=80=8556725=20=E6=88=91=E7=9A=84=E8=AE=A2=E9=98=85=EF=BC=8C?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/questionItemInfo.vue | 10 ++- .../personal/pages/my-questions/index.vue | 64 +++++++++++++------ 2 files changed, 53 insertions(+), 21 deletions(-) diff --git a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue index 408da7b5c..2db8bdde9 100644 --- a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue +++ b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue @@ -12,7 +12,7 @@
附件： -
+
{{ item.name }}
@@ -43,6 +43,10 @@ export default { type: Object, required: false }, + fileList: { + type: Array, + required: false + }, questionerForm: { type: Object, required: false @@ -58,6 +62,9 @@ export default { } }, methods:{ + fileListSetFunc(){ + return this.assemble(this.answer.appendixId,this.answer.appendixName) + }, archiveVerify(){ return !!(this.questionerForm && this.questionerForm.questioner && this.questionerForm.questioner !== this.answererNowUserName && this.institutionId === '30001273'); @@ -83,7 +90,6 @@ export default { answerChang(){} }, mounted () { - this.fileList = this.assemble(this.answer.appendixId,this.answer.appendixName) }, watch:{ answer: { diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index 25d27956b..95b52d63e 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -68,6 +68,7 @@
- +
@@ -126,6 +127,7 @@
- +
@@ -184,6 +186,7 @@
- +
@@ -242,6 +245,7 @@
- +
@@ -311,7 +315,7 @@
-
-
-
-
-
- +
@@ -635,7 +639,7 @@
-
- +
@@ -693,7 +697,7 @@
-
- +
@@ -751,7 +755,7 @@
-
- +
@@ -846,7 +850,7 @@
取 消 - 提 交 + 提 交 @@ -1253,6 +1257,7 @@ export default { }, data(){ return{ + tagsLoading: false, submitBtnLoading: false, aiKey:1, qiiKey:1, @@ -1326,7 +1331,6 @@ export default { } }, mounted(){ - console.log(this.$store.getters.userInfo) this.standSearch() // 查询各下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", "", { @@ -1621,9 +1625,11 @@ export default { this.subSearch() }, standClick(){ + this.tagsLoading = true this.queSearch() }, standClick2(){ + this.tagsLoading = true this.$http.get('lawss/AskQuestions/getAskQuestionsByStandardId',{ standardId: this.activestand, answerer: this.$store.getters.userInfo.userId, @@ -1631,11 +1637,13 @@ export default { _this: this }, res => { this.questionsList = res.data + this.tagsLoading = false }, e =>{ }) }, standClick3(){ + this.tagsLoading = true this.$http.get('lawss/AskQuestions/getSubscriptionByStandId',{ standardId: this.activestand, answerer: this.$store.getters.userInfo.userId, @@ -1643,6 +1651,7 @@ export default { _this: this }, res => { this.questionsList = res.data + this.tagsLoading = false }, e =>{ }) @@ -1668,14 +1677,31 @@ export default { }) } this.answerList = res.data + this.answerList.fileList = this.assemble(this.answerList.appendixId,this.answerList.appendixName) }else{ this.answerList = res.data + this.answerList.fileList = this.assemble(this.answerList.appendixId,this.answerList.appendixName) } this.qiiKey++ this.dataLoading = false + this.tagsLoading = false }, e => { }) }, + fileListSetFunc(item){ + return this.assemble(item.appendixId,item.appendixName) + }, + assemble(ids,names){ + let list= []; + if(ids && ids !== '' && names && names !== ''){ + let idArray=ids.split(','); + let nameArray=names.split(','); + for(let i=0; i { this.questionsList = res.data + this.tagsLoading = false }) }, //查询回答标准 @@ -1805,7 +1832,6 @@ export default { }, //文件上传前 beforeUploadTheme(file){ - console.log(file); var filename = file.name; var index1 = filename.lastIndexOf('.') var index2 = filename.length From dcd11dfb653db857319c87a76f3c0cf032009934 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Thu, 4 Aug 2022 10:50:48 +0800 Subject: [PATCH 07/19] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E2=80=8556828=20=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E9=80=89=E6=8B=A9=E9=A1=B9=E7=9B=AE=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E9=A1=B9=E7=9B=AE=E6=98=BE=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E5=85=A8=EF=BC=8C=E5=8F=AA=E6=98=BE=E7=A4=BA10=E6=9D=A1?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg2/step1.vue | 162 ++++++++++-------- 1 file changed, 93 insertions(+), 69 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index bcc6ae5a0..96029a19b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -249,88 +249,89 @@ size="900px" custom-class="demo-drawer" > -
-
-
-
- - - - - - - - - - 查询 - - - - 清空 - - - -
+
+
+
+ + + + + + + + + + 查询 + + + + 清空 + + + +
+
+ type="selection" + width="55" + align="center" /> + {{$t('m.dataAcquisition')}}
@@ -359,6 +360,7 @@ export default { data() { return { disabledXX:!!this.$route.query.disabledXX, + replaceLoading: false, active: "1", //当前选中的type isSubmit: false, saveLoading: false, @@ -478,9 +480,10 @@ export default { }, //获取项目数据 getProjectData() { + this.replaceLoading = true this.$http.get("sarStandProjectLibrary/queryProjectWorkFlow", { - page: this.page, - pageSize: this.pageSize, + Page: this.page, + PageSize: this.pageSize, ...this.projectSearch }, { _this: this @@ -492,6 +495,7 @@ export default { this.ProjectDatas = res.data.Maintenance.records; this.total = res.data.Maintenance.total; } + this.replaceLoading = false }); }, @@ -826,6 +830,26 @@ export default { } } + .standard-content { + height: 100%; + padding: 10px 0 0; + .content { + height: 100%; + display: flex; + flex-direction: column; + padding: 0 10px; + .standard-table-wrap { + flex: auto; + overflow-y: auto; + } + .pagination { + position: static; + /deep/ .pagination-slot { + padding: 0; + } + } + } + } .demo-drawer-content { margin-top: 10px; } From ef1b19b1a44b5329751ebc833e67385b4ae24f93 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Thu, 4 Aug 2022 16:08:25 +0800 Subject: [PATCH 08/19] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E2=80=8556904=20=E9=97=AE=E7=AD=94=E5=BA=93-=E8=AE=A2=E9=98=85?= =?UTF-8?q?=20=E7=A8=8B=E5=BA=8F=E5=BC=82=E5=B8=B8=20api/lawss/Subscriptio?= =?UTF-8?q?n/insertSubscription=20=E8=BF=99=E4=B8=AA=E6=8E=A5=E5=8F=A3=20,?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=20=E5=8F=96=E6=B6=88=E8=AE=A2=E9=98=85?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/regulatoryRepository/standQA/index.vue | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue index ea47b938a..4bc7cbafe 100644 --- a/src/pages/regulatoryRepository/standQA/index.vue +++ b/src/pages/regulatoryRepository/standQA/index.vue @@ -59,7 +59,8 @@ 查看 - 订阅 + 订阅 + 取消订阅
@@ -673,7 +674,10 @@ export default { this.handleDetail(command[0]) break case '订阅': - this.subscribe(command[0]) + this.subscribe(command[0],'y') + break + case '取消订阅': + this.subscribe(command[0],'n') break } }, @@ -690,14 +694,15 @@ export default { }, e => { }) }, - subscribe(row){ + subscribe(row,subState){ this.$http.postData('lawss/Subscription/insertSubscription',{ askId: row.id, usId: this.$store.getters.userInfo.userId, + subState: subState, },{ _this: this }, res => { - console.log(res); + row.subState = subState }) }, refreshStandMap(){ From c507c9e3b756c9f1c00c7baab1016ae454f9cbdd Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Thu, 4 Aug 2022 17:14:05 +0800 Subject: [PATCH 09/19] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E2=80=8556789=20=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E9=80=89=E6=8B=A9=E4=BC=81=E4=B8=9A=E6=A0=87?= =?UTF-8?q?=E5=87=86=EF=BC=8C=E5=88=B6=E4=BF=AE=E8=AE=A2=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=9F=A5=E4=B8=8D=E5=87=BA?= =?UTF-8?q?=E6=9D=A5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbzxdjhgk/component/merge.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index afb14dd3b..763437848 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -226,8 +226,9 @@ - - + + + @@ -323,6 +324,7 @@ label="起草责任单位"> + {{$t('m.dataAcquisition')}}
Date: Thu, 4 Aug 2022 17:55:10 +0800 Subject: [PATCH 10/19] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E2=80=8556826=20=E6=B5=81=E7=A8=8B=E7=AC=AC=E4=B8=89=E6=AD=A5?= =?UTF-8?q?=E9=AA=A4=EF=BC=8C=E5=88=86=E5=8F=91=E9=A1=B9=E7=9B=AE=E8=8A=82?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E7=82=B9=E5=87=BB=E6=B7=BB=E5=8A=A0=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE=E4=B8=8D?= =?UTF-8?q?=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzpg/step3.vue | 238 ++++++++++-------- 1 file changed, 131 insertions(+), 107 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue index 732580c42..e74f9da10 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue @@ -226,133 +226,134 @@ size="900px" custom-class="demo-drawer" > -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - 查询 - - - - 清空 - - - -
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + + + 清空 + + + +
+

如果各项目符合法规情况相同,可同时勾选,第一个勾选项目合规排查结果,将代表所有勾选项目合规排查结果。

+ type="selection" + width="55" + align="center"> + type="index" + width="55" + label="序号" + align="center"> + align="center" + prop="projectName" + label="项目名称"/> + align="center" + width="120" + prop="projectStatus" + label="项目状态"/> + align="center" + prop="currentNode" + label="当前节点"/> + align="center" + prop="projectGroup" + label="项目群"/> + align="center" + prop="uname" + label="项目经理"/>
+ {{$t('m.dataAcquisition')}}
@@ -410,6 +411,7 @@ export default { return { active: "1", //折叠的标志，true为折叠，false为不折叠 + replaceLoading: false, foldFormFlag: false, drawerModal: false, loading: false, @@ -565,6 +567,7 @@ export default { }, //查询项目群下的项目 getProductData() { + this.replaceLoading = true // 已维护 状态 1 , 为维护 状态 0 this.projectSearch.flag = '1' this.$http.get("sarStandProjectLibrary/queryProjects", { @@ -577,6 +580,7 @@ export default { }, res => { this.productData = res.data.records; this.totalNo = res.data.total; + this.replaceLoading = false }); }, //查询项目按钮 @@ -918,6 +922,26 @@ export default { overflow-y: hidden; } } + .standard-content { + height: 100%; + padding: 10px 0 0; + .content { + height: 100%; + display: flex; + flex-direction: column; + padding: 0 10px; + .standard-table-wrap { + flex: auto; + overflow-y: auto; + } + .pagination { + position: static; + /deep/ .pagination-slot { + padding: 0; + } + } + } + } .demo-drawer-content { margin-top: 10px; } From bde539b4858ee27f7da1b646f22fa0b5caf9afd0 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Fri, 5 Aug 2022 14:18:25 +0800 Subject: [PATCH 11/19] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E2=80=8556831=20=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81?= =?UTF-8?q?=E7=A8=8B-=E6=B2=A1=E5=85=A8=E5=B1=8F=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=20=E6=B2=A1=E6=9C=89=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 195975f54..d8774ab0a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -3819,7 +3819,12 @@