diff --git a/src/pages/config/pages/linkManage/linkType/firstLink.vue b/src/pages/config/pages/linkManage/linkType/firstLink.vue index 04cf53df1..c15071f96 100644 --- a/src/pages/config/pages/linkManage/linkType/firstLink.vue +++ b/src/pages/config/pages/linkManage/linkType/firstLink.vue @@ -468,8 +468,9 @@ export default { (data, byte) => data + String.fromCharCode(byte), "") ) item.icon = src - }) - this.Loading = false + }, setTimeout(()=>{ + this.Loading = false + },1200)) } }) this.initSortable() diff --git a/src/pages/config/pages/linkManage/linkType/secondLink.vue b/src/pages/config/pages/linkManage/linkType/secondLink.vue index f5c67b7fb..6c91e0b35 100644 --- a/src/pages/config/pages/linkManage/linkType/secondLink.vue +++ b/src/pages/config/pages/linkManage/linkType/secondLink.vue @@ -466,8 +466,9 @@ export default { (data, byte) => data + String.fromCharCode(byte), "") ) item.icon = src - }) - this.Loading = false + }, setTimeout(()=>{ + this.Loading = false + },1200)) } }) this.initSortable() diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index cf109226c..c5282f73c 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -23,9 +23,9 @@
企标评价 - - + - - - + + - + + + + - + + + + + + {{ businessCommentForm.averageScore * 2 }} + +
+ 提交 + + 取消 + +
@@ -1037,19 +1066,26 @@ export default { }, data () { return { - targetScore: '', + indexType: 'dynamic', + commentReason: '', // 评价理由 + commentReason1: '', // 评价理由 + commentReason2: '', // 评价理由 + commentReason3: '', // 评价理由 + commentReason4: '', // 评价理由 + commentSubmitLoading: false, + targetScore: '', // 指标分值 + targetScore1: '', + targetScore2: '', + targetScore3: '', + targetScore4: '', businessCommentDialog: false, - businessCommentForm: {}, - revise: '', - businessCommentTable: [{ - commentTarget: '企业标准内容完整、要求合理(指标、流程等。)', - }, { - commentTarget: '企业标准便于实施应用', - }, { - commentTarget: '标准编写规范,内容清晰易理解', - }, { - commentTarget: '标准对我的实际工作很有帮助', - }], + businessCommentForm: { + averageScore: '', // 平均分值 + revise: '', + reviseReason: '', // 修订理由 + }, + businessCommentTable: [], + commentTarget: '', // 评价指标 activeNames: ['基础信息','过程稿件','实施日期'], activeState: true, visiblePlanCheck: false, @@ -1258,7 +1294,99 @@ export default { }, methods: { targetScoreChange(row){ - console.log('1234',row) + if (this.targetScore1 === '') { + this.targetScore1 = 0 + } + if (this.targetScore2 === '') { + this.targetScore2 = 0 + } + if (this.targetScore3 === '') { + this.targetScore3 = 0 + } + if (this.targetScore4 === '') { + this.targetScore4 = 0 + } + switch (row.threeIndexTitle){ + case "企业标准内容完整、要求合理(指标、流程等。)": + this.targetScore1 = 0 + this.targetScore1 = row.targetScore + break + case "企业标准便于实施应用": + this.targetScore2 = 0 + this.targetScore2 = row.targetScore + break + case "标准编写规范,内容清晰易理解": + this.targetScore3 = 0 + this.targetScore3 = row.targetScore + break + case "标准对我的实际工作很有帮助": + this.targetScore4 = 0 + this.targetScore4 = row.targetScore + break + } + this.businessCommentForm.averageScore = (this.targetScore1 + this.targetScore2 + this.targetScore3 +this.targetScore4)/4 + + + }, + commentReasonChange(row){ + if (row.threeIndexTitle === '企业标准内容完整、要求合理(指标、流程等。)'){ + this.commentReason1 = row.commentReason + } + if (row.threeIndexTitle === '企业标准便于实施应用'){ + this.commentReason2 = row.commentReason + } + if (row.threeIndexTitle === '标准编写规范,内容清晰易理解'){ + this.commentReason3 = row.commentReason + } + if (row.threeIndexTitle === '标准对我的实际工作很有帮助'){ + this.commentReason4 = row.commentReason + } + + }, + commentSubmit(){ + //验证必填 + let submitFlag = true + if (this.targetScore1 === '' || this.targetScore1 === 0 || + this.targetScore2 === '' || this.targetScore2 === 0 || + this.targetScore3 === '' || this.targetScore3 === 0 || + this.targetScore4 === '' || this.targetScore4 === 0) { + submitFlag = false + this.$message.warning('请评价指标分值') + }else if ( + (this.commentReason1 === '' && this.targetScore1 < 3) || + (this.commentReason2 === '' && this.targetScore2 < 3) || + (this.commentReason3 === '' && this.targetScore3 < 3) || + (this.commentReason4 === '' && this.targetScore4 < 3) + ) { + submitFlag = false + this.$message.warning('请简述低分理由') + } else if (this.businessCommentForm.revise === ''){ + submitFlag = false + this.$message.warning('请选择是否需要修订') + }else if (this.businessCommentForm.revise === '1' && this.businessCommentForm.reviseReason === ''){ + submitFlag = false + this.$message.warning('请填写修订理由') + } + if (submitFlag === true) { + this.$message.success('通过') + + const allData = { + tableData: this.businessCommentTable, + formData: JSON.stringify(this.businessCommentForm), + standId: this.sarStandardsInfoEO.id, + userId: this.$store.getters.userInfo.userId + } + + console.log(allData) + this.$http.postData('sarEnterpriseStandardEvaluation/quality-evaluation/submitEvaluationForm', allData, { + _this: this + }, res => { + console.log(res) + }, e => { + }) + + + } }, child1Func(child1){ const list = [] @@ -2255,6 +2383,14 @@ export default { // } }, async mounted () { + this.$http.get('sarEnterpriseStandardEvaluation/evaluation-index/getEvaluationIndex', {indexType:this.indexType}, { + _this: this + }, res => { + console.log('2371',res) + this.businessCommentTable = res.data + console.log(this.businessCommentTable) + }, e => { + }) this.sarStandardsInfoEO.id = this.$route.params.id this.getOrgTreeSource() this.standItemEO.standId = this.$route.params.id diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue index 57e02df1b..508740324 100644 --- a/src/pages/home2/index.vue +++ b/src/pages/home2/index.vue @@ -140,7 +140,7 @@ export default { } ::v-deep { .el-tabs__item { - font-size: 14px; + font-size: 15px; font-weight: 600; /*color: #333333;*/ } diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index 8ebea20ce..86d86d981 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -50,6 +50,7 @@ @@ -286,6 +312,9 @@ export default { props: ['message'], data(){ return { + QCDWmodal: false, + QCDWValue: [], + QCDWList: [], drawerTitle2: '', drawerTitle: '', type: '', @@ -322,10 +351,10 @@ export default { reviseStatus: [ {required: true, message: '请选择制修订状态', trigger: 'change'}, ], - resPerson: [ + resPersonName: [ {required: true, message: '请输入评审责任人', trigger: 'blur'}, ], - wgLeader: [ + wgLeaderName: [ {required: true, message: '请输入工作组组长', trigger: 'blur'}, ], draftTime: [ @@ -334,7 +363,7 @@ export default { releaseTime: [ {required: true, message: '请输入计划标准发布时间', trigger: 'blur'}, ], - drafter: [ + drafterName: [ {required: true, message: '请输入起草人', trigger: 'blur'}, ], mergeReason: [ @@ -404,6 +433,20 @@ export default { } }, methods: { + QCDWOK () { + let arr1 = [] + if (this.qbfsForm.unit !== undefined) { + let str = this.qbfsForm.unit.replace(/,/g, ',') + arr1 = str.split(',') + } + let arr2 = arr1.concat(this.QCDWValue) + this.qbfsForm.unit = Array.from(new Set(arr2)).join(',') + this.QCDWmodal = false + }, + QCDWClick () { + this.QCDWValue = [] + this.QCDWmodal = true + }, choiceZRR() { this.nodeList = []; this.drawerTitle = '请选择工作组组长'; diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index 027d2d449..f26e7448b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -37,10 +37,10 @@ - + @@ -69,18 +69,18 @@ - + - + @@ -188,17 +188,17 @@ label="制修订状态"> @@ -349,13 +349,13 @@ export default { this.qbfsForm.esId = this.selectList[0].id this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.draftTime = this.selectList[0].draftTime - this.qbfsForm.drafter = this.selectList[0].drafter + this.qbfsForm.drafterName = this.selectList[0].drafterName this.qbfsForm.planStatus = this.selectList[0].planStatus this.qbfsForm.releaseTime = this.selectList[0].releaseTime - this.qbfsForm.resPerson = this.selectList[0].resPerson + this.qbfsForm.resPersonName = this.selectList[0].resPersonName this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus this.qbfsForm.unit = this.selectList[0].unit - this.qbfsForm.wgLeader = this.selectList[0].wgLeader + this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName this.ListModel = false } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index b3503075a..413010df3 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -431,6 +431,9 @@ export default { }, //流程提交 handleSubmit() { + if(this.$refs["childForm"].qbfsForm.type === undefined){ + this.$refs["childForm"].qbfsForm.type = '1' + } this.repeatName() if(this.comFlag === '0'){ this.$message.warning('请更改企标名称') diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index e846129cd..bcf5d217c 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -239,7 +239,7 @@ @pageSizeChange="pageSizeChange"/> -
{ - if (item.passInfo !== undefined) { + if (item.passInfo !== 0) { this.passInfo = JSON.parse(JSON.stringify(item)).passInfo - } - let fileData = JSON.parse(JSON.stringify(item)).dockUserList - for (let i = 0; i - - -

产品经理

+

产品工程经理

- +
@@ -449,7 +449,7 @@ export default { // 角色验证 roleFormRules: { confirmName: [ - { required: true, message: "请选择产品经理", trigger: "change" } + { required: true, message: "请选择产品工程经理", trigger: "change" } ] } }; diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 559165663..26c2a7824 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -103,15 +103,15 @@
- -

产品经理

+

产品工程经理

- +
@@ -461,7 +461,7 @@ export default { // 角色验证 roleFormRules: { confirmName: [ - { required: true, message: "请选择产品经理", trigger: "change" } + { required: true, message: "请选择产品工程经理", trigger: "change" } ], approveName: [ { required: true, message: "请选择审批人", trigger: "change" } @@ -528,7 +528,6 @@ export default { } else { this.qdform.projectNumber = this.selectProject[0].projectNumber; this.qdform.projectName = this.selectProject[0].projectName; - this.qdform.projectId = this.selectProject[0].id; this.projectModel = false; } diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index 00a810200..62939e368 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -2,7 +2,7 @@
- +
基础信息
@@ -67,7 +67,7 @@ -
@@ -616,7 +615,6 @@
-
{ this.dataList = res.data.records; @@ -1008,12 +1009,13 @@ export default { this.projectStand.map(item => { let index; index = this.dataList.findIndex(items => { - return items.standId === item.standId; + return items.id === item.id; }); if (index > -1) { this.dataList.splice(index, 1); } }); + this.$refs.standSelection.clearSelection() }).catch(() => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue index f886ef95e..8f603dc36 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue @@ -59,8 +59,8 @@ @@ -1044,12 +1043,13 @@ export default { this.projectStand.map(item => { let index; index = this.dataList.findIndex(items => { - return items.standId === item.standId; + return items.id === item.id; }); if (index > -1) { this.dataList.splice(index, 1); } }); + this.$refs.standSelection.clearSelection() }).catch(() => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue index 611fd5c46..d561682d8 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue @@ -2,7 +2,7 @@
- +
基础信息
@@ -59,8 +59,8 @@