From 4d7e9a6acd1c1036e9229ee5f2a4618214892809 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 9 Jan 2023 10:35:25 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E7=AB=8B=E9=A1=B9=E8=AE=A1=E5=88=92-=E8=B5=B7?= =?UTF-8?q?=E8=8D=89=E7=95=8C=E9=9D=A2-=E5=AF=BC=E5=85=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=20=E5=AF=B9=E5=BF=85=E5=A1=AB=E9=A1=B9=E5=81=9A?= =?UTF-8?q?=E5=BF=85=E5=A1=AB=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbzxdlx/step1.vue | 109 +++++++++++++----- 1 file changed, 80 insertions(+), 29 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index 3b5891dcb..70867f480 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -57,7 +57,8 @@ 批量删除 - + - - - + + + + + + + + + - + + + @@ -83,6 +108,7 @@ + @@ -433,6 +459,20 @@ export default { processName: '', qblxData: [], }, + qblxRule2:{ + bussSort:[ + {required:true,message:"请输入企标类别"} + ], + esName:[ + {required:true,message:"请输入企标名称"} + ], + reviseStatus:[ + {required:true,message:"请输入制修订类型"} + ], + drafterName:[ + {required:true,message:"请输入起草人"} + ], + }, commentText: '', qblxRule: { processName: [ @@ -1044,39 +1084,43 @@ export default { let jsonData = this.qblx_pageData.qblxData this.qblx_pageData.qblxFile = this.fileInfoList this.qblx_pageData.commentText = this.commentText; - this.$refs["qblx_pageData"].validate((valid) => { - if (valid) { - this.$refs["roleForm"].validate(async (valid) => { + this.$refs.qblx_pageData2.validate((valid)=>{ + if(valid){ + this.$refs["qblx_pageData"].validate((valid) => { if (valid) { - this.isSubmit = true - let finishCount = 0; - while (finishCount < jsonData.length) { - await this.listSubmit(jsonData[finishCount]) - .then(() => { - finishCount++ - }).catch(e => { - }) - } - if (finishCount === jsonData.length) { - this.$message.success("提交成功"); - this.isSubmit = false - this.$router.push('/processCenter') - } - this.isSubmit = false + this.$refs["roleForm"].validate(async (valid) => { + if (valid) { + this.isSubmit = true + let finishCount = 0; + while (finishCount < jsonData.length) { + await this.listSubmit(jsonData[finishCount]) + .then(() => { + finishCount++ + }).catch(e => { + }) + } + if (finishCount === jsonData.length) { + this.$message.success("提交成功"); + this.isSubmit = false + this.$router.push('/processCenter') + } + this.isSubmit = false + } else { + return this.$message.warning("请完善人员信息"); + } + }); } else { - return this.$message.warning("请完善人员信息"); + return this.$message.warning("请完善基础信息"); } }); - } else { - return this.$message.warning("请完善基础信息"); + }else{ + return this.$message.warning("请完善企标类别、企标名称、制修订类型、起草人"); } - }); + }) }else{ this.$message.warning('立项列表不能为空') } - }, - } } @@ -1194,5 +1238,12 @@ export default { } } } +.qblx_page_form{ + width:100%; + height:62%; + /deep/ .el-form-item__error{ + display: none; + } +} From 0c815e8b54f63c8e20279775817a40074ca99068 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 9 Jan 2023 10:57:41 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86-=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=E7=BB=8F=E7=90=86=E5=AE=A1=E6=A0=B8=E8=8A=82=E7=82=B9?= =?UTF-8?q?-=E9=A9=B3=E5=9B=9E=E5=90=8E=E5=9B=9E=E6=98=BE=E8=AF=84?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/stepC6.vue | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index 7f6a4215b..9fd8c842e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -878,7 +878,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {saveTaskForPub,changeAssigneeNew,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process"; + import {saveTaskForPub,changeAssigneeNew,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount,evaluationHisListByOne} from "api/process"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; @@ -1825,6 +1825,9 @@ getTaskId (mesg) { this.form = mesg.form this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD')) + if(this.form.fsRejectStatus === 1){ + this.evaluationHisListByOne() + } this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS']) this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS']) @@ -3009,7 +3012,12 @@ this.$nextTick(() => { this.form = JSON.parse(JSON.stringify(item)) this.form.evaluationData = [] - this.getEvaluation() + if(this.form.fsRejectStatus === 1){ + this.evaluationHisListByOne() + }else { + this.getEvaluation() + } + // this.getEvaluation() this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = item.id @@ -3033,6 +3041,19 @@ this.formKey++ }) }, + evaluationHisListByOne() { + return new Promise((resolve, reject) => { + evaluationHisListByOne({ + pid: this.pId,taskInfo:'重新技术委员会评审、评审意见修改' + }).then(res => { + if (res) { + this.form.evaluationData = JSON.parse(res.mesg) + this.$forceUpdate() + } + }).catch(e => { + }) + }) + }, filterObj(obj){ if(obj && obj !== ''){ if(obj instanceof Array){ From 6f679be8d765ca882946d9cf167562ef070a9545 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 9 Jan 2023 11:53:56 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E7=AB=8B=E9=A1=B9=E8=AE=A1=E5=88=92-=E8=B5=B7?= =?UTF-8?q?=E8=8D=89=E7=95=8C=E9=9D=A2-=E7=82=B9=E5=87=BB=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=BC=B9=E5=87=BA=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbzxdlx/step1.vue | 61 ++++++++++++++----- 1 file changed, 45 insertions(+), 16 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index 70867f480..833504f27 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -28,21 +28,27 @@ placeholder="请输入项目目标"/> -
- - - 点击上传 - - + + + + + + + + + + + + + + + + + + 点击上传 + +
+
{{ item.name }}
@@ -367,6 +373,23 @@ :nodeList="nodeListZRBM" @checkedRole="drawerCheckZRBM" /> + + + + +

点击或拖拽上传文件

+ + Date: Mon, 9 Jan 2023 14:04:12 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E7=AB=8B=E9=A1=B9=E8=AE=A1=E5=88=92-=E8=B5=B7?= =?UTF-8?q?=E8=8D=89=E7=95=8C=E9=9D=A2-=E8=A1=A8=E6=A0=BC=E6=82=AC?= =?UTF-8?q?=E6=B5=AE=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbzxdlx/step1.vue | 53 +++++++++++-------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index 833504f27..a49cb9ef5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -74,40 +74,42 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '20px'}"> - + - + - + - - + + - - - - - + + + + +