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 01/23] =?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 02/23] 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 03/23] 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 04/23] 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 05/23] 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 06/23] 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 07/23] =?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 08/23] 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 09/23] =?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 10/23] =?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 11/23] =?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 12/23] 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 13/23] =?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 14/23] =?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 15/23] =?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 16/23] =?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 17/23] =?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 18/23] =?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 19/23] =?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 20/23] 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 => { }) }) From 2c6cd94f20f4a4e7abea04fac2a0cba5cb4458ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 4 Aug 2021 17:25:58 +0800 Subject: [PATCH 21/23] =?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/xmpg/step1.vue | 7 +- .../pages/creatProcess/xmpg/step3.vue | 92 ++- .../pages/creatProcess/xmpg/test.vue | 595 ++++++++++++++++++ .../pages/processDetail/index.vue | 3 +- .../tabComponents/taskDraft/index.vue | 32 +- 5 files changed, 663 insertions(+), 66 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/test.vue diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index ad7e4df9d..c75e17d9b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -451,6 +451,8 @@ export default { listForm: { standNumber: "", //标准编号 standName: "",//标准名称 + XCXSSRQ: "", //新车型实施日期 + ZCCSSRQ: "", //在产车实施日期 certifiedEngineer: "", //认证工程师 qualityEngineer: "", //质量工程师 breakdownList: [{ @@ -655,6 +657,7 @@ export default { if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) { this.$message.warning("请选择分发责任人"); } else { + this.isSubmit = true var json = Object.assign(this.listForm, this.roleForm); this.$refs["listForm"].validate((valid) => { if (valid) { @@ -708,9 +711,11 @@ export default { //选择拆分标准确定事件 OkDrawer() { - if (this.selectedList.length == 1) { + if (this.selectedList.length === 1) { this.listForm.standNumber = this.selectedList[0].standSortShow + '-' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ; this.listForm.standName = this.selectedList[0].standName; + this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj + this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj this.listForm.id = this.selectedList[0].id; this.$http.get("SarStandItems/sar-stand-items/findAllItems", { ids: this.listForm.id, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 283e74541..e3362d266 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -57,7 +57,7 @@
- 批量分发落实人 + 批量分发落实人
{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }} - + @@ -260,6 +259,8 @@ export default { tabValue: "listOfCountries", selectedList: [], //选择清单的选择框 selectList: [], //选择标准的选择框 + lsIndex: '', + lsType: '', bringData: [], commentText: "", //填写会签意见 page: 1, @@ -346,7 +347,7 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { - console.log(res); + console.log(res.mesg) if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); @@ -355,11 +356,6 @@ export default { }); }); }, - - createItemId() { - return Number(Math.random().toString().substr(3,18) + Date.now()).toString(36); - }, - /** * @description: 动态表单读取 */ @@ -373,7 +369,6 @@ export default { for (let i = 0; i < item.pepdtos.length; i++) { for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) { this.listForm.breakdownList.push({ - itemId: this.createItemId(), itemsName: item.pepdtos[i].breakdownList[j].itemsName, itemNum: item.pepdtos[i].breakdownList[j].itemsNum, responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer, @@ -395,46 +390,47 @@ export default { }); } } + console.log(this.listForm.breakdownList); }, - //批量操作按钮 - batchOperation(id) { - if (this.selectList.length === 0) { - this.$message.warning("请至少选择一条数据进行批量分发"); - } else { - this.nodeList = []; - this.nodeList.push(id); - this.modalshowflag = true; + checkedRole (data) { + if (this.type === 1) { + this.listForm.breakdownList[this.lsIndex].implementerId = data[0].id + this.listForm.breakdownList[this.lsIndex].implementer = data[0].name + } else if(this.type === 2) { + this.listForm.breakdownList.forEach( item => { + this.selectList.forEach( items => { + if (item === items) { + item.implementerId = data[0].id + item.implementer = data[0].name + } + }) + }) } - }, - checkedRole(data) { - // 选取负责人时的操作 - let mis = []; - let miss = []; - this.selectList.forEach(item => { - item.implementer = data[0].name; - item.implementerId = data[0].id; - mis.push(item.projectNumber); - miss.push(item.itemNum) - }); - this.listForm.breakdownList.forEach(item => { - if (!mis.includes(item.projectNumber) && !miss.includes(item.itemsNum)) { - this.selectList.push(item); - } - }); - this.listForm.breakdownList = this.selectList; - this.$refs.selection.clearSelection(); - this.modalshowflag = false; + this.modalshowflag = false }, cancleUserInfo() { this.modalshowflag = false; }, - choiceZRRS(scope) { - if (scope != null) this.dsadadadsada = scope.$index; - this.nodeList = []; - if (this.roleForm.implementer.length > 0) { - this.nodeList = this.roleForm.implementer.split(","); + choiceZRRS (row, type, index) { + this.type = type + if (type === 1) { + this.drawerTitle = '选择责任人' + this.nodeList = [] + this.lsIndex = index + this.lsType = type + this.nodeList.push(row) + this.modalshowflag = true + } else if (type === 2) { + // 批量 + if (this.selectList.length > 0) { + this.lsType = type + this.nodeList = [] + this.modalshowflag = true + this.drawerTitle = '批量选择责任人' + } else { + this.$message.warning('请选择要分发的数据') + } } - this.modalshowflag2 = true; }, getTree() { this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/test.vue b/src/pages/processCenter/pages/creatProcess/xmpg/test.vue new file mode 100644 index 000000000..daa015930 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg/test.vue @@ -0,0 +1,595 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index ff4dd93eb..120de5f7b 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -178,6 +178,7 @@ export default { let row = {...this.detailData[index]} row.taskIds = row.id row.taskInfo = row.name + console.log(row.name) row.tabsName = this.$route.query.tabsName let prcType = this.detailData[index].prcType // 流程类型 // 判断当前流程是否已全部办理完成 @@ -205,7 +206,7 @@ export default { this.toProcessDetail('bzqdfbStep4',row) }else if (prcType === '5'){ //标准项目合规评估 标准维度 - if(row.taskInfo === '标准法规部部长审批'){ + if(row.taskInfo === '标准法规部领导审核'){ this.toProcessDetail('xmpgStep7',row) }else{ this.toProcessDetail('xmpgStep2',row) diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 3e3f73c32..1a8c3c2a8 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -4,22 +4,22 @@
- - - - - - + + + + + + + + + + + + + + + + Date: Wed, 4 Aug 2021 17:56:37 +0800 Subject: [PATCH 22/23] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step4.vue | 10 +---- .../pages/creatProcess/wfhxzg/step5.vue | 39 ++++++++++++++----- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index 627b58150..a684c38a4 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -312,8 +312,7 @@ export default { } else { this.dataList = [listJSON] } - this.newDataList = [] - this.dataList.forEach(item => { + this.dataList.forEach(item => { if (item.fileText.length !== 0) { item.fileText.forEach(item1 => { this.fileTextList.push({ @@ -340,12 +339,7 @@ export default { id: res.data.attId, name: res.data.standName }) - this.newDataList.forEach(item =>{ - this.fileListData.fileText.push({ - id: item.id, - name: item.name - }) - }) + this.fileListData.fileText = this.newDataList this.$message({ showClose: true, message: res.message, diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 073001399..ab8c6df90 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -107,15 +107,9 @@ - + @@ -212,6 +206,15 @@ submitBTNText="同意" > + + + +
@@ -226,6 +229,7 @@ export default { name: "wfhxzgStep5", data() { return { + fileMadel: false, detailData: [], loading: false, commentText: '', @@ -271,6 +275,10 @@ export default { } }, methods: { + queryFile(row) { + this.fileTextList = row.fileText + this.fileMadel = true + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -297,14 +305,14 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList - this.dataList.forEach(item => { + /*this.dataList.forEach(item => { item.fileText.forEach(item1 => { this.fileTextList.push({ id: item1.id, name: item1.name }) }) - }) + })*/ }) }, @@ -351,6 +359,9 @@ export default { handleSubmitNo() { if (this.commentText) { var json = { + responUserInfo: { + info: this.dataList + }, actionFlag: 1, commentText: this.commentText } @@ -361,6 +372,7 @@ export default { }, {}, res => { if (res.success) { this.$message.success('驳回成功') + this.fileTextList = [] this.$router.push('/processCenter') } }) @@ -452,6 +464,13 @@ export default { /deep/.el-upload{ display: block; } + // 上传信息回显多余隐藏 + /deep/.el-upload-list__item .el-icon-close { + font-size: 0; + } + /deep/.el-upload-list__item .el-icon-close-tip { + font-size: 0; + } .content-center { padding: 10px 0px 10px 10px; } From d56974c416b6edc7e94a4f5e74babf4c7d330f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 4 Aug 2021 18:00:55 +0800 Subject: [PATCH 23/23] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=90=E4=BA=A4lodin?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1-1.vue | 2 + .../pages/creatProcess/bzqdfb/step1.vue | 5 +- .../pages/creatProcess/bzqdfb/step2.vue | 2 + .../pages/creatProcess/bzqdfb/step3.vue | 2 + .../pages/creatProcess/bzqdfb/step4.vue | 2 + .../pages/creatProcess/xmpg/step1-1.vue | 3 +- .../pages/creatProcess/xmpg/step1.vue | 1 + .../pages/creatProcess/xmpg/step2.vue | 2 + .../pages/creatProcess/xmpg/step3.vue | 2 + .../pages/creatProcess/xmpg/step4.vue | 2 + .../pages/creatProcess/xmpg/step5.vue | 2 + .../pages/creatProcess/xmpg/step6.vue | 2 + .../pages/creatProcess/xmpg/step7.vue | 2 + .../pages/creatProcess/xmpg/test.vue | 595 ------------------ 14 files changed, 26 insertions(+), 598 deletions(-) delete mode 100644 src/pages/processCenter/pages/creatProcess/xmpg/test.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index da6e5b796..0aaef349e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1057,6 +1057,7 @@ export default { if (valid) { this.$refs["Form"].validate((valid) => { if (valid) { + this.isSubmit = true this.$http.get("lawss/activiti/startProcess", { type: "4" }, { _this: this }, res => { @@ -1072,6 +1073,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }); } }); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 1fad32ba3..574677866 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -208,7 +208,7 @@ + :color="roleForm.ministerUser ? '#66b1ff' : ''" v-if="signFlag === '1'">

标准/政策法规工程师

@@ -1024,11 +1024,11 @@ export default { this.$message.warning("标准不能为空"); } else { var json = Object.assign(this.listForm, this.roleForm); - console.log(json) this.$refs["qdfbForm"].validate((valid) => { if (valid) { this.$refs["Form"].validate((valid) => { if (valid) { + this.isSubmit = true this.$http.get("lawss/activiti/startProcess", { type: "4" }, { _this: this }, res => { @@ -1044,6 +1044,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }); } }); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 1b18f1766..f651fe48e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -390,6 +390,7 @@ export default { if (this.commentText === null || this.commentText === undefined || this.commentText === "") { this.$message.warning("请填写会签意见"); }else{ + this.isSubmit = true this.listForm.commentText = this.commentText; this.listForm.approvalOpinion = ""; this.listForm.signFlag = ""; @@ -405,6 +406,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 79adf88df..8c29d742e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -712,6 +712,7 @@ export default { //提交事件 handleSubmit() { const json = JSON.stringify(this.listForm); + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -723,6 +724,7 @@ export default { this.$message.success(res.message) this.$router.push('/processCenter') } + this.isSubmit = false }); }, //标准表格选择框改变 diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index cfb326ed6..0d8cf9310 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -404,6 +404,7 @@ export default { if (this.commentText === null || this.commentText === undefined || this.commentText === "") { this.$message.warning("请填写审批意见"); } else { + this.isSubmit = true this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { @@ -417,6 +418,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }); } }, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 48849b845..2e84bd32f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -681,7 +681,7 @@ export default { this.$message.warning("请选择分发责任人"); } else { var json = Object.assign(this.listForm, this.roleForm); - console.log(json); + this.isSubmit = true this.$refs["listForm"].validate((valid) => { if (valid) { this.$refs["roleForm"].validate((valid) => { @@ -701,6 +701,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }); } }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index c75e17d9b..58f52cd16 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -678,6 +678,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }); } }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 688712f47..696a2f8e8 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -341,6 +341,7 @@ export default { }else{ this.listForm.commentText = this.commentText const json = JSON.stringify(this.listForm); + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -352,6 +353,7 @@ export default { this.$message.success(res.message) this.$router.push('/processCenter') } + this.isSubmit = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index e3362d266..29c37d98e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -459,6 +459,7 @@ export default { this.listForm.approvalOpinion = ""; this.listForm.signFlag = ""; const json = JSON.stringify(this.listForm.breakdownList); + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -470,6 +471,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); } else { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 1a4d60404..548f3e639 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -493,6 +493,7 @@ export default { this.listForm.signFlag = ""; this.listForm.dataList = this.dataList; const json = JSON.stringify(this.listForm); + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -504,6 +505,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 4e92accc3..b350287cb 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -480,6 +480,7 @@ export default { this.listForm.dataList = this.dataList this.listForm.fenFlag = '2' const json = JSON.stringify(this.listForm); + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -491,6 +492,7 @@ export default { this.$message.success(res.message) this.$router.push('/processCenter') } + this.isSubmit = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index eeec0a723..e74199aa4 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -455,6 +455,7 @@ export default { 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; this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; @@ -475,6 +476,7 @@ export default { this.$message.success(res.message) this.$router.push('/processCenter') } + this.isSubmit = false }, e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index a1ef9dd2f..40b79891e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -463,6 +463,7 @@ export default { this.listForm.fenFlag = "1"; this.listForm.dataList = this.dataList const json = JSON.stringify(this.listForm); + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -474,6 +475,7 @@ export default { this.$message.success(res.message) this.$router.push('/processCenter') } + this.isSubmit = false }, e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/test.vue b/src/pages/processCenter/pages/creatProcess/xmpg/test.vue deleted file mode 100644 index daa015930..000000000 --- a/src/pages/processCenter/pages/creatProcess/xmpg/test.vue +++ /dev/null @@ -1,595 +0,0 @@ - - - - - - -