From eb699db2bd9341df7c1595b47f7c07de8d6ff69c Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 6 Dec 2021 16:56:16 +0800 Subject: [PATCH 1/4] commit --- src/pages/details/otherStandardDetails/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index dd9c0b8d1..da8f196f2 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3713,7 +3713,7 @@ export default { & > p { min-height: 42px; line-height: 43px; - border-bottom: 1px solid #E5E5E5; + /*border-bottom: 1px solid #E5E5E5;*/ } } } From d79bf122e73a9099fd998b3795986af53ff4a3da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 6 Dec 2021 17:27:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=A4=8D=E5=AE=A1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbfs/step1-4.vue | 3 ++- .../pages/creatProcess/qbfs/step1.vue | 15 ++++++++++++--- .../pages/creatProcess/qbfs/step2.vue | 16 ++++++++++------ .../pages/creatProcess/qbfs/step3.vue | 3 ++- .../pages/creatProcess/qbfs/step4.vue | 5 +++-- .../processCenter/pages/processDetail/index.vue | 2 +- 6 files changed, 30 insertions(+), 14 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1-4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1-4.vue index 736bfb5b7..02dd19eee 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step1-4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1-4.vue @@ -110,7 +110,7 @@

{{ item.name }} + :key="item.id"> {{ item.oldFileName }} { this.qbfsForm = JSON.parse(JSON.stringify(item)); + this.fileList = item.fileList let res = item.res ? item.res.substring(1, item.res.lastIndexOf("]")) : ""; res = res.split(","); this.dataList = []; diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue index 952d7543c..21a407305 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue @@ -101,7 +101,7 @@

{{ item.name }} + :key="item.id"> {{ item.oldFileName }} { + let fileIds = res.data.attrInfoCaseMap.fbgbuss + this.$http.get('att/attFile/getMultiFileInfos',{fileIds: fileIds}, { + _this: this + }, res => { + this.fileList = res.data + }) + }) this.qbfsForm.entNumber = this.selectList[0].standCode || '--' this.qbfsForm.cnName = this.selectList[0].standName || '--' this.qbfsForm.enName = this.selectList[0].standEnName || '--' @@ -515,7 +525,6 @@ export default { this.qbfsForm.releaseDate = this.selectList[0].issueTime || '--' this.qbfsForm.implementDate = this.selectList[0].putTime || '--' this.qbfsForm.reviewDate = '--' //复审日期字段未确定 - this.fileList = this.selectList[0].standFileList this.ListModel = false } }, @@ -525,7 +534,6 @@ export default { }, //企业标准选中项改变 selectListChange(data){ - console.log(data); this.selectList = data }, // 点击查看 @@ -568,6 +576,7 @@ export default { this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true + this.qbfsForm.fileList = this.fileList this.qbfsForm.commentText = this.commentText var json = Object.assign(this.qbfsForm, this.roleForm) this.$http.get('lawss/activiti/startProcess', {type: '23'}, { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue index 20f6a0243..9f94f9e6c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue @@ -97,7 +97,7 @@

{{ item.name }} + :key="item.id"> {{ item.oldFileName }} { this.qbfsForm = JSON.parse(JSON.stringify(item)) + this.fileList = item.fileList }) }, handleTabs(name) { @@ -406,18 +407,21 @@ export default { this.modalshowflag = true; }, checkedRole(data) { - var idList = ""; - var nameList = ""; + let idList = ""; + let nameList = ""; data.forEach(item => { - if (nameList.length > 0) { + if (nameList.length) { nameList += ","; idList += ","; } idList += item.id; nameList += item.name; }); - this.qbfsForm.jgUserId = idList; - this.qbfsForm.jgUser = nameList; + this.$set(this.qbfsForm, 'jgUser', nameList) + this.$set(this.qbfsForm, 'jgUserId', idList) + if(this.qbfsForm.jgUser){ + this.$refs.qbfsForm.validateField('jgUser') + } }, /** * @Description: 点击下载 diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue index 5e132ed8a..52c17fcbb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue @@ -97,7 +97,7 @@

{{ item.name }} + :key="item.id"> {{ item.oldFileName }} { this.qbfsForm = JSON.parse(JSON.stringify(item)) + this.fileList = item.fileList }) }, //流程提交 diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue index 4678b8f00..5559f5f43 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue @@ -107,10 +107,10 @@ clearable > - +

{{ item.name }} + :key="item.id"> {{ item.oldFileName }} { this.qbfsForm = JSON.parse(JSON.stringify(item)); + this.fileList = item.fileList let res = item.res ? item.res.substring(1, item.res.lastIndexOf("]")) : ""; res = res.split(","); this.dataList = []; diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 4169ed788..8914299d4 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -272,7 +272,7 @@ export default { this.toProcessDetail('bzchStep6-1',row) } else if(prcType === '23'){ //企标复审 - this.toProcessDetail('qbzxdjhgkStep1-5',row) + this.toProcessDetail('qbfsStep1-4',row) }else if(prcType === '24'){ //企标废止 this.toProcessDetail('qbfzStep1-7',row) From cb7b584fd1514b790fee941c5cd8efcd4760ef1f Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 6 Dec 2021 17:37:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E5=8F=82=E4=BC=9A?= =?UTF-8?q?=E5=B8=A6=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzhHd-rh/step3.vue | 5 +++++ .../pages/creatProcess/bzhHy-ch/step3.vue | 5 +++++ .../processCenter/pages/phone/bzhHd-rh/step4.vue | 9 ++++++++- .../processCenter/pages/phone/bzhHd-rh/step6.vue | 9 ++++++++- .../regulatoryRepository/nonConfomity/index.vue | 2 +- .../nonConfomity/pages/rectificationDatabase.vue | 16 ++++++---------- 6 files changed, 33 insertions(+), 13 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index 63c49a6c2..af7588ed4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -106,6 +106,7 @@ { this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData + this.rh_pageData.fillDept = this.$store.getters.userInfo.institutionName + this.rh_pageData.fillUnit = this.$store.getters.userInfo.upDeptName + this.rh_pageData.fillTel = this.$store.getters.userInfo.phone this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName if (this.rh_pageData.fillFile !== undefined) { this.fillFileList = this.rh_pageData.fillFile diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue index 45db1b442..c369e42d1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue @@ -105,6 +105,7 @@ { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData this.uploadFileLength = this.ch_pageData.fileTextList.length + this.rh_pageData.fillDept = this.$store.getters.userInfo.institutionName + this.rh_pageData.fillUnit = this.$store.getters.userInfo.upDeptName + this.rh_pageData.fillTel = this.$store.getters.userInfo.phone this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName this.roleForm = JSON.parse(JSON.stringify(item)).roleList diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue index c15538763..71dc62f2f 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue @@ -107,7 +107,14 @@ - + + + diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue index fef41fc86..c86900e53 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue @@ -111,7 +111,14 @@ - + + + diff --git a/src/pages/regulatoryRepository/nonConfomity/index.vue b/src/pages/regulatoryRepository/nonConfomity/index.vue index 75ce33ef9..2b3dfc28d 100644 --- a/src/pages/regulatoryRepository/nonConfomity/index.vue +++ b/src/pages/regulatoryRepository/nonConfomity/index.vue @@ -50,7 +50,7 @@