From 6c9c4036f151d0c20a79204488cd0257a21ee924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 24 Dec 2021 13:42:11 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=B7=B2=E5=8F=91=E5=B7=B2=E5=8A=9E?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/phone/bzqdfb/step4.vue | 2 +- src/pages/processCenter/pages/processDetail/index.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue index f06e8a654..fec05067e 100644 --- a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue @@ -9,7 +9,7 @@
基础信息
审批历史
-
+
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 249a08612..2525456e7 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -83,7 +83,7 @@ sortable="custom" align="center"> Date: Fri, 24 Dec 2021 14:05:45 +0800 Subject: [PATCH 02/12] commit --- .../pages/creatProcess/zcch/step1-1.vue | 33 +++++++------------ .../pages/creatProcess/zcrh/step1-1.vue | 33 +++++++------------ 2 files changed, 24 insertions(+), 42 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue b/src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue index 6002f4bfb..09a5b3717 100644 --- a/src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue @@ -774,28 +774,19 @@ this.$refs['Form'].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get('lawss/activiti/startProcess', { - type: '18' + var json = Object.assign(this.rhform, this.roleForm) + json.commentText = this.commentText + json.data1 = this.data1 + json.data2 = this.data2 + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: res.data, + userId: this.$store.getters.userInfo.userId }, {}, res => { - if (res.ok) { - var json = Object.assign(this.rhform, this.roleForm) - json.commentText = this.commentText - json.data1 = this.data1 - json.data2 = this.data2 - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskId: res.data, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success('流程发起成功') - this.$router.push('/processCenter') - this.isSubmit = false - } else { - this.$message.warning('流程启动失败') - this.isSubmit = false - } - }) + if (res.success) { + this.$message.success('流程发起成功') + this.$router.push('/processCenter') + this.isSubmit = false } else { this.$message.warning('流程启动失败') this.isSubmit = false diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue index 9dfef74cb..6c8116174 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue @@ -752,28 +752,19 @@ this.$refs['Form'].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get('lawss/activiti/startProcess', { - type: '17' + var json = Object.assign(this.rhform, this.roleForm) + json.commentText = this.commentText + json.data1 = this.data1 + json.data2 = this.data2 + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: res.data, + userId: this.$store.getters.userInfo.userId }, {}, res => { - if (res.ok) { - var json = Object.assign(this.rhform, this.roleForm) - json.commentText = this.commentText - json.data1 = this.data1 - json.data2 = this.data2 - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskId: res.data, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success('流程发起成功') - this.$router.push('/processCenter') - this.isSubmit = false - } else { - this.$message.warning('流程启动失败') - this.isSubmit = false - } - }) + if (res.success) { + this.$message.success('流程发起成功') + this.$router.push('/processCenter') + this.isSubmit = false } else { this.$message.warning('流程启动失败') this.isSubmit = false From 276ae69671ab8f619dfbae76d5c6ed19f6470403 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Fri, 24 Dec 2021 15:12:19 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=88=86=E8=A7=A3=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=20-=20=E6=9F=A5=E7=9C=8B=20-=20=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 7a2fd5c71..2320b4b2b 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -1152,22 +1152,22 @@
- {{ standShowItemEO.itemsNum }} + {{ standShowItemEO.itemsNum }}
- - {{ standShowItemEO.itemsName }} + + {{ standShowItemEO.itemsName }}
- - 条款内容 + {{ standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : '' }}
- - 解读内容 + {{ standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : '' @@ -1175,49 +1175,49 @@
- - 新车型实施日期 + {{ standShowItemEO.xccssrq }}
- - 在产车实施日期 + {{ standShowItemEO.zccssrq }}
- - {{ standShowItemEO.applyArctic }} + + {{ standShowItemEO.applyArctic }}
- - {{ + + {{ standShowItemEO.responsibleUnit }}
- - + + {{ standShowItemEO.dutyEngineer }}
- - + + {{ standShowItemEO.comparedWithPrevious }}
- - + + {{ standShowItemEO.complianceRequire }}
- - + + {{ standShowItemEO.complianceState }}
From 2ff8b784173a6baa40f91985bfd858a8b8c700ed Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 24 Dec 2021 15:21:39 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=B8=85=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/addEdit.vue | 20 +++++++++---------- .../pages/otherAddEit.vue | 15 ++++++++------ .../pages/projectAddEit.vue | 12 +++++------ 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 26874117b..68685d1fc 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -81,9 +81,9 @@ - + @@ -202,7 +202,6 @@ @@ -212,7 +211,6 @@ @@ -220,7 +218,6 @@ @@ -327,7 +324,6 @@ @@ -335,14 +331,12 @@ @@ -635,9 +629,10 @@ export default { // 新增、编辑 数据搜索字段 sarAccessInfoSearch: { id: '', - standName: '', + standNumber: '', askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 + pageNo: 1, page: 1, pageSize: this.$store.getters.userInfo.configContent, validFlag: 0, @@ -649,6 +644,7 @@ export default { standName: '', askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 + pageNo: 1, page: 1, pageSize: this.$store.getters.userInfo.configContent, validFlag: 0, @@ -998,7 +994,7 @@ export default { clearSearchLaws() { this.sarAccessInfoSearch.askType = '' // 监管类型 this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源 - this.sarAccessInfoSearch.standName = '' + this.sarAccessInfoSearch.standNumber = '' this.sarAccessInfo.standName = '' this.sarAccessInfo.standNumber = '' this.isListType = false @@ -1476,6 +1472,8 @@ export default { }) }, pageInfo() { + this.sarAccessInfoSearch.pageNo = 1 + this.sarAccessInfoSearch.page = 1 if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){ StandardsInfoPage(this.sarAccessInfoSearch).then(res => { this.sarAccessInfoSearchList = res.data.list @@ -1526,6 +1524,8 @@ export default { }, selectPage() { + this.sarAccessInfo.pageNo = 1 + this.sarAccessInfo.page = 1 StandardsInfoPage(this.sarAccessInfo).then(res => { this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 81dce1559..1cbe14f95 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -182,12 +182,10 @@ @@ -195,7 +193,6 @@ show-overflow-tooltip prop="zccssrq" align="center" - sortable label="在产车实施日期"> @@ -305,14 +301,12 @@ @@ -499,6 +493,7 @@ export default { askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 page: 1, + pageNo: 1, Size: this.$store.getters.userInfo.configContent, validFlag: 0, advanceSearchVOStr: '' @@ -510,6 +505,7 @@ export default { askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 page: 1, + pageNo: 1, pageSize: this.$store.getters.userInfo.configContent, validFlag: 0, advanceSearchVOStr: '' @@ -832,6 +828,8 @@ export default { // 点数据搜索 查询按钮 事件 searchLawsStands () { this.showTableFlag = false + this.sarAccessInfoSearch.pageNo = 1 + this.sarAccessInfoSearch.page = 1 this.selectLawsStands() }, // 点击清空查询条件 按钮事件 @@ -1232,6 +1230,8 @@ export default { }) }, pageInfo() { + this.sarAccessInfoSearch.pageNo = 1 + this.sarAccessInfoSearch.page = 1 if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') { StandardsInfoPage(this.sarAccessInfoSearch).then(res => { this.sarAccessInfoSearchList = res.data.list @@ -1282,6 +1282,8 @@ export default { } }, selectPage() { + this.sarAccessInfo.page = 1 + this.sarAccessInfo.pageNo = 1 StandardsInfoPage(this.sarAccessInfo).then(res =>{ this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { @@ -1297,6 +1299,7 @@ export default { }, // 高级检索查询按钮 selectBtn() { + this.sarAccessInfo.pageNo = 1 if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { this.sarAccessInfoSearch.standType = 'INLAND' this.selectPage() diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index dfec4ebff..83dca2e39 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -238,20 +238,17 @@ @@ -355,7 +352,6 @@ @@ -363,14 +359,12 @@ @@ -569,6 +563,7 @@ export default { syrz: '', typeApplicable: '', dataSource: 'INLAND_STAND', // 数据来源 + pageNo: 1, page: 1, pageSize: this.$store.getters.userInfo.configContent, validFlag: 0, @@ -582,6 +577,7 @@ export default { typeApplicable: '', askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 + pageNo: 1, page: 1, pageSize: this.$store.getters.userInfo.configContent, validFlag: 0, @@ -1355,6 +1351,8 @@ export default { }, // 查询按钮 selectLawsStands() { + this.sarAccessInfoSearch.pageNo = 1 + this.sarAccessInfoSearch.page = 1 if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { this.sarAccessInfoSearch.standType = 'INLAND' this.pageInfo() @@ -1371,6 +1369,8 @@ export default { }, /** 高级查询查询按钮*/ selectPage() { + this.sarAccessInfo.pageNo = 1 + this.sarAccessInfo.page = 1 StandardsInfoPage(this.sarAccessInfo).then(res => { this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { From e266fd731cc9ff6fd56b8cf741325ee04bf20706 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 24 Dec 2021 15:37:04 +0800 Subject: [PATCH 05/12] commit --- .../pages/creatProcess/bzjd/step1-1.vue | 6 +++ .../pages/creatProcess/bzjd/step1.vue | 6 +++ .../components/EnterpriseStandardDatabase.vue | 48 ++++++------------- .../enterpriseStandardPlan/index.vue | 13 +++-- 4 files changed, 35 insertions(+), 38 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 1c6c4db0c..a22438391 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -68,6 +68,7 @@ @@ -553,6 +554,11 @@ name: "bzjdStep1-1", data() { return { + pickerOptions: { + disabledDate(time) { + return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的 + } + }, similarityDegree: '', leftData: [], rightData: [], diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index fbd5f6cad..99c118937 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -69,6 +69,7 @@ @@ -563,6 +564,11 @@ export default { name: "bzjdStep1", data() { return { + pickerOptions: { + disabledDate(time) { + return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的 + } + }, similarityDegree: '', leftData: [], rightData: [], diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 295ff82ea..04a0db39c 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -144,7 +144,7 @@ - {{ opt.label}} + {{ opt.label}} @@ -158,14 +158,14 @@ - {{ opt.label}} + {{ opt.label}} - {{ opt.label}} + {{ opt.label}} @@ -471,9 +471,9 @@ @@ -515,8 +515,8 @@ placeholder="请选择文本状态" clearable> {{ opt.label }} @@ -546,7 +546,6 @@ >