From 7003e7df93bc2f01a85ac14562b035dfa6d49b44 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Mon, 22 Nov 2021 09:35:01 +0800 Subject: [PATCH 01/36] feat:new --- package-lock.json | 193 +++++++++++++++++++++------------------------- 1 file changed, 88 insertions(+), 105 deletions(-) diff --git a/package-lock.json b/package-lock.json index eee858d4b..5a5bd04ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3596,23 +3596,6 @@ "upath": "^1.1.1" } }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, "commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", @@ -4558,94 +4541,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.5.0", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz", - "integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "big.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "dev": true, - "optional": true - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, - "optional": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-style-loader": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz", @@ -13608,6 +13503,94 @@ "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.22.4.tgz", "integrity": "sha512-XLI5s0AdqMP2Lf4I4CmdmOq8kjb5DDFGR77wAuxCfpEuYSfhTRyyx6MetgZMiL6Lxa0DasjBOiOcciU3NkL3/Q==" }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.8.3", + "resolved": "https://registry.npmmirror.com/vue-loader/download/vue-loader-16.8.3.tgz", + "integrity": "sha1-1D5nXe9bqTRdbH8FkUwT2GGZcIc=", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995651629&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz", + "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646697260&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz", + "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz", + "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.nlark.com/color-name/download/color-name-1.1.4.tgz", + "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=", + "dev": true, + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz", + "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=", + "dev": true, + "optional": true + }, + "hash-sum": { + "version": "2.0.0", + "resolved": "https://registry.npm.taobao.org/hash-sum/download/hash-sum-2.0.0.tgz", + "integrity": "sha1-gdAbtd6OpKIUrV1urRtSNGCwtFo=", + "dev": true, + "optional": true + }, + "loader-utils": { + "version": "2.0.2", + "resolved": "https://registry.npmmirror.com/loader-utils/download/loader-utils-2.0.2.tgz?cache=0&sync_timestamp=1636687952028&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Floader-utils%2Fdownload%2Floader-utils-2.0.2.tgz", + "integrity": "sha1-1uO0+4GHByGuTghoqxHdY4NowSk=", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmmirror.com/supports-color/download/supports-color-7.2.0.tgz", + "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "vue-router": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.0.tgz", From 4e0f398ad7c545c6b0278fa59e52b117263cb720 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Mon, 22 Nov 2021 09:41:51 +0800 Subject: [PATCH 02/36] feat:FOTON release --- src/components/navMenu/index.vue | 1268 +++--- .../processCenter/pages/newProcess/index.vue | 1119 +++-- .../nonConfomity/index.vue | 122 +- .../searchCenter/pages/advancedSearch.vue | 3826 ++++++++--------- .../searchCenter/pages/standardSearch.vue | 32 +- src/sysConfig/index.js | 29 +- 6 files changed, 3167 insertions(+), 3229 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 5c6a3d765..94c9695c4 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -1,34 +1,34 @@ diff --git a/src/pages/regulatoryRepository/nonConfomity/index.vue b/src/pages/regulatoryRepository/nonConfomity/index.vue index 2fbd07e11..e70d082ba 100644 --- a/src/pages/regulatoryRepository/nonConfomity/index.vue +++ b/src/pages/regulatoryRepository/nonConfomity/index.vue @@ -1,77 +1,77 @@ diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index 3f55f76e4..b9c174ee1 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -7,9 +7,9 @@
{{ $t("m.generalSearch") }}{{ $t("m.advancedSearch") }} + class="senior">{{ $t("m.advancedSearch") }}
@@ -27,8 +27,8 @@ {{ $t("m.clearQuery") }}
- - + +
@@ -39,9 +39,9 @@ {{ $t("m.standAll") }} - + {{ $t("m.enterpriseStandard") }} @@ -75,11 +75,11 @@ - + @@ -144,10 +144,10 @@ - - - - + + + + @@ -462,16 +462,16 @@ - - + + @@ -832,11 +832,11 @@ - - - - - + + + + + @@ -938,23 +938,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
@@ -974,8 +974,8 @@
+ v-if="!kindtext && this.selectIndex === 'INLAND_STAND' && this.buyRoleFlag === 0 && (this.resultData === null || this.resultData.length === 0)" + class="toBuyClass"> {{ $t("m.noQueryResult") }}！ @@ -984,50 +984,50 @@
+ tooltip-effect="dark" + border + :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" + :data="resultData" + style="width: 100%" + v-loading="tableLoading"> + align="center" + type="index" + width="50"> + align="center" + :label="$t('m.itemNumber')" + show-overflow-tooltip + v-if="selectIndex === 'items'"> + align="center" + :label="$t('m.entryName')" + v-if="selectIndex === 'items'"> + align="center" + :label="$t('m.newModelImplementationDate')" + v-if="selectIndex === 'items'" + width="140"> + align="center" + :label="$t('m.implementationDateOfProductionVehicle')" + v-if="selectIndex === 'items'" + width="140"> + align="center" + :label="$t('m.clauseRequirements')" + v-if="selectIndex === 'items'" + width="200"> + align="center" + :label="$t('m.applicableModels')" + v-if="selectIndex === 'items'" + width="200"> + align="center" + :label="$t('m.issueTime')" + v-if="selectIndex !== 'items'" + width="130"> + align="center" + :label="selectIndex === 'INLAND_LAWS' ? '新车实施日期' :$t('m.putTime')" + width="130"> + align="center" + width="180" + :label="selectIndex === 'INLAND_STAND' ? '文本状态' : (this.selectIndex === 'INLAND_LAWS' ? '文件状态' : '文本状态')"> -
@@ -1235,1238 +1235,981 @@ diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index de91fb48c..f376503e4 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -127,10 +127,10 @@ :label="selectIndex === 'stand'||'bussstand' ? $t('m.standStateShow') : (selectIndex === 'laws' ? $t('m.fileStatus') : $t('m.enterpriseStandardStatus'))" width="200"> 取消收藏 收藏 - + @@ -388,10 +388,10 @@ label: '海外标准法规', // value没改 value: 'bussstand' }, - { - label: '国内外政策', - value: 'laws' - }, + // { + // label: '国内外政策', + // value: 'laws' + // }, { label: '企业标准', value: 'enterprise' @@ -420,10 +420,10 @@ label: '海外标准法规', // value没改 value: 'bussstand' }, - { - label: '国内外政策', - value: 'laws' - }, + // { + // label: '国内外政策', + // value: 'laws' + // }, { label: '企业标准', value: 'enterprise' @@ -760,10 +760,10 @@ label: '海外标准法规', value: 'bussstand' }, - { - label: '国内外政策', - value: 'laws' - }, + // { + // label: '国内外政策', + // value: 'laws' + // }, { label: '企业标准', value: 'enterprise' @@ -1099,7 +1099,7 @@ "JASO","JIS","GSO","GOST","ΓOCT","TP","SASO","UAE","CONTRAN","DENATRAN", "ABNT NBR","NBR","INMETRO","CONAMA","Normative Instruction","ADR"]; const bussStandVerify = ["Q/FT A","Q/FT B","Q/FT E","Q/FT F","Q/FT G","Q/FT M", - "Q/FT Q","Q/FT R","Q/FT S","Q/FT T","Q/FT V","Q/FT X","Q/FT Y","Q/FT Z","Q/QCBFC"]; + "Q/FT Q","Q/FT R","Q/FT S","Q/FT T","Q/FT V","Q/FT X","Q/FT Y","Q/FT Z","Q/QCBFC"]; if(data[key]){ console.log(data[key]) const list = [] diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 23bedc3ed..6485c1a23 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,16 +6,17 @@ // 服务器地址 // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' -// const devIp = '192.168.10.249' -const devIp = '62.234.136.153' -// const devInterfacePORT = '9999' -const devInterfacePORT = '8033' +// const devIp = '192.168.10.248' +// 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 devWebUrl = 'http://62.234.136.153:8038/#/' +const devWebUrl = 'https://srms.foton.com.cn/#/' // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录) -const webLoginType = 'dev' +const webLoginType = 'idm' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const simpleFilePath = 'att/attFile/upload' @@ -38,10 +39,10 @@ const processPort = '17210' *****************************************************************/ // 生产环境配置 -const prodIp = '62.234.136.153' -const prodInterfacePORT = '8033' -// const prodIp = 'slrs.foton.com.cn' -// const prodInterfacePORT = '' +// const prodIp = '62.234.136.153' +// const prodInterfacePORT = '8033' +const prodIp = 'srms.foton.com.cn' +const prodInterfacePORT = '' // 判断环境 const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp @@ -49,13 +50,13 @@ 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: 'http://' + serverIP + ':' + interfacePORT, + baseUrl: 'https://' + serverIP + ':' + interfacePORT, webLoginType: webLoginType, ssoLoginUrlDev: ssoLogin + devWebUrl, ssoLoginUrl: ssoLogin, devWebUrl: devWebUrl, - serverUrl: 'http://' + serverIP, // 服务器IP地址 - interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址, + serverUrl: 'https://' + serverIP, // 服务器IP地址 + interfaceUrl: 'https://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址, cloudResInterFaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/busApi/', // 云端资源库服务器端接口访问地址, simpleUploadPath: 'api/' + simpleFilePath, // 单文件上传地址 multipleUploadPath: 'api/' + multipleFilePath, // 多文件上传地址 @@ -64,5 +65,5 @@ module.exports = { webSocket: webSocket + ':' + devInterfacePORT + '/websocket/socketServer', // webSocket连接 enterprise: enterprise, // GQ广汽 SJZX数据中心 theme: theme, // 主题 - processInterfaceURL: `http://${serverIP}:${processPort}/bat-wkflow` + processInterfaceURL: `https://${serverIP}:${processPort}/bat-wkflow` } From 3557110552aabe5c8dc3fc82512e046a3b60982c Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Fri, 26 Nov 2021 09:12:56 +0800 Subject: [PATCH 03/36] feat:FOTON release --- src/components/navMenu/index.vue | 788 ++++++++----------------------- 1 file changed, 205 insertions(+), 583 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 30e44c74c..01799fdb3 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -1,34 +1,34 @@ + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue new file mode 100644 index 000000000..aab5fc477 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue @@ -0,0 +1,482 @@ + + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 081dd1ae8..586eed8cc 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -258,6 +258,12 @@ export default { }else if(prcType === '10'){ //项目清单确认 this.toProcessDetail('xmqdqrStep1-3',row) + } else if(prcType === '20') { + // 入会流程 + this.toProcessDetail('bzrhStep6-1',row) + } else if(prcType === '21') { + // 参会流程 + this.toProcessDetail('bzchStep6-1',row) } } else { this.$message.warning('当前流程未全部办理完成，无法查看') diff --git a/src/router/index.js b/src/router/index.js index 430af915a..51d645e1c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1631,6 +1631,15 @@ const routes = [ title: '外部标准化协会入会流程（审批)' } }, + { + path: '/bzrhStep6-1', + name: 'bzrhStep6-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会入会流程' + } + }, // 外部标准化协会参会流程 { @@ -1687,6 +1696,15 @@ const routes = [ title: '外部标准化协会参会流程（审定）' } }, + { + path: '/bzchStep6-1', + name: 'bzchStep6-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会参会流程' + } + }, { path: '/bzhhStep1', name: 'bzhhStep1', From e3b81f600995f19b57de1cc66b498a6ef90d4e82 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 3 Dec 2021 15:02:04 +0800 Subject: [PATCH 19/36] =?UTF-8?q?=E5=8F=82=E4=BC=9A=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzhHy-ch/step1.vue | 112 ++++++++---- .../pages/creatProcess/bzhHy-ch/step2.vue | 119 +++++++------ .../pages/creatProcess/bzhHy-ch/step3.vue | 88 +++++++--- .../pages/creatProcess/bzhHy-ch/step4.vue | 114 ++++++------ .../pages/creatProcess/bzhHy-ch/step5.vue | 92 +++++++--- .../pages/creatProcess/bzhHy-ch/step6-1.vue | 157 +++-------------- .../pages/creatProcess/bzhHy-ch/step6.vue | 165 +++++++++++------- 7 files changed, 452 insertions(+), 395 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 6e269cd45..ce7cc3e85 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -97,7 +97,8 @@ - + @@ -170,6 +171,19 @@
+ + +
+ + +
+ +
@@ -319,7 +333,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {startProcess, saveTaskFirst, completeTask} from '@/api/process.js' +import {startProcess, queryTaskFirst, saveTaskFirst, completeTask} from '@/api/process.js' export default { components: { @@ -393,6 +407,13 @@ export default { roleShowflagOne: false, isSubmit: false, saveLoading: false, + commentText: '' + } + }, + mounted() { + this.bpnId = this.$route.query.bpnId + if (this.bpnId !== undefined) { + this.getData() } }, methods: { @@ -400,6 +421,16 @@ export default { handleTabs(name) { this.active = name }, + getData() { + queryTaskFirst({ + bpnId: this.$route.query.bpnId + }).then(res => { + let mes = JSON.parse(res.mes) + this.ch_pageData = mes.ch_pageData + this.commentText = mes.commentText + this.roleForm = mes.roleForm + }); + }, //上传按钮 /* uploadFile(val) { @@ -557,10 +588,12 @@ export default { _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.userName) - _formData.append('prcType', '20') + _formData.append('prcType', '21') _formData.append('json', JSON.stringify({ roleForm: this.roleForm, - ch_pageData: this.ch_pageData + ch_pageData: this.ch_pageData, + commentText: this.commentText + })) saveTaskFirst(_formData).then(res => { this.saveLoading = false @@ -572,39 +605,44 @@ export default { }, /** 提交按钮*/ handleSubmit() { - let json = { - prcCreateUser: this.$store.getters.userInfo.userId, - prcCreateUserName: this.$store.getters.userInfo.userName, - roleList: this.roleForm, - ch_pageData: this.ch_pageData, - directorList: this.roleForm.dockUser, - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.$refs['roleForm'].validate((valid) => { - if (valid) { - this.isSubmit = true - const paramsInfo = { - type: '21' - } - startProcess(paramsInfo).then(res => { - this.taskID = res.data - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskID) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }) - }) - } - }) + if (this.commentText === '') { + this.$message.warning('请输入回执说明') + } else { + let json = { + prcCreateUser: this.$store.getters.userInfo.userId, + prcCreateUserName: this.$store.getters.userInfo.userName, + roleList: this.roleForm, + ch_pageData: this.ch_pageData, + commentText: this.commentText, + directorList: this.roleForm.dockUser, } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.$refs['roleForm'].validate((valid) => { + if (valid) { + this.isSubmit = true + const paramsInfo = { + type: '21' + } + startProcess(paramsInfo).then(res => { + this.taskID = res.data + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskID) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }) + }) + } + }) + } + }) + } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue index ae2d7683e..85d3a435c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -59,19 +59,18 @@ - + {{ '-' }} + + {{ item.name }} {{ ';'}} + - {{ ch_pageData.sort || '-'}} + 计划内 + 计划外 @@ -104,14 +103,14 @@
- +
+ v-model="commentText">
@@ -217,7 +216,7 @@ export default { ch_pageData: {}, ch_rules: {}, nodeList: [], - textContent: '', + commentText: '', isBack: false, isSubmit: false, @@ -228,6 +227,7 @@ export default { taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + uploadFileLength: '' } }, computed: { @@ -272,61 +272,72 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData + this.uploadFileLength = this.ch_pageData.fileTextList.length this.ch_pageData.meetingInRole = this.$store.getters.userInfo.userName this.roleForm = JSON.parse(JSON.stringify(item)).roleList }) }, // 退回按钮 handleSubmitNo() { - let json = { - roleList: this.roleForm, - memberId: this.$store.getters.userInfo.userId, - passFlag: '0', - commentText: this.textContent, - ch_pageData: this.ch_pageData, - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isBack = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('退回成功') - this.$router.push("/processCenter"); - } - this.isBack = false - }); + if (this.commentText === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + roleList: this.roleForm, + memberId: this.$store.getters.userInfo.userId, + passFlag: '0', + commentText: this.commentText, + ch_pageData: this.ch_pageData, } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isBack = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('退回成功') + this.$router.push("/processCenter"); + } + this.isBack = false + }); + } + }) + } + }, // 提交按钮 handleSubmit() { - let json = { - roleList: this.roleForm, - memberId: this.$store.getters.userInfo.userId, - passFlag: '1', - commentText: this.textContent, - ch_pageData: this.ch_pageData, - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); + if (this.commentText === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + roleList: this.roleForm, + memberId: this.$store.getters.userInfo.userId, + passFlag: '1', + commentText: this.commentText, + ch_pageData: this.ch_pageData, } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }) + } + } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue index 96acc61f8..d828e443a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue @@ -59,18 +59,18 @@ - + {{ '-' }} + + {{ item.name }} {{ ';'}} + - {{ ch_pageData.sort || '-' }} + 计划内 + 计划外 @@ -123,9 +123,10 @@ - +
+ + +
+ + +
+ +
@@ -269,7 +283,12 @@ export default { fillLeader: '', fillFile: '', }, - ch_rules: {}, + ch_rules: { + fillLeader: [ + {required: true, message: "请选择参与人部门领导", trigger: 'blur'}, + { trigger: 'change' } + ] + }, detailData: [], loading: false, @@ -284,6 +303,9 @@ export default { taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + + uploadFileLength: '', + commentText: '' } }, computed: { @@ -327,6 +349,7 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData + this.uploadFileLength = this.ch_pageData.fileTextList.length this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName this.roleForm = JSON.parse(JSON.stringify(item)).roleList @@ -356,6 +379,7 @@ export default { _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ roleList: this.roleForm, + commentText: this.commentText, selfUser: this.$store.getters.userInfo.userId, charge: this.ch_pageData.fillLeaderId, ch_pageData: this.ch_pageData, @@ -370,28 +394,34 @@ export default { }, // 提交按钮 handleSubmit() { - let json = { - roleList: this.roleForm, - selfUser: this.$store.getters.userInfo.userId, - charge: this.ch_pageData.fillLeaderId, - ch_pageData: this.ch_pageData, - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); + if (this.commentText === '') { + this.$message.warning('请输入回执说明') + } else { + let json = { + roleList: this.roleForm, + selfUser: this.$store.getters.userInfo.userId, + commentText: this.commentText, + charge: this.ch_pageData.fillLeaderId, + ch_pageData: this.ch_pageData, } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }) + } + } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue index bf3e176f4..0e6e1971c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue @@ -59,18 +59,18 @@ - + {{ '-' }} + + {{ item.name }} {{ ';'}} + - {{ ch_pageData.sort || '-' }} + 计划内 + 计划外 @@ -109,7 +109,7 @@
- +
{ this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData + this.uploadFileLength = this.ch_pageData.fileTextList.length this.ch_pageData.myPartRole = [{ fillPeopleId: this.ch_pageData.fillPeopleId, fillPeople: this.ch_pageData.fillPeople, @@ -292,56 +294,64 @@ export default { }, // 退回按钮 handleSubmitNo() { - let json = { - member: this.selfUser, - passFlag: '0', - roleList: this.roleForm, - commentText: this.textarea, - ch_pageData: this.ch_pageData, - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isBack = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('退回成功') - this.$router.push("/processCenter"); - } - this.isBack = false - }); + if (this.textarea === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + member: this.selfUser, + passFlag: '0', + roleList: this.roleForm, + commentText: this.textarea, + ch_pageData: this.ch_pageData, } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isBack = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('退回成功') + this.$router.push("/processCenter"); + } + this.isBack = false + }); + } + }) + } }, // 提交按钮 handleSubmit() { - let json = { - member: this.selfUser, - passFlag: '1', - engineerSum: this.roleForm.startUser, - roleList: this.roleForm, - commentText: this.textarea, - ch_pageData: this.ch_pageData, - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); + if (this.textarea === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + member: this.selfUser, + passFlag: '1', + engineerSum: this.roleForm.startUser, + roleList: this.roleForm, + commentText: this.textarea, + ch_pageData: this.ch_pageData, } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }) + } } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue index ee1c0f053..a8c3901ba 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue @@ -59,18 +59,18 @@ - + {{ '-' }} + + {{ item.name }} {{ ';'}} + - {{ ch_pageData.sort || '-' }} + 计划内 + 计划外 @@ -126,6 +126,19 @@
+ + +
+ + +
+ +
@@ -210,7 +223,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { startProcess, saveTaskFirst,completeTask, inboundLiaisonDetail } from '@/api/process.js' +import { startProcess, saveTaskForPub,completeTask, inboundLiaisonDetail } from '@/api/process.js' export default { components: { ProcessHeader, @@ -237,6 +250,9 @@ export default { taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + + uploadFileLength: '', + commentText: '' } }, computed: { @@ -280,6 +296,7 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData + this.uploadFileLength = this.ch_pageData.fileTextList.length this.roleForm = JSON.parse(JSON.stringify(item)).roleList // this.ch_pageData.comityFileNum = this.fileTextList }) @@ -318,30 +335,51 @@ export default { }, // 保存按钮 handleSave() { + this.saveLoading = true + let _formData = new FormData() + _formData.append('taskIds', this.taskIds) + _formData.append('json', JSON.stringify({ + ch_pageData: this.ch_pageData, + roleList: this.roleForm, + commentText: this.commentText + })) + saveTaskForPub(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) }, // 提交按钮 handleSubmit() { - let json = { - leader: this.roleForm.leaderUserId, - ch_pageData: this.ch_pageData, - roleList: this.roleForm, - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); + if (this.commentText === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + leader: this.roleForm.leaderUserId, + ch_pageData: this.ch_pageData, + commentText: this.commentText, + roleList: this.roleForm, } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }) + } + } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue index aab5fc477..9104f1397 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue @@ -2,10 +2,7 @@
- - - - +
基础信息
@@ -62,18 +59,18 @@ - + {{ '-' }} + + {{ item.name }} {{ ';'}} + - {{ ch_pageData.sort || '-' }} + 计划内 + 计划外 @@ -111,6 +108,19 @@
+ + +
+ + +
+ +
@@ -179,21 +189,6 @@ 流程列表加载中
- -
@@ -230,6 +225,10 @@ export default { taskInfo: this.$route.query.taskInfo, taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + + uploadFileLength: '', + passTitle: '回执说明', + passHolder: '请输入回执说明' } }, computed: { @@ -273,116 +272,12 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData + this.uploadFileLength = this.ch_pageData.fileTextList.length + this.textarea = JSON.parse(JSON.stringify(item)).commentText this.roleForm = JSON.parse(JSON.stringify(item)).roleList // this.ch_pageData.comityFileNum = this.fileTextList }) }, - - /** 批量删除 */ - del_paryForm() { - if (this.deleteDataList.length < 1) { - this.$message.warning("请选择一条数据进行删除"); - } else { - this.$confirm("您确认删除这些数据?", "提示", { - confirmButtonText: "确认", - confirmButtonClass: "common-button-primary", - cancelButtonText: "取消", - type: "warning" - }).then(() => { - let exits = []; - this.deleteDataList.map(item => { - let index; - index = this.ch_pageData.myPartRole.findIndex(items => { - return items.id === item; - }); - if (index > -1) { - this.ch_pageData.myPartRole.splice(index, 1); - } - exits.push(item); - }); - this.deleteDataList = []; - }).catch(() => { - }); - } - }, - - selectedDelete(val) { - this.deleteDataList = val - }, - // 退回按钮 - handleSubmitNo() { - let json = { - passFlag: '0', - ch_pageData: this.ch_pageData, - roleList: this.roleForm - } - if (this.taskInfo === '技术管理中心主任审批') { - json.manageDepartmentList = this.roleForm.feeUserId - } else if (this.taskInfo === '费用管理部门会签') { - json.manageDepartment = this.$store.getters.userInfo.userId - json.president = this.roleForm.engineerUserId - } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { - json.engineerSumDone = this.roleForm.startUser - } else { - json = { - ch_pageData: this.ch_pageData, - roleList: this.roleForm - } - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isBack = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isBack = false - }); - } - }) - }, - // 提交按钮 - handleSubmit() { - let json = { - passFlag: '1', - ch_pageData: this.ch_pageData, - roleList: this.roleForm - } - if (this.taskInfo === '技术管理中心主任审批') { - json.manageDepartmentList = this.roleForm.feeUserId - } else if (this.taskInfo === '费用管理部门会签') { - json.manageDepartment = this.$store.getters.userInfo.userId - json.president = this.roleForm.engineerUserId - } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { - json.engineerSumDone = this.roleForm.startUser - } else { - json = { - ch_pageData: this.ch_pageData, - roleList: this.roleForm - } - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); - } - }) - } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue index 105a1410d..eea516e65 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue @@ -62,18 +62,18 @@ - + {{ '-' }} + + {{ item.name }} {{ ';'}} + - {{ ch_pageData.sort || '-' }} + 计划内 + 计划外 @@ -111,6 +111,19 @@ + + +
+ + +
+ +
@@ -230,6 +243,10 @@ export default { taskInfo: this.$route.query.taskInfo, taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + + uploadFileLength: '', + passTitle: '审批意见', + passHolder: '请输入审批意见' } }, computed: { @@ -261,6 +278,10 @@ export default { }, getData() { + if (this.taskInfo === '标准法规工程师修订完毕') { + this.passTitle = '回执说明', + this.passHolder = '请输入回执说明' + } const params = { taskIds: this.taskIds, pId: this.pId, @@ -273,6 +294,7 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData + this.uploadFileLength = this.ch_pageData.fileTextList.length this.roleForm = JSON.parse(JSON.stringify(item)).roleList // this.ch_pageData.comityFileNum = this.fileTextList }) @@ -293,7 +315,7 @@ export default { this.deleteDataList.map(item => { let index; index = this.ch_pageData.myPartRole.findIndex(items => { - return items.id === item; + return items === item; }); if (index > -1) { this.ch_pageData.myPartRole.splice(index, 1); @@ -311,77 +333,90 @@ export default { }, // 退回按钮 handleSubmitNo() { - let json = { - passFlag: '0', - ch_pageData: this.ch_pageData, - roleList: this.roleForm - } - if (this.taskInfo === '技术管理中心主任审批') { - json.manageDepartmentList = this.roleForm.feeUserId - } else if (this.taskInfo === '费用管理部门会签') { - json.manageDepartment = this.$store.getters.userInfo.userId - json.president = this.roleForm.engineerUserId - } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { - json.engineerSumDone = this.roleForm.startUser + if (this.textarea === '') { + this.$message.warning('请输入审批意见') } else { - json = { + let json = { + passFlag: '0', ch_pageData: this.ch_pageData, + commentText: this.textarea, roleList: this.roleForm } - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isBack = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isBack = false - }); + if (this.taskInfo === '技术管理中心主任审批') { + json.manageDepartmentList = this.roleForm.feeUserId + } else if (this.taskInfo === '费用管理部门会签') { + json.manageDepartment = this.$store.getters.userInfo.userId + json.president = this.roleForm.engineerUserId + } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { + json.engineerSumDone = this.roleForm.startUser + } else { + json = { + ch_pageData: this.ch_pageData, + commentText: this.textarea, + roleList: this.roleForm + } } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isBack = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isBack = false + }); + } + }) + } }, // 提交按钮 handleSubmit() { - let json = { - passFlag: '1', - ch_pageData: this.ch_pageData, - roleList: this.roleForm - } - if (this.taskInfo === '技术管理中心主任审批') { - json.manageDepartmentList = this.roleForm.feeUserId - } else if (this.taskInfo === '费用管理部门会签') { - json.manageDepartment = this.$store.getters.userInfo.userId - json.president = this.roleForm.engineerUserId - } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { - json.engineerSumDone = this.roleForm.startUser + if (this.textarea === '') { + this.$message.warning('请输入审批意见') } else { - json = { + let json = { + passFlag: '1', ch_pageData: this.ch_pageData, + commentText: this.textarea, roleList: this.roleForm } - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); + if (this.taskInfo === '技术管理中心主任审批') { + json.manageDepartmentList = this.roleForm.feeUserId + } else if (this.taskInfo === '费用管理部门会签') { + json.manageDepartment = this.$store.getters.userInfo.userId + json.president = this.roleForm.engineerUserId + } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { + json.engineerSumDone = this.roleForm.startUser + } else { + json = { + ch_pageData: this.ch_pageData, + commentText: this.textarea, + roleList: this.roleForm + } } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }) + } + } } } From e221dce3e92edd07697eb4234e82519fce23be6f Mon Sep 17 00:00:00 2001 From: "wangxiahui@91isoft.com" <140316hui> Date: Fri, 3 Dec 2021 15:31:32 +0800 Subject: [PATCH 20/36] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=8C=E8=B4=A3=E4=BB=BB=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E5=B8=88ui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/rectificationDatabase.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 64976940d..fe11fec51 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -1120,7 +1120,7 @@ export default { this.roleShowflag = true }, drawerCheck(data) { - this.addForm.dutyEngineer = data[0].name.slice(0,data[0].name.indexOf('(')) + this.addForm.dutyEngineer = data[0].name this.roleShowflag = false }, /** 选择认证工程师和质量工程师 */ @@ -1140,7 +1140,7 @@ export default { idList += ',' } idList += item.id - nameList += item.name.slice(0,item.name.indexOf('(')) + nameList += item.name }) if (this.type === 'authEngineer') { this.addForm.authEngineer = nameList From 353a756e607b4154ee8e67f966b59554b842e136 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 3 Dec 2021 15:32:36 +0800 Subject: [PATCH 21/36] commit --- .../enterpriseStandardPlan/index.vue | 209 ++++++++++++++---- 1 file changed, 172 insertions(+), 37 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index f9eefc43b..11f39d81b 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -19,13 +19,13 @@ @@ -101,27 +101,33 @@ label="计划状态" align="center" width="150"> + + @@ -180,7 +186,7 @@
@@ -199,38 +205,38 @@ - - - + + + - - - + + + + + + - +
+ + + + +
+ + +
+
+ 手动查找 +
+
+ - - - - - - @@ -285,6 +306,40 @@ @click="addDrawerClose">取消
+ + + + + + + +
+ 确认 + +
+ @@ -295,6 +350,15 @@ components: {}, data() { return { + QCDWmodal: false, + QCDWValue: [], + QCDWList: [], + type: '', + drawerTitle: '', + modalshowflag2: false, + modalshowflag: false, + nodeList: [], + nodeList2: [], loading: false, submitLoading: false, addDrawerTitle: '', @@ -307,10 +371,13 @@ planStatus: '', // 计划状态 reviseStatus: '', // 制修订状态 resPerson: '', // 评审责任人 + resPersonName: '', wgLeader: '', // 工作组组长 + wgLeaderName: '', draftTime: '', // 计划标准初稿完成时间 releaseTime: '', // 计划标准发布时间 drafter: '', // 起草人 + drafterName: '', // remarks: '', // 备注 }, addFormRules: { @@ -327,19 +394,19 @@ {required: true, message: '请选择制修订状态', trigger: 'change'}, ], resPerson: [ - {required: true, message: '请输入评审责任人', trigger: 'blur'}, + {required: true, message: '请选择评审责任人', trigger: 'change'}, ], wgLeader: [ - {required: true, message: '请输入工作组组长', trigger: 'blur'}, + {required: true, message: '请选择工作组组长', trigger: 'change'}, ], draftTime: [ - {required: true, message: '请输入计划标准初稿完成时间', trigger: 'blur'}, + {required: true, message: '请输入计划标准初稿完成时间', trigger: 'change'}, ], releaseTime: [ {required: true, message: '请输入计划标准发布时间', trigger: 'blur'}, ], drafter: [ - {required: true, message: '请输入起草人', trigger: 'blur'}, + {required: true, message: '请选择起草人', trigger: 'change'}, ], }, form: { @@ -358,6 +425,59 @@ props: {}, watch: {}, methods: { + QCDWOK () { + let arr1 = [] + if (this.addForm.unit) { + let str = this.addForm.unit.replace(/，/g, ',') + arr1 = str.split(',') + } + let arr2 = arr1.concat(this.QCDWValue) + this.addForm.unit = Array.from(new Set(arr2)).join(',') + this.QCDWmodal = false + }, + QCDWClick () { + this.QCDWValue = [] + this.QCDWmodal = true + }, + choiceZRR (type, title, id) { + this.nodeList = [] + this.nodeList.push(id) + this.type = type + this.drawerTitle = title + this.modalshowflag = true + }, + checkedRole (data) { + this.addForm.wgLeader = data[0].id + this.addForm.wgLeaderName = data[0].name + }, + choiceZRRS (type, title, id) { + this.type = type + this.drawerTitle = title + this.nodeList2 = [] + if (id) { + this.nodeList2 = id.split(',') + } + this.modalshowflag2 = true + }, + checkedRole2 (data) { + var idList = '' + var nameList = '' + data.forEach( item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.name + }) + if (this.type === 'resPerson') { + this.addForm.resPerson = idList + this.addForm.resPersonName = nameList + } else if (this.type === 'drafter') { + this.addForm.drafter = idList + this.addForm.drafterName = nameList + } + }, addDrawerSubmit () { this.$refs['addForm'].validate((valid) => { if (valid) { @@ -376,9 +496,15 @@ }, res => { this.submitLoading = false if (res.ok) { - this.addDrawer = false - this.$message.success(tips + '成功') - this.getData() + if (res.data === '操作成功') { + this.addDrawer = false + this.$message.success(tips + '成功') + this.getData() + } else { + this.addDrawer = false + this.$message.warning(res.data) + this.getData() + } } else { this.$message.warning(tips + '失败') } @@ -473,9 +599,12 @@ reviseStatus: command[0].reviseStatus, // 制修订状态 resPerson: command[0].resPerson, // 评审责任人 wgLeader: command[0].wgLeader, // 工作组组长 + resPersonName: command[0].resPersonName, // 评审责任人 + wgLeaderName: command[0].wgLeaderName, // 工作组组长 draftTime: command[0].draftTime, // 计划标准初稿完成时间 releaseTime: command[0].releaseTime, // 计划标准发布时间 - drafter: command[0].drafter, // 起草人 + drafterName: command[0].drafterName, // 起草人 + drafter: command[0].drafter, } break case '删除': @@ -525,6 +654,12 @@ computed: {}, mounted() { this.getData() + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + this.QCDWList = res.data.QCDW // 起草单位 + }, e => { + }) }, } From b4d6a56e4776879ce36191938aa9a8e4e4d93914 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 3 Dec 2021 16:47:56 +0800 Subject: [PATCH 22/36] commit --- src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 11f39d81b..36a2dd59a 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -276,13 +276,13 @@
手动查找
- From 05d8d380a019db43a3f3209636bccda675ef4d87 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Fri, 3 Dec 2021 17:28:34 +0800 Subject: [PATCH 23/36] feat: There is no way the, BUSS PROCESS -1 --- .../pages/creatProcess/qbrk/step1.vue | 2802 +++++++++++++++++ .../pages/creatProcess/qbrk/step2.vue | 1231 ++++++++ .../pages/creatProcess/qbrk/step3.vue | 2485 +++++++++++++++ .../pages/creatProcess/qbrk/step5.vue | 985 ++++++ .../processCenter/pages/newProcess/index.vue | 21 + .../tabComponents/processCenter/index.vue | 146 + src/router/index.js | 115 + 7 files changed, 7785 insertions(+) create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/step1.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/step2.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/step3.vue create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/step5.vue diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue new file mode 100644 index 000000000..69eb52786 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -0,0 +1,2802 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue new file mode 100644 index 000000000..6fe740a52 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -0,0 +1,1231 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue new file mode 100644 index 000000000..f598b654d --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -0,0 +1,2485 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue new file mode 100644 index 000000000..301d09b3c --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -0,0 +1,985 @@ + + + + + diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index efdfb9cb1..3840da988 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -298,6 +298,21 @@ + + +
+
+
+ +
+
+
企标制修订流程及企业标准库流程
+
+
+
+
+ +
@@ -379,6 +394,12 @@ export default { this.$store.commit('setDetailMap', this.$route.path) this.$store.commit('setHandleInfo') switch (prcType) { + case 'buss1': + // 企标制修订流程及企业标准库流程 + this.$router.push({ + name: 'bussLibrary1' + }) + break case '2': // 标准调研流程 this.$router.push({ diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index f31618145..b3465c084 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -318,6 +318,152 @@ export default { }) } break + case 'buss1': + if (row.taskInfo === '企标编写') { + this.$router.push({ + name: 'bussLibrary2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '企标汇总修订'){ + this.$router.push({ + name: 'bzrkStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '标准化员审批'){ + this.$router.push({ + name: 'bzrkStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '重新企标汇总修订'){ + this.$router.push({ + name: 'bzrkStepC3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '会签征求意见'){ + this.$router.push({ + name: 'bzrkStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '主起草人修订并组织评审'){ + this.$router.push({ + name: 'bzrkStep6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '标准法规工程师复审'){ + this.$router.push({ + name: 'bzrkStep7', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '重新修订并组织评审'){ + this.$router.push({ + name: 'bzrkStepC6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '技术委员会负责人/起草中心主任审核'){ + this.$router.push({ + name: 'bzrkStep8', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '标准法规部部长审核'){ + this.$router.push({ + name: 'bzrkStep9', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '专委会副主任/起草单位中心主任审定'){ + this.$router.push({ + name: 'bzrkStep10', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '专委会主任/总院院长或主管副院长批准'){ + this.$router.push({ + name: 'bzrkStep11', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '主起草人培训'){ + this.$router.push({ + name: 'bzrkStep12', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break case 'laws1': if (row.taskInfo === '政策入库审批') { this.$router.push({ diff --git a/src/router/index.js b/src/router/index.js index 950677be7..de739f1be 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -907,6 +907,121 @@ const routes = [ title: '政策入库流程' } }, + { + path: '/bussLibrary1', + name: 'bussLibrary1', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step1.vue'), + meta: { + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + }, + // { + // path: '/bussLibrary2', + // name: 'bussLibrary2', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step2.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // }, + // { + // path: '/bussLibrary3', + // name: 'bussLibrary3', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step3.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // },{ + // path: '/bussLibraryC3', + // name: 'bussLibraryC3', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // },{ + // path: '/bussLibrary4', + // name: 'bussLibrary4', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step4.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // },{ + // path: '/bussLibrary5', + // name: 'bussLibrary5', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step5.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // },{ + // path: '/bussLibrary6', + // name: 'bussLibrary6', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step6.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // },{ + // path: '/bussLibraryC6', + // name: 'bussLibraryC6', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // },{ + // path: '/bussLibrary7', + // name: 'bussLibrary7', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step7.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // },{ + // path: '/bussLibrary8', + // name: 'bussLibrary8', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step8.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // },{ + // path: '/bussLibrary9', + // name: 'bussLibrary9', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step9.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // },{ + // path: '/bussLibrary10', + // name: 'bussLibrary10', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step10.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // },{ + // path: '/bussLibrary11', + // name: 'bussLibrary11', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step11.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // },{ + // path: '/bussLibrary12', + // name: 'bussLibrary12', + // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step12.vue'), + // meta: { + // requireAuth: true, + // title: '企标制修订流程及企业标准库流程' + // } + // }, { path: '/bzdyStep1', name: 'bzdyStep1', From faa0f2a792f238885f38f220fca0da91b005b275 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 3 Dec 2021 17:29:50 +0800 Subject: [PATCH 24/36] =?UTF-8?q?=E5=8F=82=E4=BC=9A=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home2/components/empennage/index.vue | 36 +++-- src/pages/home2/index.vue | 4 +- .../pages/creatProcess/bzhHd-rh/step1.vue | 106 +++++++------- .../pages/creatProcess/bzhHd-rh/step2.vue | 85 ++++++------ .../pages/creatProcess/bzhHd-rh/step3.vue | 78 ++++++----- .../pages/creatProcess/bzhHd-rh/step4.vue | 79 ++++++----- .../pages/creatProcess/bzhHd-rh/step5.vue | 74 +++++----- .../pages/creatProcess/bzhHd-rh/step6.vue | 75 +++++----- .../pages/creatProcess/bzhHy-ch/step1.vue | 102 +++++++------- .../pages/creatProcess/bzhHy-ch/step2.vue | 97 +++++++------ .../pages/creatProcess/bzhHy-ch/step3.vue | 73 +++++----- .../pages/creatProcess/bzhHy-ch/step4.vue | 113 ++++++++------- .../pages/creatProcess/bzhHy-ch/step5.vue | 111 ++++++++------- .../pages/creatProcess/bzhHy-ch/step6.vue | 131 ++++++++++-------- 14 files changed, 627 insertions(+), 537 deletions(-) diff --git a/src/pages/home2/components/empennage/index.vue b/src/pages/home2/components/empennage/index.vue index 490412f1a..7463fc5a6 100644 --- a/src/pages/home2/components/empennage/index.vue +++ b/src/pages/home2/components/empennage/index.vue @@ -6,16 +6,16 @@ 友情链接
@@ -61,6 +59,15 @@ import {getImg} from '@/api/linkApi.js' export default { name: 'Empennage', + filters: { + snippet: function (value) { + if (value && value.length > 8) { + return value.slice(0, 8) + '...' + } else { + return value + } + } + }, components: {}, mixins: [], data() { @@ -168,6 +175,7 @@ export default { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue deleted file mode 100644 index f598b654d..000000000 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ /dev/null @@ -1,2485 +0,0 @@ - - - - - diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue deleted file mode 100644 index 301d09b3c..000000000 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ /dev/null @@ -1,985 +0,0 @@ - - - - - diff --git a/src/router/index.js b/src/router/index.js index 8da1a1b18..312f8af3b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -934,15 +934,15 @@ const routes = [ title: '企标制修订流程及企业标准库流程' } }, - // { - // path: '/bussLibrary2', - // name: 'bussLibrary2', - // component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step2.vue'), - // meta: { - // requireAuth: true, - // title: '企标制修订流程及企业标准库流程' - // } - // }, + { + path: '/bussLibrary2', + name: 'bussLibrary2', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step2.vue'), + meta: { + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + }, // { // path: '/bussLibrary3', // name: 'bussLibrary3', From 557c3ae1696a3a42247778a53a3805591ac11b91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sun, 5 Dec 2021 10:03:36 +0800 Subject: [PATCH 28/36] commit --- .../pages/creatProcess/qbzxdjhgk/component/rename.vue | 1 + src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index 725f7bce6..027d2d449 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -346,6 +346,7 @@ export default { }else if(this.selectList.length < 1){ this.$message.warning('请至少选择一条数据进行带入') }else{ + this.qbfsForm.esId = this.selectList[0].id this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.draftTime = this.selectList[0].draftTime this.qbfsForm.drafter = this.selectList[0].drafter diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index d4a9a3e8a..b3503075a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -381,7 +381,7 @@ export default { toggleComName(name) { this.comName = name; if(this.comName === 'merge'){ - this.$refs["childForm"].qbfsForm = '1' + this.$refs["childForm"].qbfsForm.type = '1' }else if(this.comName === 'delay'){ this.$refs["childForm"].qbfsForm.type = '2' }else if(this.comName === 'cancel'){ @@ -391,7 +391,6 @@ export default { }else if(this.comName === 'establish'){ this.$refs["childForm"].qbfsForm.type = '5' } - }, //流程保存 handleSave() { From bd2e9afba238ced9bba09d4415e025e20a1cc40e Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Sun, 5 Dec 2021 10:30:17 +0800 Subject: [PATCH 29/36] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/index.vue | 2 +- .../pages/creatProcess/wfhxzg/step3.vue | 84 +-- .../pages/creatProcess/wfhxzg/step5.vue | 66 --- .../pages/phone/bzhHd-ch/step2.vue | 445 +++++++++++++++ .../pages/phone/bzhHd-ch/step4.vue | 459 ++++++++++++++++ .../pages/phone/bzhHd-ch/step6.vue | 506 ++++++++++++++++++ .../pages/phone/bzhHd-rh/step2.vue | 448 ++++++++++++++++ .../pages/phone/bzhHd-rh/step4.vue | 472 ++++++++++++++++ .../pages/phone/bzhHd-rh/step6.vue | 485 +++++++++++++++++ .../pages/phone/wfhxzg/step5.vue | 473 ++++++++++++++++ src/router/index.js | 10 + 11 files changed, 3310 insertions(+), 140 deletions(-) create mode 100644 src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue create mode 100644 src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue create mode 100644 src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue create mode 100644 src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue create mode 100644 src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue create mode 100644 src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue create mode 100644 src/pages/processCenter/pages/phone/wfhxzg/step5.vue diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue index 57e02df1b..508740324 100644 --- a/src/pages/home2/index.vue +++ b/src/pages/home2/index.vue @@ -140,7 +140,7 @@ export default { } ::v-deep { .el-tabs__item { - font-size: 14px; + font-size: 15px; font-weight: 600; /*color: #333333;*/ } diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index a1755533e..1d18d8aea 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -13,72 +13,6 @@ -
{ - if (item.passInfo !== undefined) { + if (item.passInfo !== 0) { this.passInfo = JSON.parse(JSON.stringify(item)).passInfo - } - let fileData = JSON.parse(JSON.stringify(item)).dockUserList - for (let i = 0; i - +
+ + + + +
+
基础信息
+
审批历史
+
+
+
+ + + +
+ + + + + {{ ch_pageData.meetingName || '-' }} + + + + + {{ ch_pageData.primaryUnit || '-' }} + + + + + + + {{ ch_pageData.associaName || '-' }} + + + + + {{ ch_pageData.meetingStartTime || '-' }} + + + + + + + {{ ch_pageData.meetingPlace || '-' }} + + + + + {{ ch_pageData.feeStand || '-' }} + + + + + + + {{ ch_pageData.feeKind || '-' }} + + + + + {{ '-' }} + + {{ item.name }} {{ ';' }} + + + + + + + + 计划内 + 计划外 + + + + + + + + + + + + + + + + +
+
+ + +
+ + +
+ + +
+
+
+ + + + + + + + + + + + + + + + + + + + + 流程列表加载中 +
+
+ + +
+ + + + + diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue new file mode 100644 index 000000000..b7343b99e --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue @@ -0,0 +1,459 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue new file mode 100644 index 000000000..893916f36 --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue @@ -0,0 +1,506 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue new file mode 100644 index 000000000..4fa6b87d6 --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue @@ -0,0 +1,448 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue new file mode 100644 index 000000000..c15538763 --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue @@ -0,0 +1,472 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue new file mode 100644 index 000000000..fef41fc86 --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue @@ -0,0 +1,485 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue new file mode 100644 index 000000000..2dd643d0f --- /dev/null +++ b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue @@ -0,0 +1,473 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 312f8af3b..a0998ea76 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1848,6 +1848,16 @@ const routes = [ title: '标准解读流程' } }, + { + path: '/phoneWfhxStep5', + name: 'phoneWfhxStep5', + component: () => import('@/pages/processCenter/pages/phone/wfhxzg/step5.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '未符合项整改流程' + } + }, ] }, From 31b25edbcbdd9a243babe04bd75e8cdf60ecc660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sun, 5 Dec 2021 10:34:08 +0800 Subject: [PATCH 30/36] commit --- .../qbzxdjhgk/component/cancel.vue | 24 +++--- .../qbzxdjhgk/component/delay.vue | 24 +++--- .../qbzxdjhgk/component/establish.vue | 74 ++++++++++++++++--- .../qbzxdjhgk/component/merge.vue | 71 ++++++++++++++---- .../qbzxdjhgk/component/rename.vue | 24 +++--- 5 files changed, 157 insertions(+), 60 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 7a653f206..9c254a3a2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -37,10 +37,10 @@ - + @@ -70,18 +70,18 @@ - + - + @@ -181,17 +181,17 @@ label="制修订状态"> @@ -339,13 +339,13 @@ export default { this.qbfsForm.esId = this.selectList[0].id this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.draftTime = this.selectList[0].draftTime - this.qbfsForm.drafter = this.selectList[0].drafter + this.qbfsForm.drafterName = this.selectList[0].drafterName this.qbfsForm.planStatus = this.selectList[0].planStatus this.qbfsForm.releaseTime = this.selectList[0].releaseTime - this.qbfsForm.resPerson = this.selectList[0].resPerson + this.qbfsForm.resPersonName = this.selectList[0].resPersonName this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus this.qbfsForm.unit = this.selectList[0].unit - this.qbfsForm.wgLeader = this.selectList[0].wgLeader + this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName this.ListModel = false } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 2c1a0851c..3625153cd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -37,10 +37,10 @@ - + @@ -78,18 +78,18 @@ - + - + @@ -197,17 +197,17 @@ label="制修订状态"> @@ -361,13 +361,13 @@ export default { this.qbfsForm.esId = this.selectList[0].id this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.draftTime = this.selectList[0].draftTime - this.qbfsForm.drafter = this.selectList[0].drafter + this.qbfsForm.drafterName = this.selectList[0].drafterName this.qbfsForm.planStatus = this.selectList[0].planStatus this.qbfsForm.releaseTime = this.selectList[0].releaseTime - this.qbfsForm.resPerson = this.selectList[0].resPerson + this.qbfsForm.resPersonName = this.selectList[0].resPersonName this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus this.qbfsForm.unit = this.selectList[0].unit - this.qbfsForm.wgLeader = this.selectList[0].wgLeader + this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName this.ListModel = false } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index d8fa3bc70..bf18da11c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -64,17 +64,33 @@ placeholder="请选择计划标准发布时间"> - - - - + +
+ + +
+ 手动查找 +
+
+ + + + + + + + + + + + + + + + +
+ 确认 + +
+
@@ -118,6 +155,9 @@ export default { props: ['message'], data(){ return { + QCDWmodal: false, + QCDWValue: [], + QCDWList: [], drawerTitle2: '', drawerTitle: '', roleType: '', @@ -197,6 +237,20 @@ export default { }) }, methods: { + QCDWOK () { + let arr1 = [] + if (this.qbfsForm.unit.length > 0) { + let str = this.qbfsForm.unit.replace(/，/g, ',') + arr1 = str.split(',') + } + let arr2 = arr1.concat(this.QCDWValue) + this.qbfsForm.unit = Array.from(new Set(arr2)).join(',') + this.QCDWmodal = false + }, + QCDWClick () { + this.QCDWValue = [] + this.QCDWmodal = true + }, choiceZRR() { this.nodeList = []; this.drawerTitle = '请选择工作组组长'; diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index d55961518..fcd6efb7b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -81,16 +81,21 @@ placeholder="请选择初稿完成时间"> - - - - + +
+ + +
+ 手动查找 +
+
@@ -107,7 +112,7 @@ @click.native="choiceZRRS('1')"> - + @@ -207,17 +212,17 @@ label="制修订状态"> @@ -272,6 +277,27 @@ @checkedRole="checkedRole" :nodeList="nodeList" > + + + + + +
+ 确认 + +
+
@@ -286,6 +312,9 @@ export default { props: ['message'], data(){ return { + QCDWmodal: false, + QCDWValue: [], + QCDWList: [], drawerTitle2: '', drawerTitle: '', type: '', @@ -404,6 +433,20 @@ export default { } }, methods: { + QCDWOK () { + let arr1 = [] + if (this.qbfsForm.unit.length > 0) { + let str = this.qbfsForm.unit.replace(/，/g, ',') + arr1 = str.split(',') + } + let arr2 = arr1.concat(this.QCDWValue) + this.qbfsForm.unit = Array.from(new Set(arr2)).join(',') + this.QCDWmodal = false + }, + QCDWClick () { + this.QCDWValue = [] + this.QCDWmodal = true + }, choiceZRR() { this.nodeList = []; this.drawerTitle = '请选择工作组组长'; diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index 027d2d449..f26e7448b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -37,10 +37,10 @@ - + @@ -69,18 +69,18 @@ - + - + @@ -188,17 +188,17 @@ label="制修订状态"> @@ -349,13 +349,13 @@ export default { this.qbfsForm.esId = this.selectList[0].id this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.draftTime = this.selectList[0].draftTime - this.qbfsForm.drafter = this.selectList[0].drafter + this.qbfsForm.drafterName = this.selectList[0].drafterName this.qbfsForm.planStatus = this.selectList[0].planStatus this.qbfsForm.releaseTime = this.selectList[0].releaseTime - this.qbfsForm.resPerson = this.selectList[0].resPerson + this.qbfsForm.resPersonName = this.selectList[0].resPersonName this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus this.qbfsForm.unit = this.selectList[0].unit - this.qbfsForm.wgLeader = this.selectList[0].wgLeader + this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName this.ListModel = false } }, From aeb1983aecda8b1973cdd90f95ef834ff03cd658 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Sun, 5 Dec 2021 10:50:53 +0800 Subject: [PATCH 31/36] =?UTF-8?q?=E9=93=BE=E6=8E=A5=E7=AE=A1=E7=90=86loadi?= =?UTF-8?q?ng?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/linkManage/linkType/firstLink.vue | 4 +++- src/pages/config/pages/linkManage/linkType/secondLink.vue | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pages/config/pages/linkManage/linkType/firstLink.vue b/src/pages/config/pages/linkManage/linkType/firstLink.vue index 04cf53df1..a9d7ae716 100644 --- a/src/pages/config/pages/linkManage/linkType/firstLink.vue +++ b/src/pages/config/pages/linkManage/linkType/firstLink.vue @@ -469,7 +469,9 @@ export default { ) item.icon = src }) - this.Loading = false + setTimeout(()=>{ + this.Loading = false + },1200) } }) this.initSortable() diff --git a/src/pages/config/pages/linkManage/linkType/secondLink.vue b/src/pages/config/pages/linkManage/linkType/secondLink.vue index f5c67b7fb..ebfd53ccf 100644 --- a/src/pages/config/pages/linkManage/linkType/secondLink.vue +++ b/src/pages/config/pages/linkManage/linkType/secondLink.vue @@ -467,7 +467,9 @@ export default { ) item.icon = src }) - this.Loading = false + setTimeout(()=>{ + this.Loading = false + },1200) } }) this.initSortable() From a8f0ed94a723dd6beb9ab755d97a7cbcc27a2a0a Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Sun, 5 Dec 2021 11:21:27 +0800 Subject: [PATCH 32/36] =?UTF-8?q?=E4=BC=9A=E5=90=8E=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/phone/bzhHd-hh/step2.vue | 506 ++++++++++++++++++ 1 file changed, 506 insertions(+) create mode 100644 src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue diff --git a/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue new file mode 100644 index 000000000..b7c0ab1e9 --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue @@ -0,0 +1,506 @@ + + + + + + From e3dec5d12806381b87800e3eb90a6d59d2be9ed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sun, 5 Dec 2021 11:30:27 +0800 Subject: [PATCH 33/36] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbzxdjhgk/component/merge.vue | 12 +- .../pages/creatProcess/xmqdqr/step2.vue | 46 +++---- .../pages/creatProcess/xmqdqr/step3.vue | 81 ++++------- .../pages/creatProcess/xmqdqr/step4.vue | 65 ++++----- .../pages/creatProcess/xmqdqr/step5.vue | 29 ++-- .../page/listTracking.vue | 128 +++++++++--------- 6 files changed, 153 insertions(+), 208 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index fcd6efb7b..c22a3a49c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -67,7 +67,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -351,10 +351,10 @@ export default { reviseStatus: [ {required: true, message: '请选择制修订状态', trigger: 'change'}, ], - resPerson: [ + resPersonName: [ {required: true, message: '请输入评审责任人', trigger: 'blur'}, ], - wgLeader: [ + wgLeaderName: [ {required: true, message: '请输入工作组组长', trigger: 'blur'}, ], draftTime: [ @@ -363,7 +363,7 @@ export default { releaseTime: [ {required: true, message: '请输入计划标准发布时间', trigger: 'blur'}, ], - drafter: [ + drafterName: [ {required: true, message: '请输入起草人', trigger: 'blur'}, ], mergeReason: [ @@ -435,7 +435,7 @@ export default { methods: { QCDWOK () { let arr1 = [] - if (this.qbfsForm.unit.length > 0) { + if (this.qbfsForm.unit !== undefined) { let str = this.qbfsForm.unit.replace(/，/g, ',') arr1 = str.split(',') } diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index 00a810200..cf9269892 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -117,26 +117,26 @@ sortable label="标准实施日期"> diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue index f886ef95e..f86e24020 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue @@ -60,7 +60,7 @@ :data="dataList" border ref="selection" - height="59%" + height="65%" @selection-change="selectStandChange" style="width: 100%; border:1px solid #ccc" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', @@ -85,8 +85,8 @@