From fa96edf2cf160164df283c4ae76494ead3a7925d Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 24 Jan 2022 18:00:46 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BD=92=E6=A1=A3=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzrk/step2.vue | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 31130d429..1d960222d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -1225,6 +1225,7 @@ export default { if (this.form.zrgcs.length === 0) { this.form.zrgcs = '' } + this.form.menusId = this.form.treeListId const json = JSON.stringify(this.form); this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, @@ -1260,17 +1261,13 @@ export default { processCreateStand(_formData).then(res => { if (res.result === '操作成功' || res.data === '入库成功') { this.$message.success(res.data) - let menuList = { - idlist: [this.form.standId], - menuIds: this.form.treeListId - } - this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenuForFlow', menuList, { + /*this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenuForFlow', menuList, { _this: this, }, resMenu => { if (resMenu.ok) { console.log(resMenu) } - }) + })*/ setTimeout(() => { this.$router.push({ name: 'ProcessCenter' From f407ef402a0bba21e9ea3cc5645d5782d13aee98 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 24 Jan 2022 18:07:49 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=BD=92=E6=A1=A3=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E6=9B=B4=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/processCenter/pages/creatProcess/bzrk/step2.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 1d960222d..f82d5cadf 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -1225,7 +1225,7 @@ export default { if (this.form.zrgcs.length === 0) { this.form.zrgcs = '' } - this.form.menusId = this.form.treeListId + this.form.menusIds = this.form.treeListId const json = JSON.stringify(this.form); this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, From 7031e0dc01e35e6621191db61b7183ee1966ef0b Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 24 Jan 2022 18:14:53 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index f82d5cadf..ea1ca6d4a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -1225,7 +1225,7 @@ export default { if (this.form.zrgcs.length === 0) { this.form.zrgcs = '' } - this.form.menusIds = this.form.treeListId + this.form.menuIds = this.form.treeListId const json = JSON.stringify(this.form); this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, From 357874db8aee453a95a792d60181785de19e27cc Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 24 Jan 2022 20:03:26 +0800 Subject: [PATCH 4/5] feat: There is no way the, --- .../components/EnterpriseStandardDatabase.vue | 246 +++++++++++++++++- 1 file changed, 245 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 6e34d4592..5499ca708 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -277,6 +277,10 @@ size="mini" @click="OCRAdd('2')" v-btn-permission="'247cebaefa7cf1683092af160af11502'">编辑 + 企标复审计划 +
@@ -1335,6 +1339,118 @@
+ +
+
+ + + + + + + + + + + + 查询 + + + + 清空 + + +
+
+ + + + + + + + + + + + + + + + + {{$t('m.dataAcquisition')}} + + +
+ 取消 + +
+ 10){ + str = str.substring(0,10) + } + return str + }, + filterOp(data){ + if(!data || data === ""){ + return "" + } + const map = new Map(); + map.set(1,"修订"); + map.set(2,"废止"); + map.set(3,"继续有效"); + return map.get(data) + }, + selectBuss(){ + this.replaceLawsNumModel = true + this.getReplaceLawsNumRow() + }, + replaceLawsNumModelCancel () { + // this.replaceLawsNumModel = false + this.$refs.selections.clearSelection() + }, + pageChangeReplace (page) { + this.replacePage = page + this.replaceLawsNumForm.page = page + this.getReplaceLawsNumRow() + }, + pageSizeChangeReplace (pageSize) { + // this.replaceRows = pageSize + this.replaceLawsNumForm.pageSize = pageSize + this.getReplaceLawsNumRow() + }, + getResetLawsNumRow () { + this.replaceLawsNumForm = { + standCode: '', // 标准编号 + reviewTimeArr:'', + reviewTimeStart:'', + reviewTimeEnd:'', + issueTimeArr:'', + issueTimeStart:'', + issueTimeEnd:'', + page: 1, + pageSize: this.$store.getters.userInfo.configContent, + total: 0, + validFlag: '0', + } + this.getReplaceLawsNumRow() + }, + getReplaceLawsNumRow () { + if(this.replaceLawsNumForm.issueTimeArr && this.replaceLawsNumForm.issueTimeArr.length > 0){ + this.replaceLawsNumForm.issueTimeStart = this.replaceLawsNumForm.issueTimeArr[0] || null + this.replaceLawsNumForm.issueTimeEnd = this.replaceLawsNumForm.issueTimeArr[1] || null + } + if(this.replaceLawsNumForm.reviewTimeArr && this.replaceLawsNumForm.reviewTimeArr.length > 0){ + this.replaceLawsNumForm.reviewTimeStart = this.replaceLawsNumForm.reviewTimeArr[0] || null + this.replaceLawsNumForm.reviewTimeEnd = this.replaceLawsNumForm.reviewTimeArr[1] || null + } + this.$http.get('lawss/sarBussionessStandState/getSarBussionStandPage', this.replaceLawsNumForm, { + _this: this, + loading: 'replaceLoading' + }, res => { + this.replaceLawsNumRow = res.data.list + this.replaceTotal = res.data.count + // if (this.selectedListRep.length !== 0) { + // this.selectedListRep.map((list) => { + // this.replaceLawsNumRow.map((item) => { + // if (list.id === item.id) { + // item._checked = true + // } + // }) + // }) + // } + }, e => { + }) + }, + getReplaceLawsNumRowFirst () { + this.replaceLawsNumForm.page = 1 + this.replacePage = 1 + if(this.replaceLawsNumForm.issueTimeArr && this.replaceLawsNumForm.issueTimeArr.length > 0){ + console.log(this.replaceLawsNumForm.issueTimeArr) + this.replaceLawsNumForm.issueTimeStart = this.replaceLawsNumForm.issueTimeArr[0] || null + this.replaceLawsNumForm.issueTimeEnd = this.replaceLawsNumForm.issueTimeArr[1] || null + } + if(this.replaceLawsNumForm.reviewTimeArr && this.replaceLawsNumForm.reviewTimeArr.length > 0){ + this.replaceLawsNumForm.reviewTimeStart = this.replaceLawsNumForm.reviewTimeArr[0] || null + this.replaceLawsNumForm.reviewTimeEnd = this.replaceLawsNumForm.reviewTimeArr[1] || null + } + this.$http.get('lawss/sarBussionessStandState/getSarBussionStandPage', this.replaceLawsNumForm, { + _this: this, + loading: 'replaceLoading' + }, res => { + this.replaceLawsNumRow = res.data.list + this.replaceTotal = res.data.count + // if (this.selectedListRep.length !== 0) { + // this.selectedListRep.map((list) => { + // this.replaceLawsNumRow.map((item) => { + // if (list.id === item.id) { + // item._checked = true + // } + // }) + // }) + // } + }, e => { + }) + }, // 左右拖动事件 dragControllerLR: function () { var resize = document.getElementById("resize"); @@ -4614,7 +4858,7 @@ export default { // this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS let year = date.getFullYear() + 5; - let month = (date.getMonth() + 1).toString(); + let month = (date.getMonth()).toString(); let day = (date.getDate()).toString(); if (month.length == 1) { month = "0" + month; From 123bfaaa4bcbd250484dac18a7dbc641ed1e8764 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 24 Jan 2022 20:04:31 +0800 Subject: [PATCH 5/5] feat: There is no way the, --- .../components/EnterpriseStandardDatabase.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index f1f179093..2f032f270 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -277,10 +277,10 @@ size="mini" @click="OCRAdd('2')" v-btn-permission="'247cebaefa7cf1683092af160af11502'">编辑 - 企标复审计划 - + + + +