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

监管端bug修复：13754、13714

2024年1月24日测试
limingyu 2024-01-31 10:30:24 +08:00
parent e71ba80f39
commit ca1d5df750
3 changed files with 172 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/views/hidden/commonly/commonly/components/companiesList.vue
View File

@ -1,6 +1,7 @@
<template>
<div class="app-container">
<el-form label-width="100px">
<el-row>
<el-row>
<el-col :span="4">
<el-form-item label="隐患来源">
@ -46,6 +47,8 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<el-form-item label="隐患状态">
<el-select v-model="form.HIDDEN_STATUS" placeholder="隐患状态" clearable style="width: 100%">
@ -64,6 +67,17 @@
<el-input v-model="form.CONFIRM_USER"/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="隐患类型" prop="HIDDENTYPE">
<el-cascader
ref="deptTree_Select3"
:options="hiddenTypeList"
:props="defaultProps2"
v-model="form.HIDDEN_TYPE"
collapse-tags
clearable/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="整改负责人">
<el-input v-model="form.RECTIFICATION_USER"/>
@ -74,6 +88,7 @@
<el-input v-model="form.CHECK_USER"/>
</el-form-item>
</el-col>
</el-row>
<el-col :span="6">
<el-form-item label="隐患发现时间">
<el-date-picker
@ -209,7 +224,7 @@ export default {
varList: [],
treeData: [],
hiddenPartList: [],
hiddenTypeList: [],
hiddenTypeList: [],//隐患类型
hiddenlevelList: [
{
value: 'hiddenLevel1004',
@ -230,6 +245,13 @@ export default {
children: 'nodes',
label: 'name'
},
defaultProps2: {
value: 'id',
children: 'nodes',
label: 'name',
multiple: true,
emitPath: false
},
form: {
SOURCE: undefined,
HIDDENDESCR: '',
@ -243,6 +265,7 @@ export default {
CONFIRM_USER: '',
HIDDENFIND_NAME: '',
CORPINFO_ID: '',
HIDDEN_TYPE: '',
HIDDEN_STATUS: undefined
}
}

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

@ -408,9 +408,15 @@ export default {
{
PROMISE_ID: this.$parent.PROMISE_ID
}
).then((data) => {
).then(async(data) => {
const DETAIL = data.promistDetail.map(item => ({ value: item.COLLATERAL, id: item.PROMISEDETAIL_ID }))
this.form = { ...data.varList, DISTRIBUTIONOBJECT: data.varList.RELEASE_PLATFORM, DETAIL, people: [], coverpeople: [] }
this.form = {
...data.varList,
DISTRIBUTIONOBJECT: data.varList.RELEASE_PLATFORM,
DETAIL,
people: [],
coverpeople: []
}
this.isSelectTemplate = true
for (let i = 0; i < data.people.length; i++) {
this.form.people.push({
@ -426,15 +432,15 @@ export default {
for (let j = 0; j < this.form.people.length; j++) {
if (this.form.DISTRIBUTIONOBJECT === '1') {
if (data.people[i].POST_ID === this.form.people[j].POST_ID) {
this.form.people[j].USER_ID.push(data.people[i].USER_ID)
this.form.people[j].USER_ID = data.people[i].USER_ID
this.form.people.splice(j + 1, 1)
this.getUserList(this.form.people[j].DEPARTMENT_ID, this.form.people[j].POST_ID, j, 'created', 'people')
await this.getUserList(this.form.people[j].DEPARTMENT_ID, this.form.people[j].POST_ID, j, 'created', 'people')
}
} else {
if (data.people[i].DEPARTMENT_ID === this.form.people[j].DEPARTMENT_ID) {
this.form.people[j].USER_ID.push(data.people[i].USER_ID)
this.form.people[j].USER_ID = data.people[i].USER_ID
this.form.people.splice(j + 1, 1)
this.getUserList1({ id: this.form.people[j].DEPARTMENT_ID }, j, 'created', 'people')
await this.getUserList1({ id: this.form.people[j].DEPARTMENT_ID }, j, 'created', 'people')
}
}
}
@ -458,9 +464,9 @@ export default {
})
for (let j = 0; j < this.form.coverpeople.length; j++) {
if (data.coverpeople[i].DEPARTMENT_ID === this.form.coverpeople[j].DEPARTMENT_ID) {
this.form.coverpeople[j].USER_ID.push(data.coverpeople[i].USER_ID)
this.form.coverpeople[j].USER_ID = data.coverpeople[i].USER_ID
this.form.coverpeople.splice(j + 1, 1)
this.getUserList1({ id: this.form.coverpeople[j].DEPARTMENT_ID }, j, 'created', 'coverpeople')
await this.getUserList1({ id: this.form.coverpeople[j].DEPARTMENT_ID }, j, 'created', 'coverpeople')
}
}
}
@ -517,6 +523,7 @@ export default {
},
// 人员
getUserList(DEPARTMENT_ID, POST_ID, index, type, list) {
return new Promise((resolve) => {
if (type !== 'created') {
let flag = false
for (let i = 0; i < this.form[list].length; i++) {
@ -543,11 +550,14 @@ export default {
if (type !== 'created') {
this.form[list][index].USER_ID = ''
}
resolve()
}).catch((e) => {
})
})
},
// 人员
getUserList1({ id: DEPARTMENT_ID }, index, type, list) {
return new Promise((resolve) => {
if (type !== 'created') {
let flag = false
for (let i = 0; i < this.form[list].length; i++) {
@ -574,8 +584,10 @@ export default {
if (type !== 'created') {
this.form[list][index].USER_ID = ''
}
resolve()
}).catch((e) => {
})
})
},
addPeople() {
this.form.people.push(

9
src/views/security_commitment/promise_book_issued/components/see.vue
View File

@ -23,7 +23,8 @@
<td>{{ form.PROMISE_TERM_END }}</td>
</tr>
</table>
<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>
<table class="table-ui">
<tr v-for="(item,index) in form.people" :key="item.id">
<td v-if="form.RELEASE_PLATFORM === '1'" class="bbg">{{ '单位' + (index + 1) }}</td>
@ -36,7 +37,8 @@
<td>{{ item.USERNAME && item.USERNAME.join('、') }}</td>
</tr>
</table>
<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>
<table class="table-ui">
<tr v-for="(item,index) in form.coverpeople" :key="item.id">
<td class="bbg">{{ '部门' + (index + 1) }}</td>
@ -45,7 +47,8 @@
<td>{{ item.USERNAME && item.USERNAME.join('、') }}</td>
</tr>
</table>
<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>
<table class="table-ui">
<tr>
<td class="bbg">正文</td>