From 771e4f0878d5b648956725a50b412b71c99d8ad0 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Thu, 30 Jun 2022 13:58:34 +0800 Subject: [PATCH 01/56] feat: There is no way the, xxxxx --- public/index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/index.html b/public/index.html index 9658d8771..4db23906a 100644 --- a/public/index.html +++ b/public/index.html @@ -35,10 +35,10 @@ .flex {display:flex;flex-direction:column;justify-content:center;align-items:center;text-align:center;} - - - - + + - + + + + + + diff --git a/src/pages/home2/components/releaseBuss/index.vue b/src/pages/home2/components/releaseBuss/index.vue index efd958425..c6692f926 100644 --- a/src/pages/home2/components/releaseBuss/index.vue +++ b/src/pages/home2/components/releaseBuss/index.vue @@ -91,13 +91,7 @@ export default { // 此处需要调用接口,修改个人配置 }, togo () { - if(this.total && this.total > 10){ - this.pageVerify = true - this.pageSize = this.$store.getters.userInfo.configContent - }else { - this.pageVerify = false - } - this.getAdvice() + this.$router.push({path:'/releaseBuss2'}) }, // 点击查看 handlePreview (item) { diff --git a/src/pages/home2/components/releaseBuss2/index.vue b/src/pages/home2/components/releaseBuss2/index.vue new file mode 100644 index 000000000..cc029042a --- /dev/null +++ b/src/pages/home2/components/releaseBuss2/index.vue @@ -0,0 +1,180 @@ + + + + + + diff --git a/src/pages/home2/components/releaseQA/index.vue b/src/pages/home2/components/releaseQA/index.vue index c50e6a01f..a9c494c35 100644 --- a/src/pages/home2/components/releaseQA/index.vue +++ b/src/pages/home2/components/releaseQA/index.vue @@ -91,13 +91,7 @@ export default { // 此处需要调用接口,修改个人配置 }, togo () { - if(this.total && this.total > 10){ - this.pageVerify = true - this.pageSize = this.$store.getters.userInfo.configContent - }else { - this.pageVerify = false - } - this.getAdvice() + this.$router.push({path:'/releaseQA2'}) }, // 点击查看 handlePreview (item) { diff --git a/src/pages/home2/components/releaseQA2/index.vue b/src/pages/home2/components/releaseQA2/index.vue new file mode 100644 index 000000000..eff31d03d --- /dev/null +++ b/src/pages/home2/components/releaseQA2/index.vue @@ -0,0 +1,185 @@ + + + + + + diff --git a/src/pages/home2/components/releaseUs/index.vue b/src/pages/home2/components/releaseUs/index.vue index 33b4a8d56..3f76904e1 100644 --- a/src/pages/home2/components/releaseUs/index.vue +++ b/src/pages/home2/components/releaseUs/index.vue @@ -101,13 +101,7 @@ export default { // 此处需要调用接口,修改个人配置 }, togo () { - if(this.total && this.total > 10){ - this.pageVerify = true - this.pageSize = this.$store.getters.userInfo.configContent - }else { - this.pageVerify = false - } - this.getAdvice() + this.$router.push({path:'/releaseUs2'}) }, // 将文本状态的id与name对应 setMap(data) { diff --git a/src/pages/home2/components/releaseUs2/index.vue b/src/pages/home2/components/releaseUs2/index.vue new file mode 100644 index 000000000..92cbe8a8f --- /dev/null +++ b/src/pages/home2/components/releaseUs2/index.vue @@ -0,0 +1,196 @@ + + + + + + diff --git a/src/router/index.js b/src/router/index.js index 717077a88..aa922feaf 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -14,6 +14,42 @@ const routes = [ title: '动态跳转', } }, + { + path: '/release2', + name: 'Release2', + component: resolve => require(['@/pages/home2/components/release2/index.vue'], resolve), + meta: { + requireAuth: true, + title: '国内外标准法规入库', + } + }, + { + path: '/releaseUs2', + name: 'ReleaseUs2', + component: resolve => require(['@/pages/home2/components/releaseUs2/index.vue'], resolve), + meta: { + requireAuth: true, + title: '在研标准法规入库', + } + }, + { + path: '/releaseBuss2', + name: 'ReleaseBuss2', + component: resolve => require(['@/pages/home2/components/releaseBuss2/index.vue'], resolve), + meta: { + requireAuth: true, + title: '企业标准发布', + } + }, + { + path: '/releaseQA2', + name: 'ReleaseQA2', + component: resolve => require(['@/pages/home2/components/releaseQA2/index.vue'], resolve), + meta: { + requireAuth: true, + title: '标准问答', + } + }, { path: '/blankPage', name: 'blankPage', From 06b91f15ffe487c599e1d848ae909890139dcaac Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Sun, 3 Jul 2022 18:01:50 +0800 Subject: [PATCH 15/56] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20#5?= =?UTF-8?q?5969=20#55973=20=E4=BC=81=E6=A0=87=E9=A1=BA=E5=BA=8F=E5=8F=B7?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/process.js | 8 + .../qbrk-product/common/formEditList.vue | 14 +- .../creatProcess/qbrk-product/step13.vue | 47 +- .../qbrk/common/formEditListFb.vue | 1017 +++++++++++++++++ .../pages/creatProcess/qbrk/step1.vue | 2 +- .../pages/creatProcess/qbrk/step13.vue | 59 +- 6 files changed, 1125 insertions(+), 22 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue diff --git a/src/api/process.js b/src/api/process.js index ed2cf8171..ab709c7b6 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -93,6 +93,14 @@ export function processCreateBuss (data) { }) } +export function verifySnExists (data) { + return axios({ + url: '/api/sarBussStandSn/sar-buss-stand-sn/verifySnExists', + method: 'get', + params: data + }) +} + export function processCreatePlan (data) { return axios({ url: '/api/lawss/actSarItemsPlan/processCreatePlan', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue index 10488a8ea..b60f33902 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue @@ -73,13 +73,13 @@ - - - - - - - + + + { + if (value === '') { + callback(new Error('请输入企标顺序号')) + } else { + let res = await this.verifySnExists() + if(res.data){ + callback() + let date = new Date(); + let year = date.getFullYear(); + this.form.standSn = this.form.standNum + this.form.standNumber = this.form.standNum + this.form.standYear = this.regDate(year) // 待带入立项标准 + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + callback(new Error('企标顺序号已存在或已锁定')) + } + } + }; const validateZrUserIdName = (rule, value, callback) => { if(this.FBGBUSSFileList.length === 0){ callback(new Error('请上传发布稿文件!')) @@ -974,9 +993,11 @@ standSort: [ { required: true, message: '请选择企标类别', trigger: 'change' } ], - standNumber: [ - { required: true, message: '请输入企标编号', trigger: 'blur' }, + standNum: [ + { required: true, message: '请输入企标顺序号', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, + {validator: validateStandNumber, trigger: 'change'} + ], standYear: [ { required: true, message: '请输入标准年份'}, @@ -2607,6 +2628,19 @@ } return list; }, + verifySnExists(){ + return new Promise((resolve, reject) => { + verifySnExists({ + taskId:this.taskIds, + standSn:this.form.standNum, + standSort:this.form.standSort + }).then(res => { + const history = res; + resolve(history) + }).catch(e => { + }) + }) + }, getData() { if(this.taskIds && this.pId){ return new Promise((resolve, reject) => { @@ -2675,16 +2709,17 @@ this.isSubmit = true this.saveLoading = true } - this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1',standSort:this.form.standSort}, { + + this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1',standSort:this.form.standSort,taskId: this.taskIds}, { _this: this }, res => { const obj = res.data - let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn + let standSn = obj.newStandSn this.form.standSn = standSn + this.form.standNum = standSn this.form.standNumber = standSn this.form.standYear = year // 待带入立项标准 this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) - console.log(this.form) if(type === '1'){ this.isSubmit = false this.saveLoading = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue new file mode 100644 index 000000000..da808614e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue @@ -0,0 +1,1017 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 43a95ddc1..968862d66 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -1244,7 +1244,7 @@ pageSize: this.$store.getters.userInfo.configContent, unit: '', esName: '', - planStatus: '0,3', + planStatus: '0,3,6', reviseStatus: '', }, tableData: { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 1bd81afde..73a5f1927 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -626,11 +626,13 @@ From 7d2ab53ed79eae3982a010fa522415581dc6c912 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 5 Jul 2022 14:48:15 +0800 Subject: [PATCH 27/56] bug 55871 --- .../components/EnterpriseStandardDatabase.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index b40c6297f..7213c5115 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -3945,7 +3945,7 @@ export default { if (nowstandinfo.firstPutTime != null && nowstandinfo.firstPutTime !== '') { nowstandinfo.firstPutTime = this.$dateFormat(this.sarBussionessStandEO.firstPutTime, 'yyyy-MM-dd hh:mm:ss') } - nowstandinfo.standCode = nowstandinfo.standSort + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + nowstandinfo.standCode = nowstandinfo.standSort+" "+ nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) this.$http.postData('lawss/sarBussionessStand/updateSarBussionessStand', nowstandinfo, { _this: this, loading: 'isSubmit' From efd3c9c66528b0cd0c93d5c1c5bb45715046b165 Mon Sep 17 00:00:00 2001 From: zhaoxianhui <1994861028@qq.com> Date: Tue, 5 Jul 2022 15:13:58 +0800 Subject: [PATCH 28/56] =?UTF-8?q?=20=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=EF=BC=8C=E6=96=B0=E5=A2=9E/?= =?UTF-8?q?=E7=BC=96=E8=BE=91=EF=BC=8C=E5=B7=A5=E4=BD=9C=E7=BB=84=E7=BB=84?= =?UTF-8?q?=E9=95=BF=E5=92=8C=E5=B7=A5=E4=BD=9C=E7=BB=84=E7=BB=84=E5=91=98?= =?UTF-8?q?=E7=9A=84=E6=8A=BD=E5=B1=89=EF=BC=8C=E7=BC=BA=E5=B0=91=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8C=89=E9=92=AEBUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/workTree/index.vue | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/components/workTree/index.vue b/src/components/workTree/index.vue index d93320d38..2b905e5a4 100644 --- a/src/components/workTree/index.vue +++ b/src/components/workTree/index.vue @@ -12,14 +12,23 @@ :inline="true" @submit.native.prevent > - + - - + + + + 查询 + + + + + 清空 + + + From 301291d594a0083a4557daefc80ffed6a8a46031 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 5 Jul 2022 16:11:31 +0800 Subject: [PATCH 29/56] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20bu?= =?UTF-8?q?g=20#56300=20=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86-=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=B8=8A=E4=BC=A0=E7=9A=84=E9=99=84=E4=BB=B6=20?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=8F=90=E4=BA=A4=EF=BC=8C=E5=86=8D=E6=AC=A1?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=96=87=E4=BB=B6=E6=B2=A1=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomFormComponents/File.vue | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue index 278d37d52..4dc120d31 100644 --- a/src/components/CustomFormComponents/File.vue +++ b/src/components/CustomFormComponents/File.vue @@ -256,6 +256,23 @@ export default { const index = this.$refs.importFileAboutStand.uploadFiles.findIndex(e => e.response.data.id === file.response.data.id); this.$refs.importFileAboutStand.uploadFiles.splice(index, 1); this.showFileList.splice(index, 1) + const value = this.value + let ids = value.split(',') + if (file.response) { + let fileIds = file.response.data.id + let newIdList = this.removeArray(ids, fileIds) + let newStr = '' + if (newIdList != null && newIdList.length > 0) { + for (let i = 0; i < newIdList.length; i++) { + if (newIdList[i] !== '') { + newStr += newIdList[i] + ',' + } + } + this.$emit('input', newStr) + } else { + this.$emit('input', '') + } + } }, // 修改 handleModifyName(file) { From 0f7672413cd08cdfa63399c1ac05401e71075fc2 Mon Sep 17 00:00:00 2001 From: zhaoxianhui <1994861028@qq.com> Date: Tue, 5 Jul 2022 16:46:24 +0800 Subject: [PATCH 30/56] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86-?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2=E5=90=8E-=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=97=A0=E6=B3=95=E6=B8=85=E7=A9=BABUG=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 7213c5115..3eb628ace 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -4496,6 +4496,9 @@ export default { this.sarBussionessSearch.BDTQBBHBUSS = '' this.sarBussionessSearch.advanceSearchVOStr = '' this.sarBussionessSearch.standEnName = '' + this.sarBussionessSearch.standYear='' + this.sarBussionessSearch.textStatusBuss='' + this.sarBussionessSearch.revisionStatus='' this.isAdvancedSearch = false this.getBussionStandTable() } else if (flag === 2) { From 3529bc82d8e3bdc95c0344ebdfa408d39930b248 Mon Sep 17 00:00:00 2001 From: zhaoxianhui <1994861028@qq.com> Date: Tue, 5 Jul 2022 16:56:53 +0800 Subject: [PATCH 31/56] =?UTF-8?q?=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92-?= =?UTF-8?q?=E6=9C=AA=E5=8B=BE=E9=80=89=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=EF=BC=8C?= =?UTF-8?q?tips=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=EF=BC=9A=E8=AF=B7=E9=80=89=E6=8B=A9=E8=A6=81?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E6=95=B0=E6=8D=AEBug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 ec8188710..a48a0c3ba 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -1247,7 +1247,7 @@ }) }).catch(() => {}) } else { - this.$message.warning('请选择要移除的数据') + this.$message.warning('请选择要删除的数据') } }, dataSelectChange (val) { From 2755be6961b51fe4feb23012c093e0abf6ba00ee Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 5 Jul 2022 16:58:32 +0800 Subject: [PATCH 32/56] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20bu?= =?UTF-8?q?g=20#56322=20=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86-=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E8=B5=B7=E8=8D=89=E4=BA=BA=E6=97=B6=20=E8=B5=B7?= =?UTF-8?q?=E8=8D=89=E9=83=A8=E9=97=A8=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AF=B9?= =?UTF-8?q?=20=EF=BC=88=E4=BC=81=E6=A0=87=E7=BC=96=E5=86=99=E8=8A=82?= =?UTF-8?q?=E7=82=B9=EF=BC=89=E5=BA=94=E8=AF=A5=E6=98=AF=E4=B8=A4=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step1.vue | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 968862d66..fd32e7a3b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -1963,6 +1963,14 @@ } return data }, + filterStringDate(data){ + if(data === undefined || data === null || data === '' || data === 'null'){ + return "" + }else { + data = data.toString() + } + return data + }, handleProcessStandardNext(status) { switch (status) { // 新增 @@ -1994,11 +2002,11 @@ // 引用标准 this.form.YYBZ = this.filterDate(this.standardCheckedList[0].esMatingRelations) // 起草人带入 - this.form.QCRBUSS = this.filterDate(this.standardCheckedList[0].drafterName) - this.form.QCRBUSSID = this.filterDate(this.standardCheckedList[0].drafter) + this.form.QCRBUSS = this.filterStringDate(this.standardCheckedList[0].drafterName) + this.form.QCRBUSSID = this.filterStringDate(this.standardCheckedList[0].drafter) // 起草部门带入 - this.form.QCDW = this.filterDate(this.standardCheckedList[0].unitName) - this.form.QCDWID = this.filterDate(this.standardCheckedList[0].unit) + this.form.QCDW = this.filterStringDate(this.standardCheckedList[0].unitName) + this.form.QCDWID = this.filterStringDate(this.standardCheckedList[0].unit) this.form.TXLBBUSS = this.filterDate(this.standardCheckedList[0].tsJsonName) this.form.menuId = this.filterDate(this.standardCheckedList[0].tsJson) this.form.treeType = 'sarMs' From ec138c9f44abaf0e2da618934ede6428fa787420 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 5 Jul 2022 18:06:02 +0800 Subject: [PATCH 33/56] feat: There is no way the, #56326 #56321 --- .../enterpriseStandardPlan/index.vue | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index a48a0c3ba..6440abd35 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -1100,32 +1100,36 @@ this.modalshowflag2 = true }, checkedRole2 (data) { + let idList = '' let nameList = '' - let bmIdList = '' - let bmNameList = '' data.forEach( item => { if (nameList.length > 0) { nameList += ',' idList += ',' - bmIdList += ',' - bmNameList += ',' } idList += item.id nameList += item.name - bmIdList += item.topUnitId - bmNameList += item.topUnit }) + 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 - this.addForm.unitName = bmNameList - this.addForm.unit = bmIdList + if(data && data.length > 0){ + const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",") + const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",") + this.addForm.unitName = institutionNameList + this.addForm.unit = institutionIdList + } } }, + unique(newArr) { + const res = new Map(); + return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1)); + }, addDrawerSubmit () { this.$refs['addForm'].validate((valid) => { if (valid) { From 8ef4d8271d9bbf5f2168bab3338138219f68c2f9 Mon Sep 17 00:00:00 2001 From: zhaoxianhui <1994861028@qq.com> Date: Wed, 6 Jul 2022 10:15:09 +0800 Subject: [PATCH 34/56] =?UTF-8?q?=E3=80=90=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E3=80=91=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=20=E5=90=8D=E7=A7=B0=E8=BF=87=E9=95=BF=E6=97=B6=20=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=A4=9A=E5=87=BA?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E7=AC=A6Bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/phone/bzrk/step2.vue | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue index 74fa39027..8f470ede8 100644 --- a/src/pages/processCenter/pages/phone/bzrk/step2.vue +++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue @@ -53,12 +53,7 @@ - +
{{form.standName}}
- +
{{form.standEnName}}
@@ -369,7 +359,10 @@
- + + +
{{form.dtbjh}}
+
@@ -384,8 +377,14 @@
- - + + +
{{form.cbbh}}
+
+ + +
{{form.yybj}}
+
@@ -1052,4 +1051,7 @@ export default { line-height: 22px !important; } } +.wrap{ + white-space:normal; +} From b4f857863b49309cc244ffe4ffc6002b767f34d9 Mon Sep 17 00:00:00 2001 From: zhaoxianhui <1994861028@qq.com> Date: Wed, 6 Jul 2022 10:45:04 +0800 Subject: [PATCH 35/56] =?UTF-8?q?=E3=80=90WELINK=E3=80=91=E6=A0=87?= =?UTF-8?q?=E5=87=86=E8=B0=83=E7=A0=94=E6=B5=81=E7=A8=8B=20=E6=89=B9?= =?UTF-8?q?=E5=87=86=E8=8A=82=E7=82=B9=20=E7=BC=BA=E5=B0=91=E8=B0=83?= =?UTF-8?q?=E7=A0=94=E6=A8=A1=E6=9D=BF=E5=92=8C=E7=9B=B8=E5=85=B3=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E5=AD=97=E6=AE=B5BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/phone/bzdy/step9.vue | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/phone/bzdy/step9.vue b/src/pages/processCenter/pages/phone/bzdy/step9.vue index b84236e39..691171e79 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step9.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step9.vue @@ -3,7 +3,7 @@ - +
基础信息
审批历史
@@ -35,6 +35,26 @@ - -
+ +
+
+ {{ item.name }} +
+
+
+ - - +
+
+ +
+
+ {{ item.name }} +
+
+
+ - - +
+
隐藏基础信息 @@ -136,7 +156,9 @@ date: '', // 完成时间 hzfileId: '', hzfileName: '', - textsh: '' + textsh: '', + modelList:[], //调研模板 + fjList:[] //相关附件 }, formRules: { textsh: [ @@ -292,10 +314,13 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + console.log(data) this.commentText9 = data.commentText9 || '' this.form.processName = data.form ? data.form.processName : data.processName this.form.title = data.title || data.form.title this.form.date = data.date || data.form.date + this.form.modelList = data.modelList + this.form.fjList =data.fjList this.json = data || data.form this.tableData = data.responUserList || data.form.responUserList this.form.hzfileId = data.hzfileId || data.form.hzfileId From bbb008e692c90df6dbba497133fef6972a3830ba Mon Sep 17 00:00:00 2001 From: zhaoxianhui <1994861028@qq.com> Date: Wed, 6 Jul 2022 14:44:07 +0800 Subject: [PATCH 36/56] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E9=9A=90=E8=97=8FBUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/navMenu/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 3fbdc9c8b..8827ed2a8 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -399,11 +399,11 @@ // path: '/convertDocView', // menuId: '3F52K25546' // }, - { - title: '菜单管理', - path: '/menuManage', - menuId: '87b8b4f5817a7829696e63185c744d52' - }, + // { + // title: '菜单管理', + // path: '/menuManage', + // menuId: '87b8b4f5817a7829696e63185c744d52' + // }, { title: '链接管理', path: '/linkManage', From 22da9f9cdbb0d8d94e7cb10e6d33dd285ace5955 Mon Sep 17 00:00:00 2001 From: zhaoxianhui <1994861028@qq.com> Date: Wed, 6 Jul 2022 15:58:12 +0800 Subject: [PATCH 37/56] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=EF=BC=8C=E6=96=B0=E5=A2=9E/?= =?UTF-8?q?=E7=BC=96=E8=BE=91=EF=BC=8C=E5=B7=A5=E4=BD=9C=E7=BB=84=E7=BB=84?= =?UTF-8?q?=E9=95=BF=E5=92=8C=E5=B7=A5=E4=BD=9C=E7=BB=84=E7=BB=84=E5=91=98?= =?UTF-8?q?=E7=9A=84=E6=8A=BD=E5=B1=89=EF=BC=8C=E7=BC=BA=E5=B0=91=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8C=89=E9=92=AEBUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/workTree/index.vue | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/components/workTree/index.vue b/src/components/workTree/index.vue index 2b905e5a4..49f16915d 100644 --- a/src/components/workTree/index.vue +++ b/src/components/workTree/index.vue @@ -12,22 +12,17 @@ :inline="true" @submit.native.prevent > - + - + 查询 - - - 清空 - - From a78bd5ac9727af52467f5530f51f00922daa8cec Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Wed, 6 Jul 2022 16:11:22 +0800 Subject: [PATCH 38/56] feat: There is no way the, bug #56317 --- .../processCenter/pages/creatProcess/qbrk-product/step13.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index c796b2c89..bd6a658cd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -616,7 +616,7 @@ let year = date.getFullYear(); this.form.standSn = this.form.standNum this.form.standNumber = this.form.standNum - this.form.standYear = this.regDate(year) // 待带入立项标准 + this.form.standYear = year // 待带入立项标准 this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) }else { callback(new Error('企标顺序号已存在或已锁定')) From b3ec2f51fa4c2740066d777c84f214945cc7118b Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Wed, 6 Jul 2022 17:51:35 +0800 Subject: [PATCH 39/56] feat: There is no way the, bug #56378 --- .../pages/creatProcess/qbfs/step4.vue | 12 ++++++------ .../pages/creatProcess/qbrk-product/step1.vue | 13 ++++++------- .../pages/creatProcess/qbrk/step1.vue | 15 +++++++-------- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue index 7778e27b6..986ba6957 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue @@ -318,14 +318,14 @@ export default { if(this.userType === 'QCRBUSS'){ this.qbfsForm.QCRBUSSID=idList; this.qbfsForm.QCRBUSS=nameList; + if(data && data.length > 0){ + const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",") + const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",") + this.qbfsForm.QCDWID = institutionIdList + this.qbfsForm.QCDW = institutionNameList + } this.formKey++ } - if(data && data.length > 0){ - const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",") - const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",") - this.qbfsForm.QCDWID = institutionIdList - this.qbfsForm.QCDW = institutionNameList - } this.modalShowRoleFlag = false }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index a231b62ae..484e1763a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -1864,13 +1864,12 @@ }else if(this.userType === 'QCRBUSS'){ this.form.QCRBUSSID=idList; this.form.QCRBUSS=nameList; - } - - if(data && data.length > 0){ - const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",") - const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",") - this.form.QCDWID = institutionIdList - this.form.QCDW = institutionNameList + if(data && data.length > 0){ + const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",") + const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",") + this.form.QCDWID = institutionIdList + this.form.QCDW = institutionNameList + } } this.modalShowRoleFlag = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index fd32e7a3b..04430b8f6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -1785,19 +1785,18 @@ }else if(this.userType === 'QCRBUSS'){ this.form.QCRBUSSID=idList; this.form.QCRBUSS=nameList; + if(data && data.length > 0){ + console.log(data) + const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",") + const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",") + this.form.QCDWID = institutionIdList + this.form.QCDW = institutionNameList + } }else if(this.userType === 'bzUserId'){ this.roleForm.bzUserId = idList this.roleForm.bzUserName = nameList } - if(data && data.length > 0){ - console.log(data) - const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",") - const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",") - this.form.QCDWID = institutionIdList - this.form.QCDW = institutionNameList - } - this.modalShowRoleFlag = false }, unique(newArr) { From 8d4f29b364d66c4806d3206b30643f293131f29c Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Thu, 7 Jul 2022 16:02:59 +0800 Subject: [PATCH 40/56] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=A6=E4=BE=A7=E6=A0=91=E5=BD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- .../regulatoryRepository/dataCenter/index.vue | 665 ++++++++++++++++-- 2 files changed, 596 insertions(+), 71 deletions(-) diff --git a/src/App.vue b/src/App.vue index 0f854550a..4765d5b4b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,5 +1,5 @@ + + - - - - 数据获取中 - + >删除 + + + + + 数据获取中 + + - + + +
+ + + + + + + + + + + + + + +
+ +
maxT - 150) moveLen = maxT - 150; + + resize.style.left = moveLen; + left.style.width = moveLen + "px"; + right.style.width = (box.clientWidth - moveLen - 5) + "px"; + } + document.onmouseup = function (evt) { + document.onmousemove = null; + document.onmouseup = null; + resize.releaseCapture && resize.releaseCapture(); + } + resize.setCapture && resize.setCapture(); + return false; + } + }, + // 国内标签过滤 + filterNode(value, data) { + if (!value) return true; + return data.name.indexOf(value) !== -1; + }, + selectMenu1() { + return new Promise((resolve, reject) => { + this.$http.get('fileMaterialCenter/zlTree', {}, { + _this: this + }, res => { + const history = res; + resolve(history) + }) + }) + }, + async getTreeAsync(){ + + let tsResource = await this.selectMenu1() + + let list1 = [] + if(tsResource && tsResource.ok && tsResource.data){ + list1 = tsResource.data + } + if(list1.length > 0){ + this.treeList = list1 + } + }, + treeClick(treeNode) { + this.selectSarMenu = treeNode + this.dataCenterSearch.treeId = treeNode.id + this.searchInfo() + }, + // 树节点鼠标移入移出 + mouseenter(data) { + if (data.name !== '我的收藏') { + this.$set(data, 'show', true) + if (data.parentId !== null) { + this.$set(data, 'showDel', true) + } + } + }, + mouseleave(data) { + this.$set(data, 'show', false) + this.$set(data, 'showDel', false) + }, + update(data) { + this.modalType = 2 + this.productModal = true + this.productModelAdd = data + // 取消所有的选中效果 + this.productTitle = '编辑目录' + // const newChild = { id: this.id++, label: 'testtest', children: [] }; + // if (!data.children) { + // this.$set(data, 'children', []); + // } + // data.children.push(newChild); + }, + + append(data) { + this.modalType = 1 + this.productModal = true + // 取消所有的选中效果 + this.productTitle = '新增目录' + this.productModelAdd.name = '' + this.productModelAdd.parentId = data.id + this.productModelAdd.parentId = '' + }, + + selectMenu() { + this.$http.get('fileMaterialCenter/zlTree', {}, { + _this: this + }, res => { + this.treeList = res.data + this.dataCenterSearch.treeId = '' + this.searchInfo() + }) + }, + remove(node, data) { + //通过 stahndinfoList 是否有数据进行判断 + this.$confirm(data.children.length > 0 ? '该节点下有记录,是否删除?' : '是否删除菜单', '提示', { + confirmButtonText: '确定', + confirmButtonClass: 'common-button-primary', + cancelButtonText: '取消', + roundButton: true, + type: 'warning' + }).then(() => { + this.$http.delete("fileMaterialCenter/zlTree", { + id: data.id + }, res => { + }, e => { + if (e.ok) { + this.$message({ + type: 'success', + message: "删除成功" + }) + this.selectMenu() + this.getDomesticStandardTable() + } else { + this.$message({ + type: 'warning', + message: e.message + }) + } + }) + }).catch(() => { + this.$refs.selections.clearSelection() + this.$message({ + type: 'info', + message: '已取消删除' + }) + }) + // const parent = node.parent; + // const children = parent.data.children || parent.data; + // const index = children.findIndex(d => d.id === data.id); + // children.splice(index, 1); + }, + closeDrawer() { + this.$nextTick(() => { + this.$refs['productModelAdd'].resetFields() + this.productModelAdd = { + name: '', + parentId: '', + sort: '' + } + }) + this.productModal = false + }, + // 提交新增/修改 + saveProduct(name) { + this.$refs[name].validate((valid) => { + if (valid) { + if (this.modalType === 1) { + this.$http.postData('fileMaterialCenter/zlTree', this.productModelAdd, { + _this: this + }, res => { + if (res.ok) { + this.selectMenu() + this.productModal = false + this.productModelAdd = { + name: '', + parentId: '', + sort: '' + } + } else { + this.productModal = true + } + }, e => { + }) + } else if (this.modalType === 2) { + this.$http.putData('fileMaterialCenter/zlTree', this.productModelAdd, { + _this: this + }, res => { + this.selectMenu() + this.productModal = false + this.productModelAdd = { + name: '', + parentId: '', + sort: '' + } + }, e => { + }) + } + } else { + } + }) + }, + closeModal() { + this.productModal = false + this.closeDrawer() + }, + treeCollapse() { + this.sideClose = !this.sideClose + }, toDetail(row){ - console.log('243',row) this.$router.push({ name: "dataCenterDetail", params: { @@ -270,7 +605,6 @@ export default { }); }, uploadSuccess(response, file, fileList) { - console.log('240',fileList) const fileIdList = fileList.map(item => { if (item.response){ return item.response.data.attId @@ -279,8 +613,6 @@ export default { } }) this.attributeEO.attachFileId = fileIdList.join(',') - console.log('343',this.fileList) - console.log('349',this.attributeEO.attachFileId) }, handleRemove(file, fileList) { const fileIdList = fileList.map(item => { @@ -388,8 +720,6 @@ export default { }); }, e => { }); - console.log('343',this.fileList) - console.log('349',this.attributeEO.attachFileId) // const fileIdList = this.fileList.map(item => { // return item.id @@ -453,8 +783,11 @@ export default { this.showInfoModal = false }, }, - mounted() { + async mounted() { this.searchInfo() + // 进入页面后查询树形结构目录 + await this.getTreeAsync() + this.dragControllerLR() } } @@ -466,6 +799,198 @@ export default { } background-color: white; height: 100%; - padding: 10px 20px; + display: flex; +} +#left { + width: calc(30% - 5px); + height: 100%; + float: left; +} + +#resize { + width: 5px; + height: 100%; + cursor: w-resize; + float: left; +} + +#right { + float: right; + width: 70%; + height: 100%; +} +.tree-content { + background: #fff; + width: 16%; + position: relative; + + .tree { + /deep/ .el-card__body { + padding: 0 !important; + } + + .el-card { + width: 500px; + min-width: 2000px; + max-width: 100%; + //min-width: min-content; + } + + height: 95%; + width: calc(~'100% - 15px'); + position: absolute; + left: 0; + } + + .tree-collapse { + position: absolute; + right: 0; + } +} + +.tree-right { + overflow-y: hidden; + padding: 0; + position: relative; + width: 100%; + height: 100%; + display: flex; + flex-direction: column; + + .content { + display: flex; + flex-direction: column; + position: relative; + flex: auto; + + .table-wrap { + flex: auto; + overflow: hidden; + display: flex; + flex-direction: column; + + .collection-btn { + padding: 0; + border: none; + color: #F2CB51; + font-size: 18px; + width: 18px; + height: 18px; + background-color: transparent; + /*background: rgba(244, 162, 39, 0.1);*/ + + //.icon-collection { + // background-image: url("~assets/images/shangqi/standardDetails/collection.png"); + //} + + } + } + + .pagination { + position: static; + + /deep/ .pagination-slot { + padding: 0; + } + } + } +} +.table-area{ + padding: 0 10px 10px 10px; +} + +/deep/ .tree-line { + .el-tree-node { + position: relative; + padding-left: 0px; // 缩进量 + line-height: 30px; + } + + .el-tree-node__children { + padding-left: 16px; // 缩进量 + } + + // 竖线 + .el-tree-node::before { + content: ""; + height: 100%; + width: 1px; + position: absolute; + left: -3px; + top: -26px; + border-width: 1px; + border-left: 1px dashed #858990e0; + } + + // 当前层最后一个节点的竖线高度固定 + .el-tree-node:last-child::before { + height: 38px; // 可以自己调节到合适数值 + } + + // 横线 + .el-tree-node::after { + content: ""; + width: 11px; + height: 20px; + position: absolute; + left: -3px; + top: 12px; + border-width: 1px; + border-top: 1px dashed #858990e0; + } + + // 去掉最顶层的虚线,放最下面样式才不会被上面的覆盖了 + & > .el-tree-node::after { + border-top: none; + } + + & > .el-tree-node::before { + border-left: none; + } + + // 展开关闭的icon + .el-tree-node__expand-icon { + font-size: 16px; + // 叶子节点(无子节点) + &.is-leaf { + color: transparent; + // display: none; // 也可以去掉 + } + } +} + +/deep/ .icon-tree { + margin: 0 5px 0 10px; + position: relative; + background: url('~@/assets/images/shangqi/img/tree-add.png'); + background-size: 100% 100%; +} + +/deep/ .expanded { + background: url('~@/assets/images/shangqi/img/tree-sub.png'); + background-size: 100% 100%; +} + +/deep/ .is-leaf { + background-image: none; + background-size: 100% 100%; +} + +/deep/ .is-leaf-none { + position: relative; + display: inline-block; + width: 15px; + height: 15px; + background: url('~@/assets/images/shangqi/img/none-file-new.png'); + background-size: 100% 100%; +} + +/deep/ .is-show { + position: relative; + display: inline-block; + width: 15px; + height: 15px; + background: url('~@/assets/images/shangqi/img/tree.png'); + background-size: 100% 100%; } From 328b17fe5ffb21e3011270f6a97c7d5fda6454bc Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 8 Jul 2022 10:19:17 +0800 Subject: [PATCH 41/56] =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulatoryRepository/dataCenter/index.vue | 46 ++++++++++--------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/src/pages/regulatoryRepository/dataCenter/index.vue b/src/pages/regulatoryRepository/dataCenter/index.vue index 2b5e30df7..85ceaec46 100644 --- a/src/pages/regulatoryRepository/dataCenter/index.vue +++ b/src/pages/regulatoryRepository/dataCenter/index.vue @@ -26,7 +26,7 @@ type="text" size="mini" v-show="data.show" - v-btn-permission="'764f630a49072d76a237dbcc9a1831e1'" + v-btn-permission="'e9e80920563325fa7f6e91213ee98466'" @click="() => append(data)"> 新增 @@ -34,7 +34,7 @@ type="text" size="mini" v-show="data.show" - v-btn-permission="'afdef0736eb111e9865e19fa3129d0ac'" + v-btn-permission="'0b95246d8ad2da6c54381deffa3d0fa2'" @click="() => update(data)"> 编辑 @@ -42,7 +42,7 @@ type="text" size="mini" v-show="data.showDel" - v-btn-permission="'c517df26b904cb8f69495f7f38f8f77b'" + v-btn-permission="'07ba9d907841a62a18267198da3873b1'" @click="() => remove(node, data)"> 删除 @@ -93,6 +93,7 @@ 查询 @@ -109,6 +110,7 @@ 新增 @@ -160,12 +162,14 @@ 编辑 删除 @@ -823,25 +827,25 @@ export default { background: #fff; width: 16%; position: relative; - + .tree { /deep/ .el-card__body { padding: 0 !important; } - + .el-card { width: 500px; min-width: 2000px; max-width: 100%; //min-width: min-content; } - + height: 95%; width: calc(~'100% - 15px'); position: absolute; left: 0; } - + .tree-collapse { position: absolute; right: 0; @@ -856,19 +860,19 @@ export default { height: 100%; display: flex; flex-direction: column; - + .content { display: flex; flex-direction: column; position: relative; flex: auto; - + .table-wrap { flex: auto; overflow: hidden; display: flex; flex-direction: column; - + .collection-btn { padding: 0; border: none; @@ -878,17 +882,17 @@ export default { height: 18px; background-color: transparent; /*background: rgba(244, 162, 39, 0.1);*/ - + //.icon-collection { // background-image: url("~assets/images/shangqi/standardDetails/collection.png"); //} - + } } - + .pagination { position: static; - + /deep/ .pagination-slot { padding: 0; } @@ -905,11 +909,11 @@ export default { padding-left: 0px; // 缩进量 line-height: 30px; } - + .el-tree-node__children { padding-left: 16px; // 缩进量 } - + // 竖线 .el-tree-node::before { content: ""; @@ -921,12 +925,12 @@ export default { border-width: 1px; border-left: 1px dashed #858990e0; } - + // 当前层最后一个节点的竖线高度固定 .el-tree-node:last-child::before { height: 38px; // 可以自己调节到合适数值 } - + // 横线 .el-tree-node::after { content: ""; @@ -938,16 +942,16 @@ export default { border-width: 1px; border-top: 1px dashed #858990e0; } - + // 去掉最顶层的虚线,放最下面样式才不会被上面的覆盖了 & > .el-tree-node::after { border-top: none; } - + & > .el-tree-node::before { border-left: none; } - + // 展开关闭的icon .el-tree-node__expand-icon { font-size: 16px; From 0c562f21af63da40a8e2836f440fbe08cf6f01d4 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Fri, 8 Jul 2022 13:53:40 +0800 Subject: [PATCH 42/56] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=96=99?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=B7=A6=E4=BE=A7=E6=A0=91=E5=BD=A2=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/regulatoryRepository/dataCenter/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/regulatoryRepository/dataCenter/index.vue b/src/pages/regulatoryRepository/dataCenter/index.vue index 85ceaec46..cc758b084 100644 --- a/src/pages/regulatoryRepository/dataCenter/index.vue +++ b/src/pages/regulatoryRepository/dataCenter/index.vue @@ -492,7 +492,6 @@ export default { this.productTitle = '新增目录' this.productModelAdd.name = '' this.productModelAdd.parentId = data.id - this.productModelAdd.parentId = '' }, selectMenu() { From a8256a8d8e8db7584df2271eaa845759ba60b646 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Fri, 8 Jul 2022 18:07:22 +0800 Subject: [PATCH 43/56] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulatoryRepository/standQA/index.vue | 452 ++---- .../regulatoryRepository/standQA/index2.vue | 1385 +++++++++++++++++ 2 files changed, 1521 insertions(+), 316 deletions(-) create mode 100644 src/pages/regulatoryRepository/standQA/index2.vue diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue index 1c0fe93f9..b1c80bf9d 100644 --- a/src/pages/regulatoryRepository/standQA/index.vue +++ b/src/pages/regulatoryRepository/standQA/index.vue @@ -3,6 +3,16 @@
+ + + + + @@ -24,243 +34,46 @@
- - -
-
- 暂无数据 -
-
-
- - - -
-
- -
-
- 暂无数据 -
-
-
- - - -
-
- -
-
- 暂无数据 -
-
-
- - - -
-
- -
-
- 暂无数据 -
-
-
- - - -
-
-
+ + + + + + + + + + +
+ + +
+ +
+ +
+ +
+
@@ -766,13 +604,37 @@ export default { {required: true, message: '请输入问题', trigger: 'blur'}, ], }, + classificationOption: [ + { + value: 'INLAND', + label: '国内标准' + }, + { + value: 'FOREIGN', + label: '海外标准' + }, + { + value: 'BUSINESS_STAND', + label: '企业标准' + }, + { + value: 'OTHER', + label: '公共问题' + } + ], + tableData: [], + tableLoading: false, + tableTotal: 0, questionSerach:{ classification: 'INLAND', standardName: '', //标准名称 standardEncdoing: '', //标准编号 problemDescription: '', //关键词/问题描述 + page: 1, + pageSize: this.$store.getters.userInfo.configContent, }, answerList: [], + answerListDrawer: false, answer: '', standList: [], standIdList: [], @@ -781,33 +643,9 @@ export default { } }, mounted(){ - if(this.$route.query.queId){ - this.questionSerach.standardName = this.$route.query.standName - this.questionSerach.classification = this.$route.query.standType - this.activeName = this.$route.query.standType - this.standSearch() - }else{ - switch (this.standType){ - case 'INLAND': - this.standSearch2() - break - case 'FOREIGN': - this.activeName = 'FOREIGN' - this.questionSerach.classification = 'FOREIGN' - this.standSearch2() - break - case 'BUSINESS_STAND': - this.activeName = 'BUSINESS_STAND' - this.questionSerach.classification = 'BUSINESS_STAND' - this.standSearch2() - break - case 'OTHER': - this.activeName = 'OTHER' - this.questionSerach.classification = 'OTHER' - this.standSearch2() - break - } - } + this.questionSerach.standardName = this.$route.query.standName + this.questionSerach.classification = this.$route.query.standType + this.searchBtn() // 查询各下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", "", { _this: this, @@ -820,6 +658,34 @@ export default { }); }, methods:{ + formatClassification(e){ + for (let i=0; i { + this.answerListDrawer = true + this.answerList = res.data + }, e => { + }) + }, refreshStandMap(){ this.standMap = new Map() this.standList.forEach(item=>{ @@ -1029,9 +895,6 @@ export default { this.questionSerach.standardEncdoing = '' this.standSearch() }, - standClick(){ - this.queSearch() - }, questionClick(){ sessionStorage.setItem('queId', this.activeQue) this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{ @@ -1087,18 +950,19 @@ export default { questioner: this.$store.getters.userInfo.userId, //提问人 problemDescription: '', //关键词/问题描述 } - this.standSearch2() + this.searchBtn() }, searchBtn(){ - this.questionSerach.classification = this.activeType this.questionSerach.questioner = '' - this.$http.get('lawss/AskQuestions/retrieve',{ + this.tableLoading = true + this.$http.postData('lawss/AskQuestions/list',{ ...this.questionSerach },{ _this: this }, res => { - this.standList = res.data - this.refreshStandMap() + this.tableData = res.data.records + this.tableTotal = res.total + this.tableLoading = false }) }, //问题查询 @@ -1113,31 +977,7 @@ export default { this.questionsList = res.data }) }, - //回答查询 - ansSearch(){ - this.$http.get('lawss/AskQuestions/getReplyDetails',{ - classification: this.questionSerach.classification, - answerer: this.$store.getters.userInfo.userId, - }, { - _this: this, - }, res => { - - }) - }, //查询提问标准 - standSearch(){ - this.$http.get('lawss/AskQuestions/getAskQuestionsDetails',{ ...this.questionSerach },{ - _this: this - }, res =>{ - this.standList = res.data - this.refreshStandMap() - if(this.$route.query.queId){ - this.activestand = this.standList[0].standardId - this.queSearch() - } - }, e => { - }) - }, standSearch2(){ let qId = this.$route.query.standId let queNumber = 0 @@ -1240,27 +1080,7 @@ export default { _this: this }, res => { this.dialogVisible = false - switch (this.standType){ - case 'INLAND': - this.standSearch2() - break - case 'FOREIGN': - this.activeName = 'FOREIGN' - this.questionSerach.classification = 'FOREIGN' - this.standSearch2() - break - case 'BUSINESS_STAND': - this.activeName = 'BUSINESS_STAND' - this.questionSerach.classification = 'BUSINESS_STAND' - this.standSearch2() - break - case 'OTHER': - this.activeName = 'OTHER' - this.questionSerach.classification = 'OTHER' - this.standSearch2() - break - } - this.queSearch() + this.searchBtn() }, e => { }) diff --git a/src/pages/regulatoryRepository/standQA/index2.vue b/src/pages/regulatoryRepository/standQA/index2.vue new file mode 100644 index 000000000..1c0fe93f9 --- /dev/null +++ b/src/pages/regulatoryRepository/standQA/index2.vue @@ -0,0 +1,1385 @@ + + + + + + From 1c66e735d8c3b1f4e66b9b2ecaa8ef09338bb505 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Sat, 9 Jul 2022 13:00:39 +0800 Subject: [PATCH 44/56] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E5=93=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FillingDatePicker.vue | 2 +- src/main.js | 42 +-- .../pages/linkManage/linkType/firstLink.vue | 2 +- .../pages/linkManage/linkType/secondLink.vue | 2 +- .../standAutoSplit/pages/itemSplitInfo.vue | 2 +- .../pages/creatProcess/bzdy/step1.vue | 45 +-- .../pages/creatProcess/bzff/step1.vue | 41 +-- .../pages/creatProcess/bzfy/step1.vue | 51 +-- .../pages/creatProcess/bzhHd-rh/step1.vue | 83 ++--- .../pages/creatProcess/bzhHd-rh/step3.vue | 2 +- .../pages/creatProcess/bzhHd-rh/step4.vue | 2 +- .../pages/creatProcess/bzhHh-hh/step1.vue | 29 +- .../pages/creatProcess/bzhHy-ch/step1.vue | 70 ++--- .../pages/creatProcess/bzhHy-ch/step3.vue | 2 +- .../pages/creatProcess/bzjd/step1.vue | 71 ++--- .../pages/creatProcess/bzpg/step1.vue | 77 ++--- .../pages/creatProcess/bzqdfb/step1.vue | 59 ++-- .../pages/creatProcess/bzrk/step1.vue | 236 +++++++------- .../pages/creatProcess/bzrk/step2.vue | 6 +- .../pages/creatProcess/bzrk/step3.vue | 6 +- .../pages/creatProcess/bzrk/step5.vue | 6 +- .../pages/creatProcess/bzzqyj/step1.vue | 63 ++-- .../pages/creatProcess/cywbbzzxd/step1.vue | 15 +- .../pages/creatProcess/jrbzhxh/step1.vue | 15 +- .../creatProcess/qbfs/common/formList.vue | 14 +- .../qbfs/common/formListStep2.vue | 14 +- .../qbfs/common/formListStep5.vue | 14 +- .../pages/creatProcess/qbfs/step1.vue | 60 ++-- .../pages/creatProcess/qbfz/step1.vue | 57 ++-- .../qbrk-product/common/formEditList.vue | 12 +- .../qbrk-product/common/formList.vue | 12 +- .../qbrk-product/common/formListIn.vue | 272 ++++++++-------- .../pages/creatProcess/qbrk-product/step1.vue | 163 +++++----- .../creatProcess/qbrk/common/formEditList.vue | 14 +- .../qbrk/common/formEditListFb.vue | 14 +- .../creatProcess/qbrk/common/formList.vue | 14 +- .../creatProcess/qbrk/common/formListIn.vue | 296 +++++++++--------- .../pages/creatProcess/qbrk/step1.vue | 167 +++++----- .../qbzxdjhgk/component/cancel.vue | 53 ++-- .../qbzxdjhgk/component/delay.vue | 33 +- .../qbzxdjhgk/component/establish.vue | 73 ++--- .../qbzxdjhgk/component/merge.vue | 93 +++--- .../qbzxdjhgk/component/rename.vue | 55 ++-- .../pages/creatProcess/qbzxdjhgk/step1.vue | 39 +-- .../pages/creatProcess/qbzxdlx/step1.vue | 71 ++--- .../pages/creatProcess/wbsm/step1.vue | 51 +-- .../pages/creatProcess/wfhxzg/step1.vue | 43 +-- .../pages/creatProcess/xmpg/step1.vue | 53 ++-- .../pages/creatProcess/xmpg2/step1.vue | 7 +- .../pages/creatProcess/xmqdqr/step1.vue | 67 ++-- .../pages/creatProcess/zcch/step1.vue | 69 ++-- .../pages/creatProcess/zchh/step1.vue | 37 +-- .../pages/creatProcess/zcrh/step1.vue | 67 ++-- .../pages/creatProcess/zcrk/step1.vue | 146 ++++----- .../pages/creatProcess/zcrk/step2.vue | 6 +- .../pages/creatProcess/zcrk/step5.vue | 6 +- .../pages/creatProcess/zczqyj/step1.vue | 55 ++-- .../creatProcess/zdrzbzORzchgxxmsc/step1.vue | 51 +-- .../pages/phone/bzhHd-rh/step4.vue | 2 +- .../processCenter/pages/phone/bzrk/step2.vue | 12 +- .../pages/phone/qbfs/common/formList.vue | 12 +- .../pages/phone/qbfs/common/formListStep5.vue | 10 +- .../qbrk-product/common/formEditList.vue | 12 +- .../phone/qbrk-product/common/formList.vue | 4 +- .../phone/qbrk-product/common/formListIn.vue | 12 +- .../pages/phone/qbrk/common/formEditList.vue | 14 +- .../pages/phone/qbrk/common/formList.vue | 12 +- .../pages/phone/qbrk/common/formListIn.vue | 14 +- .../pages/processDetail/index.vue | 71 +++-- .../tabComponents/monitorProcess/index.vue | 3 +- .../pages/addEdit.vue | 14 +- .../domesticStandardsAndRegulations/index.vue | 4 +- .../components/EnterpriseStandardDatabase.vue | 6 +- .../foreignRegulationsDatabase/index.vue | 6 +- .../pages/rectificationDatabase.vue | 4 +- 75 files changed, 1676 insertions(+), 1663 deletions(-) diff --git a/src/components/CustomFormComponents/FillingDatePicker.vue b/src/components/CustomFormComponents/FillingDatePicker.vue index 659855673..1d7638233 100644 --- a/src/components/CustomFormComponents/FillingDatePicker.vue +++ b/src/components/CustomFormComponents/FillingDatePicker.vue @@ -14,7 +14,7 @@ :value="value" type="date" :editable="true" - :disabled="true" + disabled :placeholder="placeholder" @input="handleChange" > diff --git a/src/main.js b/src/main.js index f0e245ea8..128868042 100644 --- a/src/main.js +++ b/src/main.js @@ -307,47 +307,7 @@ router.beforeEach(function (to, from, next) { if(isMobile()){ next('/processedPage') }else { - // 根据type判断跳转具体流程页面 - if (prcType === '1') { - // 标准入库流程数据 - extracted("bzrkStep5"); - } else if (prcType === 'buss1') { - //标准清单发布流程数据 - extracted("bussLibraryDetail"); - } else if (prcType === 'buss2') { - //标准清单发布流程数据 - extracted("bussLibraryProductDetail"); - } else if (prcType === 'buss3') { - //标准清单发布流程数据 - extracted("bussFsDetail"); - } else if (prcType === '4') { - //标准清单发布流程数据 - extracted("bzqdfbStep1-4"); - } else if (prcType === '5') { - //标准项目合规评估 标准维度 - if (path === "/xmpgStep2" || path === "/xmpgStep1" || path === "/xmpgStep1-2") { - extracted("xmpgStep1-2"); - } else { - extracted("bzpgStep8-1"); - } - } else if (prcType === '6') { - //标准项目合规评估 项目维度 - extracted("xmpgStep1-5"); - } else if (prcType === '8') { - // 未符合项整改 - extracted("wfhxzgStep5-1"); - } else if (prcType === '9') { - extracted("bzjdStep1-6"); - //标准调研流程 - } else if (prcType === '2') { - extracted("bzdyStep1-9"); - } else if (prcType === '3') { - //标准征求意见 - extracted("bzzqyjStep1-9"); - } else if (prcType === '10') { - //项目清单确认 - extracted("xmqdqrStep1-4"); - } + next() } } else { // 业务系统 当前节点未完成 // commitStatus 大于0 表示当前节点存在未完成干活流程 diff --git a/src/pages/config/pages/linkManage/linkType/firstLink.vue b/src/pages/config/pages/linkManage/linkType/firstLink.vue index bb7f7d552..796716725 100644 --- a/src/pages/config/pages/linkManage/linkType/firstLink.vue +++ b/src/pages/config/pages/linkManage/linkType/firstLink.vue @@ -111,7 +111,7 @@ class="label-input-form" > - + - + 属性 编辑 - 编辑 + 编辑 复制 删除 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index 91c7fef8b..e66caa4d8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -26,21 +26,21 @@ - - -
{{ item.name }} -
-
{{ item.name }} -
-
- 隐藏基础信息 - 展开基础信息 + 隐藏基础信息 + 展开基础信息
-

标准法规工程师

- - + +
@@ -151,8 +151,8 @@

技术委员会相关专委会主任/ 工程研究总院责任部门领导、事业部标准化员

- - + +
@@ -163,8 +163,8 @@

标准法规部高级经理、责任部门高级经理

- - + +
@@ -174,9 +174,9 @@

技术委员会相关专委会主任/ 工程研究总院责任部门中心主任、技术管理中心主任

- - - + + +
@@ -186,8 +186,8 @@

工程研究总院院长/标准法规业务主管副院长

- - + +
@@ -196,7 +196,7 @@
- - - - - - @@ -75,7 +75,7 @@ - 发放申请列表
- 添加 - 删除 + 添加 + 删除
-

流程发起人

- +
@@ -161,7 +161,7 @@

责任对接人

- +
@@ -170,7 +170,7 @@

责任人

- +
@@ -178,7 +178,7 @@

标准法规工程师

- +
@@ -186,7 +186,7 @@

责任对接人,标准法规部部门负责人

- +
@@ -210,21 +210,21 @@ - - -
- - - - - 标准需求列表
- 添加 - 删除 + 添加 + 删除
-

流程发起人

- +
@@ -166,7 +166,7 @@

责任对接人

- +
@@ -175,7 +175,7 @@

责任人

- +
@@ -183,7 +183,7 @@

标准法规工程师

- +
@@ -191,7 +191,7 @@

责任对接人,标准法规部部门负责人

- +
@@ -215,70 +215,70 @@ - - - - - - - - - -
- - - - @@ -65,7 +65,7 @@ - @@ -79,7 +79,7 @@ - @@ -93,7 +93,7 @@ - @@ -113,7 +113,7 @@ {{ item.name.slice(0, 30) + '...' }} {{ ';' }} {{ item.name }} - - - - + - + - + - + - +
- 添加 - @@ -239,7 +239,7 @@
-

标准法规工程师

- - + +
@@ -274,8 +274,8 @@

技术委员会分委会主任/技术主管部门负责人

- - + +
@@ -286,8 +286,8 @@

责任工程师

- - + +
@@ -298,8 +298,8 @@

参会人员所在部门负责人

- - + +
@@ -310,8 +310,8 @@

标准法规部人员

- - + +
@@ -322,8 +322,8 @@

标准法规部主管领导

- - + +
@@ -334,8 +334,8 @@

费用管理部门

- - + +
@@ -346,8 +346,8 @@

业务主管副院长

- - + +
@@ -358,8 +358,8 @@

院长

- - + +
@@ -393,7 +393,7 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue index 73c170810..4a358d522 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue @@ -90,7 +90,7 @@ - +
- 添加 - 批量删除 + 添加 + 批量删除
@@ -113,8 +113,8 @@
@@ -133,7 +133,7 @@ :before-remove="beforeRemoveOther" :on-success="onsuccessOther" > - 点击上传 + 点击上传
@@ -153,8 +153,8 @@

参会人

- - + +
@@ -164,8 +164,8 @@

法规工程师

- - + +
@@ -175,7 +175,7 @@
- - - +
- - - @@ -79,7 +79,7 @@ - - + - + - + @@ -116,7 +116,7 @@ {{ item.name.slice(0,30) + '...' }} {{ ';' }} {{ item.name }} - @@ -143,8 +143,8 @@
- 添加 - 批量删除 + 添加 + 批量删除
@@ -171,7 +171,7 @@
-

标准法规工程师

- - + +
@@ -206,8 +206,8 @@

分委会主任/部门中心主任

- - + +
@@ -218,8 +218,8 @@

责任工程师

- - + +
@@ -230,8 +230,8 @@

参会人员所在部门中心主任

- - + +
@@ -242,8 +242,8 @@

标准法规部人员

- - + +
@@ -254,8 +254,8 @@

标准法规部主管中心主任

- - + +
@@ -266,8 +266,8 @@

管理推进部

- - + +
@@ -278,8 +278,8 @@

业务主管副院长

- - + +
@@ -290,8 +290,8 @@

院长

- - + +
@@ -324,7 +324,7 @@
-
- 导入 + 导入
- -
- 导入 + 导入
- - - - 隐藏基础信息 - 展开基础信息 + 隐藏基础信息 + 展开基础信息
- + 批量编辑
@@ -127,7 +127,7 @@ show-overflow-tooltip align="center"> @@ -189,8 +189,8 @@ width="240" align="center"> @@ -198,7 +198,7 @@
-

标准法规工程师

- - + +
@@ -233,8 +233,8 @@

标准法规部高级经理

- - +
- - + - 查询 - 清空 @@ -339,8 +339,8 @@ 数据加载中…… @@ -350,7 +350,7 @@ size="800px">
- 关闭 + 关闭
@@ -399,8 +399,8 @@ 数据加载中…… @@ -432,7 +432,7 @@
- - - - + - -
- 选择标准 + 选择标准 - - - - - - - -
- 隐藏基础信息 + 隐藏基础信息 - + 展开基础信息 @@ -118,8 +118,8 @@
- 添加 - 批量删除 + 添加 + 批量删除
@@ -165,8 +165,8 @@ prop="distributePerson" label="分发责任人"> @@ -174,7 +174,7 @@
-

标准法规工程师

- - + +
@@ -211,8 +211,8 @@

标准法规部法规分析业务经理

- - +
@@ -224,8 +224,8 @@

标准法规部高级经理

- - +
@@ -250,7 +250,7 @@
- - - -
@@ -378,7 +378,7 @@
- - + - + - -
- 车型类别清单 其他清单 - + 选择清单
- - -
{{ item.name }} -
-
- 添加 - 批量删除 + 添加 + 批量删除
-

标准法规工程师

- - +
@@ -205,8 +205,8 @@

相关业务单位

- - +
@@ -219,8 +219,8 @@

标准法规工程师

- - +
@@ -232,8 +232,8 @@

标准法规部法规分析业务经理

- - +
@@ -258,13 +258,13 @@ - - -
@@ -527,7 +527,7 @@ - - - - - - 国内标准入库 - 海外标准入库 + 国内标准入库 + 海外标准入库 - + - - + - + - - + 是 + - + - @@ -101,14 +101,14 @@ - - - - - - - + - -
- -
- -
- - + - + - + - + - + - + - + @@ -679,7 +679,7 @@ > - - - - - - - - - + - + @@ -797,7 +797,7 @@ - + - + - + - - - + - + -
- - + - + - + - + @@ -923,20 +923,20 @@ - + - - - + - -
-

标准法规工程师

- +
@@ -1033,7 +1033,7 @@

责任工程师

- +
@@ -1044,7 +1044,7 @@

标准法规工程师

- +
@@ -1054,7 +1054,7 @@

标准法规部法规分析业务经理

- +
@@ -1065,8 +1065,7 @@
- - - - - - @@ -1249,7 +1248,7 @@ - @@ -1258,7 +1257,7 @@ - + - - - - 查询 - @@ -1362,7 +1361,7 @@ - + @@ -1381,21 +1380,21 @@
- -
- -
- -
- - - - + - + - + - + - + - - + - + - + - + - + @@ -370,7 +370,7 @@ - - {{'手动查找'}} -
- - - {{'手动查找'}} - @@ -444,7 +444,7 @@
- --> - + - + @@ -500,7 +500,7 @@ - + @@ -512,7 +512,7 @@ - + @@ -546,7 +546,7 @@

标准起草人

- +
@@ -556,7 +556,7 @@

其他起草人

- +
@@ -566,7 +566,7 @@

标准起草人

- +
@@ -576,7 +576,7 @@

标准法规工程师/事业部标准化员

- +
@@ -586,7 +586,7 @@

各事业部标准化员(时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-尧燕、图雅诺-耿红静、欧辉-赵淑珍、普罗科-符清萍、雷萨-杨卫利),项目组各PMT/PAT

- +
@@ -596,7 +596,7 @@

标准起草人

- +
@@ -606,7 +606,7 @@

标准法规工程师

- +
@@ -616,7 +616,7 @@

总院项目总工、标准法规部高级经理/各事业部整车所产品经理、各事业部标准业务经理

- +
@@ -626,7 +626,7 @@ - + @@ -636,7 +636,7 @@

产品工程经理、技术管理中心主任/事业部技术中心主任、标准法规部高级经理

- +
@@ -646,7 +646,7 @@ - + @@ -656,7 +656,7 @@

总院项目经理/事业部研发副总裁

- +
@@ -666,7 +666,7 @@

标准法规工程师

- +
@@ -676,7 +676,7 @@ - + @@ -688,7 +688,7 @@
- - - - 清空 @@ -814,8 +814,8 @@ @pageChange="pageChangeReplace" @pageSizeChange="pageSizeChangeReplace"> - + @@ -859,8 +859,8 @@ - - + + @@ -876,21 +876,21 @@
- -
- -
- -
- - - - + - + - + - + - + - + - - + - + - + - + - + - + @@ -338,12 +338,12 @@ - - {{'手动查找'}} - - {{'手动查找'}} - - - + - + @@ -396,15 +396,15 @@ - - -
-
- --> - + - + @@ -500,7 +500,7 @@ - + @@ -512,7 +512,7 @@ - + @@ -546,7 +546,7 @@

标准起草人

- +
@@ -556,7 +556,7 @@

其他起草人

- +
@@ -566,7 +566,7 @@

标准起草人

- +
@@ -576,7 +576,7 @@

总院各中心兼职标准化员/各事业部标准化员

- +
@@ -586,7 +586,7 @@

张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师

- +
@@ -596,7 +596,7 @@

标准起草人

- +
@@ -606,7 +606,7 @@

标准法规工程师

- +
@@ -616,7 +616,7 @@

起草单位高级经理

- +
@@ -626,7 +626,7 @@

标准法规部高级经理

- +
@@ -636,7 +636,7 @@

起草单位中心主任

- +
@@ -646,7 +646,7 @@

总院技术委员会覆盖领域企业标准:专委会主任;总院技术委员会未覆盖领域企业标准:总院院长或总院主管副院长

- +
@@ -656,7 +656,7 @@

标准起草人

- +
@@ -666,7 +666,7 @@

标准法规工程师

- +
@@ -678,7 +678,7 @@
- - - - 清空 @@ -804,8 +804,8 @@ @pageChange="pageChangeReplace" @pageSizeChange="pageSizeChangeReplace"> - + @@ -849,8 +849,8 @@ - - + + @@ -866,28 +866,28 @@
@@ -338,6 +338,7 @@ export default { props: ['message'], data(){ return{ + disabledXX:!!this.$route.query.disabledXX, formRules: { bussSort: [ { required: true, message: "请选择企标类别", trigger: "blur" } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 270dc4a85..679af2fa8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -17,7 +17,7 @@ 选择延期标准
- @@ -33,7 +33,7 @@
- - - - -
-
- - - - - - - - - @@ -354,6 +354,7 @@ export default { props: ['message'], data(){ return{ + disabledXX:!!this.$route.query.disabledXX, BZList: [], cbcdOptions: [], standSortOptions: [], diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index 849795b9f..b69cf51e0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -6,13 +6,13 @@ - - + - - + - - - + - - + - - + - - + - - + @@ -100,11 +100,11 @@ - - - + - - + - {{ item.name }} - + - +
@@ -196,19 +196,19 @@
- + - + - 查询 - 清空 @@ -274,8 +274,8 @@
@@ -301,8 +301,8 @@
@@ -319,14 +319,14 @@
- - - 清空 @@ -382,8 +382,8 @@
@@ -438,6 +438,7 @@ export default { } }; return { + disabledXX:!!this.$route.query.disabledXX, workModel: false, workSearch: { workGroupName: "", diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index b8b7ee587..a4f2a9dc2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -14,25 +14,25 @@ - 根据企标编号、名称查询 + 根据企标编号、名称查询 - + - + - 根据企标编号、名称、类别查询 + 根据企标编号、名称、类别查询 - + - + @@ -42,13 +42,13 @@ - - + - - + - - - + - - + @@ -120,7 +120,7 @@ - + - - - + - - + - - + @@ -165,11 +165,11 @@ - - - + @@ -193,7 +193,7 @@ > - - - + - - 清空 @@ -332,8 +332,8 @@ @@ -349,19 +349,19 @@
- + - + - 查询 - 清空 @@ -427,8 +427,8 @@
@@ -454,8 +454,8 @@ @@ -472,14 +472,14 @@
- - - 清空 @@ -535,8 +535,8 @@
@@ -579,6 +579,7 @@ export default { props: ['message'], data(){ return { + disabledXX:!!this.$route.query.disabledXX, workModel: false, workSearch: { workGroupName: "", diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index 5040111eb..24add2080 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -14,16 +14,16 @@ - 选择更名标准 + 选择更名标准 - - + - - + - - - + - - -
-
- - - - - - - + - - - - + - - 清空 @@ -327,8 +327,8 @@
@@ -345,6 +345,7 @@ export default { props: ['message'], data(){ return{ + disabledXX:!!this.$route.query.disabledXX, formRules: { bussSort: [ { required: true, message: "请选择企标类别", trigger: "blur" } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index 537d668c7..f522eb2fc 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -23,15 +23,15 @@ - 立项 + 立项 - 合并 + 合并 - 延期 + 延期 - 取消 + 取消 - 更名 + 更名 @@ -43,7 +43,7 @@
-

标准立项申请人

- - +
@@ -83,8 +83,8 @@

标准立项单位整车/系统总工

- - +
@@ -102,8 +102,8 @@

采购部相关人员(可选)

海外相关人员(可选)

- - +
@@ -116,8 +116,8 @@

标准体系工作组组长

- - +
@@ -130,8 +130,8 @@

总院技术委员会覆盖领域企业标准:专委会主任/总院技术委员会未覆盖领域企业标准:总院院长或总院主管副院长

- - +
@@ -144,8 +144,8 @@

相关单位、工程研究总院标准法规部

- - +
@@ -222,7 +222,7 @@
- - - - + 点击上传 @@ -51,10 +51,10 @@
- 新增 - 导入 - 模板下载 - 批量删除 + 新增 + 导入 + 模板下载 + 批量删除
@@ -87,7 +87,7 @@
-

标准法规工程师

- - + +
@@ -121,8 +121,8 @@

责任工程师

- - +
@@ -145,7 +145,7 @@ - + - - + - - + - - + - - + - - + - - - @@ -237,14 +237,14 @@
- - - 清空 @@ -300,11 +300,11 @@
-
- 添加 - 批量删除 + 添加 + 批量删除