From 209e772c0923096ab2d047738785ed732a5f0430 Mon Sep 17 00:00:00 2001 From: fanlin Date: Wed, 28 Jul 2021 17:44:35 +0800 Subject: [PATCH 01/14] =?UTF-8?q?bug=E5=85=A5=E5=BA=93=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BA=86=E9=99=84=E4=BB=B6=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=97=B6=EF=BC=8C=E5=86=8D=E6=AC=A1=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E4=BA=86=E4=B8=80=E4=B8=AA=E9=99=84=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=90=8E=EF=BC=8C=E6=9F=A5=E7=9C=8B=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C=E9=99=84=E4=BB=B6=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomFormComponents/File.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue index 0a4ecebb4..322ac2238 100644 --- a/src/components/CustomFormComponents/File.vue +++ b/src/components/CustomFormComponents/File.vue @@ -255,7 +255,7 @@ export default { uploadSuccess(res, file, fileList) { if (res.ok) { // this.value += res.data.id + ',' - this.$emit('input', this.value + res.data.id + ',') + this.$emit('input', this.value ? this.value + ',' : this.value+ res.data.id + ',') this.$emit('success') this.$message({ message: '文件上传成功', diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 7abdff57a..d26ffa3b0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -876,8 +876,11 @@ } }, getRule(){ - if (this.formTongGuo.approvalOpinion !== '1') { + if (this.formTongGuo.approvalOpinion === '0') { + this.rules.commentText.required = false this.$refs.formTongGuo.clearValidate('commentText') + } else { + this.rules.commentText.required = true } }, popoverHide (checkedIds, checkedData) { From e960aa5cdfcd86037fac8149577beb401e4fcbfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 28 Jul 2021 18:18:51 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1-1.vue | 258 +++++++++++------- .../pages/creatProcess/bzqdfb/step1.vue | 118 +++++--- .../pages/creatProcess/bzqdfb/step2.vue | 87 ++++-- .../pages/creatProcess/bzqdfb/step3.vue | 172 ++++++++++-- .../pages/creatProcess/bzqdfb/step4.vue | 53 +++- src/sysConfig/index.js | 2 +- 6 files changed, 499 insertions(+), 191 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 6d6626e98..401babe87 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -103,7 +103,6 @@ @@ -128,20 +127,20 @@ label="发布日期"> + @@ -324,26 +326,13 @@ }} - - - + @click="getStandData"> 查询 @@ -601,7 +590,6 @@ - - - - + - - - { + if (item.xcxssrqgj === null){ + this.$set(item, "XCXSSRQ", ''); + this.$set(item, "ZCCSSRQ", ''); + }else{ + this.$set(item, "XCXSSRQ", item.xcxssrqgj); + this.$set(item, "ZCCSSRQ", item.zccssrqgj); + } + }) this.listForm.dataList = res.data; let formId = []; this.dataList.map(item => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index c1c65b777..40db856ba 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -93,20 +93,19 @@ - - - - - - - - - - + + + + + + + + @@ -409,8 +408,8 @@ export default { label: "name" }, roleForm: { - startUserName: this.$store.getters.userInfo.userName, - startUser: this.$store.getters.userInfo.id, + prcCreateUserName: this.$store.getters.userInfo.userName, + prcCreateUser: this.$store.getters.userInfo.userId, qualityEngineer: "", certifiedEngineer: "", qualityEngineerName: "", @@ -521,10 +520,11 @@ export default { this.listForm.certifiedEngineer = data[0].id; this.listForm.certifiedEngineerName = data[0].name; } else if (this.type === "distributePerson") { - // this.dataList.distributePerson = data[0].id; - // this.dataList.distributePersonName = data[0].name; + this.dataList.distributePersonId = data[0].id; + this.dataList.distributePerson = data[0].name; this.listForm.dataList[this.dsadadadsada].distributePersonId = data[0].id; this.listForm.dataList[this.dsadadadsada].distributePerson = data[0].name; + console.log(this.dataList) this.showColumn = false; this.$nextTick(() => { this.showColumn = true; @@ -652,6 +652,7 @@ export default { this.$message.warning("请选择分发责任人"); } else { var json = Object.assign(this.listForm, this.roleForm); + console.log(json); this.$refs["listForm"].validate((valid) => { if (valid) { this.$refs["roleForm"].validate((valid) => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 123463a43..2d7414f24 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -328,33 +328,36 @@ export default { //驳回事件 beforeBack () { - this.listForm.passFlag = '1' - this.handleSubmit() + if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('请填写审批意见') + }else{ + this.listForm.passFlag = '1' + this.handleSubmit() + } }, //提交事件 handleSubmit() { - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; - this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; - this.listForm.zrUserId = this.$store.getters.userInfo.userId ; - this.listForm.commentText = this.commentText; - this.listForm.standId = this.listForm.standId; - this.listForm.breakdownList = this.listForm.breakdownList - const json = JSON.stringify(this.listForm); - this.$http.post('lawss/activiti/completeTask', { - taskIds: this.taskIds, - userId: this.userId, - json: json, - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message) - this.$router.push('/processCenter') - } - }, e => { + if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('请填写审批意见') + }else{ + this.listForm.commentText = this.commentText + const json = JSON.stringify(this.listForm); + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.taskIds, + userId: this.userId, + json: json, + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + this.$router.push('/processCenter') + } + }, e => { + + }); + } - }); }, //标准表格选择框改变 selectStandChange(data) { diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 152f4d24b..ff4dd93eb 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -205,10 +205,18 @@ export default { this.toProcessDetail('bzqdfbStep4',row) }else if (prcType === '5'){ //标准项目合规评估 标准维度 - this.toProcessDetail('xmpgStep7',row) + if(row.taskInfo === '标准法规部部长审批'){ + this.toProcessDetail('xmpgStep7',row) + }else{ + this.toProcessDetail('xmpgStep2',row) + } }else if(prcType === '6'){ //标准项目合规评估 项目维度 - this.toProcessDetail('xmpg2Step12',row) + if(row.taskInfo === '标准法规部领导审核'){ + this.toProcessDetail('xmpg2Step12',row) + }else{ + this.toProcessDetail('xmpg2Step2',row) + } } } else { this.$message.warning('当前流程未全部办理完成，无法查看') From d62f69ed7e85510ec1e750e0ec857073f4c4034e Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 29 Jul 2021 15:22:24 +0800 Subject: [PATCH 09/14] commit --- .../config/pages/mechanismManage/index.vue | 2 +- src/pages/home1/components/todoList/index.vue | 451 +++++++++++++++++- .../processCenter/pages/newProcess/index.vue | 19 +- .../tabComponents/processCenter/index.vue | 1 - 4 files changed, 458 insertions(+), 15 deletions(-) diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index beb4d7667..bf1e90b44 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -312,7 +312,7 @@ export default { } .tree-content { background: #fff; - width: 16%; + width: 300px; position: relative; .tree { width: 95%; diff --git a/src/pages/home1/components/todoList/index.vue b/src/pages/home1/components/todoList/index.vue index 72814cde8..f7e585052 100644 --- a/src/pages/home1/components/todoList/index.vue +++ b/src/pages/home1/components/todoList/index.vue @@ -87,6 +87,7 @@ export default { } }) } + break case '2': if (row.taskInfo === '责任对接人选择责任人') { this.$router.push({ @@ -110,9 +111,166 @@ export default { prcType: row.prcType } }) + } else if (row.taskInfo === '责任对接人审批') { + this.$router.push({ + name: 'bzdyStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '标准法规工程师调研汇总'){ + this.$router.push({ + name: 'bzdyStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '责任人会签'){ + this.$router.push({ + name: 'bzdyStep6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '部长+对接人审核') { + this.$router.push({ + name: 'bzdyStep7', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo.indexOf('工程研究总院院长') == 0 ) { + this.$router.push({ + name: 'bzdyStep9', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else { + this.$router.push({ + name: 'bzdyStep8', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } break; - //标准清单更新/发布流程 + case '3': + if (row.taskInfo === '责任对接人选择责任人') { + this.$router.push({ + name: 'bzzqyjStep2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '责任人填写征求意见'){ + this.$router.push({ + name: 'bzzqyjStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '责任对接人审批') { + this.$router.push({ + name: 'bzzqyjStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '标准法规工程师汇总填写处理意见') { + this.$router.push({ + name: 'bzzqyjStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '责任人会签') { + this.$router.push({ + name: 'bzzqyjStep6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '部长+对接人审核') { + this.$router.push({ + name: 'bzzqyjStep7', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo.indexOf('技术委员会相关专委会主任') == 0 ) { + this.$router.push({ + name: 'bzzqyjStep8', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else { + this.$router.push({ + name: 'bzzqyjStep9', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break + //标准清单更新/发布流程 case'4' : if (row.taskInfo === '进行会签，填写意见') { this.$router.push({ @@ -148,8 +306,8 @@ export default { } }) } - break; - //项目合规评估流程 + break + //项目合规评估流程 case '5' : if(row.taskInfo === '标准法规部业务经理审批'){ this.$router.push({ @@ -162,8 +320,293 @@ export default { prcType: row.prcType } }) + }else if(row.taskInfo === '标准评估任务下发'){ + this.$router.push({ + name: 'xmpgStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '合规性评估'){ + this.$router.push({ + name: 'xmpgStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '分发责任人审核'){ + this.$router.push({ + name: 'xmpgStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '汇总审核'){ + this.$router.push({ + name: 'xmpgStep6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '标准法规部领导审核'){ + this.$router.push({ + name: 'xmpgStep7', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break + //项目评估流程-项目 + case '6': + if(row.taskInfo === '标准法规部业务经理审批'){ + this.$router.push({ + name: 'xmpg2Step2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '工程经理转办'){ + this.$router.push({ + name: 'xmpg2Step3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '架构经理任务分发') { + this.$router.push({ + name: 'xmpg2Step4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '分发责任人下发') { + this.$router.push({ + name: 'xmpg2Step5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '合规性评估') { + this.$router.push({ + name: 'xmpg2Step6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '分发负责人审批') { + this.$router.push({ + name: 'xmpg2Step7', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '架构经理审批') { + this.$router.push({ + name: 'xmpg2Step8', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '工程经理审批') { + this.$router.push({ + name: 'xmpg2Step9', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '标准法规部经理审批') { + this.$router.push({ + name: 'xmpg2Step10', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '汇总审批') { + this.$router.push({ + name: 'xmpg2Step11', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '标准法规部部长审批') { + this.$router.push({ + name: 'xmpg2Step12', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break + //未符合项整改流程 + case '8' : + if(row.taskInfo === '下发至标准法规工程师'){ + this.$router.push({ + name: 'wfhxzgStep2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '确认+选择责任人') { + this.$router.push({ + name: 'wfhxzgStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '上传佐证材料填写信息') { + this.$router.push({ + name: 'wfhxzgStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else { + this.$router.push({ + name: 'wfhxzgStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break + case '9': + if (row.taskInfo === '选择执行人') { + this.$router.push({ + name: 'bzjdStep2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '填写解读分析') { + this.$router.push({ + name: 'bzjdStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '责任人审核') { + this.$router.push({ + name: 'bzjdStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '工程师审核') { + this.$router.push({ + name: 'bzjdStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '部长审批') { + this.$router.push({ + name: 'bzjdStep6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } - } }, }, diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 320976806..db1b4483f 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -4,7 +4,7 @@

标准法规管理流程
- +
@@ -22,7 +22,7 @@
- +
@@ -40,7 +40,7 @@
- +
@@ -58,7 +58,7 @@
- +
@@ -76,7 +76,7 @@
- +
@@ -94,7 +94,7 @@
- +
@@ -112,7 +112,7 @@
- +
@@ -130,7 +130,7 @@
- +
@@ -281,7 +281,8 @@ export default { * @returns {boolean} */ bzfggllc() { - return true + const idArray = ['2564bd61852551b99e0fe3d49a89b288', '2d0f99ba961c551b1d8cad8ad5223731', '7751d25f72d0a6515e4110ae41837db8', '90c7bae6308595f053c6f6f90167e493', '9adff72ab464793564c5d1de20b45620', 'a151f5e2ee44f8df81e201b8696fca31', 'f4eeb9ed48eac5686a456a5582508d9c', 'fc25b770ad3752cdec52f3bd7b35a6a1'] + return this.checkPermission(idArray) }, /** * 政策管理流程 diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index b28ec60cb..3af975738 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -216,7 +216,6 @@ export default { dealWith (row) { // 办理 this.setHandleInfo(JSON.stringify(row)) const prcType = row.prcType - console.log(prcType); switch(prcType) { case '1': if (row.taskInfo === '标准法规业务经理审批') { From 77825748b45440048a3501eca59cbeed7af8cf46 Mon Sep 17 00:00:00 2001 From: fanlin Date: Thu, 29 Jul 2021 15:29:59 +0800 Subject: [PATCH 10/14] =?UTF-8?q?bug=EF=BC=9A=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E4=BA=BA=E4=BF=AE=E8=AE=A2=E9=A1=B5=E9=9D=A2=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=9C=88=E4=BD=8F=E7=9A=84=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E9=A1=B5=E9=9D=A2=E5=92=8C=E4=BF=AE=E8=AE=A2=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=BC=BA=E5=B0=91=E9=83=A8=E5=88=86=E4=BB=A3=E6=9B=BF?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 17 +++++++++++++++++ .../pages/creatProcess/bzrk/step2.vue | 11 ++++++++++- .../pages/creatProcess/bzrk/step3.vue | 8 ++++++++ .../pages/creatProcess/bzrk/step4.vue | 18 ++++++++++++++++++ 4 files changed, 53 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 493a8f6ae..9f0ac517a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -711,6 +711,20 @@ + + + {{'手动查找'}} + - + + + + + + + + + + {{'手动查找'}} + + Date: Thu, 29 Jul 2021 15:32:37 +0800 Subject: [PATCH 11/14] commit --- .../domesticStandardsAndRegulations/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 5b3add18e..59bd2bd9f 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -4,7 +4,7 @@
Date: Thu, 29 Jul 2021 15:35:12 +0800 Subject: [PATCH 12/14] =?UTF-8?q?bug=EF=BC=9A=E6=A0=87=E5=87=86=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B--=E6=88=91=E5=8F=B8=E7=BD=B2?= =?UTF-8?q?=E5=90=8D=E4=BA=BA=E4=B8=8E=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=9A=84=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzrk/step1.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 9f0ac517a..73e8b0114 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -638,8 +638,13 @@ - - + From 9cff5a507063a6be443ef1ca9d9325f8091003bf Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Thu, 29 Jul 2021 16:59:48 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E6=B8=85=E7=A9=BA=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=A1=B5=E7=9A=84=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standAutoSplit/index.vue | 38 +-- .../standAutoSplit/pages/itemSplitInfo.vue | 10 +- .../localTool/standardRecognition/index.vue | 306 +++++++++--------- .../page/listOfCountries.vue | 6 +- .../page/listOther.vue | 6 +- .../page/listProject.vue | 6 +- .../pages/addEdit.vue | 8 +- .../pages/details.vue | 12 +- .../pages/otherAddEit.vue | 8 +- .../pages/projectAddEit.vue | 8 +- 10 files changed, 190 insertions(+), 218 deletions(-) diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index e4306b6ee..3f07616db 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -51,20 +51,12 @@ prop="showNumber" label="标准号/政策号" align="center"> - - - - - + 失败 - +