This commit is contained in:
宋伟佳
2021-12-05 10:34:08 +08:00
parent bd2e9afba2
commit 31b25edbcb
5 changed files with 157 additions and 60 deletions
@@ -37,10 +37,10 @@
<el-option label="未制定" value="未制定"></el-option>
</el-select>
</el-form-item>
<el-form-item label="评审责任人" prop="resPerson" class="add-form-item form-item-disabled">
<el-form-item label="评审责任人" prop="resPersonName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.resPerson"
v-model="qbfsForm.resPersonName"
placeholder="请输入评审责任人"
clearable
></el-input>
@@ -70,18 +70,18 @@
<el-option label="完成" value="完成"></el-option>
</el-select>
</el-form-item>
<el-form-item label="起草人" prop="drafter" class="add-form-item form-item-disabled">
<el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.drafter"
v-model="qbfsForm.drafterName"
placeholder="请输入起草人"
clearable
></el-input>
</el-form-item>
<el-form-item label="工作组组长" prop="wgLeader" class="add-form-item form-item-disabled">
<el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.wgLeader"
v-model="qbfsForm.wgLeaderName"
placeholder="请输入工作组组长"
clearable
></el-input>
@@ -181,17 +181,17 @@
label="制修订状态">
</el-table-column>
<el-table-column
prop="drafter"
prop="drafterName"
align="center"
label="起草人">
</el-table-column>
<el-table-column
prop="resPerson"
prop="resPersonName"
align="center"
label="评审责任人">
</el-table-column>
<el-table-column
prop="wgLeader"
prop="wgLeaderName"
align="center"
label="工作组组长">
</el-table-column>
@@ -339,13 +339,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
}
},
@@ -37,10 +37,10 @@
<el-option label="未制定" value="未制定"></el-option>
</el-select>
</el-form-item>
<el-form-item label="评审责任人" prop="resPerson" class="add-form-item form-item-disabled">
<el-form-item label="评审责任人" prop="resPersonName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.resPerson"
v-model="qbfsForm.resPersonName"
placeholder="请输入评审责任人"
clearable
></el-input>
@@ -78,18 +78,18 @@
<el-option label="完成" value="完成"></el-option>
</el-select>
</el-form-item>
<el-form-item label="起草人" prop="drafter" class="add-form-item form-item-disabled">
<el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.drafter"
v-model="qbfsForm.drafterName"
placeholder="请输入起草人"
clearable
></el-input>
</el-form-item>
<el-form-item label="工作组组长" prop="wgLeader" class="add-form-item form-item-disabled">
<el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.wgLeader"
v-model="qbfsForm.wgLeaderName"
placeholder="请输入工作组组长"
clearable
></el-input>
@@ -197,17 +197,17 @@
label="制修订状态">
</el-table-column>
<el-table-column
prop="drafter"
prop="drafterName"
align="center"
label="起草人">
</el-table-column>
<el-table-column
prop="resPerson"
prop="resPersonName"
align="center"
label="评审责任人">
</el-table-column>
<el-table-column
prop="wgLeader"
prop="wgLeaderName"
align="center"
label="工作组组长">
</el-table-column>
@@ -361,13 +361,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
}
},
@@ -64,17 +64,33 @@
placeholder="请选择计划标准发布时间">
</el-date-picker>
</el-form-item>
<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-option
v-for="item in qcdwOptions"
placeholder="请选择起草责任单位"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" >
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-input
clearable
v-model="qbfsForm.unit"
placeholder="选择或输入起草单位">
</el-input>
<div>
<el-button
size="mini"
type="primary"
@click="QCDWClick"
class="common-button-primary">手动查找</el-button>
</div>
</div>
</el-form-item>
<!-- <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-option-->
<!-- v-for="item in qcdwOptions"-->
<!-- placeholder="请选择起草责任单位"-->
<!-- :key="item.value"-->
<!-- :value="item.label"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="新增原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">
<el-input
type="textarea"
@@ -103,6 +119,27 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<el-dialog
:visible.sync="QCDWmodal"
width="500px"
title="选择起草部门"
destroy-on-close
:close-on-click-modal="false"
@closed="QCDWmodal = false">
<el-select v-model="QCDWValue" multiple filterable placeholder="请选择" style="width: 100%;">
<el-option
v-for="item in qcdwOptions"
:key="item.value"
:label="item.label"
:value="item.label">
</el-option>
</el-select>
<div slot="footer" class="demo-drawer-footer">
<el-button size="mini" type="primary" class="common-button-default" icon="el-icon-check"
@click="QCDWOK">确认
</el-button>
</div>
</el-dialog>
</div>
</template>
@@ -118,6 +155,9 @@ export default {
props: ['message'],
data(){
return {
QCDWmodal: false,
QCDWValue: [],
QCDWList: [],
drawerTitle2: '',
drawerTitle: '',
roleType: '',
@@ -197,6 +237,20 @@ export default {
})
},
methods: {
QCDWOK () {
let arr1 = []
if (this.qbfsForm.unit.length > 0) {
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 = '请选择工作组组长';
@@ -81,16 +81,21 @@
placeholder="请选择初稿完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.unit" filterable multiple clearable>
<el-option
v-for="item in qcdwOptions"
placeholder="请选择起草责任单位"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" >
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-input
clearable
v-model="qbfsForm.unit"
placeholder="选择或输入起草单位">
</el-input>
<div>
<el-button
size="mini"
type="primary"
@click="QCDWClick"
class="common-button-primary">手动查找</el-button>
</div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -107,7 +112,7 @@
@click.native="choiceZRRS('1')">
</el-input>
</el-form-item>
<el-form-item label="工作组组长" prop="wgLeader" class="add-form-item form-item-disabled">
<el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
<el-input v-model="qbfsForm.wgLeader" style="display: none;"></el-input>
<el-input v-model="qbfsForm.wgLeaderName" placeholder="请选择工作组组长"
@click.native="choiceZRR"></el-input>
@@ -207,17 +212,17 @@
label="制修订状态">
</el-table-column>
<el-table-column
prop="drafter"
prop="drafterName"
align="center"
label="起草人">
</el-table-column>
<el-table-column
prop="resPerson"
prop="resPersonName"
align="center"
label="评审责任人">
</el-table-column>
<el-table-column
prop="wgLeader"
prop="wgLeaderName"
align="center"
label="工作组组长">
</el-table-column>
@@ -272,6 +277,27 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<el-dialog
:visible.sync="QCDWmodal"
width="500px"
title="选择起草部门"
destroy-on-close
:close-on-click-modal="false"
@closed="QCDWmodal = false">
<el-select v-model="QCDWValue" multiple filterable placeholder="请选择" style="width: 100%;">
<el-option
v-for="item in qcdwOptions"
:key="item.value"
:label="item.label"
:value="item.label">
</el-option>
</el-select>
<div slot="footer" class="demo-drawer-footer">
<el-button size="mini" type="primary" class="common-button-default" icon="el-icon-check"
@click="QCDWOK">确认
</el-button>
</div>
</el-dialog>
</div>
</template>
@@ -286,6 +312,9 @@ export default {
props: ['message'],
data(){
return {
QCDWmodal: false,
QCDWValue: [],
QCDWList: [],
drawerTitle2: '',
drawerTitle: '',
type: '',
@@ -404,6 +433,20 @@ export default {
}
},
methods: {
QCDWOK () {
let arr1 = []
if (this.qbfsForm.unit.length > 0) {
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 = '请选择工作组组长';
@@ -37,10 +37,10 @@
<el-option label="未制定" value="未制定"></el-option>
</el-select>
</el-form-item>
<el-form-item label="评审责任人" prop="resPerson" class="add-form-item form-item-disabled">
<el-form-item label="评审责任人" prop="resPersonName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.resPerson"
v-model="qbfsForm.resPersonName"
placeholder="请输入评审责任人"
clearable
></el-input>
@@ -69,18 +69,18 @@
<el-option label="完成" value="完成"></el-option>
</el-select>
</el-form-item>
<el-form-item label="起草人" prop="drafter" class="add-form-item form-item-disabled">
<el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.drafter"
v-model="qbfsForm.drafterName"
placeholder="请输入起草人"
clearable
></el-input>
</el-form-item>
<el-form-item label="工作组组长" prop="wgLeader" class="add-form-item form-item-disabled">
<el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
<el-input
readonly
v-model="qbfsForm.wgLeader"
v-model="qbfsForm.wgLeaderName"
placeholder="请输入工作组组长"
clearable
></el-input>
@@ -188,17 +188,17 @@
label="制修订状态">
</el-table-column>
<el-table-column
prop="drafter"
prop="drafterName"
align="center"
label="起草人">
</el-table-column>
<el-table-column
prop="resPerson"
prop="resPersonName"
align="center"
label="评审责任人">
</el-table-column>
<el-table-column
prop="wgLeader"
prop="wgLeaderName"
align="center"
label="工作组组长">
</el-table-column>
@@ -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
}
},