FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

企标制修订计划修改bug

Browse Source
This commit is contained in:
宋伟佳
2021-12-03 18:02:22 +08:00
parent faa0f2a792
commit 86a7f19206
10 changed files with 522 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+2 -1
View File
@@ -305,7 +305,7 @@ export default {
//企业标准查询 //企业标准查询
getStandDataBtn(){ getStandDataBtn(){
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
reviseStatus: this.standardSearch.reviseStatus, reviseStatus: this.standardSearch.reviseStatus || '',
esName: this.standardSearch.standName, esName: this.standardSearch.standName,
page: this.page, page: this.page,
pageSize: this.pageSize, pageSize: this.pageSize,
@@ -336,6 +336,7 @@ export default {
}else if(this.selectList.length < 1){ }else if(this.selectList.length < 1){
this.$message.warning('请至少选择一条数据进行带入') this.$message.warning('请至少选择一条数据进行带入')
}else{ }else{
this.qbfsForm.esId = this.selectList[0].id
this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.esName = this.selectList[0].esName
this.qbfsForm.draftTime = this.selectList[0].draftTime this.qbfsForm.draftTime = this.selectList[0].draftTime
this.qbfsForm.drafter = this.selectList[0].drafter this.qbfsForm.drafter = this.selectList[0].drafter
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+2 -1
View File
@@ -327,7 +327,7 @@ export default {
//企业标准查询 //企业标准查询
getStandDataBtn(){ getStandDataBtn(){
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
reviseStatus: this.standardSearch.reviseStatus, reviseStatus: this.standardSearch.reviseStatus || '',
esName: this.standardSearch.standName, esName: this.standardSearch.standName,
page: this.page, page: this.page,
pageSize: this.pageSize, pageSize: this.pageSize,
@@ -358,6 +358,7 @@ export default {
}else if(this.selectList.length < 1){ }else if(this.selectList.length < 1){
this.$message.warning('请至少选择一条数据进行带入') this.$message.warning('请至少选择一条数据进行带入')
}else{ }else{
this.qbfsForm.esId = this.selectList[0].id
this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.esName = this.selectList[0].esName
this.qbfsForm.draftTime = this.selectList[0].draftTime this.qbfsForm.draftTime = this.selectList[0].draftTime
this.qbfsForm.drafter = this.selectList[0].drafter this.qbfsForm.drafter = this.selectList[0].drafter
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+175 -91
View File
@@ -1,91 +1,109 @@
<template> <template>
<div> <div>
<process-title> <process-title>
<template slot="title">立项信息</template> <template slot="title">立项信息</template>
</process-title> </process-title>
<el-form :model="qbfsForm" class="label-input-form prc-content-border" <el-form :model="qbfsForm" class="label-input-form prc-content-border"
label-width="150px" :rules="qbfsFormRules" ref="qbfsForm"> label-width="150px" :rules="qbfsFormRules" ref="qbfsForm">
<el-form-item v-if="false" label="" prop="type" class="add-form-item form-item-disabled"> <el-form-item v-if="false" label="" prop="type" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="qbfsForm.type" v-model="qbfsForm.type"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="qbfsForm.esName" v-model="qbfsForm.esName"
placeholder="请输入企标名称" placeholder="请输入企标名称"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.planStatus" placeholder="请选择计划状态"> <el-select v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
<el-option label="制定" value="制定"></el-option> <el-option label="制定" value="制定"></el-option>
<el-option label="修订" value="修订"></el-option> <el-option label="修订" value="修订"></el-option>
<el-option label="完成" value="完成"></el-option> <el-option label="完成" value="完成"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态"> <el-select v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
<el-option label="制定完成" value="制定完成"></el-option> <el-option label="制定完成" value="制定完成"></el-option>
<el-option label="制定中" value="制定中"></el-option> <el-option label="制定中" value="制定中"></el-option>
<el-option label="未制定" value="未制定"></el-option> <el-option label="未制定" value="未制定"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input v-model="qbfsForm.drafter" style="display: none;"></el-input>
v-model="qbfsForm.drafter" <el-input v-model="qbfsForm.drafterName" placeholder="请选择起草人"
placeholder="请输入起草人" @click.native="choiceZRRS('1')">
:maxlength="500"/> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="resPerson" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input v-model="qbfsForm.resPerson" style="display: none;"></el-input>
v-model="qbfsForm.resPerson" <el-input v-model="qbfsForm.resPersonName" placeholder="请选择评审责任人"
placeholder="请输入评审责任人" @click.native="choiceZRRS('2')">
:maxlength="500"/> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="wgLeader" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="wgLeaderName" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input v-model="qbfsForm.wgLeader" style="display: none;"></el-input>
v-model="qbfsForm.wgLeader" <el-input v-model="qbfsForm.wgLeaderName" placeholder="请选择工作组组长"
placeholder="请输入工作组组长" @click.native="choiceZRR"></el-input>
:maxlength="500"/> </el-form-item>
</el-form-item> <el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">
<el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled"> <el-date-picker
<el-date-picker v-model="qbfsForm.draftTime"
v-model="qbfsForm.draftTime" value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd" type="date"
type="date" placeholder="请选择计划标准初稿完成时间">
placeholder="请选择计划标准初稿完成时间"> </el-date-picker>
</el-date-picker> </el-form-item>
</el-form-item> <el-form-item label="计划标准发布时间" style="width: 100%; margin-right:10px" prop="releaseTime" class="add-form-item form-item-disabled">
<el-form-item label="计划标准发布时间" style="width: 100%; margin-right:10px" prop="releaseTime" class="add-form-item form-item-disabled"> <el-date-picker
<el-date-picker v-model="qbfsForm.releaseTime"
v-model="qbfsForm.releaseTime" value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd" type="date"
type="date" placeholder="请选择计划标准发布时间">
placeholder="请选择计划标准发布时间"> </el-date-picker>
</el-date-picker> </el-form-item>
</el-form-item> <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled">
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled"> <el-select v-model="qbfsForm.unit" filterable multiple clearable>
<el-input <el-option
v-model="qbfsForm.unit" v-for="item in qcdwOptions"
placeholder="请输入起草责任单位" placeholder="请选择起草责任单位"
:maxlength="500"/> :key="item.value"
</el-form-item> :value="item.value"
<el-form-item label="新增原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled"> :label="item.label"
<el-input ></el-option>
type="textarea" </el-select>
v-model="qbfsForm.newReason" </el-form-item>
placeholder="请输入新增原因" <el-form-item label="新增原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">
:maxlength="500"/> <el-input
</el-form-item> type="textarea"
<!-- <el-form-item label="备注" style="width: 100%; margin-right:10px" class="add-form-item" prop="remarks">--> v-model="qbfsForm.newReason"
<!-- <el-input--> placeholder="请输入新增原因"
<!-- v-model="qbfsForm.remarks"--> :maxlength="500"/>
<!-- placeholder="请输入备注"--> </el-form-item>
<!-- :maxlength="500"/>--> <!-- <el-form-item label="备注" style="width: 100%; margin-right:10px" class="add-form-item" prop="remarks">-->
<!-- </el-form-item>--> <!-- <el-input-->
</el-form> <!-- v-model="qbfsForm.remarks"-->
</div> <!-- placeholder="请输入备注"-->
<!-- :maxlength="500"/>-->
<!-- </el-form-item>-->
</el-form>
<!-- 多选择责任人-->
<Role-tree
:is-title="drawerTitle2"
:is-visible.sync="modalshowflag2"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
></Role-tree>
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
</div>
</template> </template>
<script> <script>
@@ -100,6 +118,14 @@ export default {
props: ['message'], props: ['message'],
data(){ data(){
return { return {
drawerTitle2: '',
drawerTitle: '',
roleType: '',
modalshowflag2: false,
modalshowflag: false,
nodeList2: [],
nodeList: [],
qcdwOptions: [],
qbfsForm: { qbfsForm: {
type: '5', type: '5',
unit: '', // 单位 unit: '', // 单位
@@ -107,10 +133,13 @@ export default {
planStatus: '', // 计划状态 planStatus: '', // 计划状态
reviseStatus: '', // 制修订状态 reviseStatus: '', // 制修订状态
resPerson: '', // 评审责任人 resPerson: '', // 评审责任人
resPersonName: '',
wgLeader: '', // 工作组组长 wgLeader: '', // 工作组组长
wgLeaderName: '',
draftTime: '', // 计划标准初稿完成时间 draftTime: '', // 计划标准初稿完成时间
releaseTime: '', // 计划标准发布时间 releaseTime: '', // 计划标准发布时间
drafter: '', // 起草人 drafter: '', // 起草人
drafterName: '',
newReason: '', //新增原因 newReason: '', //新增原因
// remarks: '', // 备注 // remarks: '', // 备注
}, },
@@ -127,10 +156,10 @@ export default {
reviseStatus: [ reviseStatus: [
{required: true, message: '请选择制修订状态', trigger: 'change'}, {required: true, message: '请选择制修订状态', trigger: 'change'},
], ],
resPerson: [ resPersonName: [
{required: true, message: '请输入评审责任人', trigger: 'blur'}, {required: true, message: '请输入评审责任人', trigger: 'blur'},
], ],
wgLeader: [ wgLeaderName: [
{required: true, message: '请输入工作组组长', trigger: 'blur'}, {required: true, message: '请输入工作组组长', trigger: 'blur'},
], ],
draftTime: [ draftTime: [
@@ -139,7 +168,7 @@ export default {
releaseTime: [ releaseTime: [
{required: true, message: '请输入计划标准发布时间', trigger: 'blur'}, {required: true, message: '请输入计划标准发布时间', trigger: 'blur'},
], ],
drafter: [ drafterName: [
{required: true, message: '请输入起草人', trigger: 'blur'}, {required: true, message: '请输入起草人', trigger: 'blur'},
], ],
newReason: [ newReason: [
@@ -158,7 +187,62 @@ export default {
} }
} }
}, },
mounted(){
//查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
}, res => {
console.log(res);
this.qcdwOptions = res.data.QCDW // 起草单位
})
},
methods: { methods: {
choiceZRR() {
this.nodeList = [];
this.drawerTitle = '请选择工作组组长';
this.modalshowflag = true;
},
checkedRole(data) {
this.qbfsForm.wgLeader = data[0].id;
this.qbfsForm.wgLeaderName = data[0].name;
this.modalshowflag = false;
},
choiceZRRS(type) {
this.roleType = type
if(type === '1' ){
this.drawerTitle2 = '请选择起草人'
this.nodeList2 = [];
if (this.qbfsForm.drafter !== undefined) {
this.nodeList2 = this.qbfsForm.drafter.split(",");
}
}else if(type === '2'){
this.drawerTitle2 = '请选择评审责任人'
this.nodeList2 = [];
if (this.qbfsForm.resPerson !== undefined) {
this.nodeList2 = this.qbfsForm.resPerson.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.roleType === '1'){
this.qbfsForm.drafter = idList;
this.qbfsForm.drafterName = nameList;
}else if(this.roleType === '2'){
this.qbfsForm.resPerson = idList;
this.qbfsForm.resPersonName = nameList;
}
},
validateForm () { validateForm () {
let flag = null let flag = null
this.$refs['qbfsForm'].validate((valid) => { this.$refs['qbfsForm'].validate((valid) => {
@@ -170,7 +254,7 @@ export default {
}) })
return flag return flag
} }
} },
}; };
</script> </script>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+180 -113
View File
@@ -3,86 +3,48 @@
<process-title> <process-title>
<template slot="title">合并企标信息</template> <template slot="title">合并企标信息</template>
</process-title> </process-title>
<el-form
ref="qbzxdForm"
:model="qbzxdForm"
:rules="formRules"
class="label-input-form prc-content-border"
label-width="150px"
>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="选择合并标准1" prop="orgName" class="add-form-item form-item-disabled">
<el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">根据企标编号、名称查询</el-button>
</el-form-item>
<el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbzxdForm.esName"
placeholder="请输入企标名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="计划状态" prop="planStatus" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbzxdForm.planStatus"
placeholder="请输入计划状态"
clearable
></el-input>
</el-form-item>
<el-form-item v-show="standShow" label="制修订状态" prop="reviseStatus" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbzxdForm.reviseStatus"
placeholder="请输入制修订状态"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="选择合并标准2" prop="orgName" class="add-form-item form-item-disabled">
<el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow2">根据企标编号、名称、类别查询</el-button>
</el-form-item>
<el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbzxdForm2.esName"
placeholder="请输入企标名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="计划状态" prop="planStatus" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbzxdForm2.planStatus"
placeholder="请输入计划状态"
clearable
></el-input>
</el-form-item>
<el-form-item v-show="standShow2" label="制修订状态" prop="reviseStatus" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbzxdForm2.reviseStatus"
placeholder="请输入制修订状态"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<process-title>
<template slot="title">合并后企标信息</template>
</process-title>
<el-form <el-form
ref="qbfsForm" ref="qbfsForm"
:model="qbfsForm" :model="qbfsForm"
:rules="formRules" :rules="qbfsFormRules"
class="label-input-form prc-content-border" class="label-input-form prc-content-border"
label-width="150px" label-width="150px"
> >
<div v-if="foldFormFlag"> <div v-if="foldFormFlag">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="选择合并标准1" prop="orgName" class="add-form-item form-item-disabled">
<el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">根据企标编号、名称查询</el-button>
</el-form-item>
<el-form-item label="企标名称" prop="esName1" class="add-form-item form-item-disabled">
<el-input readonly v-model="qbfsForm.esName1" placeholder="请输入企标名称" clearable></el-input>
</el-form-item>
<el-form-item label="计划状态" prop="planStatus1" class="add-form-item form-item-disabled">
<el-input readonly v-model="qbfsForm.planStatus1" placeholder="请输入计划状态" clearable></el-input>
</el-form-item>
<el-form-item v-show="standShow" label="制修订状态" prop="reviseStatus1" class="add-form-item form-item-disabled">
<el-input readonly v-model="qbfsForm.reviseStatus1" placeholder="请输入制修订状态" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="选择合并标准2" prop="orgName" class="add-form-item form-item-disabled">
<el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow2">根据企标编号、名称、类别查询</el-button>
</el-form-item>
<el-form-item label="企标名称" prop="esName2" class="add-form-item form-item-disabled">
<el-input readonly v-model="qbfsForm.esName2" placeholder="请输入企标名称" clearable></el-input>
</el-form-item>
<el-form-item label="计划状态" prop="planStatus2" class="add-form-item form-item-disabled">
<el-input readonly v-model="qbfsForm.planStatus2" placeholder="请输入计划状态" clearable></el-input>
</el-form-item>
<el-form-item v-show="standShow2" label="制修订状态" prop="reviseStatus2" class="add-form-item form-item-disabled">
<el-input readonly v-model="qbfsForm.reviseStatus2" placeholder="请输入制修订状态" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<process-title>
<template slot="title">合并后企标信息</template>
</process-title>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="false" label="" prop="type" class="add-form-item form-item-disabled"> <el-form-item v-if="false" label="" prop="type" class="add-form-item form-item-disabled">
@@ -106,11 +68,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="评审责任人" prop="resPerson" class="add-form-item form-item-disabled"> <el-form-item label="评审责任人" prop="resPerson" class="add-form-item form-item-disabled">
<el-input <el-input v-model="qbfsForm.resPerson" style="display: none;"></el-input>
v-model="qbfsForm.resPerson" <el-input v-model="qbfsForm.resPersonName" placeholder="请选择评审责任人"
placeholder="请输入评审责任人" @click.native="choiceZRRS('2')">
clearable </el-input>
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="初稿完成时间" prop="draftTime" class="add-form-item form-item-disabled"> <el-form-item label="初稿完成时间" prop="draftTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
@@ -121,11 +82,15 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled"> <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
<el-input <el-select v-model="qbfsForm.unit" filterable multiple clearable>
v-model="qbfsForm.unit" <el-option
placeholder="请输入起草责任单位" v-for="item in qcdwOptions"
clearable placeholder="请选择起草责任单位"
></el-input> :key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -137,18 +102,15 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="起草人" prop="drafter" class="add-form-item form-item-disabled"> <el-form-item label="起草人" prop="drafter" class="add-form-item form-item-disabled">
<el-input <el-input v-model="qbfsForm.drafter" style="display: none;"></el-input>
v-model="qbfsForm.drafter" <el-input v-model="qbfsForm.drafterName" placeholder="请选择起草人"
placeholder="请输入起草人" @click.native="choiceZRRS('1')">
clearable </el-input>
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="工作组组长" prop="wgLeader" class="add-form-item form-item-disabled"> <el-form-item label="工作组组长" prop="wgLeader" class="add-form-item form-item-disabled">
<el-input <el-input v-model="qbfsForm.wgLeader" style="display: none;"></el-input>
v-model="qbfsForm.wgLeader" <el-input v-model="qbfsForm.wgLeaderName" placeholder="请选择工作组组长"
placeholder="请输入工作组组长" @click.native="choiceZRR"></el-input>
clearable
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled"> <el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
@@ -296,6 +258,20 @@
<el-button type="primary" size="mini" @click="OkDrawer">带入</el-button> <el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
</div> </div>
</el-drawer> </el-drawer>
<!-- 多选择责任人-->
<Role-tree
:is-title="drawerTitle2"
:is-visible.sync="modalshowflag2"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
></Role-tree>
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
</div> </div>
</template> </template>
@@ -310,6 +286,14 @@ export default {
props: ['message'], props: ['message'],
data(){ data(){
return { return {
drawerTitle2: '',
drawerTitle: '',
type: '',
modalshowflag2: false,
modalshowflag: false,
nodeList2: [],
nodeList: [],
qcdwOptions: [],
standShow: false, standShow: false,
standShow2: false, standShow2: false,
ListModel: false, ListModel: false,
@@ -319,7 +303,44 @@ export default {
total: 0, total: 0,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
selectList: [], selectList: [],
formRules: {}, qbfsFormRules: {
esName1: [
{required: true, message: '请选择合并计划企标名称', trigger: 'blur'},
],
esName2: [
{required: true, message: '请选择合并计划企标名称', trigger: 'blur'},
],
unit: [
{required: true, message: '请输入单位', trigger: 'blur'},
],
esName: [
{required: true, message: '请输入企标名称', trigger: 'blur'},
],
planStatus: [
{required: true, message: '请选择计划状态', trigger: 'change'},
],
reviseStatus: [
{required: true, message: '请选择制修订状态', trigger: 'change'},
],
resPerson: [
{required: true, message: '请输入评审责任人', trigger: 'blur'},
],
wgLeader: [
{required: true, message: '请输入工作组组长', trigger: 'blur'},
],
draftTime: [
{required: true, message: '请输入计划标准初稿完成时间', trigger: 'blur'},
],
releaseTime: [
{required: true, message: '请输入计划标准发布时间', trigger: 'blur'},
],
drafter: [
{required: true, message: '请输入起草人', trigger: 'blur'},
],
mergeReason: [
{required: true, message: '请输入合并原因', trigger: 'blur'},
],
},
standinfoList: [], standinfoList: [],
standardSearch: { standardSearch: {
reviseStatus: "", reviseStatus: "",
@@ -334,6 +355,9 @@ export default {
isSubTime: "", isSubTime: "",
mergeReason: "", mergeReason: "",
company: "", company: "",
resPersonName: '',
drafterName: '',
wgLeaderName:'',
groupLeader: "", groupLeader: "",
drafterPeople: "", drafterPeople: "",
formulateStatus: "", formulateStatus: "",
@@ -357,21 +381,16 @@ export default {
reviewDate: '', reviewDate: '',
abolishCause:'', abolishCause:'',
}, },
qbzxdForm2: {
standCode: "",
standName: "",
enName: '',
entCategory: '',
replaceNumber: '',
replacedNumber: '',
releaseDate: '',
implementDate: '',
reviewDate: '',
abolishCause:'',
},
} }
}, },
mounted() { mounted() {
//查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
}, res => {
console.log(res);
this.qcdwOptions = res.data.QCDW // 起草单位
})
this.getStandDataBtn() this.getStandDataBtn()
}, },
@@ -385,6 +404,52 @@ export default {
} }
}, },
methods: { methods: {
choiceZRR() {
this.nodeList = [];
this.drawerTitle = '请选择工作组组长';
this.modalshowflag = true;
},
checkedRole(data) {
this.qbfsForm.wgLeader = data[0].id;
this.qbfsForm.wgLeaderName = data[0].name;
this.modalshowflag = false;
},
choiceZRRS(type) {
this.type = type
if(type === '1' ){
this.drawerTitle2 = '请选择起草人'
this.nodeList2 = [];
if (this.qbfsForm.drafter !== undefined) {
this.nodeList2 = this.qbfsForm.drafter.split(",");
}
}else if(type === '2'){
this.drawerTitle2 = '请选择评审责任人'
this.nodeList2 = [];
if (this.qbfsForm.resPerson !== undefined) {
this.nodeList2 = this.qbfsForm.resPerson.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 === '1'){
this.qbfsForm.drafter = idList;
this.qbfsForm.drafterName = nameList;
}else if(this.type === '2'){
this.qbfsForm.resPerson = idList;
this.qbfsForm.resPersonName = nameList;
}
},
validateForm () { validateForm () {
let flag = null let flag = null
this.$refs['qbfsForm'].validate((valid) => { this.$refs['qbfsForm'].validate((valid) => {
@@ -418,14 +483,16 @@ export default {
this.$message.warning('请至少选择一条数据进行带入') this.$message.warning('请至少选择一条数据进行带入')
}else{ }else{
if(this.showType === 'one'){ if(this.showType === 'one'){
this.qbzxdForm.esName = this.selectList[0].esName || '--' this.qbfsForm.esId1 = this.selectList[0].id || '--'
this.qbzxdForm.planStatus = this.selectList[0].planStatus || '--' this.qbfsForm.esName1 = this.selectList[0].esName || '--'
this.qbzxdForm.reviseStatus = this.selectList[0].reviseStatus || '--' this.qbfsForm.planStatus1 = this.selectList[0].planStatus || '--'
this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus || '--'
this.standShow = true this.standShow = true
}else{ }else{
this.qbzxdForm2.esName = this.selectList[0].esName || '--' this.qbfsForm.esId2 = this.selectList[0].id || '--'
this.qbzxdForm2.planStatus = this.selectList[0].planStatus || '--' this.qbfsForm.esName2 = this.selectList[0].esName || '--'
this.qbzxdForm2.reviseStatus = this.selectList[0].reviseStatus || '--' this.qbfsForm.planStatus2 = this.selectList[0].planStatus || '--'
this.qbfsForm.reviseStatus2= this.selectList[0].reviseStatus || '--'
this.standShow2 = true this.standShow2 = true
} }
this.ListModel = false this.ListModel = false
@@ -434,7 +501,7 @@ export default {
//企业标准查询 //企业标准查询
getStandDataBtn(){ getStandDataBtn(){
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
reviseStatus: this.standardSearch.reviseStatus, reviseStatus: this.standardSearch.reviseStatus || '',
esName: this.standardSearch.standName, esName: this.standardSearch.standName,
page: this.page, page: this.page,
pageSize: this.pageSize, pageSize: this.pageSize,
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+1 -1
View File
@@ -315,7 +315,7 @@ export default {
//企业标准查询 //企业标准查询
getStandDataBtn(){ getStandDataBtn(){
this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
reviseStatus: this.standardSearch.reviseStatus, reviseStatus: this.standardSearch.reviseStatus || '',
esName: this.standardSearch.standName, esName: this.standardSearch.standName,
page: this.page, page: this.page,
pageSize: this.pageSize, pageSize: this.pageSize,
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+67 -48
View File
@@ -268,6 +268,7 @@ export default {
}, },
data() { data() {
return { return {
comFlag: 0,
active: "1", active: "1",
commentText: "", commentText: "",
comName: "merge", comName: "merge",
@@ -414,22 +415,71 @@ export default {
this.saveLoading = false this.saveLoading = false
}) })
}, },
repeatName(){
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
this.$http.get('esRevisePlan/es-revise-plan/getDataByName', {esName: qbzxdFrom.esName, id : qbzxdFrom.esId}, {
_this: this
}, res => {
let dataList = res.data
dataList.forEach(item => {
if(item.esName === qbzxdFrom.esName1 || item.esName === qbzxdFrom.esName2){
this.comFlag++
}else{
this.comFlag = 0
}
})
})
},
//流程提交 //流程提交
handleSubmit() { handleSubmit() {
if (this.$route.query.prcNum === undefined) { this.repeatName()
let flag = this.$refs["childForm"].validateForm(); if(this.comFlag === '0'){
let qbzxdFrom = this.$refs["childForm"].qbfsForm; this.$message.warning('请更改企标名称')
if (flag) { }else {
this.$refs["roleForm"].validate((valid) => { if (this.$route.query.prcNum === undefined) {
if (valid) { let flag = this.$refs["childForm"].validateForm();
this.isSubmit = true; let qbzxdFrom = this.$refs["childForm"].qbfsForm;
var json = Object.assign(qbzxdFrom, this.roleForm); if (flag) {
this.$http.get("lawss/activiti/startProcess", { type: "25" }, { this.$refs["roleForm"].validate((valid) => {
_this: this if (valid) {
}, res => { this.isSubmit = true;
if (res.ok) { var json = Object.assign(qbzxdFrom, this.roleForm);
this.$http.get("lawss/activiti/startProcess", { type: "25" }, {
_this: this
}, res => {
if (res.ok) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.isSubmit = false;
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
}
});
}
});
} else {
this.$message.warning("请完善人员信息");
}
});
} else {
this.$message.warning("请完善基础信息");
}
} else {
let flag = this.$refs["childForm"].validateForm();
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
if (flag) {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.isSubmit = true;
var json = Object.assign(qbzxdFrom, this.roleForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data, taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json) json: JSON.stringify(json)
}, { }, {
@@ -441,46 +491,15 @@ export default {
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
} }
}); });
} else {
this.$message.warning("请完善人员信息");
} }
}); });
} else { } else {
this.$message.warning("请完善人员信息"); this.$message.warning("请完善基础信息");
} }
}); }
} else {
this.$message.warning("请完善基础信息");
} }
} else {
let flag = this.$refs["childForm"].validateForm();
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
if (flag) {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.isSubmit = true;
var json = Object.assign(qbzxdFrom, this.roleForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.isSubmit = false;
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
}
});
} else {
this.$message.warning("请完善人员信息");
}
});
} else {
this.$message.warning("请完善基础信息");
}
}
}, },
// 流程阶段负责人选择 // 流程阶段负责人选择
choiceZRR(type, title, id) { choiceZRR(type, title, id) {
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
+26 -23
View File
@@ -36,21 +36,21 @@
<el-option label="未制定" value="未制定"></el-option> <el-option label="未制定" value="未制定"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="qbfsForm.drafter" v-model="qbfsForm.drafter"
placeholder="请输入起草人" placeholder="请输入起草人"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item prop="resPerson" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="qbfsForm.resPerson" v-model="qbfsForm.resPerson"
placeholder="请输入评审责任人" placeholder="请输入评审责任人"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item prop="wgLeader" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="wgLeaderName" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="qbfsForm.wgLeader" v-model="qbfsForm.wgLeader"
@@ -148,7 +148,7 @@
</div> </div>
<div> <div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="回执说明"> <el-collapse-item title="审批意见">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
<el-input <el-input
type="textarea" type="textarea"
@@ -391,26 +391,29 @@ export default {
}); });
}, },
beforeBack(){ beforeBack(){
this.isSubmit = true if(!this.commentText){
this.qbfsForm.passFlag = '1' this.$message.warning('请填写审批意见')
this.qbfsForm.commentText = this.commentText }else{
let json = JSON.stringify(this.qbfsForm); this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', { this.qbfsForm.passFlag = '1'
taskIds: this.$route.query.taskIds, this.qbfsForm.commentText = this.commentText
userId: this.$store.getters.userInfo.userId, let json = JSON.stringify(this.qbfsForm);
json: json, this.$http.post('lawss/activiti/completeTask', {
}, { taskIds: this.$route.query.taskIds,
_this: this userId: this.$store.getters.userInfo.userId,
}, res => { json: json,
if (res.success) { }, {
this.$message.success(res.message) _this: this
this.$router.push('/processCenter') }, res => {
} if (res.success) {
this.isSubmit = false this.$message.success(res.message)
}, e => { this.$router.push('/processCenter')
}); }
this.isSubmit = false
}, e => {
});
}
}, },
}, },
}; };
</script> </script>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
+23 -20
View File
@@ -148,7 +148,7 @@
</div> </div>
<div> <div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="回执说明"> <el-collapse-item title="审批意见">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
<el-input <el-input
type="textarea" type="textarea"
@@ -391,26 +391,29 @@ export default {
}); });
}, },
beforeBack(){ beforeBack(){
this.isSubmit = true if(!this.commentText){
this.qbfsForm.deptCenterFlag = '1' this.$message.warning('请填写审批意见')
this.qbfsForm.commentText = this.commentText }else{
let json = JSON.stringify(this.qbfsForm); this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', { this.qbfsForm.deptCenterFlag = '1'
taskIds: this.$route.query.taskIds, this.qbfsForm.commentText = this.commentText
userId: this.$store.getters.userInfo.userId, let json = JSON.stringify(this.qbfsForm);
json: json, this.$http.post('lawss/activiti/completeTask', {
}, { taskIds: this.$route.query.taskIds,
_this: this userId: this.$store.getters.userInfo.userId,
}, res => { json: json,
if (res.success) { }, {
this.$message.success(res.message) _this: this
this.$router.push('/processCenter') }, res => {
} if (res.success) {
this.isSubmit = false this.$message.success(res.message)
}, e => { this.$router.push('/processCenter')
}); }
this.isSubmit = false
}, e => {
});
}
}, },
}, },
}; };
</script> </script>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
+23 -19
View File
@@ -148,7 +148,7 @@
</div> </div>
<div> <div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="回执说明"> <el-collapse-item title="审批意见">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
<el-input <el-input
type="textarea" type="textarea"
@@ -391,24 +391,28 @@ export default {
}); });
}, },
beforeBack(){ beforeBack(){
this.isSubmit = true if(!this.commentText){
this.qbfsForm.bzFlag = '1' this.$message.warning('请填写审批意见')
this.qbfsForm.commentText = this.commentText }else{
let json = JSON.stringify(this.qbfsForm); this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', { this.qbfsForm.bzFlag = '1'
taskIds: this.$route.query.taskIds, this.qbfsForm.commentText = this.commentText
userId: this.$store.getters.userInfo.userId, let json = JSON.stringify(this.qbfsForm);
json: json, this.$http.post('lawss/activiti/completeTask', {
}, { taskIds: this.$route.query.taskIds,
_this: this userId: this.$store.getters.userInfo.userId,
}, res => { json: json,
if (res.success) { }, {
this.$message.success(res.message) _this: this
this.$router.push('/processCenter') }, res => {
} if (res.success) {
this.isSubmit = false this.$message.success(res.message)
}, e => { this.$router.push('/processCenter')
}); }
this.isSubmit = false
}, e => {
});
}
}, },
}, },
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+23 -19
View File
@@ -148,7 +148,7 @@
</div> </div>
<div> <div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="回执说明"> <el-collapse-item title="审批意见">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
<el-input <el-input
type="textarea" type="textarea"
@@ -391,24 +391,28 @@ export default {
}); });
}, },
beforeBack(){ beforeBack(){
this.isSubmit = true if(!this.commentText){
this.qbfsForm.bzfgbzFlag = '1' this.$message.warning('请填写审批意见')
this.qbfsForm.commentText = this.commentText }else{
let json = JSON.stringify(this.qbfsForm); this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', { this.qbfsForm.bzfgbzFlag = '1'
taskIds: this.$route.query.taskIds, this.qbfsForm.commentText = this.commentText
userId: this.$store.getters.userInfo.userId, let json = JSON.stringify(this.qbfsForm);
json: json, this.$http.post('lawss/activiti/completeTask', {
}, { taskIds: this.$route.query.taskIds,
_this: this userId: this.$store.getters.userInfo.userId,
}, res => { json: json,
if (res.success) { }, {
this.$message.success(res.message) _this: this
this.$router.push('/processCenter') }, res => {
} if (res.success) {
this.isSubmit = false this.$message.success(res.message)
}, e => { this.$router.push('/processCenter')
}); }
this.isSubmit = false
}, e => {
});
}
}, },
}, },