guoyuepeng
/
qa-regulatory-gwj-vue
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-2024年1月8日' into dev-2024年1月8日

2024年1月19日V01.00.51
liujun 2024-01-18 18:14:12 +08:00
parent 00d698280a 852d67810c
commit 28b9bfc228
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/map/dialog/confinedspace.vue
View File

@ -261,8 +261,8 @@ export default {
this.measuresList = data.measuresList // 参数map
this.gasList = data.gasList // 参数map
this.gas = data.gas || {} // 参数map
this.pd.CONFIRM_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
this.pd.APPROVE_USER_MEASURES = this.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
this.info.CONFIRM_USER_MEASURES = data.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[0]
this.info.APPROVE_USER_MEASURES = data.pd.OTHER_PROTECTIVE_MEASURES.split(';_;')[1]
}).catch((e) => {
console.log(e)
})

10
src/views/security_commitment/promise_book_issued/components/add.vue
View File

@ -141,7 +141,10 @@
}"
>
<div style="display:flex;justify-content: space-between;align-items: flex-start;">
<el-select v-model="item.USER_ID" multiple style="width: calc(100% - 60px);">
<el-select v-if="form.TYPE!='1'" v-model="item.USER_ID" multiple style="width: calc(100% - 60px);">
<el-option v-for="item in item.userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
</el-select>
<el-select v-if="form.TYPE=='1'" v-model="item.USER_ID" style="width: calc(100% - 60px);">
<el-option v-for="item in item.userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
</el-select>
<el-button v-if="index !== 0" type="danger" @click="removePeople(index)">删除</el-button>
@ -193,7 +196,10 @@
}"
>
<div style="display:flex;justify-content: space-between;align-items: flex-start;">
<el-select v-model="item.USER_ID" :multiple-limit="1" multiple style="width: 100%;">
<el-select v-if="form.TYPE!='1'" v-model="item.USER_ID" :multiple-limit="1" multiple style="width: 100%;">
<el-option v-for="item in item.userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
</el-select>
<el-select v-if="form.TYPE=='1'" v-model="item.USER_ID" style="width: 100%;">
<el-option v-for="item in item.userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
</el-select>
<!-- <el-button v-if="index !== 0" type="danger" @click="removeCoverPeople(index)">删除</el-button>-->

3
src/views/security_commitment/promise_book_issued/components/list.vue
View File

@ -86,7 +86,8 @@
<el-table-column prop="POSTNAME" label="涉及岗位" />
<el-table-column label="承诺人数/涉及人数">
<template slot-scope="{row}">
{{ row.ISSIGN }}/{{ row.PEOPLENUM_INVOLVED }}
<span v-if="row.TYPE!='1'">{{ row.ISSIGN }}/{{ row.PEOPLENUM_INVOLVED }}</span>
<span v-if="row.TYPE=='1'">{{ row.ISSIGN }}/2</span>
</template>
</el-table-column>
<el-table-column label="状态" width="80">