From bd4daea81bce111d345b244db015bbdd467efbb7 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 5 Aug 2021 13:52:56 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=20=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E9=99=A4?= =?UTF-8?q?=E4=BA=86=E5=8F=91=E8=B5=B7=E8=8A=82=E7=82=B9=EF=BC=8C=EF=BC=8C?= =?UTF-8?q?=E5=90=8E=E7=BB=AD=E6=89=80=E6=9C=89=E8=8A=82=E7=82=B9=EF=BC=8C?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=99=84=E4=BB=B6=E6=8A=A5=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=EF=BC=88=E6=9C=AC=E5=9C=B0=EF=BC=89=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index dd5c530aa..f92ea5f99 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -862,8 +862,13 @@ }, methods: { downloadFile (fileType) { + //文件id中出现了','字符,去除掉 if(fileType === 'fbgbjbd'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId + if(this.fbgbjbdFileId.search(',')){ + this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",",""); + console.log(this.fbgbjbdFileId); + } + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId }else if(fileType === 'xgd'){ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId }else if(fileType === 'bpg'){ @@ -964,6 +969,7 @@ this.caFileId = processForm.ca this.zbjbdFileId = processForm.zbjbd this.getFormFieldList(processForm) + console.log(processForm); } }).catch(e => { }) From bb287587cd854612095c084d73041f6692182bb5 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 5 Aug 2021 13:57:26 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=20=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E9=99=A4?= =?UTF-8?q?=E4=BA=86=E5=8F=91=E8=B5=B7=E8=8A=82=E7=82=B9=EF=BC=8C=EF=BC=8C?= =?UTF-8?q?=E5=90=8E=E7=BB=AD=E6=89=80=E6=9C=89=E8=8A=82=E7=82=B9=EF=BC=8C?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=99=84=E4=BB=B6=E6=8A=A5=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=EF=BC=88=E6=9C=AC=E5=9C=B0=EF=BC=89=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step3.vue | 4 ++++ src/pages/processCenter/pages/creatProcess/bzrk/step5.vue | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index e0b897644..26187ebbd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -836,6 +836,10 @@ export default { methods: { downloadFile (fileType) { if(fileType === 'fbgbjbd'){ + if(this.fbgbjbdFileId.search(',')){ + this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",",""); + console.log(this.fbgbjbdFileId); + } window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId }else if(fileType === 'xgd'){ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index 2d414fb44..840e35e6e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -815,6 +815,10 @@ methods: { downloadFile (fileType) { if(fileType === 'fbgbjbd'){ + if(this.fbgbjbdFileId.search(',')){ + this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",",""); + console.log(this.fbgbjbdFileId); + } window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId }else if(fileType === 'xgd'){ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId From 959725449d116407c6b4df6d6f3988a54cb13325 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Thu, 5 Aug 2021 14:15:14 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81--=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2=20?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=A0=B9=E6=8D=AE=E7=AB=A0=E8=8A=82=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E8=BF=9B=E8=A1=8C=E6=AD=A3=E5=BA=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardForComments/pags/consultationDetails.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 2af3b6084..4a37819e5 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -43,6 +43,7 @@ From 2d441e65ab69bdcd993f558bebc868c06199f3e5 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 5 Aug 2021 14:24:05 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E5=BA=94=E8=AF=A5=E8=B7=9F=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=BA=93=E4=B8=80=E8=87=B4=EF=BC=8C=E5=8F=AF=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E4=B8=8A=E4=BC=A0=E5=A4=9A=E4=B8=AA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzdy/step1.vue | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index dab32ce04..45ccf0b85 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -45,18 +45,23 @@ v-model="form.modelName" clearable > -
- {{ form.modelName }} -
-
- - 点击上传 + + + + + + + + + + + + + + + {{isFileUploadStr}} -
+ @@ -179,7 +184,7 @@ :before-upload="beginImportFile" :on-success="importFileSuccess" :on-progress="progressFile" - :show-file-list="false" + :show-file-list="true" >
@@ -201,6 +206,7 @@ export default { name: "bzdyStep1", data() { return { + isFileUploadStr:'点击上传', progressType: false, loadProgress: 0, commentText: '', @@ -350,7 +356,8 @@ export default { // 导入标准数据成功后执行 importFileSuccess (response, file) { if (response.ok) { - this.fileMadel = false + this.isFileUploadStr='点击查看已上传文件'; + this.fileMadel = true; this.loadProgress = 0 this.progressType = false this.form.model = response.data.id From 07e9255e5f4699ec7e38235db32c3b69ac645400 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Thu, 5 Aug 2021 14:47:13 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=EF=BC=88=E7=BB=8F?= =?UTF-8?q?=E7=90=86=E4=BA=BA=E5=AE=A1=E6=89=B9=EF=BC=89=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E9=80=9A=E8=BF=87=EF=BC=8C=E5=BA=94=E4=B8=8D=E5=BF=85=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=84=8F=E8=A7=81=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index f92ea5f99..bdbc16be0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -890,11 +890,12 @@ } }, getRule(){ + if (this.formTongGuo.approvalOpinion === '0') { - this.rules.commentText.required = false + this.rules.commentText[0].required = false; this.$refs.formTongGuo.clearValidate('commentText') - } else { - this.rules.commentText.required = true + }else { + this.rules.commentText[0].required = true; } }, popoverHide (checkedIds, checkedData) { From 2cc5ca1632a62adacbb0ead1866a20156b0f2646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 5 Aug 2021 14:53:15 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93=E5=B7=B2=E7=BB=B4=E6=8A=A4=E6=9C=AA=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E5=88=87=E6=8D=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg2/step4.vue | 10 +- .../localProductsOrProjectLibrary/index.vue | 1583 +++++++++-------- .../pages/details.vue | 9 +- 3 files changed, 822 insertions(+), 780 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue index dbd1b065f..b97ace1ac 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue @@ -406,17 +406,15 @@ export default { } }, checkedRole (data) { - let roleId = data[0].id - let roleName = data[0].name if (this.type === 1) { - this.dataList[this.zrIndex].liablePeopleId = roleId - this.dataList[this.zrIndex].liablePeople = roleName + this.dataList[this.zrIndex].liablePeopleId = data[0].id + this.dataList[this.zrIndex].liablePeople = data[0].name } else if(this.type === 2) { this.dataList.forEach( item => { this.selectList.forEach( items => { if (item.standId === items.standId) { - item.liablePeopleId = roleId - item.liablePeople = roleName + item.liablePeopleId = data[0].id + item.liablePeople = data[0].name } }) }) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index 1b966f002..601dc8728 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -3,21 +3,22 @@
- + @@ -30,7 +31,8 @@ :value="opt.label" :key="opt.value" :label="opt.label" - >{{ opt.label}} + >{{ opt.label }} + @@ -49,14 +51,16 @@ class="common-button-primary" size="small" v-btn-permission="'d1b1bffb39a67dea0d452a8ba4e3ae35'" - @click="getLocalProductTableBtn">查询 + @click="getLocalProductTableBtn">查询 + 清空 + @click="clearAllSearch">清空 + 高级查询 + >高级查询 +
@@ -79,110 +84,110 @@
+ @selection-change="handleSelectionChange"> + type="selection" + width="55" + align="center"> + show-overflow-tooltip + prop="projectPlatfor" + align="center" + label="产品平台"> + prop="projectNumber" + align="center" + width="90" + label="项目编号"> + show-overflow-tooltip + prop="projectName" + align="center" + label="项目名称"> - + - + + show-overflow-tooltip + prop="currentNode" + align="center" + label="当前节点"> - + prop="projectLevel" + align="center" + label="项目级别"> + + show-overflow-tooltip + prop="projectManager" + align="center" + label="项目经理"> - + .dem diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 29c37d98e..49726090c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -126,6 +126,21 @@ +
+ + +
+ + +
+ + +
- - - - - - - - - - - - - - - +
+ + +
+ + +
+ + +
@@ -611,10 +611,4 @@ export default { } } - .demo-drawer-content { - margin-top: 10px; - } -} - - - + .demo-draw diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index b350287cb..684e338b6 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -447,9 +447,6 @@ export default { }, //驳回事件 beforeBack () { - if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ - this.$message.warning('请填写审批意见') - } else { this.listForm.applyUpdUserId = this.dataList[0].distributePersonId this.listForm.commentText = this.commentText; this.listForm.dataList = this.dataList @@ -468,17 +465,13 @@ export default { } }, e => { }); - } }, //提交事件 handleSubmit() { - if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ - this.$message.warning('请填写审批意见') - }else { this.listForm.applyUpdUserId = this.dataList[0].distributePersonId - this.listForm.commentText = this.commentText; this.listForm.dataList = this.dataList this.listForm.fenFlag = '2' + this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { @@ -495,7 +488,7 @@ export default { this.isSubmit = false }, e => { }); - } + }, //标准表格选择框改变 selectStandChange(data) { @@ -598,10 +591,4 @@ export default { } } - .demo-drawer-content { - margin-top: 10px; - } -} - - - + .demo- diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index e74199aa4..95cf31713 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -452,9 +452,6 @@ export default { }, //提交事件 handleSubmit() { - if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ - this.$message.warning('请填写审批意见') - } else { this.isSubmit = true this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; @@ -480,7 +477,7 @@ export default { }, e => { }); - } + }, //标准表格选择框改变 selectStandChange(data) { @@ -583,10 +580,4 @@ export default { } } - .demo-drawer-content { - margin-top: 10px; - } -} - - - + .demo- diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 40b79891e..3f5518210 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -451,9 +451,6 @@ export default { }, //提交事件 handleSubmit() { - if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ - this.$message.warning('请填写审批意见') - } else { this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; @@ -479,7 +476,6 @@ export default { }, e => { }); - } }, //标准表格选择框改变 selectStandChange(data) { From 18aed9b6926befe75c9b9113d820b7f811dfcefb Mon Sep 17 00:00:00 2001 From: song2048 <2639528268@qq.com> Date: Thu, 5 Aug 2021 16:27:21 +0800 Subject: [PATCH 10/15] no message --- src/sysConfig/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index d2960cf5d..18d7b7c7a 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,7 +6,7 @@ // 服务器地址 // const devIp = '10.96.10.171' // const devInterfacePORT = '9999' -const devIp = '10.96.170.156' +const devIp = '192.168.0.104' const devInterfacePORT = '9999' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' From 526bc169e036aa02543f56392433b3346e55078e Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 5 Aug 2021 16:49:31 +0800 Subject: [PATCH 11/15] =?UTF-8?q?feat:=20=E6=90=9C=E7=B4=A2=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=20es=20=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../searchCenter/pages/advancedSearch.vue | 272 +++++++----------- 1 file changed, 99 insertions(+), 173 deletions(-) diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index 4611f40a4..ffcef1be5 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -27,10 +27,8 @@ {{ $t("m.clearQuery") }}
- {{ $t("m.export") }} - + +
@@ -932,65 +930,41 @@ align="center" :label="$t('m.action')" width="200"> - +
@@ -1315,10 +1289,29 @@ export default { dropdownItemsCollect: [{ "val": "取消收藏" }, { "val": "分享" }, { "val": "流程" }], judgeRoleFlag: false, judgeRoleMessage: "", - exportSearchInfo: {} + exportSearchInfo: {}, + twoOptions: [], + formFieldListStandData: [] }; }, methods: { + getAddFormFieldList (isEdit) { + this.$http.get('lawss/sarStandAttrDetails/list', {}, { + _this: this + }, + res => { + if (res.ok) { + const { data = {} } = res + // 国内外标准 + const inlandList = data['INLAND_STAND'] || [] + const foreignList = data['FOREIGN_STAND'] || [] + const foreignFilterList = foreignList.filter ( item => item.attrField === 'GXHBQ' || item.attrField === 'ZBJBD' || item.attrField === 'KWJ' || item.attrField === 'TXLB'); + console.log(foreignFilterList) + this.formFieldListStandData = this.formFieldListStandData.concat(inlandList).concat(foreignFilterList); + console.log(this.formFieldListStandData,'-----------------------------------1') + } + }, e => {}) + }, choiceZRR1 (type, title, id) { this.drawerTitle = title this.modalShowFlag1 = true @@ -1497,22 +1490,22 @@ export default { } } }, // 点击收藏/取消收藏事件 - handleCommand(command) { - switch (command.command) { - case "d": - this.judgeRolePermiOnSar(command.item, 2); // 收藏 - break; - case "a": - this.judgeRolePermiOnSar(command.item, 3); // 取消收藏 - break; - case "b": - this.judgeRolePermiOnSar(command.item, 4); // 分享 - break; - case "c": - this.judgeRolePermiOnSar(command.item, 6); // 流程 - break; - } - }, // 下拉菜单点击事件 + handleCommand (command) { + switch (command.command) { + case 'd': + this.judgeRolePermiOnSar(command.item, 2) // 收藏 + break + case 'a': + this.judgeRolePermiOnSar(command.item, 3) // 取消收藏 + break + case 'b': + this.judgeRolePermiOnSar(command.item, 4) // 分享 + break + case 'l': + this.judgeRolePermiOnSar(command.item, 1) // 查看 + break + } + }, // 下拉菜单点击事件 beforeHandleCommand(command, item) { return { "item": item, @@ -1658,37 +1651,19 @@ export default { pagetype = "BUSINESS_STAND"; } } - this.$http.get("lawss/sarMenu/judgeSarMenuByRole", { - sarId: item.id, - sarType: pagetype - }, { - _this: this - }, res => { - if (res.ok) { - this.judgeRoleFlag = true; - if (type === 1) { + if (type === 1) { this.detailsStandardLaws(item); - } else if (type === 2) { + } else if (type === 2) { this.collectStandard(item); - } else if (type === 3) { + } else if (type === 3) { this.cancelCollectStandard(item); - } else if (type === 4) { + } else if (type === 4) { this.shareSarInfo(item); - } else if (type === 5) { + } else if (type === 5) { this.showRecommendDetials(item); - } else if (type === 6) { + } else if (type === 6) { this.goProcess(item); - } - } else { - this.judgeRoleFlag = false; - this.$message({ - message: res.message, - type: "error" - }); } - }, e => { - this.judgeRoleFlag = false; - }); } }, showDetailsByRole(item) { @@ -1722,64 +1697,20 @@ export default { this.standForm.page = this.page; this.standForm.pageSize = this.$store.getters.userInfo.configContent; let nowStandForm = JSON.parse(JSON.stringify(this.standForm)); - if (this.standForm.issueTime != null && this.standForm.issueTime !== "") { - nowStandForm.issueTime = this.$dateFormat(this.standForm.issueTime, "yyyy-MM-dd hh:mm:ss"); - } - if (this.standForm.issueTimeSt != null && this.standForm.issueTimeSt !== "") { - nowStandForm.issueTimeSt = this.$dateFormat(this.standForm.issueTimeSt, "yyyy-MM-dd hh:mm:ss"); - } - if (this.standForm.issueTimeEd != null && this.standForm.issueTimeEd !== "") { - nowStandForm.issueTimeEd = this.$dateFormat(this.standForm.issueTimeEd, "yyyy-MM-dd hh:mm:ss"); - } - if (this.standForm.putTime != null && this.standForm.putTime !== "") { - nowStandForm.putTime = this.$dateFormat(this.standForm.putTime, "yyyy-MM-dd hh:mm:ss"); - } - if (this.standForm.putTimeSt != null && this.standForm.putTimeSt !== "") { - nowStandForm.putTimeSt = this.$dateFormat(this.standForm.putTimeSt, "yyyy-MM-dd hh:mm:ss"); - } - if (this.standForm.putTimeEd != null && this.standForm.putTimeEd !== "") { - nowStandForm.putTimeEd = this.$dateFormat(this.standForm.putTimeEd, "yyyy-MM-dd hh:mm:ss"); - } - if (this.standForm.newproductPutTime != null && this.standForm.newproductPutTime !== "") { - nowStandForm.newproductPutTime = this.$dateFormat(this.standForm.newproductPutTime, "yyyy-MM-dd hh:mm:ss"); - } - if (this.standForm.registerPutTime != null && this.standForm.registerPutTime !== "") { - nowStandForm.registerPutTime = this.$dateFormat(this.standForm.registerPutTime, "yyyy-MM-dd hh:mm:ss"); - } - if (this.standForm.productPutTime != null && this.standForm.productPutTime !== "") { - nowStandForm.productPutTime = this.$dateFormat(this.standForm.productPutTime, "yyyy-MM-dd hh:mm:ss"); - } - if (this.standForm.productPutTimeSt != null && this.standForm.productPutTimeSt !== "") { - nowStandForm.productPutTimeSt = this.$dateFormat(this.standForm.productPutTimeSt, "yyyy-MM-dd hh:mm:ss"); - } else { - nowStandForm.productPutTimeSt = ""; - } - if (this.standForm.productPutTimeEd != null && this.standForm.productPutTimeEd !== "") { - nowStandForm.productPutTimeEd = this.$dateFormat(this.standForm.productPutTimeEd, "yyyy-MM-dd hh:mm:ss"); - } else { - nowStandForm.productPutTimeEd = ""; - } - if (this.standForm.newcarPutTime != null && this.standForm.newcarPutTime !== "") { - nowStandForm.newcarPutTime = this.$dateFormat(this.standForm.newcarPutTime, "yyyy-MM-dd hh:mm:ss"); - } - if (this.standForm.newcarPutTimeSt != null && this.standForm.newcarPutTimeSt !== "") { - nowStandForm.newcarPutTimeSt = this.$dateFormat(this.standForm.newcarPutTimeSt, "yyyy-MM-dd hh:mm:ss"); - } else { - nowStandForm.newcarPutTimeSt = ""; - } - if (this.standForm.newcarPutTimeEd != null && this.standForm.newcarPutTimeEd !== "") { - nowStandForm.newcarPutTimeEd = this.$dateFormat(this.standForm.newcarPutTimeEd, "yyyy-MM-dd hh:mm:ss"); - } else { - nowStandForm.newcarPutTimeEd = ""; - } - if (this.standForm.firstPutTime != null && this.standForm.firstPutTime !== "") { - nowStandForm.firstPutTime = this.$dateFormat(this.standForm.firstPutTime, "yyyy-MM-dd hh:mm:ss"); - } - if (this.standForm.putYear != null && this.standForm.putYear !== "") { - nowStandForm.putYear = this.$dateFormat(this.standForm.putYear, "yyyy"); - } + // 处理动态表单的时间和下拉框格式 + const formFieldList = this.formFieldListStandData + const sarStandAttrObj = {} + formFieldList.forEach((item) => { + const attrField = item.attrField.toLowerCase(); + const value = nowStandForm[attrField] + // 时间格式处理 + if (item.attrType === 'DATE_PICKER' && value) { + nowStandForm[item.attrField] = this.standForm[attrField] + } + sarStandAttrObj[item.attrField] = nowStandForm[attrField] + }) + nowStandForm['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'") this.exportSearchInfo = nowStandForm; - nowStandForm['sarStandAttrEOStr'] = JSON.stringify(nowStandForm).replace(/"/g, "'") this.$http.post("search/searchCenter/searchSarBykey", nowStandForm, { _this: this, loading: "resultLoading" @@ -1920,20 +1851,13 @@ export default { let routername = ""; let pagetype = ""; if (item.type === "stand") { - if (this.$hasPermission("CFEZ3VP7EA95CTRBH3JB") || this.$hasPermission("R5DNG6EZC66CNFC4RHPH")) { - if (item.stand_type === "INLAND") { - routername = "OtherStandardDetails"; - pagetype = "INLAND_STAND"; + if (item.standType === "INLAND") { + routername = "OtherStandardDetails"; + pagetype = "INLAND_STAND"; } else { - routername = "OtherForeignDetails"; - pagetype = "FOREIGN_STAND"; + routername = "OtherForeignDetails"; + pagetype = "FOREIGN_STAND"; } - } else { - this.$message({ - message: "无权访问", - type: "warning" - }); - } } else if (item.type === "laws") { if (this.$hasPermission("9P2UTSAHZ3AHKDGAEY6V")) { routername = "OtherLawsDetails"; @@ -2349,6 +2273,7 @@ export default { computed: { // 条件按钮提示 toggleConditionTips() { + this.standForm.selectValue = '' return this.kindtext ? "收起条件" : "展开条件"; } }, @@ -2408,6 +2333,7 @@ export default { // 加载表格 this.searchSarBykey(); this.showBuyRole(); + this.getAddFormFieldList(); // 组织结构 this.getOrgTreeSource(); // this.selectBussRoleMsg(); From a2af7ad00729df73e1d8f377575e0b9a1475c9f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 5 Aug 2021 16:56:29 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg2/step1-1.vue | 11 ++++++----- .../processCenter/pages/creatProcess/xmpg2/step1.vue | 2 +- .../processCenter/pages/creatProcess/xmpg2/step12.vue | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index db6b832e9..19a55d780 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -87,22 +87,22 @@ { - console.log(res.mes); let mes = JSON.parse(res.mes); this.listForm = mes.form; this.dataList = mes.form.dataList; @@ -547,6 +546,7 @@ export default { if (valid) { this.$refs['roleForm'].validate((valid) => { if (valid) { + this.isSubmit = true this.$http.get("lawss/activiti/startProcess", { type: "6" }, { _this: this }, res => { @@ -562,6 +562,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }); } }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 2539b5689..1f8280f2b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -526,7 +526,7 @@ export default { _formData.append("createUserName", this.$store.getters.userInfo.userName); _formData.append("prcType", "6"); _formData.append("json", JSON.stringify({ - form: this.form, + form: this.listForm, roleForm: this.roleForm, commentText: this.commentText })); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index 7daf927fe..f2e01646f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -2,7 +2,7 @@
- +
基础信息
From 050a3a30a592d0efc2acad914727cc157b793002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 5 Aug 2021 17:22:06 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/searchCenter/pages/standardSearch.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index 04ef5ace5..b4d0b82af 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -212,7 +212,7 @@ export default { //查询选项 queryOptions() { let _this = this; - this.$http.post("search/searchCenter/getMenu", {}, { + this.$http.post("search/getMenu", {}, { _this: this }, res => { _this.searchData = [ From 2e3232ade284d01078e955f7718bd2fe8ce9f57f Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Thu, 5 Aug 2021 17:31:47 +0800 Subject: [PATCH 14/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=E7=82=B9=E5=87=BB=E5=8F=AF=E8=BF=9B=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=EF=BC=8C=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?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/components/ProcessFooter.vue | 7 +++- .../pages/creatProcess/wfhxzg/step1.vue | 15 +++---- .../pages/creatProcess/wfhxzg/step2.vue | 4 +- .../pages/creatProcess/wfhxzg/step3.vue | 4 +- .../pages/creatProcess/wfhxzg/step4.vue | 39 +++++++++++-------- .../pages/creatProcess/wfhxzg/step5.vue | 10 +++-- .../pages/addEdit.vue | 9 +++++ .../pages/otherAddEit.vue | 9 +++++ .../pages/projectAddEit.vue | 9 +++++ 9 files changed, 74 insertions(+), 32 deletions(-) diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index 7afe67ada..266344463 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -53,7 +53,7 @@ size="small" class="common-button-danger" @click="beforeBack" - :loading="isSubmit" + :loading="isSubmitBack" v-if="showBack"> {{ backBTNText }} @@ -151,6 +151,11 @@ export default { type: Boolean, default: false }, + // 保存按钮loading + isSubmitBack: { + type: Boolean, + default: false + }, // 是否默认委托事件 defaultEntrust: { type: Boolean, diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index b15859b09..de2138c64 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -31,7 +31,7 @@ @@ -102,7 +102,7 @@

确认+选择责任人

- +
@@ -114,7 +114,7 @@

负责人

- +
@@ -126,7 +126,7 @@

分发负责人

- +
@@ -148,7 +148,7 @@ @@ -210,9 +210,9 @@ @selection-change="selectedChange" > - + @@ -291,6 +291,7 @@ export default { pageSize: 10, total: 0, closeState: '1', + standId: '', standSerialNumber: '', // 标准号/名称 productName: '', // 项目名称 responsibleUnit: '' // 责任部门 diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 34d9c9a60..b52339f31 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -97,9 +97,9 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> - + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index e8a67fc9b..5716eb580 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -99,9 +99,9 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> - + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index a684c38a4..71d89ca6a 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -87,9 +87,9 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> - + @@ -118,6 +118,7 @@ accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" :before-upload="handleBeforeUpload" :before-remove="handleBeforeRemove" + :on-remove="handleONRemove" :on-success="handleOnsuccess" > { if (item.fileText.length !== 0) { - item.fileText.forEach(item1 => { - this.fileTextList.push({ - id: item1.id, - name: item1.name - }) - }) + this.fileTextList = item.fileText } }) }) @@ -335,10 +331,18 @@ export default { // 文件上传成功 handleOnsuccess(res, file, fileList) { if (res.ok) { - this.newDataList.push({ - id: res.data.attId, - name: res.data.standName - }) + if (this.fileTextList !== null) { + this.newDataList = this.fileTextList + this.newDataList.push({ + id: res.data.attId, + name: res.data.standName + }) + } else { + this.newDataList.push({ + id: res.data.attId, + name: res.data.standName + }) + } this.fileListData.fileText = this.newDataList this.$message({ showClose: true, @@ -377,14 +381,17 @@ export default { }, // 移除上传的文件 handleBeforeRemove(file, fileList) { + this.fileListData.fileText = fileList this.fileTextList = fileList - this.newDataList.forEach((item, index) => { +/* this.newDataList.forEach((item, index) => { if (file.name === item.name || file.id === item.id) { this.newDataList.splice(index, 1) - } - }) - }, + console.log(this.dataList) + } + })*/ + }, + handleONRemove() {}, /************ ********* *****************/ // 点击查看 handlePreview (item) { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index ab8c6df90..865a6a96e 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -87,9 +87,9 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> - + @@ -201,7 +201,7 @@ approval @back="handleSubmitNo" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="backLoading" @submit="handleSubmit" submitBTNText="同意" > @@ -357,6 +357,7 @@ export default { }) }, handleSubmitNo() { + this.backLoading = true if (this.commentText) { var json = { responUserInfo: { @@ -372,12 +373,13 @@ export default { }, {}, res => { if (res.success) { this.$message.success('驳回成功') - this.fileTextList = [] this.$router.push('/processCenter') + this.backLoading = false } }) } else { this.$message.warning('请输入反馈意见') + this.backLoading = false } }, //未整改项抽屉中的查询按钮 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 4a89f62c4..883ef6927 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -185,6 +185,9 @@ prop="standName" label="标准名称" > + + + + + + + + + Date: Thu, 5 Aug 2021 17:33:04 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E6=9B=B4=E6=94=B97=E6=AD=A5=E6=A0=B7?= =?UTF-8?q?=E5=BC=8Fstyle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step1-1.vue | 1 + .../pages/creatProcess/xmpg/step1.vue | 1 + .../pages/creatProcess/xmpg/step2.vue | 6 +++++- .../pages/creatProcess/xmpg/step3.vue | 16 +--------------- .../pages/creatProcess/xmpg/step4.vue | 6 +++++- .../pages/creatProcess/xmpg/step5.vue | 6 +++++- .../pages/creatProcess/xmpg/step6.vue | 6 +++++- .../pages/creatProcess/xmpg/step7.vue | 1 - 8 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 5842ea30e..e01298782 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -405,6 +405,7 @@ export default { drawerTitle: "", //drawer标题 // 查询相关参数 searching: false, + commentText:'', standardSearch: { standType: "", standName: "" diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 5c28d466d..93b96686c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -389,6 +389,7 @@ export default { productData: [], //添加抽屉的数据 standList: [], //新添加的标准 modalshowflag: false, // drawer开关 + commentText: '', drawerTitle: "", //drawer标题 // 查询相关参数 searching: false, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 856ce6777..91cc0a018 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -456,4 +456,8 @@ export default { } } - .dem + .demo-drawer-content { + margin-top: 10px; + } +} + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 49726090c..aafe0469e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -126,21 +126,7 @@ -
- - -
- - -
- - -
+ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 684e338b6..9bf3d7814 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -591,4 +591,8 @@ export default { } } - .demo- + .demo-drawer-content { + margin-top: 10px; + } +} +> diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index 95cf31713..da7a853ea 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -580,4 +580,8 @@ export default { } } - .demo- + .demo-drawer-content { + margin-top: 10px; + } +} + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 3f5518210..d12fc2bc4 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -510,7 +510,6 @@ export default {