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

Merge branch 'pet' into dev

20240528Test
liujun 2024-04-13 18:48:17 +08:00
parent 756be6d2d4 e370ab4c05
commit 4a2a2969a0
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/hidden/major/morehiddenchange/components/list.vue
View File

@ -135,7 +135,7 @@
<el-table-column label="操作" width="220"> <el-table-column label="操作" width="220">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button icon="el-icon-view" size="mini" @click="goView(row.HIDDEN_ID,'view')">查看</el-button> <el-button icon="el-icon-view" size="mini" @click="goView(row.HIDDEN_ID,'view')">查看</el-button>
<el-button v-if="row.STATE =='13'" type="primary" icon="el-icon-view" size="mini" @click="goView(row.HIDDEN_ID,'edit')">整改</el-button> <el-button v-if="row.STATE =='13' && loginUserId == row.RECTIFICATIONOR" type="primary" icon="el-icon-view" size="mini" @click="goView(row.HIDDEN_ID,'edit')">整改</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -203,7 +203,8 @@ export default {
keyFindStateTime: '', keyFindStateTime: '',
keyFindEndTime: '', keyFindEndTime: '',
keyConfirmUser: '' keyConfirmUser: ''
} },
loginUserId: JSON.parse(sessionStorage.getItem('user')).USER_ID
} }
}, },
created() { created() {

5
src/views/keyprojects/outsourced/components/list.vue
View File

@ -14,8 +14,8 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="施工相关方"> <el-form-item label="施工相关方">
<el-select v-model="UNITS_ID" placeholder="请选择施工相关方" style="width: 100%;"> <el-select v-model="UNITS_ID" filterable placeholder="请选择施工相关方" style="width: 100%;">
<el-option v-for="item in unitsList" :key="item.UNITS_ID" :label="item.UNITS_NAME" :value="item.UNITS_ID" /> <el-option v-for="(item, index) in unitsList" :key="index" :label="item.UNITS_NAME" :value="item.UNITS_ID" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -425,6 +425,7 @@ export default {
{ UNITS_ID: this.form.UNITS_ID } { UNITS_ID: this.form.UNITS_ID }
).then((data) => { ).then((data) => {
this.unitsList = data.varList this.unitsList = data.varList
this.$forceUpdate()
}).catch((e) => { }).catch((e) => {
}) })
}, },