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 1/4] =?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 2/4] =?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 3/4] =?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 4/4] =?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="标准名称" > + + + + + + + + +