From 06b51d51e865dc4d2ea363769dfddfbb068bb0b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 15 Feb 2023 11:47:52 +0800 Subject: [PATCH 01/32] =?UTF-8?q?=E4=BF=AE=E6=94=B910=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sysConfig/index.js | 73 +++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 48 deletions(-) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 4b5e53eb3..e9a596d71 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -1,80 +1,57 @@ -/** - * @description: 通用配置 - * @author: chenxiaoxi - * @date: 2018-09-04 17:47:46 - */ +/* @description: 通用配置 +* @author: chenxiaoxi +* @date: 2018-09-04 17:47:46 +*/ // 服务器地址 // const devIp = '39.98.140.126' -// const devInterfacePORT = '10005' -// const devIp = '192.168.10.6' +// const devInterfacePORT = '4202' +// const devIp = '192.168.1.42' +// const devInterfacePORT = '9999' +const devIp = '10.10.10.46' +const devInterfacePORT = '4202' +// const devIp = '10.0.3.11' +// const devIp = 'localhost' +// const devInterfacePORT = '10086' // const devIp = '62.234.136.153' // const devInterfacePORT = '8033' -const devIp = '10.19.11.243' -const devInterfacePORT = '4304' // 配置 idm 认证 const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri=' - -const ssoLogout = 'http://sso.foton.com.cn/logout?service=' // 配置 前端服务 -const devWebUrl = 'https://srms.foton.com.cn/#/' +const devWebUrl = 'http://62.234.136.153:8038/#/' // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录) -const webLoginType = 'idm' +const webLoginType = 'dev' // 配置onlyOffice 前端服务 -const onlyOfficeUrl = 'http://10.100.5.116:8088' - -// 配置 kkFileView 前端服务 -const kkFileViewUrl = 'https://srms.foton.com.cn/preview' +// const onlyOfficeUrl = 'http://127.0.0.1:8080' +const onlyOfficeUrl = 'http://10.10.10.46:8103' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' -const simpleFilePath = 'att/attFile/upload' -const multipleFilePath = 'att/attFile/uploadFiles' -const staticFilePath = '192.168.10.140:10010' -// const staticFilePath = '106.2.13.189:8888' -const staticPDFPath = '192.168.7.140' -const webSocket = '192.168.7.178' -// const enterprise = '' -const enterprise = 'SJZX' -const theme = 'theme-one' // 主题(theme-one浅蓝色,theme-two深蓝色) -const processPort = '17210' -/***************************************************************** - <<<<<<<<< 主题修改 >>>>>>>>> - - 1. 主题分为theme-one,theme-two两种 - 2. 修改assets/styles/style.less文件,注释theme-one/theme-two - 3. 将上方theme改为theme-one/theme-two - - *****************************************************************/ // 生产环境配置 -// const prodIp = '62.234.136.153' -// const prodInterfacePORT = '8033' -const prodIp = 'srms.foton.com.cn' -const prodInterfacePORT = '' +// const prodIp = '39.98.140.126' +// const prodInterfacePORT = '4201' +const prodIp = '10.10.10.46' +const prodInterfacePORT = '4202' +// const prodIp = 'slrs.foton.com.cn' +// const prodInterfacePORT = '' // 判断环境 const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp -const interfacePORT = process.env.NODE_ENV === 'production' ? prodInterfacePORT : devInterfacePORT const CLOUD_RES_INTERFACE_PORT = process.env.NODE_ENV === 'production' ? DEV_CLOUD_RES_INTERFACE_PORT : DEV_CLOUD_RES_INTERFACE_PORT module.exports = { - baseUrl: 'https://' + serverIP + ':' + interfacePORT, + baseUrl: 'http://' + serverIP + ':' + interfacePORT, webLoginType: webLoginType, ssoLoginUrlDev: ssoLogin + devWebUrl, - ssoLogoutUrlDev: ssoLogout + devWebUrl, ssoLoginUrl: ssoLogin, onlyOfficeUrl: onlyOfficeUrl, - kkFileViewUrl: kkFileViewUrl, devWebUrl: devWebUrl, - serverUrl: 'https://' + serverIP, // 服务器IP地址 - interfaceUrl: 'https://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址, + serverUrl: 'http://' + serverIP, // 服务器IP地址 + interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址, cloudResInterFaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/busApi/', // 云端资源库服务器端接口访问地址, simpleUploadPath: 'api/' + simpleFilePath, // 单文件上传地址 multipleUploadPath: 'api/' + multipleFilePath, // 多文件上传地址 - staticFilePath: 'http://' + staticFilePath, - staticPDFPath: 'http://' + staticPDFPath, - webSocket: webSocket + ':' + devInterfacePORT + '/websocket/socketServer', // webSocket连接 enterprise: enterprise, // GQ广汽 SJZX数据中心 theme: theme, // 主题 processInterfaceURL: `http://${serverIP}:${processPort}/bat-wkflow` From 498222041351205836dab22e8a34721da66391a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 15 Feb 2023 13:38:47 +0800 Subject: [PATCH 02/32] =?UTF-8?q?=E4=BF=AE=E6=94=B910=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sysConfig/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index e9a596d71..e4b888431 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -8,7 +8,7 @@ // const devIp = '192.168.1.42' // const devInterfacePORT = '9999' const devIp = '10.10.10.46' -const devInterfacePORT = '4202' +const interfacePORT = '4202' // const devIp = '10.0.3.11' // const devIp = 'localhost' // const devInterfacePORT = '10086' From 15fe3f429a34cc394ac8078aadfe03a6ab575e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 15 Feb 2023 13:43:33 +0800 Subject: [PATCH 03/32] =?UTF-8?q?=E4=BF=AE=E6=94=B910=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sysConfig/index.js | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index e4b888431..d37f1238d 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -1,4 +1,5 @@ -/* @description: 通用配置 +2月6日 13:53登录GitLab 中文社区版已查看http://git.hzwlsoft.com/已读刚刚10:53/** + * @description: 通用配置 * @author: chenxiaoxi * @date: 2018-09-04 17:47:46 */ @@ -6,10 +7,10 @@ // const devIp = '39.98.140.126' // const devInterfacePORT = '4202' // const devIp = '192.168.1.42' -// const devInterfacePORT = '9999' +const devInterfacePORT = '9999' const devIp = '10.10.10.46' -const interfacePORT = '4202' -// const devIp = '10.0.3.11' +const devInterfacePORT = '4202' +// // const devIp = '10.0.3.10' // const devIp = 'localhost' // const devInterfacePORT = '10086' // const devIp = '62.234.136.153' @@ -22,12 +23,30 @@ const devWebUrl = 'http://62.234.136.153:8038/#/' const webLoginType = 'dev' // 配置onlyOffice 前端服务 -// const onlyOfficeUrl = 'http://127.0.0.1:8080' -const onlyOfficeUrl = 'http://10.10.10.46:8103' +const onlyOfficeUrl = 'http://127.0.0.1:8080' +// const onlyOfficeUrl = 'http://10.10.10.46:8103' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' +const simpleFilePath = 'att/attFile/upload' +const multipleFilePath = 'att/attFile/uploadFiles' +const staticFilePath = '192.168.10.140:10010' +// const staticFilePath = '106.2.13.189:8888' +const staticPDFPath = '192.168.7.140' +const webSocket = '192.168.7.178' +// const enterprise = '' +const enterprise = 'SJZX' +const theme = 'theme-one' // 主题(theme-one浅蓝色,theme-two深蓝色) +const processPort = '17210' +/***************************************************************** + <<<<<<<<< 主题修改 >>>>>>>>> + + 1. 主题分为theme-one,theme-two两种 + 2. 修改assets/styles/style.less文件,注释theme-one/theme-two + 3. 将上方theme改为theme-one/theme-two + + *****************************************************************/ // 生产环境配置 // const prodIp = '39.98.140.126' // const prodInterfacePORT = '4201' @@ -38,6 +57,7 @@ const prodInterfacePORT = '4202' // 判断环境 const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp +const interfacePORT = process.env.NODE_ENV === 'production' ? prodInterfacePORT : devInterfacePORT const CLOUD_RES_INTERFACE_PORT = process.env.NODE_ENV === 'production' ? DEV_CLOUD_RES_INTERFACE_PORT : DEV_CLOUD_RES_INTERFACE_PORT module.exports = { @@ -52,6 +72,9 @@ module.exports = { cloudResInterFaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/busApi/', // 云端资源库服务器端接口访问地址, simpleUploadPath: 'api/' + simpleFilePath, // 单文件上传地址 multipleUploadPath: 'api/' + multipleFilePath, // 多文件上传地址 + staticFilePath: 'http://' + staticFilePath, + staticPDFPath: 'http://' + staticPDFPath, + webSocket: webSocket + ':' + devInterfacePORT + '/websocket/socketServer', // webSocket连接 enterprise: enterprise, // GQ广汽 SJZX数据中心 theme: theme, // 主题 processInterfaceURL: `http://${serverIP}:${processPort}/bat-wkflow` From 4022b7d25494439e3826004e4a83f8f141535894 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 15 Feb 2023 13:50:01 +0800 Subject: [PATCH 04/32] =?UTF-8?q?=E4=BF=AE=E6=94=B910=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sysConfig/index.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index d37f1238d..a1c2e4a8f 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -1,5 +1,4 @@ -2月6日 13:53登录GitLab 中文社区版已查看http://git.hzwlsoft.com/已读刚刚10:53/** - * @description: 通用配置 +/*** @description: 通用配置 * @author: chenxiaoxi * @date: 2018-09-04 17:47:46 */ @@ -7,7 +6,7 @@ // const devIp = '39.98.140.126' // const devInterfacePORT = '4202' // const devIp = '192.168.1.42' -const devInterfacePORT = '9999' +// const devInterfacePORT = '9999' const devIp = '10.10.10.46' const devInterfacePORT = '4202' // // const devIp = '10.0.3.10' From daa1dafa0724e24f7f585d7194b72a09a20f543e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 15 Feb 2023 15:50:07 +0800 Subject: [PATCH 05/32] =?UTF-8?q?=E4=BF=AE=E6=94=B910=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 a1c2e4a8f..8b7c32caa 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -22,8 +22,8 @@ const devWebUrl = 'http://62.234.136.153:8038/#/' const webLoginType = 'dev' // 配置onlyOffice 前端服务 -const onlyOfficeUrl = 'http://127.0.0.1:8080' -// const onlyOfficeUrl = 'http://10.10.10.46:8103' +// const onlyOfficeUrl = 'http://127.0.0.1:8080' +const onlyOfficeUrl = 'http://10.10.10.46:8103' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' From 0b8ccfd9cf2920cf688b5612fd260e91ea6a80b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 15 Feb 2023 16:23:04 +0800 Subject: [PATCH 06/32] =?UTF-8?q?=E4=BF=AE=E6=94=B910=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sysConfig/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 8b7c32caa..34651f156 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -23,7 +23,7 @@ const webLoginType = 'dev' // 配置onlyOffice 前端服务 // const onlyOfficeUrl = 'http://127.0.0.1:8080' -const onlyOfficeUrl = 'http://10.10.10.46:8103' +const onlyOfficeUrl = 'http://10.10.10.46:8889' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' From f72fe55fc75b21724ed5df3d11e3c12f772f54f6 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 17 Feb 2023 14:33:26 +0800 Subject: [PATCH 07/32] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=20?= =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F=20=E4=B8=89=E5=A4=A9?= =?UTF-8?q?=E4=BB=A5=E5=86=85=E7=9A=84=E6=95=B0=E6=8D=AE=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?new?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/CollectionStandard.vue | 2 +- src/sysConfig/index.js | 42 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue index 0d956b6d5..71bd62e02 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue @@ -55,7 +55,7 @@ -
标题：{{ item.collectTitle }}
+
标题：
标题：{{ item.collectTitle }}
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 4b5e53eb3..62b44c7ad 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -5,26 +5,26 @@ */ // 服务器地址 // const devIp = '39.98.140.126' -// const devInterfacePORT = '10005' -// const devIp = '192.168.10.6' +// const devInterfacePORT = '4202' +// const devIp = '192.168.1.42' +// const devInterfacePORT = '9999' +// const devIp = '10.10.10.46' +// const devInterfacePORT = '4202' +// const devIp = '10.0.3.10' +const devIp = 'localhost' +const devInterfacePORT = '10086' // const devIp = '62.234.136.153' // const devInterfacePORT = '8033' -const devIp = '10.19.11.243' -const devInterfacePORT = '4304' // 配置 idm 认证 const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri=' - -const ssoLogout = 'http://sso.foton.com.cn/logout?service=' // 配置 前端服务 -const devWebUrl = 'https://srms.foton.com.cn/#/' +const devWebUrl = 'http://62.234.136.153:8038/#/' // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录) -const webLoginType = 'idm' +const webLoginType = 'dev' // 配置onlyOffice 前端服务 -const onlyOfficeUrl = 'http://10.100.5.116:8088' - -// 配置 kkFileView 前端服务 -const kkFileViewUrl = 'https://srms.foton.com.cn/preview' +const onlyOfficeUrl = 'http://127.0.0.1:8080' +// const onlyOfficeUrl = 'http://10.10.10.46:8103' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' @@ -48,10 +48,12 @@ const processPort = '17210' *****************************************************************/ // 生产环境配置 -// const prodIp = '62.234.136.153' -// const prodInterfacePORT = '8033' -const prodIp = 'srms.foton.com.cn' -const prodInterfacePORT = '' +// const prodIp = '39.98.140.126' +// const prodInterfacePORT = '4201' +const prodIp = '10.10.10.46' +const prodInterfacePORT = '4202' +// const prodIp = 'slrs.foton.com.cn' +// const prodInterfacePORT = '' // 判断环境 const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp @@ -59,16 +61,14 @@ const interfacePORT = process.env.NODE_ENV === 'production' ? prodInterfacePORT const CLOUD_RES_INTERFACE_PORT = process.env.NODE_ENV === 'production' ? DEV_CLOUD_RES_INTERFACE_PORT : DEV_CLOUD_RES_INTERFACE_PORT module.exports = { - baseUrl: 'https://' + serverIP + ':' + interfacePORT, + baseUrl: 'http://' + serverIP + ':' + interfacePORT, webLoginType: webLoginType, ssoLoginUrlDev: ssoLogin + devWebUrl, - ssoLogoutUrlDev: ssoLogout + devWebUrl, ssoLoginUrl: ssoLogin, onlyOfficeUrl: onlyOfficeUrl, - kkFileViewUrl: kkFileViewUrl, devWebUrl: devWebUrl, - serverUrl: 'https://' + serverIP, // 服务器IP地址 - interfaceUrl: 'https://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址, + serverUrl: 'http://' + serverIP, // 服务器IP地址 + interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址, cloudResInterFaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/busApi/', // 云端资源库服务器端接口访问地址, simpleUploadPath: 'api/' + simpleFilePath, // 单文件上传地址 multipleUploadPath: 'api/' + multipleFilePath, // 多文件上传地址 From b2df5122d8815f34a6bfce9f85f2e9111dc0b332 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 17 Feb 2023 15:02:40 +0800 Subject: [PATCH 08/32] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sysConfig/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 62b44c7ad..b5d2db059 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -78,4 +78,4 @@ module.exports = { enterprise: enterprise, // GQ广汽 SJZX数据中心 theme: theme, // 主题 processInterfaceURL: `http://${serverIP}:${processPort}/bat-wkflow` -} +} \ No newline at end of file From 3a7190ea080675b9375d1159c18d1a0a6db359b5 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 20 Feb 2023 14:06:14 +0800 Subject: [PATCH 09/32] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=97=AE=E7=AD=94=20?= =?UTF-8?q?=E6=8F=90=E9=97=AE=E6=8F=90=E4=BA=A4=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E5=8F=96addQuizOrAnswerTasks=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/personal/pages/my-questions/index.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index e4f269600..21f35cc12 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -1933,6 +1933,12 @@ export default { this.handleSelectForm.lawName = '' this.handleSelectForm.standName = '' this.handleSelectForm.numberName = '' + this.$http.postData('lawss/activiti/addQuizOrAnswerTasks',{ str:res.data }, + { + _this: this + }, res => { + }, e => { + }) }, e => { this.submitBtnLoading = false }) From 6f0b3c8466c4022e16bca0c7e9651963dea351e9 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 20 Feb 2023 16:31:24 +0800 Subject: [PATCH 10/32] =?UTF-8?q?=E9=97=AE=E7=AD=94=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/personal/pages/my-questions/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index 21f35cc12..4fa10ef21 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -1933,7 +1933,7 @@ export default { this.handleSelectForm.lawName = '' this.handleSelectForm.standName = '' this.handleSelectForm.numberName = '' - this.$http.postData('lawss/activiti/addQuizOrAnswerTasks',{ str:res.data }, + this.$http.postData('lawss/activiti/startProcessRollBack',{ str:res.data }, { _this: this }, res => { From c40e57ba4fbe4c07933838c669c98d69922862e7 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 20 Feb 2023 16:51:48 +0800 Subject: [PATCH 11/32] =?UTF-8?q?=E9=97=AE=E7=AD=94=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/personal/pages/my-questions/index.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index 4fa10ef21..10af77639 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -1933,7 +1933,9 @@ export default { this.handleSelectForm.lawName = '' this.handleSelectForm.standName = '' this.handleSelectForm.numberName = '' - this.$http.postData('lawss/activiti/startProcessRollBack',{ str:res.data }, + this.$http.postData('lawss/activiti/startProcessRollBack',{ + json: JSON.stringify(res.data), + type: '27' }, { _this: this }, res => { From 3811c8dfc120e65df645477d9f57534c340e3757 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 22 Feb 2023 16:10:24 +0800 Subject: [PATCH 12/32] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../my-questions/components/answerItem.vue | 6 ++++ .../components/questionItemInfo.vue | 2 +- .../personal/pages/my-questions/index.vue | 30 +++++++++++++++++-- .../pages/components/ProcessMixin.vue | 6 +++- .../tabComponents/processCenter/index.vue | 12 ++++++++ 5 files changed, 51 insertions(+), 5 deletions(-) diff --git a/src/pages/personal/pages/my-questions/components/answerItem.vue b/src/pages/personal/pages/my-questions/components/answerItem.vue index 8fe10d24b..cdeaa62c6 100644 --- a/src/pages/personal/pages/my-questions/components/answerItem.vue +++ b/src/pages/personal/pages/my-questions/components/answerItem.vue @@ -116,6 +116,12 @@ export default { this.$http.postData('lawss/Reply/insertReply',{ ...this.form },{ _this: this }, res => { + this.$http.post("lawss/activiti/completeTask", { + json: JSON.stringify(this.form), + taskId: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + }); if(res.respCode === '200'){ this.form.reply = '' this.fileList = [] diff --git a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue index 2db8bdde9..a6a033a1e 100644 --- a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue +++ b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue @@ -58,7 +58,7 @@ export default { institutionId: this.$store.getters.userInfo.institutionId, answererNowUserId: this.$store.getters.userInfo.userId, answererNowUserName: this.$store.getters.userInfo.userName, - fileList:[], + // fileList:[], } }, methods:{ diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index 10af77639..da931bca0 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -1331,10 +1331,17 @@ export default { answerList: [], standList: [], questionsList: [], + prcName:'', + taskIds:'', standMap: new Map() } }, mounted(){ + if(this.$route.query){ + var index = this.$route.query.prcName.indexOf('-(') + this.prcName = this.$route.query.prcName.substring(0,index) + this.taskIds = this.$route.query.taskIds + } this.standSearch() // 查询各下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", "", { @@ -1824,6 +1831,10 @@ export default { }, //查询提问标准 standSearch(){ + if(this.$route.query){ + this.questionSerach.standardEncdoing = this.prcName + } + console.log(this.questionSerach) this.$http.get('lawss/AskQuestions/getAskQuestionsDetails',{ ...this.questionSerach },{ _this: this }, res =>{ @@ -1933,12 +1944,25 @@ export default { this.handleSelectForm.lawName = '' this.handleSelectForm.standName = '' this.handleSelectForm.numberName = '' - this.$http.postData('lawss/activiti/startProcessRollBack',{ + this.$http.post('lawss/activiti/startProcessRollBack',{ json: JSON.stringify(res.data), - type: '27' }, + type: '27', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + }, { _this: this - }, res => { + }, val => { + this.$http.post('lawss/activiti/completeTask',{ + taskIds: val.data, + userId : this.$store.getters.userInfo.userId, + json: JSON.stringify(res.data), + }, + { + _this: this + }, res => { + }, e => { + }) }, e => { }) }, e => { diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue index 4ca8a60fe..89d232ba1 100644 --- a/src/pages/processCenter/pages/components/ProcessMixin.vue +++ b/src/pages/processCenter/pages/components/ProcessMixin.vue @@ -111,7 +111,11 @@ export default { { label: "企标制修订立项", value: "26" - } + }, + { + label: "问答流程", + value: "27" + } ], formDisableFlag: false, pickerOptions: { diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 39983ba25..399809b91 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -2227,6 +2227,18 @@ export default { }) } break + case '27': + this.$router.push({ + name: 'MyQuestions', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType, + + } + }) } }, ...mapMutations(['setProcess', 'setHandleInfo']), From 151661a3f2c52fc4c97a8f560b0aa713ce6f7dd7 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Thu, 23 Feb 2023 11:35:57 +0800 Subject: [PATCH 13/32] =?UTF-8?q?=E9=97=AE=E7=AD=94=E4=B8=AD=E5=BF=83=20?= =?UTF-8?q?=E9=97=AE=E7=AD=94=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/todoList/index.vue | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index c924b4856..205ac4704 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -1943,6 +1943,18 @@ export default { } }) } + case '27': + this.$router.push({ + name: 'MyQuestions', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType, + + } + }) break } From 42809d43dd579846dec3d812c5400a3983b03d0a Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 24 Feb 2023 10:50:26 +0800 Subject: [PATCH 14/32] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=20?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E9=87=8D=E5=A4=8D=E6=8F=90=E7=A4=BA=E8=AF=AD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index b89e17c62..d8ef407e6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -2139,7 +2139,7 @@ _this: this }, res => { if (!res.ok) { - this.$message.warning('标准号重复') + this.$message.warning(res.message) return } }) From 801400f5b38eb20d9e20fcb389df11a0528a1620 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 24 Feb 2023 11:26:06 +0800 Subject: [PATCH 15/32] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index d8ef407e6..c83239325 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -2156,7 +2156,7 @@ _this: this }, res => { if (!res.ok) { - this.$message.warning('标准号重复') + this.$message.warning(res.message) return } }) @@ -3741,7 +3741,7 @@ } }) } else { - this.$message.warning('标准号重复') + this.$message.warning(res.message) return } }) From f6defecf98730f2d173468a19697c8c52aa89c94 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 24 Feb 2023 13:56:38 +0800 Subject: [PATCH 16/32] =?UTF-8?q?1.=E4=BC=81=E6=A0=87=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E6=B5=81=E7=A8=8B-=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9-?= =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E6=97=B6=E6=B2=A1=E6=9C=89=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=BF=85=E5=A1=AB=E6=8F=90=E7=A4=BA=202.?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81?= =?UTF-8?q?=E7=A8=8B-=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzpg/step1.vue | 2 +- src/pages/processCenter/pages/creatProcess/qbfs/step5.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index 8e72cd2c2..cd292efee 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -118,7 +118,7 @@
- 添加 + 添加 批量删除
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue index f5ee6de53..1bdc9f3aa 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue @@ -678,7 +678,7 @@ export default { }, e => { }); }else { - this.$message.warning('请检查基础信息表单是否填写完整') + this.$message.warning('请填写审批意见') } }) }, From c2321f6f0525bbfb0531982fca182d2fcdc0c902 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 24 Feb 2023 14:00:41 +0800 Subject: [PATCH 17/32] =?UTF-8?q?=20=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E8=8A=82=E7=82=B9-=E5=BD=93=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E4=B8=80=E6=9D=A1=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E4=B8=BA=E2=80=9C=E5=90=88=E8=A7=84=E2=80=9D=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E8=BF=9B=E8=A1=8C=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzpg/step5.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue index e9a6301d8..65d19c8b2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue @@ -900,7 +900,7 @@ export default { return }) if(submitFlag === 0 ){ - this.$message.warning('请至少对一条信息进行评估') + this.$message.warning('请对所有信息进行评估') }else{ this.handlePrice() if(this.comFlag > 0) { From 7868f31be00c2e09d99802ba5ff29a25ef369c3b Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 24 Feb 2023 16:30:41 +0800 Subject: [PATCH 18/32] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=B5=81=E7=A8=8B-=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=8A=82=E7=82=B9=20=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=AF=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 41396263c..07ce5ed81 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -448,7 +448,7 @@ } }) } else { - this.$message.warning('请输入反馈意见') + this.$message.warning('请输审批意见') } }, From d0f661b5412566847ec6c1296bfa4ae663aae94e Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 28 Feb 2023 10:53:11 +0800 Subject: [PATCH 19/32] =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=BD=92=E6=A1=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../my-questions/components/answerItem.vue | 65 ++++++++++++++----- 1 file changed, 50 insertions(+), 15 deletions(-) diff --git a/src/pages/personal/pages/my-questions/components/answerItem.vue b/src/pages/personal/pages/my-questions/components/answerItem.vue index cdeaa62c6..e008bccf4 100644 --- a/src/pages/personal/pages/my-questions/components/answerItem.vue +++ b/src/pages/personal/pages/my-questions/components/answerItem.vue @@ -68,6 +68,26 @@
点击或拖拽上传文件
+ + +
+ + +
+ +
+ + +
+ + 取 消 + 提 交 + +
@@ -88,6 +108,13 @@ export default { // 上传地址 actionPath: 'api/att/attFile/uploadNew', importModalshowflagtemp: false, + submitBtnLoading: false, + dialogVisible: false, + queList:[], + queRules:{}, + questionForm:{ + problemDescription: '', //回答 + }, fileList: [], form:{ reply: '', @@ -184,28 +211,35 @@ export default { } }) }, + handleClose(){ + this.dialogVisible = false + }, + queSubmit(){ + console.log(this.queList,'queSubmit'); + // this.$emit('emitInsState',false) + // let listId = list.join(',') + // this.$http.post('lawss/Reply/updateReply', { + // id: listId, + // },{ + // _this: this + // }, res => { + // if(res.respCode === '200'){ + // this.$emit('emitInsState',true) + // } + // }, e => { + // }) + }, //问题归档 queArchive(){ - let list = [] this.mergeSelectList = this.mergeSelectList.filter ( item => item.state !== 'yes' && item.checked); for (let i = 0; i < this.mergeSelectList.length; i++) { if(this.mergeSelectList[i].checked){ - list.push(this.mergeSelectList[i].id) + this.queList.push(this.mergeSelectList[i]) } } - if(this.mergeSelectList && this.mergeSelectList.length > 0){ - this.$emit('emitInsState',false) - let listId = list.join(',') - this.$http.post('lawss/Reply/updateReply', { - id: listId, - },{ - _this: this - }, res => { - if(res.respCode === '200'){ - this.$emit('emitInsState',true) - } - }, e => { - }) + console.log(this.queList); + if(this.queList && this.queList.length > 0){ + this.dialogVisible = true }else { this.$message.warning('请选择归档内容') } @@ -217,6 +251,7 @@ export default { }, mounted () { this.mergeSelectList = this.list + console.log(this.mergeSelectList); }, }; From 9eb8d70be0515939ce8201ceb04458aded704bfb Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 28 Feb 2023 14:56:50 +0800 Subject: [PATCH 20/32] =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=BD=92=E6=A1=A3?= =?UTF-8?q?=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../my-questions/components/answerItem.vue | 44 +++++++++---------- src/router/index.js | 9 ++++ 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/src/pages/personal/pages/my-questions/components/answerItem.vue b/src/pages/personal/pages/my-questions/components/answerItem.vue index e008bccf4..c1254be4d 100644 --- a/src/pages/personal/pages/my-questions/components/answerItem.vue +++ b/src/pages/personal/pages/my-questions/components/answerItem.vue @@ -76,11 +76,11 @@ :before-close="handleClose">
- -
- -
- +
+ + + +
@@ -104,6 +104,7 @@ export default { return{ roleFlag: false, nodeList: [], + flag:'', mergeSelectList: [], // 上传地址 actionPath: 'api/att/attFile/uploadNew', @@ -212,32 +213,32 @@ export default { }) }, handleClose(){ + this.queList = [] this.dialogVisible = false }, queSubmit(){ - console.log(this.queList,'queSubmit'); - // this.$emit('emitInsState',false) - // let listId = list.join(',') - // this.$http.post('lawss/Reply/updateReply', { - // id: listId, - // },{ - // _this: this - // }, res => { - // if(res.respCode === '200'){ - // this.$emit('emitInsState',true) - // } - // }, e => { - // }) + console.log(this.queList); + let queList = JSON.stringify(this.queList) + this.$emit('emitInsState',false) + this.$http.postData('lawss/Reply/updateReply',queList, + { + _this: this + }, res => { + if(res.respCode === '200'){ + this.$emit('emitInsState',true) + } + }, e => { + }) }, //问题归档 queArchive(){ + console.log(this.mergeSelectList); this.mergeSelectList = this.mergeSelectList.filter ( item => item.state !== 'yes' && item.checked); for (let i = 0; i < this.mergeSelectList.length; i++) { if(this.mergeSelectList[i].checked){ this.queList.push(this.mergeSelectList[i]) } } - console.log(this.queList); if(this.queList && this.queList.length > 0){ this.dialogVisible = true }else { @@ -249,9 +250,8 @@ export default { this.$emit('roleFlagBoo',true) }, }, - mounted () { - this.mergeSelectList = this.list - console.log(this.mergeSelectList); + created () { + this.mergeSelectList = JSON.parse(JSON.stringify(this.list)) }, }; diff --git a/src/router/index.js b/src/router/index.js index c18b79f5a..ce0cc379b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1508,6 +1508,15 @@ const routes = [ title: '标准调研流程' } }, + // { + // path: '/bzxqfyStep1', + // name: 'bzxqfyStep1', + // component: () => import('@/pages/processCenter/pages/creatProcess/bzxqfy/step1.vue'), + // meta: { + // requireAuth: true, + // title: '标准翻译流程' + // } + // }, { path: '/ZQYJAddFileDetails', name: 'ZQYJAddFileDetails', From 9b494c1ccf774f397a40f655f569dc325da358b5 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 1 Mar 2023 09:25:32 +0800 Subject: [PATCH 21/32] =?UTF-8?q?=E9=97=AE=E7=AD=94=E5=BA=93=20=E6=8F=90?= =?UTF-8?q?=E9=97=AE=E6=98=BE=E7=A4=BA=E6=A0=87=E5=87=86=E5=8F=B7=E5=92=8C?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/personal/pages/my-questions/index.vue | 9 +++++++++ src/pages/regulatoryRepository/standQA/index.vue | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index da931bca0..007bba784 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -823,6 +823,12 @@ 选择标准 + + {{ questionForm.standSortShow }} {{questionForm.standNumber }}-{{ questionForm.standYear }} + + + {{questionForm.standardName}} + @@ -1485,6 +1491,9 @@ export default { this.handleSelectTableList[0].standSortShow + this.handleSelectTableList[0].standNumber } this.questionForm.standardName = this.handleSelectTableList[0].standName + this.questionForm.standSortShow = this.handleSelectTableList[0].standSortShow + this.questionForm.standYear = this.handleSelectTableList[0].standYear + this.questionForm.standNumber = this.handleSelectTableList[0].standNumber this.questionForm.standardId = this.handleSelectTableList[0].id this.standModel = false }else{ diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue index 0e2af757f..ccf4c45b0 100644 --- a/src/pages/regulatoryRepository/standQA/index.vue +++ b/src/pages/regulatoryRepository/standQA/index.vue @@ -102,6 +102,12 @@ 选择标准 + + {{ questionForm.standSortShow }} {{questionForm.standNumber }}-{{ questionForm.standYear }} + + + {{questionForm.standardName}} + @@ -795,6 +801,9 @@ export default { this.handleSelectTableList[0].standSortShow + this.handleSelectTableList[0].standNumber } this.questionForm.standardName = this.handleSelectTableList[0].standName + this.questionForm.standSortShow = this.handleSelectTableList[0].standSortShow + this.questionForm.standYear = this.handleSelectTableList[0].standYear + this.questionForm.standNumber = this.handleSelectTableList[0].standNumber this.questionForm.standardId = this.handleSelectTableList[0].id this.standModel = false }else{ From 239f5fc49b279402e70391b4ebeae304683fe3d7 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Thu, 9 Mar 2023 11:50:28 +0800 Subject: [PATCH 22/32] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbrk/step1.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 039e13473..33c58b718 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -2250,6 +2250,7 @@ this.form.SYCXCLASS = res.data.attrInfoMap.SYCXCLASS ? res.data.attrInfoMap.SYCXCLASS.split(',') : [] this.form.CYCVPPSBMBUSS = res.data.attrInfoMap.CYCVPPSBMBUSS this.form.KCVPPSBMBUSS = res.data.attrInfoMap.KCVPPSBMBUSS + this.LSBBBUSSFileList = this.assemble(res.data.attrInfoMap.LSBBBUSS, res.data.attrInfoMap.LSBBBUSSName); this.form.SYCPXCLASS = res.data.attrInfoMap.SYCPXCLASS ? res.data.attrInfoMap.SYCPXCLASS.split(',') : [] this.form.CYCD = res.data.attrInfoMap.CYCD ? res.data.attrInfoMap.CYCD.split(',') : [] this.form.TXLBBUSS = res.data.attrInfoMap.TXLBBUSS From bde37df6d39b44366cd7e55b0bdd92ee3460e020 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 15 Mar 2023 11:32:06 +0800 Subject: [PATCH 23/32] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/my-collection/components/CollectionBreak.vue | 8 +++++--- .../pages/my-collection/components/CollectionDynamics.vue | 8 +++++--- .../pages/my-collection/components/CollectionLaws.vue | 8 +++++--- .../pages/my-collection/components/CollectionStandard.vue | 8 +++++--- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/pages/personal/pages/my-collection/components/CollectionBreak.vue b/src/pages/personal/pages/my-collection/components/CollectionBreak.vue index 6b3caf6f2..de3d2eef3 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionBreak.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionBreak.vue @@ -41,16 +41,18 @@
- + 所属板块：{{ item.collectType === 'STAND_SPLIT' ? '标准拆分' : '标准拆分' }} - +
标题：{{ item.collectTitle }}
 - 创建时间：{{item.creationTime}} + 状态：{{'无效'}} + 状态：{{'有效'}} + 创建时间：{{item.creationTime}}
{{$t('m.cancelCollection')}} diff --git a/src/pages/personal/pages/my-collection/components/CollectionDynamics.vue b/src/pages/personal/pages/my-collection/components/CollectionDynamics.vue index d24036fa2..3d3b7c682 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionDynamics.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionDynamics.vue @@ -41,16 +41,18 @@
- + 所属板块：{{ item.collectType === 'INLAND_MSG' ? '动态信息' : '资料中心' }} - +
标题：{{ item.collectTitle }}
 - 创建时间：{{getDate(item.creationTime)}} + 状态：{{'无效'}} + 状态：{{'有效'}} + 创建时间：{{getDate(item.creationTime)}}
{{$t('m.cancelCollection')}} diff --git a/src/pages/personal/pages/my-collection/components/CollectionLaws.vue b/src/pages/personal/pages/my-collection/components/CollectionLaws.vue index cc5250942..ba5cff9e6 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionLaws.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionLaws.vue @@ -40,16 +40,18 @@
- + 所属板块：{{ '国内外政策' }} - +
标题：{{ item.collectTitle }}
 - 创建时间：{{getDate(item.creationTime)}} + 状态：{{'无效'}} + 状态：{{'有效'}} + 创建时间：{{getDate(item.creationTime)}}
取消收藏 diff --git a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue index 71bd62e02..8f6e06c8c 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue @@ -49,11 +49,11 @@
- + 所属板块：{{ item.collectType === 'INLAND_STAND' ? '国内标准法规' : (item.collectType === 'FOREIGN_STAND' ? '海外标准法规' : '企业标准') }} - +
标题：
 @@ -61,7 +61,9 @@
标题：{{ item.collectTitle }}
 - 创建时间：{{getDate(item.creationTime)}} + 状态：{{'无效'}} + 状态：{{'有效'}} + 创建时间：{{getDate(item.creationTime)}} From 500696bf552d6153931b614fd211a2a12ff1f4c2 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 15 Mar 2023 12:02:32 +0800 Subject: [PATCH 24/32] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/my-collection/components/CollectionBreak.vue | 4 ++-- .../pages/my-collection/components/CollectionDynamics.vue | 4 ++-- .../pages/my-collection/components/CollectionLaws.vue | 4 ++-- .../pages/my-collection/components/CollectionStandard.vue | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pages/personal/pages/my-collection/components/CollectionBreak.vue b/src/pages/personal/pages/my-collection/components/CollectionBreak.vue index de3d2eef3..ea2f91c90 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionBreak.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionBreak.vue @@ -50,8 +50,8 @@
标题：{{ item.collectTitle }}
 - 状态：{{'无效'}} - 状态：{{'有效'}} + 状态：{{'无效'}} + 状态：{{'有效'}} 创建时间：{{item.creationTime}} diff --git a/src/pages/personal/pages/my-collection/components/CollectionDynamics.vue b/src/pages/personal/pages/my-collection/components/CollectionDynamics.vue index 3d3b7c682..a05d916a8 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionDynamics.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionDynamics.vue @@ -50,8 +50,8 @@
标题：{{ item.collectTitle }}
 - 状态：{{'无效'}} - 状态：{{'有效'}} + 状态：{{'无效'}} + 状态：{{'有效'}} 创建时间：{{getDate(item.creationTime)}} diff --git a/src/pages/personal/pages/my-collection/components/CollectionLaws.vue b/src/pages/personal/pages/my-collection/components/CollectionLaws.vue index ba5cff9e6..37e559cf2 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionLaws.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionLaws.vue @@ -49,8 +49,8 @@
标题：{{ item.collectTitle }}
 - 状态：{{'无效'}} - 状态：{{'有效'}} + 状态：{{'无效'}} + 状态：{{'有效'}} 创建时间：{{getDate(item.creationTime)}} diff --git a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue index 8f6e06c8c..da31f9ffe 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue @@ -61,8 +61,8 @@
标题：{{ item.collectTitle }}
 - 状态：{{'无效'}} - 状态：{{'有效'}} + 状态：{{'无效'}} + 状态：{{'有效'}} 创建时间：{{getDate(item.creationTime)}} From 12531088baf224621148ebf62ee64c7685a8e9f5 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 15 Mar 2023 16:31:14 +0800 Subject: [PATCH 25/32] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/my-collection/components/CollectionBreak.vue | 3 +-- .../pages/my-collection/components/CollectionDynamics.vue | 3 +-- .../personal/pages/my-collection/components/CollectionLaws.vue | 3 +-- .../pages/my-collection/components/CollectionStandard.vue | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/pages/personal/pages/my-collection/components/CollectionBreak.vue b/src/pages/personal/pages/my-collection/components/CollectionBreak.vue index ea2f91c90..2c3d58600 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionBreak.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionBreak.vue @@ -50,8 +50,7 @@
标题：{{ item.collectTitle }}
 - 状态：{{'无效'}} - 状态：{{'有效'}} + 状态：{{ item.validFlag == 0 ? '有效' : '无效'}} 创建时间：{{item.creationTime}} diff --git a/src/pages/personal/pages/my-collection/components/CollectionDynamics.vue b/src/pages/personal/pages/my-collection/components/CollectionDynamics.vue index a05d916a8..9350ae9ac 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionDynamics.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionDynamics.vue @@ -50,8 +50,7 @@
标题：{{ item.collectTitle }}
 - 状态：{{'无效'}} - 状态：{{'有效'}} + 状态：{{ item.validFlag == 0 ? '有效' : '无效'}} 创建时间：{{getDate(item.creationTime)}} diff --git a/src/pages/personal/pages/my-collection/components/CollectionLaws.vue b/src/pages/personal/pages/my-collection/components/CollectionLaws.vue index 37e559cf2..4a67575ec 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionLaws.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionLaws.vue @@ -49,8 +49,7 @@
标题：{{ item.collectTitle }}
 - 状态：{{'无效'}} - 状态：{{'有效'}} + 状态：{{ item.validFlag == 0 ? '有效' : '无效'}} 创建时间：{{getDate(item.creationTime)}} diff --git a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue index da31f9ffe..fb2c396d9 100644 --- a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue +++ b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue @@ -61,8 +61,7 @@
标题：{{ item.collectTitle }}
 - 状态：{{'无效'}} - 状态：{{'有效'}} + 状态：{{ item.validFlag == 0 ? '有效' : '无效'}} 创建时间：{{getDate(item.creationTime)}} From 8e9fa527a76db7225dd9bdb9266631e4a27c93b8 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 16 Mar 2023 17:01:19 +0800 Subject: [PATCH 26/32] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 38 +++++-------------- 1 file changed, 9 insertions(+), 29 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 98bf00227..6832560ed 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -233,13 +233,12 @@ - - - - - - - + 导入 { - if (boolean) { - // this.$refs.importfile.clearFiles() - if (flag === 1) { - let menuId = this.selectSarMenu.id - if (menuId == null || menuId === '') { - this.$message({ - showClose: true, - message: '请选择标准导入的目录', - type: 'error' - }) - } else { - this.importModalshowflag = true - this.showUploadlist = true - this.importExcelUrl = '/api/lawss/sarBussionessStand/importZipSarBussionessStand?menuId=' + menuId - } - } else { - this.importModalshowflag = true - this.importExcelUrl = '/api/lawss/sarBussStandItems/importSarBussStandItemsList?standId=' + this.standItemSearch.standId - } - } - }) + this.importModalshowflag = true + this.showUploadlist = true + this.importExcelUrl = '/api/lawss/sarBussionessStand/importSarBussionessStandFile' }, // 二级菜单新建，编辑，删除 clickDropMenu(name, treeNode) { From 2485a3f321db43dd6604eb5670409a9f4481b839 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 22 Mar 2023 13:54:15 +0800 Subject: [PATCH 27/32] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=20=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E6=8E=A5=E6=94=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/todoList/index.vue | 45 ++++++++++++++++++- .../pages/components/ProcessFooter.vue | 18 ++++---- .../pages/creatProcess/qbrk/step1-2.vue | 1 - 3 files changed, 53 insertions(+), 11 deletions(-) diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 205ac4704..f27e63fb6 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -11,7 +11,12 @@
  • {{ getPrcNameFilter(item) }} + style="line-height: 30px; font-size: 13px;display: inline-block;width: 80%;">{{ getPrcNameFilter(item) }} + 接受任务 @@ -61,6 +66,44 @@ export default { toPage() { this.$router.push(this.path) }, + // 接受按钮 + handleReceive(item) { + this.isSubmit = true + // execTask({ + // todoId: this.todoId // 当前节点ID + // }).then(res => { + // if (res.sign && res.sign === '0') { + // this.$message.success('接收成功') + // this.$router.push('/processCenter') + // } + // this.isSubmit = false + // }) + // if(!this.tableData.standardData[0]){ + // this.$message.warning('请先选择企标计划') + // this.isSubmit = false + // return + // } + this.$http.get("lawss/activiti/selectBusProcessNew", { + taskId: item.taskIds, + }, { + _this: this + }, res => { + this.$http.get("lawss/activiti/acceptTack", { + nowEsId: res, + oaFlag: '0', + taskId: item.taskIds, + }, { + _this: this + }, res => { + // if (res.sign && res.sign === '0') { + this.$message.success('接收成功') + this.isSubmit = false + this.showreceive = false + // this.$router.push('/processCenter') + // } + }) + }) + }, dealWith (row) { // 办理 const prcType = row.prcType switch(prcType) { diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index 1c2d9b5e7..3be40b9bc 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -97,15 +97,15 @@ v-if="showOver3" >驳回 - 接收任务 + + + + + + + + + { if (res.data === true) { - console.log(1); this.showreceive = true } else { this.showreceive = false From 52278362c535a763fa99ea52f4ac615525cb57e0 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 22 Mar 2023 16:37:59 +0800 Subject: [PATCH 28/32] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=8E=A5=E5=8F=97=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/todoList/index.vue | 12 ++++++------ .../pages/components/ProcessFooter.vue | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index f27e63fb6..4ccc27792 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -11,12 +11,12 @@
  • {{ getPrcNameFilter(item) }} - 接受任务 + style="line-height: 30px; font-size: 13px;display: inline-block;width: 100%;">{{ getPrcNameFilter(item) }} + + + + + diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index 3be40b9bc..d00e6488e 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -97,15 +97,15 @@ v-if="showOver3" >驳回 - - - - - - - - - + 接收任务 Date: Fri, 24 Mar 2023 14:11:46 +0800 Subject: [PATCH 29/32] =?UTF-8?q?=E6=A0=87=E5=87=86=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B=20=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherBussStandardDetails/index.vue | 1 + src/pages/details/otherStandardDetails/index.vue | 1 + src/pages/searchCenter/pages/standardSearch.vue | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 31272db5e..ec2303410 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -334,6 +334,7 @@ 更新记录 标准问答 + 标准需求（翻译）申请流程
    diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index bbf33b75f..c2ccd263e 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -37,6 +37,7 @@ @click="collectClick()"> 更新记录 标准问答 + 标准需求（翻译）申请流程 diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index c85d5f7bc..95c032033 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -29,6 +29,10 @@
    首页
     + + + 标准需求（翻译）申请流程 +
    From d2562746aecb27c25eeda00cb9e5830b511ece83 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Sat, 25 Mar 2023 11:06:18 +0800 Subject: [PATCH 30/32] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/todoList/index.vue | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 4ccc27792..d0fb3b692 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -12,11 +12,15 @@
    {{ getPrcNameFilter(item) }} - - - - - + 接受任务 From ecc1a9d4e79f57355a81ae23ea5c74cd202ec77f Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Sun, 26 Mar 2023 13:04:43 +0800 Subject: [PATCH 31/32] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzrk/step1.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index c83239325..f21d8b437 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1957,6 +1957,11 @@ this.checkIsOnly() } }, + 'form.standName' : { + handler: function() { + this.checkIsOnly() + } + }, 'form.standNumber' : { handler: function() { this.checkIsOnly() @@ -2129,10 +2134,11 @@ } if (this.form.standInData === '0') { standType = 'INLAND' - if(this.form.standSort && this.form.standNumber && this.form.standYear){ + if(this.form.standSort && this.form.standNumber && this.form.standYear && this.form.standName){ this.$http.get('sarStandardsInfo/sar-standards-info/checkIsOnly', { standType: standType, standSort: this.form.standSort, + standName: this.form.standName, standNumber: this.form.standNumber, standYear: this.form.standYear, }, { @@ -2146,10 +2152,11 @@ } } else { standType = 'FOREIGN' - if(this.form.standSort && this.form.standNumber){ + if(this.form.standSort && this.form.standNumber && this.form.standName){ this.$http.get('sarStandardsInfo/sar-standards-info/checkIsOnly', { standType: standType, standSort: this.form.standSort, + standName: this.form.standName, standNumber: this.form.standNumber, standYear: this.form.standYear, }, { @@ -3680,6 +3687,7 @@ this.$http.get('sarStandardsInfo/sar-standards-info/checkIsOnly', { standType: standType, standSort: this.form.standSort, + standName: this.form.standName, standNumber: this.form.standNumber, standYear: this.form.standYear, }, { From 4c114237a7299169ef3af6844d258441d63faffe Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Sun, 26 Mar 2023 16:00:16 +0800 Subject: [PATCH 32/32] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=9D=A1=E4=BB=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index f21d8b437..b29432904 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -2499,6 +2499,7 @@ handleProcessStandardNext(status) { this.submitType = status switch (status) { + // 新增 case 1: this.gdType = '新增' @@ -2507,8 +2508,8 @@ this.standardDrawer = false this.verifySarStandard = true // this.clearFormData(this.form) - this.clearFormData() - this.clearFileListData() + // this.clearFormData() + // this.clearFileListData() break // 带入（确认） case 2: