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
guoyuepeng 2024-01-18 15:35:01 +08:00
parent efc32a194f dda1af7787
commit 04887019e5
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/evaluation/branch_hazard_assessment/components/evaluation.vue
View File

@ -168,7 +168,7 @@
v-if="USER_ID=='1'"
type="danger"
icon="el-icon-view"
@click="fnDelvaluation(row.HIDDEN_ID)">删除
@click="fnDelvaluation(row.HIDDEN_ID)">重置考评
</el-button>
</template>
</el-table-column>
@ -428,7 +428,7 @@ export default {
})
},
fnDelvaluation(hiddenId) {
this.$confirm('确定要删除选中的评审记录吗?', {
this.$confirm('确定要重置选中的评审记录吗?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'

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

@ -3,7 +3,10 @@
<el-form ref="form" :rules="rules" :model="form" label-width="120px">
<el-row>
<el-col :span="24">
<el-form-item label="承诺书名称" prop="PROMISE_NAME">
<el-form-item v-if="form.TYPE!='1'" label="承诺书名称" prop="PROMISE_NAME">
<el-input v-model="form.PROMISE_NAME" placeholder="请输入"/>
</el-form-item>
<el-form-item v-if="form.TYPE =='1'" label="责任状名称" prop="PROMISE_NAME">
<el-input v-model="form.PROMISE_NAME" placeholder="请输入"/>
</el-form-item>
</el-col>
@ -43,9 +46,10 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-divider content-position="left">承诺人</el-divider>
<el-divider v-if="form.TYPE!='1'" content-position="left">承诺人</el-divider>
<el-divider v-if="form.TYPE=='1'" content-position="left">受状人</el-divider>
</el-col>
<el-col v-if="form.DISTRIBUTIONOBJECT" :span="24">
<el-col v-if="form.DISTRIBUTIONOBJECT&&form.TYPE!='1'" :span="24">
<el-form-item style="text-align: right">
<el-button type="primary" @click="addPeople">添加</el-button>
</el-form-item>
@ -148,7 +152,8 @@
</el-row>
<el-row>
<el-col :span="24">
<el-divider content-position="left">被承诺人</el-divider>
<el-divider v-if="form.TYPE!='1'" content-position="left">被承诺人</el-divider>
<el-divider v-if="form.TYPE=='1'" content-position="left">发状人</el-divider>
</el-col>
<!-- <el-col :span="24">-->
<!-- <el-form-item style="text-align: right">-->
@ -649,6 +654,21 @@ export default {
this.form.TYPE = row.TYPE
this.dialog.visible = false
this.isSelectTemplate = true
if (this.form.TYPE == '1') {
this.form.people = [
{
treeData: [],
postList: [],
userList: [],
CORPINFO_ID: '',
DEPARTMENT_ID: null,
POST_ID: '',
USER_ID: [],
id: Math.random()
}
]
this.$forceUpdate()
}
}).catch((e) => {
})
},