From fde336157ed87f8425b78f0f29a5e11c8ac7a50f Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Sat, 24 Jul 2021 09:33:32 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1-1.vue | 1456 +++++++++++++++++ .../pages/creatProcess/bzqdfb/step1.vue | 4 +- .../pages/creatProcess/bzqdfb/step2.vue | 25 +- .../pages/creatProcess/bzqdfb/step3.vue | 11 + .../pages/creatProcess/bzqdfb/step4.vue | 917 ++++++----- .../tabComponents/taskDraft/index.vue | 10 + src/router/index.js | 9 + 7 files changed, 1949 insertions(+), 483 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue new file mode 100644 index 000000000..bc2aba78e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -0,0 +1,1456 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 00b06a111..7bd76fbbd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -1012,11 +1012,11 @@ export default { _formData.append('createUserName', this.$store.getters.userInfo.userName) _formData.append('prcType', '4') _formData.append('json', JSON.stringify({ - form: this.form, + form: this.listForm, roleForm: this.roleForm, commentText: this.commentText })) - saveTaskFirst(_formData).then(res => { + saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 6bb1abe0b..5ae8b512e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -37,13 +37,15 @@ clearable > - + - diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 25fccf741..e1bcf6b58 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -226,6 +226,16 @@ export default { } }) break + case '4': + this.$router.push({ + name: 'bzqdfbStep1-1', + query: { + type: '4', + processName: '标准清单发布更新流程', + bpnId: id + } + }) + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/router/index.js b/src/router/index.js index 1e81556bc..ea5cdf612 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -249,6 +249,15 @@ const routes = [ title: '标准清单发布/更新流程' } }, + { + path: '/bzqdfbStep1-1', + name: 'bzqdfbStep1-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue'), + meta: { + requireAuth: true, + title: '标准清单发布/更新流程' + } + }, { path: '/bzqdfbStep2', name: 'bzqdfbStep2', From 193dfc6bebd8253f52734e45c2d8581c3c7d7aba Mon Sep 17 00:00:00 2001 From: fanlin Date: Sat, 24 Jul 2021 10:46:35 +0800 Subject: [PATCH 02/15] bug --- .../domesticStandardsAndRegulations/index.vue | 12 ++++++++---- .../foreignStandardsAndRegulations/index.vue | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 7dc2712f0..98f2d0e0f 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -449,7 +449,7 @@ label-width="150px" class="add-form-item" > - + @@ -459,7 +459,7 @@ label-width="150px" class="add-form-item" > - + @@ -1295,7 +1295,8 @@ export default { children: 'children', label: 'menuName' }, - id: '', + id: '', // 收藏数据的id + collectId: '', // 收藏id modalShowFlag1: false, // drawer开关 modalShowFlag2: false, // drawer开关 modalShowFlag3: false, // drawer开关 @@ -2264,6 +2265,7 @@ export default { // 编辑标准属性 selectStandardPro (item, state) { this.id = item.id + this.collectId = item.collectId this.addOrUPdateFlag = 2 this.modalshowtitle = '编辑国内标准' this.modalshowflag = true @@ -3120,8 +3122,10 @@ export default { if (res.ok) { this.personCollect.collectType = 'INLAND_STAND' this.personCollect.id = this.id + this.personCollect.collectResId = this.collectId + this.personCollect.collectTitle = this.sarStandardsInfoEO.standName this.personCollect.userId = this.$store.getters.userInfo.userId - this.$http.get('person/personCollect/updatePersonCollect', this.personCollect, { + this.$http.putData('person/personCollect/updatePersonCollect', this.personCollect, { _this: this, loading: 'loading' }, res => { diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index accef9644..b394854ef 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -510,7 +510,7 @@ label-width="150px" class="add-form-item" > - + @@ -520,7 +520,7 @@ label-width="150px" class="add-form-item" > - + @@ -2048,7 +2048,7 @@ export default { Promise.all([this.queryDisplayLocation()]).then((values) => { const [displayLocation] = values const formFieldList = this.formFieldList - console.log(formFieldList) + console.log(formFieldList, 'AAAAAAAAAAAAAAAAAAAAA') this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; this.sarStandardsInfoEO.standSort = item.standSort From 4dbb21654296c48c94008cc6f2f3f05b6ca941a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sat, 24 Jul 2021 13:36:57 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg2/step10.vue | 13 ++ .../pages/creatProcess/xmpg2/step11.vue | 13 ++ .../pages/creatProcess/xmpg2/step12.vue | 13 ++ .../pages/creatProcess/xmpg2/step5.vue | 104 ++++++------- .../pages/creatProcess/xmpg2/step6.vue | 139 ++++++++---------- .../pages/creatProcess/xmpg2/step7.vue | 13 ++ .../pages/creatProcess/xmpg2/step8.vue | 13 ++ .../pages/creatProcess/xmpg2/step9.vue | 13 ++ src/router/index.js | 54 +++++++ 9 files changed, 245 insertions(+), 130 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue new file mode 100644 index 000000000..0878bdc83 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue new file mode 100644 index 000000000..9d6912cc0 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue new file mode 100644 index 000000000..9c9449cee --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 34def29dd..26fee2b8e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -48,12 +48,12 @@ @@ -70,6 +70,16 @@ label="标准名称" > + + + + @@ -345,22 +335,34 @@ export default { selectList: [], treeData: [], // 人员数据 roleForm: { - liablePeople: "" + workPeople: "" }, + itemFlag: true, peopleFlag: true, - nodeList: [], defaultProps: { children: "children", label: "name" }, + complianceReasons:'', + zcComplianceReasons:'', //表单的数据 listForm: { projectNumber: "", //项目编号 projectName: "", //项目名称 - dataList: [], //项目下的标准数据 - children: [], //标准下的分解单数据 + dataList: [ + { + complianceReasons:'', + zcComplianceReasons:'', + } + ], //项目下的标准数据 + children: [] //标准下的分解单数据 }, - dataList: [], //展示的标准数据 + dataList: [ + { + complianceReasons:'', + zcComplianceReasons:'', + } + ], //展示的标准数据 commentText: "", //审批意见 detailData: [], //流程历史数据 userId: this.$store.getters.userInfo.userId, @@ -410,10 +412,33 @@ export default { this.listForm.prcName = this.prcName; this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; - console.log(item.dataList); this.dataList = item.dataList; - this.dataList.distributePerson = item.dataList[0].distributePerson; - this.listForm.breakdownList = item.breakdownList; + let children = []; + item.breakdownList.forEach( + item => { + let aa = { + key: item.standId, + id: item.id, + standId: item.itemsNum, + itemsNum: item.itemsNum, + itemsName: item.itemsName, + workPeople: "请选择责任人" + }; + children.push(aa); + } + ); + this.dataList.forEach(key => { + key["children"] = []; + children.forEach(breakDown => { + if (key.standId === breakDown.key) { + key["children"].push(breakDown); + } + }); + if (key["children"].length === 0) { + delete key["children"]; + } + }); + this.listForm.children = children; }); }, //保存事件 @@ -423,7 +448,7 @@ export default { //提交事件 handleSubmit() { this.listForm.dataList.forEach(item => { - if (item.liablePeople !== undefined) { + if (item.workPeople !== undefined) { this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); console.log(json); @@ -445,17 +470,6 @@ export default { } }); }, - //批量操作按钮 - batchOperation(id) { - console.log(this.selectList); - if (this.selectList.length === 0) { - this.$message.warning("请至少选择一条数据进行批量分发"); - } else { - this.nodeList = []; - this.nodeList.push(id); - this.modalshowflag = true; - } - }, //标准表格选择框改变 selectStandChange(data) { this.selectList = data; @@ -474,26 +488,6 @@ export default { this.roleRow = this.$refs.tree.getCheckedNodes()[0]; } }, - checkedRole(data) { - // 选取负责人时的操作 - let mis = []; - this.selectList.forEach(item => { - item.liablePeople = data[0].name; - item.liablePeopleId = data[0].id; - mis.push(item.standId); - }); - this.dataList.forEach(item => { - if (!mis.includes(item.standId)) { - this.selectList.push(item); - } - }); - this.dataList = this.selectList; - this.$refs.selection.clearSelection(); - this.modalshowflag = false; - }, - cancleUserInfo() { - this.modalshowflag = false; - } }, computed: { listNoDataText() { @@ -558,24 +552,9 @@ export default { height: calc(~'100% - 103px'); overflow: auto; - .tableTitle { - margin-bottom: 10px; - height: 30px; - line-height: 30px; - position: relative; - font-size: 13px; - font-weight: bold; - - .tableButton { - position: absolute; - right: 0; - top: 0; - } - .accessStandardsAndRegulations { height: 100%; } - } } .demo-drawer-content { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue new file mode 100644 index 000000000..91e5db738 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue new file mode 100644 index 000000000..8d214e447 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue new file mode 100644 index 000000000..9f9eaad0e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 1e81556bc..eac7a7939 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -393,6 +393,60 @@ const routes = [ title: '项目合规评估流程-项目' } }, + { + path: '/xmpg2Step7', + name: 'xmpg2Step7', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step7.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, + { + path: '/xmpg2Step8', + name: 'xmpg2Step8', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step8.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, + { + path: '/xmpg2Step9', + name: 'xmpg2Step9', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step9.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, + { + path: '/xmpg2Step10', + name: 'xmpg2Step10', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step10.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, + { + path: '/xmpg2Step11', + name: 'xmpg2Step11', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step11.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, + { + path: '/xmpg2Step12', + name: 'xmpg2Step12', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step12.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程-项目' + } + }, { path: '/wfhxzgStep1', name: 'wfhxzgStep1', From a3d029a624dc61e0d423273a98b39c1f6833f3dd Mon Sep 17 00:00:00 2001 From: fanlin Date: Sat, 24 Jul 2021 13:42:40 +0800 Subject: [PATCH 04/15] =?UTF-8?q?bug=EF=BC=9A=E5=9B=BD=E5=86=85=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=9F=A5=E7=9C=8B=E6=A0=87=E5=87=86=E5=88=86?= =?UTF-8?q?=E8=A7=A3=E5=8D=95=EF=BC=8C=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 47 +++++++++++-------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 179e7af34..52b406538 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -195,6 +195,7 @@ icon="icon-separate" >标准分解单

+

@@ -412,9 +413,16 @@ width="150" > + + {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }} + + + + - - - - - @@ -179,13 +179,13 @@ title="下载" @click="downloadFile(file.id)" class="icon-download" - v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'JHQALHMF6F' : 'dakDL3sNLq'" + v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" /> 上传时间：{{ dateFormat(file.modifyTime) }} @@ -195,7 +195,6 @@ icon="icon-separate" >标准分解单

-

@@ -257,11 +256,13 @@ title="下载" @click="downloadFile(file.id)" class="icon-download" + v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" /> 上传时间：{{ dateFormat(file.modifyTime) }} @@ -271,13 +272,13 @@ title="下载" @click="downloadFile(file.id)" class="icon-download" - v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'JHQALHMF6F' : 'dakDL3sNLq'" + v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'" /> 上传时间：{{ dateFormat(file.modifyTime) }} diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 98f2d0e0f..5f0b7ebe2 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3123,7 +3123,7 @@ export default { this.personCollect.collectType = 'INLAND_STAND' this.personCollect.id = this.id this.personCollect.collectResId = this.collectId - this.personCollect.collectTitle = this.sarStandardsInfoEO.standName + this.personCollect.collectTitle = this.sarStandardsInfoEO.standName + '(编号:'+this.sarStandardsInfoEO.standSort + this.sarStandardsInfoEO.standNumber + this.sarStandardsInfoEO.standYear +')' this.personCollect.userId = this.$store.getters.userInfo.userId this.$http.putData('person/personCollect/updatePersonCollect', this.personCollect, { _this: this, @@ -3204,6 +3204,7 @@ export default { formData.collectMenuId = undefined } formData.standType = 'INLAND' + formData.userId = this.$store.getters.userInfo.userId this.SarExportSearchEo = formData this.loading = true this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { @@ -3250,6 +3251,7 @@ export default { } this.sarConfigStandSearch.page = this.configPage // this.sarConfigStandSearch.pageSize = this.configRows + this.sarConfigStandSearch.userId = this.$store.getters.userInfo.userId this.sarConfigStandSearch.pageSize = this.$store.getters.userInfo.configContent this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarConfigStandSearch, { _this: this, @@ -3414,6 +3416,7 @@ export default { this.quoteIdList1 = [] this.replaceStandNumForm.quoteIdList = '' } + this.replaceStandNumForm.userId = this.$store.getters.userInfo.userId // if (this.sarStandardsInfoEO.replaceStandNumId !== null && this.sarStandardsInfoEO.replaceStandNumId !== '') { // this.replaceStandNumForm.quoteIdList = this.sarStandardsInfoEO.replaceStandNumId.toString() // (this.replaceStandNumForm.quoteIdList) @@ -3650,6 +3653,7 @@ export default { if (this.sarStandardsInfoEO.lawsExplainQuote !== null && this.sarStandardsInfoEO.lawsExplainQuote !== '') { this.lawsExplainQuoteForm.quoteIdList = this.sarStandardsInfoEO.lawsExplainQuote.toString() } + this.sarStandardsInfoEO.userId = this.$store.getters.userInfo.userId this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.lawsExplainQuoteForm, { _this: this, loading: 'lawsExplainQuoteFormLoading' From 3a5dd8ed1d8529ea3431d9001d64ec63e845279a Mon Sep 17 00:00:00 2001 From: fanlin Date: Sat, 24 Jul 2021 14:26:45 +0800 Subject: [PATCH 06/15] =?UTF-8?q?bug:=E5=9B=BD=E5=86=85/=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E5=B7=A6=E4=BE=A7=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E6=A0=91=E4=B8=8A=E6=96=B9=E9=9C=80=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 16 ++++++++++++++++ .../foreignStandardsAndRegulations/index.vue | 16 +++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 5f0b7ebe2..cec1fc816 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3,6 +3,10 @@
+ + @@ -1286,6 +1291,7 @@ export default { }, data () { return { + filterText: '', // 国内法规过滤 props: { label: 'menuName', children: 'children' @@ -1943,7 +1949,17 @@ export default { textStatusMap: {} // 文本状态id与name对应 } }, + watch: { + filterText(val) { + this.$refs.tree.filter(val); + } + }, methods: { + // 国内标签过滤 + filterNode(value, data) { + if (!value) return true; + return data.menuName.indexOf(value) !== -1; + }, choiceZRR1 (type, title, id) { this.drawerTitle = title this.modalShowFlag1 = true diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index b394854ef..d7acd19ee 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -3,6 +3,10 @@
+ + @@ -1741,14 +1746,23 @@ export default { displayLocation: [], orgData: [], delLoading: false, - standState: '' + standState: '', + filterText: '' } }, props: { }, watch: { + filterText(val) { + this.$refs.tree.filter(val); + } }, methods: { + // 海外标签过滤 + filterNode(value, data) { + if (!value) return true; + return data.menuName.indexOf(value) !== -1; + }, choiceZRR2 (type, title, id) { this.drawerTitle = title this.modalShowFlag2 = true From 2990241a64df8a9b314206b5978f796f3a520814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sat, 24 Jul 2021 15:23:00 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E6=B8=85=E5=8D=95=20=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1.vue | 16 +-- .../pages/creatProcess/bzqdfb/step2.vue | 135 +++++++++++++----- .../pages/creatProcess/bzqdfb/step4.vue | 92 +++++++----- .../pages/creatProcess/xmpg/step1.vue | 12 +- .../pages/details.vue | 6 +- 5 files changed, 172 insertions(+), 89 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 7bd76fbbd..78beff3a1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -800,7 +800,6 @@ export default { listForm: { listType: "", //区分是哪个清单 listName: "", //清单名称 - // applyRegion: "", //适用区域 descriptionList: "", //清单说明 fileId: "", model: "", // 上传模板 @@ -1097,8 +1096,7 @@ export default { }); this.fileListName = middle; this.fileIds.push(file.response.data.id); - // this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id - // this.$message.success('上传成功') + this.$message.success('上传成功') } else { this.$message.error(res.message); fileList.pop(); @@ -1110,7 +1108,6 @@ export default { var index1 = filename.lastIndexOf("."); var index2 = filename.length; var fileSuffix = filename.substring(index1, index2); - // const fileSuffix = file.name.split('.')[1] // 后缀名 //把后缀转大写 if (fileSuffix !== undefined && fileSuffix !== null) { fileSuffix = fileSuffix.toUpperCase(); @@ -1260,16 +1257,17 @@ export default { } this.listForm.standId = bringData[0].id; this.listForm.listName = bringData[0].detailedListName; - this.listForm.applyRegion = bringData[0].applicationScope; this.listForm.descriptionList = bringData[0].remark; this.listForm.fileId = bringData[0].fileId; this.ListModel = false; - this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { id: bringData[0].id }, { + this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", + { id: bringData[0].id, page: this.page, Size:this.pageSize}, { _this: this }, res => { - if (res.data == null) { - res.data = []; - } + console.log(res.data); + // if (res.data == null) { + // res.data = []; + // } this.dataList = res.data; this.listForm.dataList = res.data; let formId = []; diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 5ae8b512e..976a14cda 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -37,19 +37,26 @@ clearable > - - - - + +
+

{{ listForm.modelName }} + + +

+
+
+ 暂无数据 +
@@ -70,6 +77,10 @@ prop="code" width="180px" label="标准号"> + { + console.log(res); + this.$nextTick(() => { + res.data.map(item => { + this.listForm.modelName = item.oldFileName + this.listForm.model = item.id + }); + }); + }, e => { + }); + }, + /** + * @Description: 点击下载 + */ + downloadFile(attId) { + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } else { + this.$message.error("请选择要下载的文件"); + } + }, + downloadFileByWater(attId, fileSuffix) { + let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); + if (fileExtension !== "pdf" && fileExtension !== "PDF") { + this.$message.error("水印下载仅支持PDF,pdf格式文件"); + } else { + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId; + } else { + this.$message.error("请选择要下载的文件"); + } + } + }, //保存事件 handleSave() { @@ -356,28 +407,6 @@ export default { }, selectThree() { - }, - // 请求上传的文件信息 - getFileInfo() { - // this.$http.get("att/attFile/getMultiFileInfos", { - // fileIds: this.sarAccessEO.fileIds - // }, { - // _this: this - // }, res => { - // console.log(res); - // this.$nextTick(() => { - // res.data.map(item => { - // // 赋值要回显的上传文件内容 - // this.fileInfoList.push({ - // name: item.oldFileName, - // uid: item.uid, - // status: item.status, - // id: item.id - // }); - // }); - // }); - // }, e => { - // }); }, pageChange(page) { this.page = page; @@ -397,8 +426,6 @@ export default { mounted() { this.processTable(); this.getData(); - this.getFileInfo(); - // console.log(this.$store.getters.getHandleInfo); } }; @@ -413,6 +440,36 @@ export default { padding: 0 20px 0; } } + .fileClass { + cursor: pointer; + } + .fileClass:hover{ + color: #0c91e5; + } + p { + & > a { + cursor: pointer; + } + + & > i { + display: inline-block; + margin-left: 3px; + width: 18px; + height: 16px; + background-repeat: no-repeat; + background-size: 100% 100%; + background-position: center center; + vertical-align: sub; + cursor: pointer; + } + .icon-download { + background-image: url("~assets/images/shangqi/img/download.png"); + } + + .icon-download2 { + background-image: url("~assets/images/shangqi/img/download2.png"); + } + } .choiceBtn { .el-button--primary { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 41f77d353..eadf18395 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -21,14 +21,6 @@ > - - - - - - - - - - - - - - - - - - - - - + +
+

{{ listForm.modelName }} + + +

+
+
+ 暂无数据 +
+ @@ -251,7 +241,6 @@ listForm: { listType: "", //区分是哪个清单 listName: "", //清单名称 - // applyRegion: "", //适用区域 descriptionList: "", //清单说明 enclosure: "", //附件 signFlag: "1", //是否会签 1为会签 2为不会签 @@ -337,6 +326,45 @@ this.listForm.zrUserId = item.zrUserId }) }, + // 请求上传的文件信息 + getFileInfo() { + this.$http.get("att/attFile/getMultiFileInfos", { + fileIds: this.fileIds + }, { + _this: this + }, res => { + console.log(res); + this.$nextTick(() => { + res.data.map(item => { + this.listForm.modelName = item.oldFileName + this.listForm.model = item.id + }); + }); + }, e => { + }); + }, + /** + * @Description: 点击下载 + */ + downloadFile(attId) { + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } else { + this.$message.error("请选择要下载的文件"); + } + }, + downloadFileByWater(attId, fileSuffix) { + let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); + if (fileExtension !== "pdf" && fileExtension !== "PDF") { + this.$message.error("水印下载仅支持PDF,pdf格式文件"); + } else { + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId; + } else { + this.$message.error("请选择要下载的文件"); + } + } + }, //驳回事件 beforeBack() { this.listForm.approvalOpinion = '1' diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index bd52ce074..1c6baaad8 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -496,17 +496,17 @@ export default { } else if (this.type === "qualityEngineer") { this.roleForm.qualityEngineer = data[0].id; this.roleForm.qualityEngineerName = data[0].name; - this.listForm.qualityEngineer = this.roleForm.qualityEngineer; - this.listForm.qualityEngineerName = this.roleForm.qualityEngineerName; + this.listForm.qualityEngineer = data[0].id; + this.listForm.qualityEngineerName = data[0].name; } else if (this.type === "certifiedEngineer") { this.roleForm.certifiedEngineer = data[0].id; this.roleForm.certifiedEngineerName = data[0].name; - this.listForm.certifiedEngineer = this.roleForm.certifiedEngineer; - this.listForm.certifiedEngineerName = this.roleForm.certifiedEngineerName; + this.listForm.certifiedEngineer = data[0].id; + this.listForm.certifiedEngineerName = data[0].name; } else if (this.type === "distributePerson") { this.listForm.distributePerson = data[0].name; - this.listForm.dataList[this.dsadadadsada].distributePersonId=this.roleRow.id - this.listForm.dataList[this.dsadadadsada].distributePerson=this.roleRow.name + this.listForm.dataList[this.dsadadadsada].distributePersonId= data[0].id + this.listForm.dataList[this.dsadadadsada].distributePerson= data[0].name this.showColumn = false; this.$nextTick(() => { this.showColumn = true diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 6ab697efe..d50c934ca 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -30,11 +30,11 @@
- 调取 - 批量删除 + 调取 + 批量删除 导出 From 0cfa7167314bd08418262595105467cb596b405b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sat, 24 Jul 2021 15:43:00 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E8=AF=84=E4=BC=B0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmpg/step2.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg/step3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg/step4.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg/step5.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg/step6.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/xmpg/step7.vue | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 307ae7832..7c9ef4c0b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -37,16 +37,16 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 5965a188a..bd027def8 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -39,14 +39,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index d3f680706..ca0d504ef 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -39,14 +39,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 1dc390e5a..7d55dff6f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -39,14 +39,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index c5b0bb69a..eaa28bcd6 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -39,14 +39,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 607b70c25..467b93137 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -39,14 +39,14 @@ From cb528250cae04731f2fa1c89bc5eeb5e012dfdc0 Mon Sep 17 00:00:00 2001 From: fanlin Date: Sat, 24 Jul 2021 16:30:28 +0800 Subject: [PATCH 09/15] =?UTF-8?q?bug=EF=BC=9A=E5=9B=BD=E5=86=85=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=8C=E7=BC=96=E8=BE=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=BA=94=E5=8E=BB=E6=8E=89=E8=A2=AB=E5=BC=95?= =?UTF-8?q?=E7=94=A8=E6=A0=87=E5=87=86=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/treeSelect/treeSelectNew.vue | 14 ++++++++++++++ .../domesticStandardsAndRegulations/index.vue | 1 + 2 files changed, 15 insertions(+) diff --git a/src/components/treeSelect/treeSelectNew.vue b/src/components/treeSelect/treeSelectNew.vue index 1ac8eb973..b8a892ea0 100644 --- a/src/components/treeSelect/treeSelectNew.vue +++ b/src/components/treeSelect/treeSelectNew.vue @@ -218,6 +218,20 @@ this.isShowSelect = !this.isShowSelect; } }, + // 递归 + getTreeData(data) { + // 循环遍历json数据 + for (let i = 0; i < data.length; i++) { + if (data[i].children.length < 1) { + // children若为空数组，则将children设为undefined + delete data[i].children + } else { + // children若不为空数组，则继续 递归调用 本方法 + this.getTreeData(data[i].children) + } + } + return data + }, // 节点选中状态发生变化时的回调 handleCheckChange () { var checkedKeys = this.$refs.tree.getCheckedKeys(); // 所有被选中的节点的 key 所组成的数组数据 diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index cec1fc816..e34a317ae 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -444,6 +444,7 @@ From 8cfb1430584891f874cc224eb8f0e6978e0ed74e Mon Sep 17 00:00:00 2001 From: fanlin Date: Sat, 24 Jul 2021 16:45:53 +0800 Subject: [PATCH 10/15] =?UTF-8?q?bug:=20=E5=85=A5=E5=BA=93=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=97=B6=E6=9C=AA=E5=BF=85=E5=A1=AB=E9=A1=B9=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=A1=AB=E5=86=99=EF=BC=8C=20=E5=9C=A8=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=9F=A5=E7=9C=8B=EF=BC=8C=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=EF=BC=8C=E5=BA=94=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index e34a317ae..b7a97c8e7 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2291,8 +2291,10 @@ export default { Promise.all([this.queryDisplayLocation()]).then((values) => { const [displayLocation] = values console.log(this.formFieldList, 'assssssssssss') + console.log(item, 'itemitemitemitem') const formFieldList = this.formFieldList this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) + console.log(item.attrInfoCaseMap, 'gggg大大大滴滴答答') if(this.sarStandardsInfoEO.standSystem){ this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; } @@ -2303,10 +2305,9 @@ export default { } Object.keys(item.attrInfoMap || {}).forEach((key) => { if (item.attrInfoMap[key]) { - this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key]) + this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key] === '[]' ? '' : item.attrInfoMap[key]) } }) - const dynamicFormField = this.sarStandardsInfoEO this.sarStandardsInfoEO.EOPSSRQ = this.$moment(this.sarStandardsInfoEO.EOPSSRQ).isValid() ? this.$moment(this.sarStandardsInfoEO.EOPSSRQ) : this.sarStandardsInfoEO.EOPSSRQ this.sarStandardsInfoEO['id'] = item.id From 33e84ae2bb51d7ffc666644353b6712342304bba Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Sat, 24 Jul 2021 16:54:02 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=96=B0=E5=A2=9E=E6=97=B6=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=87=BA=E7=8E=B0value=E5=8F=98=E4=B8=BA=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/unqualProcess.js | 14 ++ .../pages/addEdit.vue | 177 +++++++------- .../pages/details.vue | 79 +------ .../pages/otherAddEit.vue | 214 +++++++++++------ .../pages/projectAddEit.vue | 215 ++++++++++++------ 5 files changed, 422 insertions(+), 277 deletions(-) diff --git a/src/api/unqualProcess.js b/src/api/unqualProcess.js index a87c8a3ac..94d623b60 100644 --- a/src/api/unqualProcess.js +++ b/src/api/unqualProcess.js @@ -24,3 +24,17 @@ export function uploadFileText (data) { params: data }) } +export function dicTypeData (data) { + return axios({ + url: 'api/sys/dictype/getDicTypeListCode', + method: 'get', + params: data + }) +} +export function StandardsInfoPage (data) { + return axios({ + url: 'api/sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', + method: 'get', + params: data + }) +} diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 69bb4a9e0..9300400fc 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -80,7 +80,7 @@ - +
- - - - - - - + + + +
@@ -403,18 +395,12 @@ align="center" width="180px" label="适用车型"> - - - - - +