From 5276910972d676d67f0ccb7d393a2ae867631bf3 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 3 Aug 2021 15:41:21 +0800 Subject: [PATCH 01/26] commit --- src/pages/processCenter/pages/creatProcess/bzjd/step1.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 0e1e083c2..bd91ea3ca 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -14,6 +14,7 @@ @@ -499,7 +500,7 @@ _this: this }, res => { this.standInfoList = res.data.list - this.total = res.data.total + this.total = res.data.count this.spinShow = false }, e => { }) @@ -727,8 +728,10 @@ handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { + console.log(1); this.$refs['Form'].validate((valid) => { if (valid) { + console.log(2); let b = 0 for (let a = 0; a < this.itemList.length; a++) { if (!this.itemList[a].zrUserId) { From 0657191abfc1c7f268b6ff331180cf0f083c4de5 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Wed, 4 Aug 2021 09:00:31 +0800 Subject: [PATCH 02/26] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E6=B8=85=E7=A9=BA=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=A1=B5=E7=9A=84=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 6d8ca7b07..b15859b09 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -253,7 +253,7 @@ { if (valid) { From c104054e961e84465379202cda14f262bd10ebd3 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Wed, 4 Aug 2021 09:15:13 +0800 Subject: [PATCH 03/26] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step2.vue | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 4a203c4e7..9bb85737c 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -123,7 +123,7 @@ @click.native="clickOpen(scope.row)" v-model="scope.row.dutyPeopleInfo" size="mini" - placeholder="请输入内容" + placeholder="请选择分发责任人" /> @@ -220,6 +220,7 @@ > { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) + }, // 提交按钮 handleSubmit() { this.isSubmit = true From bc76c4ceef0f0b43f24491e44f60769b50704eb7 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Wed, 4 Aug 2021 09:18:54 +0800 Subject: [PATCH 04/26] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue | 1 - src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 9bb85737c..8b3878ffb 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -222,7 +222,6 @@ Date: Wed, 4 Aug 2021 10:44:24 +0800 Subject: [PATCH 05/26] commit --- .../pages/creatProcess/bzjd/step1.vue | 2 - .../pages/creatProcess/bzjd/step2.vue | 24 ++++- .../pags/consultationDetails.vue | 101 ++++++++---------- 3 files changed, 69 insertions(+), 58 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index bd91ea3ca..8df138551 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -728,10 +728,8 @@ handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { - console.log(1); this.$refs['Form'].validate((valid) => { if (valid) { - console.log(2); let b = 0 for (let a = 0; a < this.itemList.length; a++) { if (!this.itemList[a].zrUserId) { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 1ebcac3fe..45d18b0dc 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -198,6 +198,7 @@ { + this.saveLoading = false + this.$message.success('保存成功') + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 578bec260..2af3b6084 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -32,54 +32,52 @@ 添加 导出 -
-
- + - - - - - - - - - - - - -
+ + + + + + + + + + + +
{ this.standinfoList = res.data.records + console.log(this.standinfoList); this.total = res.data.total this.spinShow = false - res.data.records.forEach(item => { - if (item.ideaKey == 1) { - this.ideaKey = false - } else { - this.ideaKey = true - } - }) }, e => { }) }, @@ -388,6 +380,7 @@ display: flex; margin:10px 0; flex-direction: column; + padding: 0; .el-tabs{ height: 100%; display: flex; From 3574e89d4465a4dd71cf2eb142ab21064b523a1b Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 4 Aug 2021 10:48:40 +0800 Subject: [PATCH 06/26] =?UTF-8?q?feat:=20=E5=9B=BD=E5=86=85=E5=A4=96?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=20=E9=80=89=E4=BA=BA=E7=BB=9F=E4=B8=80=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 106 ++++++++++++------ 1 file changed, 74 insertions(+), 32 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index fd24218c6..da988f82e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -976,38 +976,51 @@ 提交 - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + item.id).join(",") + this.roleForm.zrUserName = this.zrUserIds.map(item => item.name).join(",") + } + this.modalshowflag2 = true + }, + checkedRole2 (data) { + var idList = '' + var nameList = '' + data.forEach( item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.name + }) + this.zrUserIds = idList + this.zrUserIds = nameList + }, + checkedRole (data) { + if (this.userType === 'jlUserId') { + this.roleForm.jlUserId = data.id + this.roleForm.jlUserName = data.name + } + }, // z责任人会签姓名搜索 filterNode(value, data) { if (!value) return true; From 70f18cd2852fe5faf1be8f00d58f2873aea69960 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Wed, 4 Aug 2021 10:52:36 +0800 Subject: [PATCH 07/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9=E6=95=B4=E6=94=B9--=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8F=B7/=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/rectificationDatabase.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 514caf49e..d81313756 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -5,7 +5,7 @@
- @@ -430,6 +430,7 @@ export default { pageNo: 1, nonConformitySearch: { standId: '', // 标准号/名称 + standSerialNumber:'', productName: '', // 项目名称 responsibleUnit: '' // 责任部门 }, From 7f3652267423f31c73fd99fb0f2f72c6ad225ea8 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 4 Aug 2021 10:53:30 +0800 Subject: [PATCH 08/26] commit --- src/common/axios/index.js | 4 ++-- src/common/axiosV2/index.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/axios/index.js b/src/common/axios/index.js index b23a55cc0..da73cb853 100644 --- a/src/common/axios/index.js +++ b/src/common/axios/index.js @@ -7,11 +7,11 @@ import axios from 'axios' import router from '@/router' import store from '@/store' import {Message} from 'element-ui' -import { baseUrl } from '@/sysConfig' +import { serverUrl } from '@/sysConfig' export const CancelToken = axios.CancelToken // import 'element-ui/lib/theme-chalk/index.css' const _axios = axios.create({ - baseURL: process.env.NODE_ENV === 'production' ? baseUrl : '/' + baseURL: process.env.NODE_ENV === 'production' ? serverUrl : '/' }) /** diff --git a/src/common/axiosV2/index.js b/src/common/axiosV2/index.js index f4aaa8125..0dfec9795 100644 --- a/src/common/axiosV2/index.js +++ b/src/common/axiosV2/index.js @@ -2,7 +2,7 @@ import axios from 'axios' import router from '@/router' import store from '@/store' import {Message} from 'element-ui' -import { baseUrl } from '@/sysConfig' +import { serverUrl } from '@/sysConfig' // import 'element-ui/lib/theme-chalk/index.css' /** @@ -19,7 +19,7 @@ let formData = (data) => { } const service = axios.create({ - baseURL: process.env.NODE_ENV === 'production' ? baseUrl : '/' + baseURL: process.env.NODE_ENV === 'production' ? serverUrl : '/' }) service.defaults.timeout = 99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 From 1b79f555a246ec223f77272f5fde222007202d98 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 4 Aug 2021 11:06:55 +0800 Subject: [PATCH 09/26] commit --- src/pages/processCenter/pages/creatProcess/bzjd/step3.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index b1513d569..ffb1fd8fe 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -530,7 +530,12 @@ this.form.itemsName1 = data.itemsName1 this.sarType = data.standInData this.json = data - const itemList = JSON.parse(data.itemList) + let itemList + if (typeof (data.itemList) == 'string') { + itemList = JSON.parse(data.itemList) + } else { + itemList = data.itemList + } itemList.forEach(item => { item.unitDeptName = this.$store.getters.userInfo.orgName item.onlineData = '' @@ -542,6 +547,7 @@ item.technicalRequir = '' item.itemsTitle = item.itermsConditions }) + console.log(2); this.itemList = itemList this.loading = false }).catch(e => { From 0719b0f7967bd0779b321fecf526969506d0fc3a Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 4 Aug 2021 11:11:01 +0800 Subject: [PATCH 10/26] commit --- src/common/axios/index.js | 4 ++-- src/common/axiosV2/index.js | 4 ++-- src/sysConfig/index.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/axios/index.js b/src/common/axios/index.js index da73cb853..b23a55cc0 100644 --- a/src/common/axios/index.js +++ b/src/common/axios/index.js @@ -7,11 +7,11 @@ import axios from 'axios' import router from '@/router' import store from '@/store' import {Message} from 'element-ui' -import { serverUrl } from '@/sysConfig' +import { baseUrl } from '@/sysConfig' export const CancelToken = axios.CancelToken // import 'element-ui/lib/theme-chalk/index.css' const _axios = axios.create({ - baseURL: process.env.NODE_ENV === 'production' ? serverUrl : '/' + baseURL: process.env.NODE_ENV === 'production' ? baseUrl : '/' }) /** diff --git a/src/common/axiosV2/index.js b/src/common/axiosV2/index.js index 0dfec9795..f4aaa8125 100644 --- a/src/common/axiosV2/index.js +++ b/src/common/axiosV2/index.js @@ -2,7 +2,7 @@ import axios from 'axios' import router from '@/router' import store from '@/store' import {Message} from 'element-ui' -import { serverUrl } from '@/sysConfig' +import { baseUrl } from '@/sysConfig' // import 'element-ui/lib/theme-chalk/index.css' /** @@ -19,7 +19,7 @@ let formData = (data) => { } const service = axios.create({ - baseURL: process.env.NODE_ENV === 'production' ? serverUrl : '/' + baseURL: process.env.NODE_ENV === 'production' ? baseUrl : '/' }) service.defaults.timeout = 99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index efe1b4c11..d2960cf5d 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -31,7 +31,7 @@ const processPort = '17210' *****************************************************************/ // 生产环境配置 const prodIp = '62.234.136.153' -const prodInterfacePORT = '8033' +const prodInterfacePORT = '8038' // 判断环境 From 38ee07db17191f8afe04658faacf900c34d2ad05 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 4 Aug 2021 11:22:59 +0800 Subject: [PATCH 11/26] commit --- src/sysConfig/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index d2960cf5d..98534ad39 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -30,8 +30,8 @@ const processPort = '17210' *****************************************************************/ // 生产环境配置 -const prodIp = '62.234.136.153' -const prodInterfacePORT = '8038' +const prodIp = '62.234.136.1531' +const prodInterfacePORT = '80381' // 判断环境 From 95a56debc20ab5dd63d578ab3643a362bf476200 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 4 Aug 2021 11:28:35 +0800 Subject: [PATCH 12/26] commit --- src/sysConfig/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 98534ad39..d2960cf5d 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -30,8 +30,8 @@ const processPort = '17210' *****************************************************************/ // 生产环境配置 -const prodIp = '62.234.136.1531' -const prodInterfacePORT = '80381' +const prodIp = '62.234.136.153' +const prodInterfacePORT = '8038' // 判断环境 From 01263e3fecd1366485bf9b6db79c8df79ec44a9b Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Wed, 4 Aug 2021 14:04:35 +0800 Subject: [PATCH 13/26] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E5=BA=93--=E6=9F=A5=E7=9C=8B=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=92=8C=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2=E5=BE=97=E5=88=B0=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulatoryRepository/nonConfomity/pages/historicalData.vue | 2 +- .../nonConfomity/pages/rectificationDatabase.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue index a520ab673..92d3a7370 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue @@ -232,7 +232,7 @@
{{historySeeForm.qaEngineer}}
 -
{{historySeeForm.actualCloseTime}}
+
{{historySeeForm.actualCloseTime.substring(0, 11)}}
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index d81313756..220bc4adc 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -269,7 +269,7 @@
{{historySeeForm.qaEngineer}}
-
{{historySeeForm.planCloseTime}}
+
{{historySeeForm.planCloseTime.substring(0, 11)}}
 From 8382dbb8683b9db4eebee951d40d05f273d68f3d Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 4 Aug 2021 14:29:17 +0800 Subject: [PATCH 14/26] commit --- .../nonConfomity/pages/rectificationDatabase.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index d81313756..b196ff616 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -203,7 +203,7 @@ - 查看 + 查看123 From 64b68df1836acaf8741e9c438743d7ba6997c7bd Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Wed, 4 Aug 2021 14:30:36 +0800 Subject: [PATCH 15/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9=E6=95=B4=E6=94=B9--=E7=94=B1=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?-=E6=A0=87=E5=87=86=E5=BD=92=E6=A1=A3=E5=88=B0=E6=9C=AA?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A1=B9=E6=95=B4=E6=94=B9=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/historicalData.vue | 2 +- .../pages/rectificationDatabase.vue | 24 ++++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue index 92d3a7370..a520ab673 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue @@ -232,7 +232,7 @@
{{historySeeForm.qaEngineer}}
-
{{historySeeForm.actualCloseTime.substring(0, 11)}}
+
{{historySeeForm.actualCloseTime}}
 diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 220bc4adc..01f2866bd 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -269,7 +269,7 @@
{{historySeeForm.qaEngineer}}
-
{{historySeeForm.planCloseTime.substring(0, 11)}}
+
{{historySeeForm.planCloseTime ? historySeeForm.planCloseTime.substring(0, 11) : '-'}}
 @@ -384,7 +384,7 @@
验证时间:
-
{{(item.validTime ? item.validTime.substring(0, 11): '')}}
+
{{(item.validTime ? item.validTime.substring(0, 11) : '')}}
验证结果:
@@ -592,16 +592,18 @@ export default { this.$nextTick(() => { const arr = [] let questionType = [] - questionType = this.historySeeForm.quesType.split(',') - questionType.map((item) => { - this.optionList.map((opr) => { - if (item === opr.value) { - item = opr.label - arr.push(item) - } + if (this.historySeeForm.quesType) { + questionType = this.historySeeForm.quesType.split(',') + questionType.map((item) => { + this.optionList.map((opr) => { + if (item === opr.value) { + item = opr.label + arr.push(item) + } + }) }) - }) - this.historySeeForm.quesType = arr.toString() + this.historySeeForm.quesType = arr.toString() + } }) }, //点击编辑按钮事件 From ef48f5cddfdfb3b9ddba66d3a3da180590acfc95 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Wed, 4 Aug 2021 14:32:18 +0800 Subject: [PATCH 16/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9=E6=95=B4=E6=94=B9--=E7=94=B1=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?-=E6=A0=87=E5=87=86=E5=BD=92=E6=A1=A3=E5=88=B0=E6=9C=AA?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A1=B9=E6=95=B4=E6=94=B9=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/rectificationDatabase.vue | 2 +- src/sysConfig/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 6536bec28..01f2866bd 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -203,7 +203,7 @@ - 查看123 + 查看
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index d2960cf5d..3ea4b4abd 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 = '127.0.0.1' const devInterfacePORT = '9999' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' From fb8be7dff843d86bbcca162920e5130d7cd63e95 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Wed, 4 Aug 2021 14:33:12 +0800 Subject: [PATCH 17/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9=E6=95=B4=E6=94=B9--=E7=94=B1=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?-=E6=A0=87=E5=87=86=E5=BD=92=E6=A1=A3=E5=88=B0=E6=9C=AA?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A1=B9=E6=95=B4=E6=94=B9=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/rectificationDatabase.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 01f2866bd..6cba4419d 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -203,7 +203,7 @@ - 查看 + 查看 From 1e294b9d8f42b206ed4b2ade85eaaa0ac75ef3da Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 4 Aug 2021 14:38:02 +0800 Subject: [PATCH 18/26] commit --- .../nonConfomity/pages/rectificationDatabase.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 6cba4419d..01f2866bd 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -203,7 +203,7 @@ - 查看 + 查看 From 9ed13dc09fe5c0b304be2624e5d33796efb1eb09 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Wed, 4 Aug 2021 14:38:57 +0800 Subject: [PATCH 19/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9=E6=95=B4=E6=94=B9--=E7=94=B1=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?-=E6=A0=87=E5=87=86=E5=BD=92=E6=A1=A3=E5=88=B0=E6=9C=AA?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A1=B9=E6=95=B4=E6=94=B9=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/rectificationDatabase.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 6cba4419d..d48e92931 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -203,7 +203,7 @@ - 查看 + 查看123 From 6439e5ea670ceaf7f775ca77bbb8666b34a56600 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Wed, 4 Aug 2021 14:46:18 +0800 Subject: [PATCH 20/26] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E5=BA=93--=E6=9F=A5=E7=9C=8B=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=92=8C=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2=E5=BE=97=E5=88=B0=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulatoryRepository/nonConfomity/pages/historicalData.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue index a520ab673..ac1ad2ac2 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue @@ -232,7 +232,7 @@
{{historySeeForm.qaEngineer}}
-
{{historySeeForm.actualCloseTime}}
+
{{historySeeForm.actualCloseTime ? historySeeForm.actualCloseTime.substring(0, 11) : '-'}}
 From 64f8962b645292dd7626b59cb397d8db6df80131 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 4 Aug 2021 14:46:58 +0800 Subject: [PATCH 21/26] =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E4=BA=86=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index b5bc7ca67..32977c38e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1528,10 +1528,16 @@ this.zrUserIds = nameList }, checkedRole (data) { - if (this.userType === 'jlUserId') { - this.roleForm.jlUserId = data.id - this.roleForm.jlUserName = data.name - } + if (this.userType === 'jlUserId') { + this.roleForm.jlUserId = data[0].id + this.roleForm.jlUserName = data[0].name + }else if(this.userType === 'zrUserId'){ + this.roleForm.zrUserId=data[0].id; + this.roleForm.zrUserName=data[0].name; + + } + + }, // z责任人会签姓名搜索 filterNode(value, data) { @@ -1834,6 +1840,7 @@ }, getTree () { this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { + this.treeData = res.data }) }, From c400abf6836421898bc9438a4f24ad7bfcc81783 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 4 Aug 2021 14:49:51 +0800 Subject: [PATCH 22/26] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=8B=86=E5=88=86-=E6=9F=A5=E7=9C=8B-=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E5=BF=AB=E9=80=9F=E6=9F=A5=E6=89=BE=20=E5=9C=A8?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=9D=A1=E4=BB=B6=E5=90=8E=E6=B8=85=E7=A9=BA?= =?UTF-8?q?=E6=A0=91=E5=BD=A2=E7=9B=AE=E5=BD=95=E8=87=AA=E5=8A=A8=E9=9A=90?= =?UTF-8?q?=E8=97=8F=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/localTool/standAutoSplit/pages/itemSplitInfo.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index c531d6c0f..22836fdde 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -18,6 +18,7 @@ :showRMenu="jurisdictionCheckForTree" :isHideRNode="jurisdictionCheckForTree" :editable="jurisdictionCheckForTree" + expandFirst showCopyBtn deptSelect autoSelect From f1715c39bd7c0208874d51a604a4f68c56f61790 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Wed, 4 Aug 2021 15:46:52 +0800 Subject: [PATCH 23/26] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E5=BA=93--=E6=9F=A5=E7=9C=8B=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=92=8C=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/historicalData.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue index ac1ad2ac2..db8ee5016 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue @@ -201,7 +201,7 @@ style="width: 100%;" :model="historySeeForm" > - +
{{historySeeForm.standSerialNumber}}
 @@ -566,6 +566,7 @@ export default { this.$nextTick(() => { const arr = [] let questionType = [] + if (this.historySeeForm.quesType){ questionType = this.historySeeForm.quesType.split(',') questionType.map((item) => { this.optionList.map((opr) => { @@ -576,6 +577,7 @@ export default { }) }) this.historySeeForm.quesType = arr.toString() + } }) }, // 分页事件 From 098b8a557c5b931a700209cf494e13536510a9a2 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 4 Aug 2021 16:18:00 +0800 Subject: [PATCH 24/26] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?-=E9=A1=B9=E7=9B=AE---=E5=8F=91=E8=B5=B7=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7=E5=92=8C=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0=E5=8F=AF=E7=BC=96=E8=BE=91=E7=9A=84?= =?UTF-8?q?bug=EF=BC=8C=E5=BA=94=E6=94=B9=E4=B8=BA=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E7=BC=96=E8=BE=91disabled?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue | 4 ++++ src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue | 2 ++ src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue | 2 ++ src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue | 2 ++ src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue | 2 ++ src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue | 2 ++ src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue | 2 ++ src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue | 2 ++ src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue | 2 ++ src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue | 2 ++ src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue | 2 ++ src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue | 2 ++ src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue | 2 ++ 13 files changed, 28 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index 74b4b3417..ad751c081 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -30,6 +30,7 @@ @@ -37,6 +38,7 @@ @@ -232,12 +234,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 7864191ff..725892839 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -30,6 +30,7 @@ @@ -37,6 +38,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index 4891306dc..5d7b5b78f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -24,6 +24,7 @@ @@ -31,6 +32,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue index ecd157571..08c35a775 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue @@ -24,6 +24,7 @@ @@ -31,6 +32,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index 5cb4a140c..775521076 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -24,6 +24,7 @@ @@ -31,6 +32,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue index d00f00f00..6bdf02a5e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue @@ -24,6 +24,7 @@ @@ -31,6 +32,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue index 0c2e6b9b9..13c6cd453 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue @@ -24,12 +24,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue index b536d78b2..95cf42fe0 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue @@ -24,6 +24,7 @@ @@ -31,6 +32,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 8d4cf8c13..c920a368e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -24,6 +24,7 @@ @@ -31,6 +32,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 632d439fa..571089bfc 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -24,6 +24,7 @@ @@ -31,6 +32,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue index 1043c1f48..6e2987607 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue @@ -24,6 +24,7 @@ @@ -31,6 +32,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue index 06afbaec8..76691bd6c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue @@ -24,6 +24,7 @@ @@ -31,6 +32,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue index a88631f58..97e7b0ffa 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -24,6 +24,7 @@ @@ -31,6 +32,7 @@ From 281193bcaa4ab204d4fb913bc3353c692562433d Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Wed, 4 Aug 2021 16:24:57 +0800 Subject: [PATCH 25/26] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step2.vue | 8 ++-- .../pages/creatProcess/wfhxzg/step3.vue | 40 ++++++++++++++-- .../pages/creatProcess/wfhxzg/step4.vue | 46 +++++++++++++++++-- 3 files changed, 82 insertions(+), 12 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 8b3878ffb..34d9c9a60 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -234,7 +234,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import { roleTreeData } from "@/api/unqualProcess.js" -import {completeTask, inboundLiaisonDetail, saveinboundTask} from "@/api/process.js" +import {completeTask, inboundLiaisonDetail, saveinboundTask, saveTaskForPub} from "@/api/process.js" export default { name: "wfhxzgStep2", @@ -373,10 +373,10 @@ export default { _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ // roleForm: this.roleForm, - itemsList: this.dataList, + standardInfoList: this.dataList, commentText: this.commentText })) - saveinboundTask(_formData).then(res => { + saveTaskForPub(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result @@ -388,7 +388,7 @@ export default { handleSubmit() { this.isSubmit = true let zqa = new Map(); - for (let lastDataListElement of this.lastDataList) { + for (let lastDataListElement of this.dataList) { let a = zqa.get(lastDataListElement.dutyPeopleInfoId) if( a == null){ a = { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index afdc672db..e8a67fc9b 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -241,7 +241,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {completeTask, inboundLiaisonDetail} from "@/api/process.js"; +import {completeTask, inboundLiaisonDetail, saveTaskForPub} from "@/api/process.js"; export default { name: "wfhxzgStep3", @@ -405,7 +405,41 @@ export default { window.open(routeUrl.href, '_blank') }, // 保存按钮 - handleSave() {}, + handleSave() { + this.isSubmit = true + let zqa = new Map(); + for (let lastDataListElement of this.dataList) { + let a = zqa.get(lastDataListElement.dutyPeopleInfoId) + if( a == null){ + a = { + id: lastDataListElement.dutyPeopleInfoId, + name: lastDataListElement.dutyPeopleInfo, + standardInfoList: [] + } + } + a.standardInfoList.push(lastDataListElement); + zqa.set(a.id, a); + } + let list = []; + for(let item of zqa) { + list.push(item[1]) + } + this.saveLoading = true + let _formData = new FormData() + _formData.append('taskIds', this.taskIds) + _formData.append('json', JSON.stringify({ + // roleForm: this.roleForm, + dockUserList: list, + commentText: this.commentText + })) + saveTaskForPub(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) + }, // 提交按钮 handleSubmit() { this.isSubmit = true @@ -418,7 +452,7 @@ export default { }) if(flag)return this.$message.warning('请选择负责人填入') let zqa = new Map(); - for (let lastDataListElement of this.lastDataList) { + for (let lastDataListElement of this.dataList) { let a = zqa.get(lastDataListElement.dutyPeopleId) if( a == null){ a = { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index df0c6c866..627b58150 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -230,7 +230,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import {uploadFile} from '@/api/unqualProcess.js'; -import {inboundLiaisonDetail, completeTask} from "@/api/process" +import {inboundLiaisonDetail, completeTask, saveTaskForPub} from "@/api/process" export default { name: "wfhxzgStep4", @@ -306,10 +306,13 @@ export default { }, getFormFieldList (item) { this.$nextTick(() => { - - this.dataList = [JSON.parse(JSON.stringify(item.responUserInfo.info))] + let listJSON = JSON.parse(JSON.stringify(item.responUserInfo.info)) + if (listJSON.length !== undefined) { + this.dataList = listJSON + } else { + this.dataList = [listJSON] + } this.newDataList = [] - console.log(this.dataList) this.dataList.forEach(item => { if (item.fileText.length !== 0) { item.fileText.forEach(item1 => { @@ -402,7 +405,40 @@ export default { window.open(routeUrl.href, '_blank') }, // 保存按钮 - handleSave() {}, + handleSave() { + let zqa = new Map(); + for (let lastDataListElement of this.dataList) { + let a = zqa.get(lastDataListElement.dutyPeopleId) + if( a == null){ + a = { + standardInfoList: [] + } + } + a.standardInfoList.push(lastDataListElement); + zqa.set(a.id, a); + } + let list = [] + for(let item of zqa) { + list.push(item[1].standardInfoList) + } + this.saveLoading = true + let _formData = new FormData() + _formData.append('taskIds', this.taskIds) + _formData.append('json', JSON.stringify({ + // roleForm: this.roleForm, + responUserInfo: { + info: this.dataList.splice(-1, 1) + }, + commentText: this.commentText + })) + saveTaskForPub(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) + }, // 提交按钮 handleSubmit() { this.isSubmit = true From e5fc796cd3b1d7cdec690f11e3dc493171cf1411 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 4 Aug 2021 17:16:48 +0800 Subject: [PATCH 26/26] commit --- src/pages/processCenter/pages/creatProcess/bzjd/step5.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index 8030287a6..ee025d337 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -363,7 +363,7 @@ this.sarType = data.standInData this.json = data this.itemList = data.itemList - this.loading = true + this.loading = false }).catch(e => { }) })