diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index f9eefc43b..11f39d81b 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -19,13 +19,13 @@ @@ -101,27 +101,33 @@ label="计划状态" align="center" width="150"> + + {{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }} + + + {{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }} + @@ -180,7 +186,7 @@ @@ -199,38 +205,38 @@ - - - + + + - - - + + + + + + - + + + + + + + + + + + 手动查找 + + + - - - - - - @@ -285,6 +306,40 @@ @click="addDrawerClose">取消 + + + + + + + + + @@ -295,6 +350,15 @@ components: {}, data() { return { + QCDWmodal: false, + QCDWValue: [], + QCDWList: [], + type: '', + drawerTitle: '', + modalshowflag2: false, + modalshowflag: false, + nodeList: [], + nodeList2: [], loading: false, submitLoading: false, addDrawerTitle: '', @@ -307,10 +371,13 @@ planStatus: '', // 计划状态 reviseStatus: '', // 制修订状态 resPerson: '', // 评审责任人 + resPersonName: '', wgLeader: '', // 工作组组长 + wgLeaderName: '', draftTime: '', // 计划标准初稿完成时间 releaseTime: '', // 计划标准发布时间 drafter: '', // 起草人 + drafterName: '', // remarks: '', // 备注 }, addFormRules: { @@ -327,19 +394,19 @@ {required: true, message: '请选择制修订状态', trigger: 'change'}, ], resPerson: [ - {required: true, message: '请输入评审责任人', trigger: 'blur'}, + {required: true, message: '请选择评审责任人', trigger: 'change'}, ], wgLeader: [ - {required: true, message: '请输入工作组组长', trigger: 'blur'}, + {required: true, message: '请选择工作组组长', trigger: 'change'}, ], draftTime: [ - {required: true, message: '请输入计划标准初稿完成时间', trigger: 'blur'}, + {required: true, message: '请输入计划标准初稿完成时间', trigger: 'change'}, ], releaseTime: [ {required: true, message: '请输入计划标准发布时间', trigger: 'blur'}, ], drafter: [ - {required: true, message: '请输入起草人', trigger: 'blur'}, + {required: true, message: '请选择起草人', trigger: 'change'}, ], }, form: { @@ -358,6 +425,59 @@ props: {}, watch: {}, methods: { + QCDWOK () { + let arr1 = [] + if (this.addForm.unit) { + let str = this.addForm.unit.replace(/,/g, ',') + arr1 = str.split(',') + } + let arr2 = arr1.concat(this.QCDWValue) + this.addForm.unit = Array.from(new Set(arr2)).join(',') + this.QCDWmodal = false + }, + QCDWClick () { + this.QCDWValue = [] + this.QCDWmodal = true + }, + choiceZRR (type, title, id) { + this.nodeList = [] + this.nodeList.push(id) + this.type = type + this.drawerTitle = title + this.modalshowflag = true + }, + checkedRole (data) { + this.addForm.wgLeader = data[0].id + this.addForm.wgLeaderName = data[0].name + }, + choiceZRRS (type, title, id) { + this.type = type + this.drawerTitle = title + this.nodeList2 = [] + if (id) { + this.nodeList2 = id.split(',') + } + this.modalshowflag2 = true + }, + checkedRole2 (data) { + var idList = '' + var nameList = '' + data.forEach( item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.name + }) + if (this.type === 'resPerson') { + this.addForm.resPerson = idList + this.addForm.resPersonName = nameList + } else if (this.type === 'drafter') { + this.addForm.drafter = idList + this.addForm.drafterName = nameList + } + }, addDrawerSubmit () { this.$refs['addForm'].validate((valid) => { if (valid) { @@ -376,9 +496,15 @@ }, res => { this.submitLoading = false if (res.ok) { - this.addDrawer = false - this.$message.success(tips + '成功') - this.getData() + if (res.data === '操作成功') { + this.addDrawer = false + this.$message.success(tips + '成功') + this.getData() + } else { + this.addDrawer = false + this.$message.warning(res.data) + this.getData() + } } else { this.$message.warning(tips + '失败') } @@ -473,9 +599,12 @@ reviseStatus: command[0].reviseStatus, // 制修订状态 resPerson: command[0].resPerson, // 评审责任人 wgLeader: command[0].wgLeader, // 工作组组长 + resPersonName: command[0].resPersonName, // 评审责任人 + wgLeaderName: command[0].wgLeaderName, // 工作组组长 draftTime: command[0].draftTime, // 计划标准初稿完成时间 releaseTime: command[0].releaseTime, // 计划标准发布时间 - drafter: command[0].drafter, // 起草人 + drafterName: command[0].drafterName, // 起草人 + drafter: command[0].drafter, } break case '删除': @@ -525,6 +654,12 @@ computed: {}, mounted() { this.getData() + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + this.QCDWList = res.data.QCDW // 起草单位 + }, e => { + }) }, }