From c9f6a06c6f06129d8d3440e6708f1b8d0093d1f7 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 5 Jan 2022 17:56:08 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/details.vue | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 14381f679..24dff2e71 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -542,21 +542,25 @@ export default { }, { _this: this }, res => { - res.data.records.forEach(item => { - if (item.nylx === "[]") { - item.nylx = null; - } - if (item.typeApplicable === "[]") { - item.typeApplicable = null; - } - if (item.sycpx === "[]") { - item.sycpx = null; - } - if(item.zrbm === "[]"){ - item.zrbm = null - } - }); - this.standinfoList = res.data.records; + if (res.data !== null) { + res.data.records.forEach(item => { + if (item.nylx === "[]") { + item.nylx = null; + } + if (item.typeApplicable === "[]") { + item.typeApplicable = null; + } + if (item.sycpx === "[]") { + item.sycpx = null; + } + if(item.zrbm === "[]"){ + item.zrbm = null + } + }); + this.standinfoList = res.data.records; + } else { + this.standinfoList = [] + } this.standardFormTotal = res.data.total; this.standinfoList.forEach(item => { if (item.standYear === null) { From 40a8cac2c83e4c37a99005fdf7fdc46cf548b782 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 6 Jan 2022 09:20:05 +0800 Subject: [PATCH 02/18] commit --- .../pages/creatProcess/bzzqyj/step1-9.vue | 49 ------------------- 1 file changed, 49 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue index dc34bc316..e7faf9028 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue @@ -14,7 +14,6 @@ @@ -265,18 +264,6 @@ export default { commentText: '', taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, - roleRow: {}, - nodeList: [], - type: '', - defaultProps: { - children: 'children', - label: 'name' - }, - treeData: [], // 人员数据 - modalshowflag: false, // drawer开关 - drawerTitle: '', //drawer标题 - textarea: '', // 意见 - ListModel: false, // 新增编辑抽屉开关 active: '1', // 默认显示 isSubmit: false, saveLoading: false, @@ -290,11 +277,6 @@ export default { modelList: [], modelNameList: '', }, - formRules: { - responUserList: [ - { required: true, message: '请选择责任人', trigger: 'change' }, - ] - }, json: {} } }, @@ -323,16 +305,6 @@ export default { this.$message.warning('文件不存在,下载失败') } }, - updataFj (item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) - }, getHistoryData () { this.$http.get('lawss/activiti/get_list_by_instance', { prcNum: this.$route.query.prcNum, @@ -384,27 +356,6 @@ export default { handleTabs(name) { this.active = name }, - handleSubmitNo() { - if (this.commentText) { - this.isSubmit = true - var json = this.json - json.actionFlag = 1 - json.commentText = this.commentText - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskIds: this.taskIds, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success('驳回成功') - this.$router.push('/processCenter') - } - this.isSubmit = false - }) - } else { - this.$message.warning('请输入反馈意见') - } - }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ From 19f09e2309eb37ce34e284ccde93abc6904f72a1 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 6 Jan 2022 10:03:06 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=B2=97=E4=BD=8D?= =?UTF-8?q?=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/pages/mechanismManage/index.vue | 68 +++++++++++++++---- .../page/listProject.vue | 2 +- 2 files changed, 56 insertions(+), 14 deletions(-) diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index 6f613fbf6..3e8039de6 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -68,6 +68,12 @@ 清空 + + + + 批量配置岗位 + + + 导入中... { - if (res.ok) { - this.$message.success('配置岗位成功') - this.modalPost = false - this.getData() - } - }) + if (this.drawerTitle === '配置岗位') { + this.$http.postData('sarUser/user/position', { + positionIds: this.$refs.tree2.getCheckedKeys(), + userId: this.userId + }, {}, res => { + if (res.ok) { + this.$message.success('配置岗位成功') + this.modalPost = false + this.getData() + } + }) + } else { + this.$http.postData('sarUser/user/positionBatch', { + positionIds: this.$refs.tree2.getCheckedKeys(), + userId: this.userId + }, {}, res => { + if (res.ok) { + this.$message.success('配置岗位成功') + this.modalPost = false + this.getData() + } + }) + } + }, searchPostName() { this.page = 1; @@ -407,7 +436,6 @@ export default { loading: 'treeLoading' }, res => { this.treeData = res.data - console.log(this.treeData); this.nodeKeyId = this.treeData[0].id this.$nextTick(function () { this.$refs.tree.setCurrentKey(this.nodeKeyId) @@ -493,6 +521,20 @@ export default { this.pageSize = pageSize this.getTree2() }, + + /** 批量编辑岗位的勾选数据 */ + selectedData(val) { + this.manageData = val + }, + + selectEdit() { + this.userId = [] + this.manageData.forEach(item=>{ + this.userId.push(item.userId) + }) + this.drawerTitle = '批量配置岗位' + this.modalPost = true + }, }, computed: {}, watch: { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue index 2cdd5f528..f3cc934b5 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue @@ -314,7 +314,7 @@ export default { }, //清空 clearSearch() { - this.sarSarAccessEOSearch.projectName = '' + this.sarSarAccessEOSearch.carType = '' this.sarSarAccessEOSearch.detailedListName = '' this.searchSarAccess() From c60df649e0774c2a930fb5db986171e9b295159f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 6 Jan 2022 13:49:17 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbzxdjhgk/component/cancel.vue | 65 +++++++------ .../qbzxdjhgk/component/delay.vue | 65 +++++++------ .../qbzxdjhgk/component/establish.vue | 74 +++++++-------- .../qbzxdjhgk/component/merge.vue | 95 ++++++++++--------- .../qbzxdjhgk/component/rename.vue | 73 +++++++------- .../pages/creatProcess/qbzxdjhgk/step1-5.vue | 75 +++++++-------- .../pages/creatProcess/qbzxdjhgk/step2.vue | 71 +++++++------- .../pages/creatProcess/qbzxdjhgk/step3.vue | 69 +++++++------- .../pages/creatProcess/qbzxdjhgk/step4.vue | 71 +++++++------- .../pages/creatProcess/qbzxdjhgk/step5.vue | 75 +++++++-------- 10 files changed, 357 insertions(+), 376 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index e51337005..0153e9590 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -64,11 +64,11 @@ placeholder="请选择初稿完成时间"> - + @@ -78,22 +78,15 @@ placeholder="请输入体系结构" :maxlength="500"/> - + - - - - - - - - - - - - - -
@@ -139,9 +115,26 @@ >
- + + + + + + + - + - + @@ -419,7 +412,13 @@ export default { }, { _this: this, }, res => { - this.standinfoList = res.data.list + this.standinfoList = [] + //展示的数据只能是未开始的 + res.data.list.forEach(item => { + if(item.planStatus === '0'){ + this.standinfoList.push(item) + } + }) this.total = res.data.count }) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 2b0953c9e..a6588fd7f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -63,11 +63,11 @@ placeholder="请选择初稿完成时间"> - + @@ -77,11 +77,11 @@ placeholder="请输入体系结构" :maxlength="500"/> - + @@ -94,13 +94,6 @@ - - - - - - - - - - - - - -
@@ -146,9 +122,26 @@ >
- + + + + + + + - + - + @@ -440,7 +433,13 @@ export default { }, { _this: this, }, res => { - this.standinfoList = res.data.list + this.standinfoList = [] + //展示的数据只能是未开始的 + res.data.list.forEach(item => { + if(item.planStatus === '0'){ + this.standinfoList.push(item) + } + }) this.total = res.data.count }) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index 221b2be10..58bb272a2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -27,15 +27,6 @@ placeholder="请输入企标名称" :maxlength="500"/> - - - - - - - - - @@ -50,6 +41,12 @@ @click.native="choiceZRRS('1')"> + + + + + @@ -78,13 +75,7 @@ placeholder="请选择计划标准发布时间"> - - - - - - + @@ -92,7 +83,7 @@ @@ -110,9 +101,9 @@ @click.native="choiceTXJG(qbfsForm.tsJson)"> - - + - - + @@ -146,25 +137,29 @@ - - - - + + + - + @@ -360,6 +355,7 @@ export default { nodeList2: [], nodeList: [], standSortOptions: [], + cbcdOptions: [], BZList: [], qcdwOptions: [], qbfsForm: { @@ -367,9 +363,9 @@ export default { unit: "", // 单位 unitName: "", esName: "", // 企标名称 - planStatus: "", // 计划状态 + planStatus: "0", // 计划状态 reviseStatus: "", // 制修订状态 - area: "", //标准范围 + area: "", //适用车型 isRelate: "", //采用何种标准 technologic: '', //指标依据 resPerson: "", // 评审责任人 @@ -380,7 +376,8 @@ export default { releaseTime: "", // 计划标准发布时间 drafter: "", // 起草人 drafterName: "", - newReason: "" //新增原因 + esMatingRelations: "", //配套标准 + newReason: "" //立项原因 // remarks: '', // 备注 }, qbfsFormRules: { @@ -393,9 +390,6 @@ export default { esName: [ { required: true, message: "请输入企标名称", trigger: "blur" } ], - planStatus: [ - { required: true, message: "请选择计划状态", trigger: "blur" } - ], reviseStatus: [ { required: true, message: "请选择制修订状态", trigger: "blur" } ], @@ -418,7 +412,7 @@ export default { {required: true, message: '请选择起草人', trigger: 'change'}, ], newReason: [ - {required: true, message: '请输入新增原因', trigger: 'blur'}, + {required: true, message: '请输入立项原因', trigger: 'blur'}, ], }, @@ -441,10 +435,12 @@ export default { this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this }, res => { - this.BZList = res.data.ENERGYTYPES //标准范围 + this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 + this.BZList = res.data.ENERGYTYPES //适用车型 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 this.standSystemOptions = res.data.TXLBBUSS // 体系结构 this.qcdwOptions = res.data.QCDW // 起草单位 + }) }, methods: { @@ -489,13 +485,14 @@ export default { this.clearQYBZ() }, QYBZenterDrawer () { + console.log(this.QYBZformSelect); if (this.QYBZformSelect.length > 1) { this.$message.warning('请选择一条标准') } else if (this.QYBZformSelect.length < 1){ this.$message.warning('请选择要带入的标准') } else { this.qbfsForm.rqbJson = this.QYBZformSelect[0].id - this.qbfsForm.rqbName = this.QYBZformSelect[0].standName + this.qbfsForm.rqbName = this.QYBZformSelect[0].standCode this.clearQYBZ() this.QYBZmodal = false } @@ -550,6 +547,9 @@ export default { if(this.qbfsForm.unit){ this.$refs.qbfsForm.validateField('unit') } + if(this.qbfsForm.unitName){ + this.$refs.qbfsForm.validateField('unitName') + } }, choiceZRR() { this.nodeList = []; diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index 4f9347a76..d8ce2a44b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -20,9 +20,6 @@ - - - @@ -34,9 +31,6 @@ - - - @@ -90,13 +84,7 @@ placeholder="请选择初稿完成时间"> - - - - - - + @@ -104,7 +92,7 @@ @@ -112,17 +100,21 @@ - - - - + + + - + + + - - - - - - - - - + + + + + + + + + + + - - + @@ -192,14 +199,6 @@ v-model="qbfsForm.esStandRelations" > - - - @@ -509,6 +508,7 @@ export default { TXJGList: [], BZList: [], standSortOptions: [], + cbcdOptions: [], //采标程度 QYBZList: [], QYBZformSelect: [], standSystemOptions: [], @@ -556,9 +556,6 @@ export default { esName: [ {required: true, message: '请输入企标名称', trigger: 'blur'}, ], - planStatus: [ - {required: true, message: '请选择计划状态', trigger: 'change'}, - ], reviseStatus: [ {required: true, message: '请选择制修订状态', trigger: 'change'}, ], @@ -593,6 +590,7 @@ export default { reviewer: "", draftTime: "", isSubTime: "", + planStatus: "0", mergeReason: "", company: "", resPersonName: '', @@ -631,7 +629,8 @@ export default { this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this }, res => { - this.BZList = res.data.ENERGYTYPES //标准范围 + this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 + this.BZList = res.data.ENERGYTYPES //适用车型 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 this.standSystemOptions = res.data.TXLBBUSS // 体系结构 this.qcdwOptions = res.data.QCDW // 起草单位 @@ -696,7 +695,7 @@ export default { this.$message.warning('请选择要带入的标准') } else { this.qbfsForm.rqbJson = this.QYBZformSelect[0].id - this.qbfsForm.rqbName = this.QYBZformSelect[0].standName + this.qbfsForm.rqbName = this.QYBZformSelect[0].standCode this.clearQYBZ() this.QYBZmodal = false } @@ -871,7 +870,13 @@ export default { }, { _this: this, }, res => { - this.standinfoList = res.data.list + this.standinfoList = [] + //展示的数据只能是未开始的 + res.data.list.forEach(item => { + if(item.planStatus === '0'){ + this.standinfoList.push(item) + } + }) this.total = res.data.count }) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index 6d859619d..1ddae5222 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -63,11 +63,11 @@ placeholder="请选择初稿完成时间"> - + @@ -77,11 +77,11 @@ placeholder="请输入体系结构" :maxlength="500"/> - + @@ -93,13 +93,6 @@ - - - - - - - + +
+ + + +
+
+ +
+ - -
- - - -
-
- -
- - - + - + @@ -427,7 +420,13 @@ export default { }, { _this: this, }, res => { - this.standinfoList = res.data.list + this.standinfoList = [] + //展示的数据只能是未开始的 + res.data.list.forEach(item => { + if(item.planStatus === '0'){ + this.standinfoList.push(item) + } + }) this.total = res.data.count }) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue index 29c7e88bd..0014cd9f8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue @@ -16,14 +16,11 @@ - - - - + - - - - - - - @@ -53,6 +43,13 @@ placeholder="请输入起草人" :maxlength="500"/> + + + - - - - + @@ -106,9 +96,9 @@ placeholder="请输入体系结构" :maxlength="500"/> - - + - + @@ -139,25 +129,28 @@ :maxlength="500"/> - + + + + - + - + @@ -359,6 +352,7 @@ export default { drawerTitle: '', detailData: [], standSortOptions: [], + cbcdOptions: [], } }, mounted() { @@ -368,7 +362,8 @@ export default { this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this }, res => { - this.BZList = res.data.ENERGYTYPES //标准范围 + this.BZList = res.data.ENERGYTYPES //适用车型 + this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) }, @@ -457,6 +452,8 @@ export default { handleSubmit(){ this.isSubmit = true this.qbfsForm.bzfgbzFlag = '0' + this.qbfsForm.planStatus = '未开始' + this.qbfsForm.area = this.qbfsForm.area.join(',') this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); this.$http.post('lawss/activiti/completeTask', { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue index ee883d1ed..85f3c1774 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue @@ -16,14 +16,11 @@ - - - - + - - - - - - - @@ -53,6 +43,13 @@ placeholder="请输入起草人" :maxlength="500"/> + + + - - - - + @@ -106,9 +96,9 @@ placeholder="请输入体系结构" :maxlength="500"/> - - + - + @@ -139,25 +129,28 @@ :maxlength="500"/> - + + + + - + - + @@ -359,6 +352,7 @@ export default { nodeList:[], drawerTitle: '', detailData: [], + cbcdOptions: [], } }, @@ -371,6 +365,7 @@ export default { }, res => { this.BZList = res.data.ENERGYTYPES //标准范围 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 + this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 }) }, methods:{ diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue index 7c3edf08b..09dbbfae0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue @@ -16,14 +16,11 @@ - - - - + - - - - - - - @@ -53,6 +43,13 @@ placeholder="请输入起草人" :maxlength="500"/> + + + - - - - + @@ -106,9 +96,9 @@ placeholder="请输入体系结构" :maxlength="500"/> - - + - + @@ -139,25 +129,28 @@ :maxlength="500"/> - + + + + - + - + @@ -357,6 +350,7 @@ export default { drawerTitle: '', detailData: [], standSortOptions: [], + cbcdOptions: [], } }, mounted() { @@ -366,6 +360,7 @@ export default { this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this }, res => { + this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 this.BZList = res.data.ENERGYTYPES //标准范围 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue index b87aaa715..93143033c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue @@ -16,14 +16,11 @@ - - - - + - - - - - - - @@ -53,6 +43,13 @@ placeholder="请输入起草人" :maxlength="500"/> + + + - - - - + @@ -106,9 +96,9 @@ placeholder="请输入体系结构" :maxlength="500"/> - - + - + @@ -139,25 +129,28 @@ :maxlength="500"/> - + + + + - + - + @@ -359,6 +352,7 @@ export default { drawerTitle: '', detailData: [], standSortOptions: [], + cbcdOptions: [], } }, mounted() { @@ -368,6 +362,7 @@ export default { this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this }, res => { + this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 this.BZList = res.data.ENERGYTYPES //标准范围 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index 0854c961e..a783a5123 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -16,14 +16,11 @@ - - - - + - - - - - - - @@ -53,6 +43,13 @@ placeholder="请输入起草人" :maxlength="500"/> + + + - - - - + @@ -106,9 +96,9 @@ placeholder="请输入体系结构" :maxlength="500"/> - - + - + @@ -139,25 +129,28 @@ :maxlength="500"/> - + + + + - + - + @@ -359,6 +352,7 @@ export default { drawerTitle: '', detailData: [], standSortOptions: [], + cbcdOptions: [], } }, mounted() { @@ -368,7 +362,8 @@ export default { this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this }, res => { - this.BZList = res.data.ENERGYTYPES //标准范围 + this.BZList = res.data.ENERGYTYPES //适用车型 + this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) }, @@ -457,6 +452,8 @@ export default { handleSubmit(){ this.isSubmit = true this.qbfsForm.bzfgbzFlag = '0' + this.qbfsForm.planStatus = '未开始' + this.qbfsForm.area = this.qbfsForm.area.join(',') this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); this.$http.post('lawss/activiti/completeTask', { From cf406b110b8ea6e4fc7ef0cd2d5bdd6608aa8218 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 6 Jan 2022 13:55:48 +0800 Subject: [PATCH 05/18] commit --- src/components/CustomFormComponents/File.vue | 7 +++++-- .../InputForAllStandards2.vue | 6 +++++- .../enterpriseStandardPlan/index.vue | 18 +++++++++++------- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue index fb95df303..6d892b758 100644 --- a/src/components/CustomFormComponents/File.vue +++ b/src/components/CustomFormComponents/File.vue @@ -267,7 +267,11 @@ export default { }, uploadSuccess(res, file, fileList) { if (res.ok) { - // this.value += res.data.id + ',' + let obj = {name: '', response: {}} + obj.name = file.response.data.oldFileName + obj.response.data = file.response.data + this.showFileList.push(obj) + // this.value += res.data.id + ',' this.$emit('input', this.value ? this.value + ','+ res.data.id + ',' : this.value+ res.data.id + ',') this.$emit('success') this.$message({ @@ -314,7 +318,6 @@ export default { this.$emit('input', '') } } - const showFileList = [] fileList.map(item => { let obj = {name: '', response: {}} diff --git a/src/components/CustomFormComponents/InputForAllStandards2.vue b/src/components/CustomFormComponents/InputForAllStandards2.vue index b50ead6cd..cd4220446 100644 --- a/src/components/CustomFormComponents/InputForAllStandards2.vue +++ b/src/components/CustomFormComponents/InputForAllStandards2.vue @@ -196,7 +196,11 @@ }, computed: { placeholder () { - return `${this.placeholderText}` + if (this.placeholderText){ + return `${this.placeholderText}` + } else { + return `请输入${this.config.attrName}` + } }, showMessage () { return `${this.config.attrName}不能为空` diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index f894c6b21..5c970f03d 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -367,11 +367,14 @@
- - - - - + + + +
@@ -591,6 +594,7 @@ }, data() { return { + CBList: [], BZList: [], TXJGList: [], TXJGmodal: false, @@ -761,7 +765,7 @@ this.$message.warning('请选择要带入的标准') } else { this.addForm.rqbJson = this.QYBZformSelect[0].id - this.addForm.rqbName = this.QYBZformSelect[0].standName + this.addForm.rqbName = this.QYBZformSelect[0].standCode this.clearQYBZ() this.QYBZmodal = false } @@ -1092,7 +1096,7 @@ this.standSystemOptions = res.data.TXLBBUSS // 体系结构 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 this.BZList = res.data.ENERGYTYPES - console.log(res.data); + this.CBList = res.data.DEGREESTANDARD }, e => { }) }, From fd97e064abd2e5eeda466276f86cdc227cc2de4b Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 6 Jan 2022 14:00:31 +0800 Subject: [PATCH 06/18] commit --- .../standardForComments/pags/consultationDetails.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 2dc31a08e..d42f83c03 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -318,7 +318,7 @@ export default { window.open(routeUrl.href, '_blank') }, exportAll() { - window.open('/api/slrs/sar-public-idea-all/tuallStand?cid=' + this.$route.query.item.cid) + window.open('/api/slrs/sar-public-idea-all/tuallStand?cid=' + this.$route.query.item.id) }, exportAll1() { window.open('/api/slrs/sar-public-idea-all/tuallStand?type=1&cid=' + this.$route.query.item.id) From 6867707647b783eacf76767d17c6fcc314a222ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 6 Jan 2022 14:08:14 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/todoList/index.vue | 164 ++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index aa12dfeff..96979893b 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -1423,6 +1423,170 @@ export default { } }) break + case '23': + if (row.taskInfo === '工作组组长指派责任人') { + this.$router.push({ + name: 'qbfsStep2', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '工作组成员标准复审') { + this.$router.push({ + name: 'qbfsStep3', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '工作组组长审批') { + this.$router.push({ + name: 'qbfsStep4', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break + case '24': + if (row.taskInfo === '标准法规部部长审核') { + this.$router.push({ + name: 'qbfzStep2', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '会签并填写意见') { + this.$router.push({ + name: 'qbfzStep3', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '起草人修改标准状态') { + this.$router.push({ + name: 'qbfzStep4', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '标准法规部部长审核1') { + this.$router.push({ + name: 'qbfzStep5', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + else if(row.taskInfo === '审定责任人审定') { + this.$router.push({ + name: 'qbfzStep6', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '批准负责人批准') { + this.$router.push({ + name: 'qbfzStep7', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break + case '25': + if (row.taskInfo === '部门高级经理审批') { + this.$router.push({ + name: 'qbzxdjhgkStep2', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '部门中心主任会签') { + this.$router.push({ + name: 'qbzxdjhgkStep3', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '标准法规工作组组长审定') { + this.$router.push({ + name: 'qbzxdjhgkStep4', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '标准法规部部长审批') { + this.$router.push({ + name: 'qbzxdjhgkStep5', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '企标制修订计划整改') { + this.$router.push({ + name: 'qbzxdjhgkStep1', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break case 'laws2': if (row.taskInfo === '责任对接人进行任务下发') { this.$router.push({ From 07fdc98499057e031aacc34119d2d4a418597f0e Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 6 Jan 2022 14:08:27 +0800 Subject: [PATCH 08/18] commit --- src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzdy/step1.vue | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index 804dfd70f..60a3757f0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -209,7 +209,7 @@ @checkedRole="checkedRole" :nodeList="nodeList" > - +
@@ -234,6 +235,7 @@
From 4ff70eba62c566813b2e1379cde481da20932422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 6 Jan 2022 14:16:24 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E8=83=BD=E6=BA=90=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/addEdit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 3bb275d1e..af8403ca5 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -877,7 +877,7 @@ export default { this.zrbmOptions = res.data.ZRBMCLASS // 能源类型数据字典 this.CycxOptions = res.data.CLLX - // this.categoryOptions = res.data.NYLXCLASS // 能源类型 + this.categoryOptions = res.data.NYLXCLASS // 能源类型 // 适用车型数据字典 this.applyArcticOptions = res.data.PRODUCTTYPE // 适用产品线数据字典 From 6ab7f441e384cceab922e11f9b1353b6bdd1ad32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 6 Jan 2022 14:28:03 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/otherAddEit.vue | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index fda399db8..1f6edd81c 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -1039,6 +1039,32 @@ export default { this.$message.warning('请勿添加重复数据') } else{ this.sarAccessInfoList.push(item) + this.sarAccessInfoList.forEach(item => { + // 能源类型转换 + if (item.nylx !== null) { + let k = (item.nylx || "").split(","); + for (let i in this.applyArcticOptions) { + for (let m = 0; m < k.length; m++) { + if (this.applyArcticOptions[i].value === k[m]) { + k[m] = this.applyArcticOptions[i].label; + } + item.nylx = k.join(","); + } + } + } + // 适用车型转换 + if (item.typeApplicable !== null) { + let k = (item.typeApplicable || "").split(","); + for (let i in this.energyKindOptions) { + for (let m = 0; m < k.length; m++) { + if (this.energyKindOptions[i].value === k[m]) { + k[m] = this.energyKindOptions[i].label; + } + item.typeApplicable = k.join(","); + } + } + } + }) // this.$refs.accessTypeSelect.clearSelection() this.$refs.entryTable.clearSelection() this.$refs.searchTable.clearSelection() From fd9788f267342295e1bd569db00e9417c222c114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 6 Jan 2022 14:36:17 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/components/ProcessMixin.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue index 2f3eace54..b4308c0c2 100644 --- a/src/pages/processCenter/pages/components/ProcessMixin.vue +++ b/src/pages/processCenter/pages/components/ProcessMixin.vue @@ -38,7 +38,7 @@ export default { value: "4" }, { - label: "项目合规评估流程-标准", + label: "标准合规评估流程", value: "5" }, { @@ -57,6 +57,14 @@ export default { label: '项目清单确认流程', value: "10" }, + { + label: "政策课题组参会流程", + value: "18" + }, + { + label: "政策课题组入会流程", + value: "17" + }, { label: "外部署名推荐审批流程", value: "16" @@ -66,7 +74,7 @@ export default { value: "15" }, { - label: "参与外部标准制修订信息提报六合彩能", + label: "参与外部标准制修订信息提报流程", value: "14" }, { From adddd3eb0bd257ca2403cc00b7ef8c8d438808ed Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 6 Jan 2022 14:41:08 +0800 Subject: [PATCH 12/18] commit --- src/App.vue | 1 - .../processCenter/pages/creatProcess/bzjd/step1-1.vue | 8 +++++++- .../processCenter/pages/creatProcess/bzjd/step1-6.vue | 8 +++++++- src/pages/processCenter/pages/creatProcess/bzjd/step1.vue | 8 +++++++- src/pages/processCenter/pages/creatProcess/bzjd/step2.vue | 8 +++++++- src/pages/processCenter/pages/creatProcess/bzjd/step3.vue | 8 +++++++- src/pages/processCenter/pages/creatProcess/bzjd/step4.vue | 8 +++++++- src/pages/processCenter/pages/creatProcess/bzjd/step5.vue | 8 +++++++- src/pages/processCenter/pages/creatProcess/bzjd/step6.vue | 8 +++++++- src/sysConfig/index.js | 8 ++++---- 10 files changed, 60 insertions(+), 13 deletions(-) diff --git a/src/App.vue b/src/App.vue index fc1f8863f..f86104cae 100644 --- a/src/App.vue +++ b/src/App.vue @@ -341,7 +341,6 @@ export default { //background: url('~@/assets/images/shangqi/home/BG.png') no-repeat; background-size: 100% 100%; font-family: MicrosoftYaHei, 微软雅黑; - & > div { position: absolute; top: 0; diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 968ecaaee..94b0ec32c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -90,7 +90,7 @@
{ + this.$refs.filterTable.doLayout(); + }); + }, PLedit () { if (this.zrIdList.length > 0) { this.PLmodalType = 2 @@ -1114,6 +1119,7 @@ } }, mounted () { + window.addEventListener('resize', this.handleResize); this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue index 0a73ae122..7391b50e6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue @@ -130,7 +130,7 @@ { + this.$refs.filterTable.doLayout(); + }); + }, getBDList () { this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { standHisId: this.oldNumber, @@ -515,6 +520,7 @@ export default { }, }, mounted () { + window.addEventListener('resize', this.handleResize); this.getHistoryData() this.getData() } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 408e2fc85..2f8607d61 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -91,7 +91,7 @@
{ + this.$refs.filterTable.doLayout(); + }); + }, PLedit () { if (this.zrIdList.length > 0) { this.PLmodalType = 2 @@ -1136,6 +1141,7 @@ export default { } }, mounted() { + window.addEventListener('resize', this.handleResize); this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 4687aff42..a7ed154ae 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -69,7 +69,7 @@ 批量编辑 { + this.$refs.filterTable.doLayout(); + }); + }, handleTransfer() { this.drawerModal = true }, @@ -515,6 +520,7 @@ }, }, mounted () { + window.addEventListener('resize', this.handleResize); this.getHistoryData() this.getData() } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index f251e5df6..66a81268b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -69,7 +69,7 @@ 批量编辑 { + this.$refs.filterTable.doLayout(); + }); + }, getBDList () { this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { standHisId: this.oldNumber, @@ -902,6 +907,7 @@ }, }, mounted () { + window.addEventListener('resize', this.handleResize); this.getHistoryData() this.getData() this.$http.get('sys/dictype/getDicTypeListCode', '', { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 1095dfb25..de5d188f7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -66,7 +66,7 @@ { + this.$refs.filterTable.doLayout(); + }); + }, checkBD (id,id2,itemsNum) { let itemsEoPage = { oldItemId: id, @@ -501,6 +506,7 @@ }, }, mounted () { + window.addEventListener('resize', this.handleResize); this.getHistoryData() this.getData() } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index 384a42003..aff836e6c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -66,7 +66,7 @@ { + this.$refs.filterTable.doLayout(); + }); + }, checkBD (id,id2,itemsNum) { let itemsEoPage = { oldItemId: id, @@ -489,6 +494,7 @@ }, }, mounted () { + window.addEventListener('resize', this.handleResize); this.getHistoryData() this.getData() } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index 5d7a6ccba..32854297b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -66,7 +66,7 @@ { + this.$refs.filterTable.doLayout(); + }); + }, checkBD (id,id2,itemsNum) { let itemsEoPage = { oldItemId: id, @@ -487,6 +492,7 @@ }, }, mounted () { + window.addEventListener('resize', this.handleResize); this.getHistoryData() this.getData() } diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 3b59eb5a2..23276ef5e 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,11 +6,11 @@ // 服务器地址 // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' -// const devIp = '192.168.10.248' +const devIp = '192.168.10.6' // const devIp = '62.234.136.153' -// const devInterfacePORT = '8033' -const devIp = '10.19.11.243' -const devInterfacePORT = '4304' +const devInterfacePORT = '9999' +// 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=' From b59c9c11ba54732ab857e8f447a2878bcfb52f3d Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 6 Jan 2022 14:42:12 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E6=B8=85=E5=8D=95=E9=87=8C=E9=9D=A2?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/details.vue | 130 ++++++++++-------- .../localProductsOrProjectLibrary/index.vue | 57 ++++---- .../pages/details.vue | 4 +- 3 files changed, 109 insertions(+), 82 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 24dff2e71..814cf97f8 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -462,39 +462,44 @@ export default { }, { _this: this }, res => { - res.data.records.forEach(item => { - if (item.nylx === "[]") { - item.nylx = null; - } - if (item.typeApplicable === "[]") { - item.typeApplicable = null; - } - if (item.sycpx === "[]") { - item.sycpx = null; - } - if(item.zrbm === "[]"){ - item.zrbm = null - } - if (item.zccssrqgj === "undefined") { - item.zccssrqgj = '-' - } - if (item.xcxssrqgj === "undefined") { - item.xcxssrqgj = '-' - } - if (item.ssrq === "undefined") { - item.ssrq = '-' - } - }); - this.standinfoList = res.data.records; - this.standardFormTotal = res.data.total; - this.standinfoList.forEach(item => { - if (item.standYear === null) { - item.standNumber = item.standSortShow + " " + item.standNumber; - } else { - item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear; - } - }); - this.standInfoTableLoading = false + if (res.data !== null) { + res.data.records.forEach(item => { + if (item.nylx === "[]") { + item.nylx = null; + } + if (item.typeApplicable === "[]") { + item.typeApplicable = null; + } + if (item.sycpx === "[]") { + item.sycpx = null; + } + if(item.zrbm === "[]"){ + item.zrbm = null + } + if (item.zccssrqgj === "undefined") { + item.zccssrqgj = '-' + } + if (item.xcxssrqgj === "undefined") { + item.xcxssrqgj = '-' + } + if (item.ssrq === "undefined") { + item.ssrq = '-' + } + }); + this.standinfoList = res.data.records; + this.standardFormTotal = res.data.total; + this.standinfoList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + " " + item.standNumber; + } else { + item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear; + } + }); + this.standInfoTableLoading = false + } else { + this.standinfoList = [] + } + }, e => { this.standInfoTableLoading = false }); @@ -506,30 +511,35 @@ export default { }, { _this: this }, res => { - res.data.records.forEach(item => { - if (item.nylx === "[]") { - item.nylx = null; - } - if (item.typeApplicable === "[]") { - item.typeApplicable = null; - } - if (item.sycpx === "[]") { - item.sycpx = null; - } - if(item.zrbm === "[]"){ - item.zrbm = null - } - }); - this.standinfoList = res.data.records; - this.standardFormTotal = res.data.total; - this.standinfoList.forEach(item => { - if (item.standYear === null) { - item.standNumber = item.standSortShow + " " + item.standNumber; - } else { - item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear; - } - }); - this.standInfoTableLoading = false + if (res.data !== null) { + res.data.records.forEach(item => { + if (item.nylx === "[]") { + item.nylx = null; + } + if (item.typeApplicable === "[]") { + item.typeApplicable = null; + } + if (item.sycpx === "[]") { + item.sycpx = null; + } + if(item.zrbm === "[]"){ + item.zrbm = null + } + }); + this.standinfoList = res.data.records; + this.standardFormTotal = res.data.total; + this.standinfoList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + " " + item.standNumber; + } else { + item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear; + } + }); + this.standInfoTableLoading = false + } else { + this.standinfoList = [] + } + }, e => { this.standInfoTableLoading = false }); @@ -773,13 +783,17 @@ export default { * 高级检索 */ selectMoreBtn() { - this.isAdvancedSearch = true; + this.standardForm.zrbm = '' + this.standardForm.responseUnit = '' + this.standardForm.standName = '' + this.standardForm.standNumber = '' this.standardFormList.standName = ""; this.standardFormList.typeApplicable = ""; this.standardFormList.nylx = ""; this.standardFormList.zrbm = ""; this.standardFormList.sycpx = ""; this.showTableFlag = false; + this.isAdvancedSearch = true; this.page = 1; this.standardForm.page = 1; this.selectInfoMore(); diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index cfe589da2..d9dda2b2c 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -4,7 +4,7 @@
+ @keyup.enter.native="getLocalProductTableBtns"> 查询 + @click="getLocalProductTableBtns">查询 @@ -477,7 +477,7 @@ export default { projectClassification: "", // 项目状态 projectStatus: "", - page: "" + page: 1 }, //查询3类 projectLibrarySearchDefault: { @@ -1210,6 +1210,37 @@ export default { this.SarExportSearchEo = this.localProTableSearch; this.$http.get("sarStandProjectLibrary/queryProject", { ...this.localProTableSearch, + page: this.page, + pageSize: this.pageSize, + }, { + _this: this, loading: "loading" + }, res => { + if (this.localProTableSearch.prodectCode === "Maintenance") { + this.localProTableList = res.data.Maintenance.records; + this.productTypeOptions = this.projectData + this.xmztOptions = this.projectStatus + this.total = res.data.Maintenance.total; + } else if (this.localProTableSearch.prodectCode === "notMaintenance") { + this.localProTableList = res.data.notMaintenance.records; + this.productTypeOptions = this.notProjectData + this.xmztOptions = this.notProjectStatus + this.total = res.data.notMaintenance.total; + } + }, e => { + }); + // this.$refs.selection.selectAll(false) + }, + + getLocalProductTableBtns() { + this.projectLibrarySearch.page = 1; + this.isAdvancedSearch = false; + this.getLocalProductTables(); + }, + getLocalProductTables() { + this.localProTableSearch.prodectCode = this.ifMaintaince; + this.localProTableSearch.dataType = this.insideTabsActiveName; + this.SarExportSearchEo = this.localProTableSearch; + this.$http.get("sarStandProjectLibrary/queryProject", { ...this.projectLibrarySearch, page: this.page, pageSize: this.pageSize, @@ -1227,26 +1258,6 @@ export default { this.xmztOptions = this.notProjectStatus this.total = res.data.notMaintenance.total; } - // this.localProTableList.map((item) => { - // this.xmztOptions.map((opr) => { - // if (item.productBrand === opr.value) { - // item.productBrand = opr.label - // } - // }) - // this.scxxOptions.map((xmItem) => { - // if (item.saleMarket === xmItem.value) { - // item.saleMarket = xmItem.label - // } - // }) - // this.scxxOptions.map((xmItem) => { - // if (item.targetMarket === xmItem.value) { - // item.targetMarket = xmItem.label - // } - // }) - // }) - // if ((this.localProTableList.length === 0 || this.localProTableList === []) && this.localProTableSearch.page !== 1) { - // this.pageChange(1) - // } }, e => { }); // this.$refs.selection.selectAll(false) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 2c23a3371..af3445f7f 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -845,7 +845,9 @@ export default { // 查询详情表格数据 this.$http.get('sarStandProjectLibrary/queryStandInfoNew', { id: this.localProEO.id, - cars: "1" + cars: "1", + current: 1, + pageSize: this.$store.getters.userInfo.configContent }, { _this: this, loading: 'loading' From 520560eaaa68668ab6f62fb96602c355b4291fcb Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 6 Jan 2022 15:00:43 +0800 Subject: [PATCH 14/18] commit --- src/pages/processCenter/pages/creatProcess/bzjd/step4.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index de5d188f7..6e2e6cfcb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -292,6 +292,12 @@
+
From e95aada38829e9ae4c51514ae03ebea50dbd5dff Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 6 Jan 2022 15:10:52 +0800 Subject: [PATCH 15/18] commit --- src/pages/processCenter/pages/creatProcess/bzdy/step3.vue | 1 - src/pages/processCenter/pages/creatProcess/bzjd/step3.vue | 1 - src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue | 1 + src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue | 1 + 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index 9ba5342de..db7a545f7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -199,7 +199,6 @@ Date: Thu, 6 Jan 2022 15:11:49 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbzxdjhgk/component/establish.vue | 2 +- .../pages/creatProcess/qbzxdjhgk/component/merge.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index 58bb272a2..00423d7c1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -267,7 +267,7 @@ custom-class="demo-drawer" >
-
+
-
+
Date: Thu, 6 Jan 2022 15:49:35 +0800 Subject: [PATCH 17/18] commit --- .../pages/creatProcess/bzzqyj/step2.vue | 26 +++++++++---------- .../pages/creatProcess/bzzqyj/step3.vue | 18 +++++-------- .../pages/creatProcess/bzzqyj/step4-1.vue | 9 ------- .../pages/creatProcess/bzzqyj/step4-2.vue | 7 ----- .../pages/creatProcess/bzzqyj/step4.vue | 9 +------ .../pages/creatProcess/bzzqyj/step5.vue | 26 ++++--------------- .../pages/creatProcess/bzzqyj/step6.vue | 13 +++------- .../pages/creatProcess/bzzqyj/step7.vue | 13 +++------- .../pages/creatProcess/bzzqyj/step8.vue | 13 +++------- .../pages/creatProcess/bzzqyj/step9.vue | 13 +++------- 10 files changed, 36 insertions(+), 111 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 77380b703..783410f60 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -214,7 +214,6 @@ export default { form: { cid: "", // 编号 endTime: "", // 结束日期 - cname: "", // 名称 fjList: [], fjListId: '', responUserList: "", @@ -370,19 +369,18 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.commentText2 = data.commentText2 || '' - this.form.cid = data.cid - this.form.endTime = data.endTime - this.form.cname = data.cname - this.form.fjList = data.fjList - // this.form.fjListId = data.fjListId - this.form.textType = data.textType - this.form.modelList = data.modelList - this.form.modelNameList = data.modelNameList - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.fjListId || data.form.fjListId - } + this.form.cid = data.form ? data.form.cid : data.cid + this.form.endTime = data.form ? data.form.endTime : data.endTime + this.form.fjList = data.form ? data.form.fjList : data.fjList + this.form.textType = data.form ? data.form.textType : data.textType + this.form.modelList = data.form ? data.form.modelList : data.modelList + this.form.responUserListName = data.form ? data.form.responUserListName : (data.responUserListName ? data.responUserListName : '') + this.form.responUserList = data.form ? data.form.responUserList : (data.responUserList ? data.responUserList : '') + // if (data.fjListId === '' || data.form.fjListId === '') { + // this.form.fjListId = '' + // } else { + // this.form.fjListId = data.form ? data.form.fjListId :data.fjListId + // } this.json = data }).catch(e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 4807528be..be51968b5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -684,22 +684,16 @@ this.submitShow = true } this.commentText3 = data.commentText3 || '' - this.form.fjList = data.fjList || data.form.fjList || [] - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.fjListId || data.form.fjListId - } - this.form.textType = data.textType || data.form.textType - this.form.modelList = data.modelList || data.form.modelList - // this.form.modelNameList = data.modelNameList || data.form.modelNameList - this.form.cid = data.cid || data.form.cid - this.form.endTime = data.endTime || data.form.endTime + this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] ) + this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] ) + this.form.textType = data.form ? data.form.textType : data.textType + this.form.cid = data.form ? data.form.cid : data.cid + this.form.endTime = data.form ? data.form.endTime : data.endTime this.todoId = res.id this.json = data this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey this.getItemList(data.standId,data.textType) - this.data = data.info || data.data || data.form.data || [] + this.data = data.form ? data.form.data : (data.data ? data.data : (data.info ? data.info : [])) }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 925b4e94c..bdaffffaf 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -455,22 +455,13 @@ }).then(res => { let data = JSON.parse(res.mesg) this.form.fjList = data.fjList || data.form.fjList - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.form.fjListId || data.fjListId - } this.form.cid = data.cid || data.form.cid this.form.endTime = data.endTime || data.form.endTime - this.form.cname = data.cname || data.form.cname this.form.textType = data.textType || data.form.textType this.form.modelList = data.modelList || data.form.modelList - this.form.modelNameList = data.modelNameList || data.form.modelNameList this.commentText41 = data.commentText41 || '' this.form.bzfgId = data.startUser this.form.bzfgName = data.startUserName - // this.form.bzfgId = data.bzfgId || '' - // this.form.bzfgName = data.bzfgName || '' this.json = data this.data = data.info || data.data }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue index 7df690f5f..b21ee8ad0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue @@ -439,18 +439,11 @@ }).then(res => { let data = JSON.parse(res.mesg) this.form.fjList = data.fjList || data.form.fjList - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.form.fjListId || data.fjListId - } this.commentText42 = data.commentText42 || '' this.form.cid = data.cid || data.form.cid this.form.endTime = data.endTime || data.form.endTime - this.form.cname = data.cname || data.form.cname this.form.textType = data.textType || data.form.textType this.form.modelList = data.modelList || data.form.modelList - this.form.modelNameList = data.modelNameList || data.form.modelNameList this.form.bzfgId = data.bzfgId || '' this.json = data this.data = data.info || data.data diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 67653a124..7153ae16c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -648,19 +648,12 @@ export default { this.acceptShow = false this.submitShow = true } - this.form.fjList = data.fjList || data.form.fjList - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.form.fjListId || data.fjListId - } this.commentText4 = data.commentText4 || '' + this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid this.form.endTime = data.endTime || data.form.endTime - this.form.cname = data.cname || data.form.cname this.form.textType = data.textType || data.form.textType this.form.modelList = data.modelList || data.form.modelList - this.form.modelNameList = data.modelNameList || data.form.modelNameList this.form.spId = data.spId || '' this.form.spName = data.spName || '' this.json = data diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 6c7fa3f31..d4ddea515 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -561,27 +561,11 @@ }).then(res => { let data = JSON.parse(res.mesg); this.commentText5 = data.commentText5 || '' - this.form.fjList = data.fjList || data.form.fjList - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.form.fjListId || data.fjListId - } - this.form.cid = data.cid || data.form.cid; - this.form.endTime = data.endTime || data.form.endTime; - this.form.cname = data.cname || data.form.cname; - this.form.textType = data.textType || data.form.textType - this.form.modelList = data.modelList || data.form.modelList - this.form.modelNameList = data.modelNameList || data.form.modelNameList - // this.oldData = JSON.parse(JSON.stringify(data.summaryList)) - // console.log(data); - // data.summaryList.forEach(item => { - // if (item.state) { - // } else { - // item.state = "1"; - // } - // item.type = false; - // }); + this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] ) + this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] ) + this.form.textType = data.form ? data.form.textType : data.textType + this.form.cid = data.form ? data.form.cid : data.cid + this.form.endTime = data.form ? data.form.endTime : data.endTime data.info.forEach(item => { if (item.state) { } else { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index 6c2fe7e66..8877bd708 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -486,16 +486,12 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg); - this.form.fjList = data.fjList || data.form.fjList - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.form.fjListId || data.fjListId - } this.commentText6 = data.commentText6 || '' + this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; - this.form.cname = data.cname || data.form.cname; + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList this.oldData = JSON.parse(JSON.stringify(data.info)) var arr = [] data.info.forEach(item => { @@ -504,9 +500,6 @@ export default { } }) this.json = data - this.form.textType = data.textType || data.form.textType - this.form.modelList = data.modelList || data.form.modelList - this.form.modelNameList = data.modelNameList || data.form.modelNameList this.data = arr }).catch(e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 50a609066..d5e82be16 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -483,16 +483,12 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.fjList = data.fjList || data.form.fjList - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.form.fjListId || data.fjListId - } this.commentText7 = data.commentText7 || '' + this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; - this.form.cname = data.cname || data.form.cname; + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList this.oldData = JSON.parse(JSON.stringify(data.info)) var arr = [] data.info.forEach(item => { @@ -500,9 +496,6 @@ export default { arr.push(item) } }) - this.form.textType = data.textType || data.form.textType - this.form.modelList = data.modelList || data.form.modelList - this.form.modelNameList = data.modelNameList || data.form.modelNameList this.json = data this.data = arr }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 61f20b5ca..a48982069 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -487,16 +487,12 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.fjList = data.fjList || data.form.fjList - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.form.fjListId || data.fjListId - } this.commentText8 = data.commentText8 || '' + this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; - this.form.cname = data.cname || data.form.cname; + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList this.oldData = JSON.parse(JSON.stringify(data.info)) var arr = [] data.info.forEach(item => { @@ -505,9 +501,6 @@ export default { } }) this.json = data - this.form.textType = data.textType || data.form.textType - this.form.modelList = data.modelList || data.form.modelList - this.form.modelNameList = data.modelNameList || data.form.modelNameList this.data = arr }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index d36978661..5c1bd115f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -486,16 +486,12 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.fjList = data.fjList || data.form.fjList - if (data.fjListId === '') { - this.form.fjListId = '' - } else { - this.form.fjListId = data.form.fjListId || data.fjListId - } this.commentText9 = data.commentText9 || '' + this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; - this.form.cname = data.cname || data.form.cname; + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList this.oldData = JSON.parse(JSON.stringify(data.info)) var arr = [] data.info.forEach(item => { @@ -504,9 +500,6 @@ export default { } }) this.json = data - this.form.textType = data.textType || data.form.textType - this.form.modelList = data.modelList || data.form.modelList - this.form.modelNameList = data.modelNameList || data.form.modelNameList this.data = arr }).catch(e => { }); From 6b46cbf63ebea72cc4ac126511e126ff0097314b Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 6 Jan 2022 15:52:13 +0800 Subject: [PATCH 18/18] commit --- src/pages/login/index.vue | 2 +- src/pages/loginVerify/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index ae5885060..75c737f81 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -183,7 +183,7 @@ if (hasHomeMenu) { this.setMenu(JSON.stringify(menuList)).then(res => { if (this.showIETips) {//判断是否IE浏览器 - alert('检测到您使用的是IE浏览器,已经和时代脱轨了!建议您更换为谷歌浏览器') + alert('为了最佳显示效果 请使用google chrome') } this.$router.push('/home2') }, e => { diff --git a/src/pages/loginVerify/index.vue b/src/pages/loginVerify/index.vue index 4d39f8939..b92c39d53 100644 --- a/src/pages/loginVerify/index.vue +++ b/src/pages/loginVerify/index.vue @@ -84,7 +84,7 @@ if(routerParam && routerParam != ''){ const UA = navigator.userAgent.toLocaleLowerCase() if (UA.match(/msie/) != null || UA.match(/trident/) != null) { - alert('检测到您使用的是IE浏览器,已经和时代脱轨了!建议您更换为谷歌浏览器') + alert('为了最佳显示效果 请使用google chrome') } const param = routerParam.split("&"); this.$router.push({