Compare commits

..

No commits in common. "9aa5cdc6609a7af87b9bce81f697d40d2fa51a1c" and "1a0f8011f8e9251081bb7a5cf39fbae944459812" have entirely different histories.

4 changed files with 5 additions and 15 deletions

View File

@ -146,7 +146,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="24">
<el-form-item <el-form-item
:label="'人员' + (index + 1)" :label="'人员' + (index + 1)"
:prop="'coverpeople.' + index + '.USER_ID'" :prop="'coverpeople.' + index + '.USER_ID'"
@ -162,11 +162,6 @@
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="岗位名称">
<el-input v-model="item.NICKNAME" placeholder="请输入"/>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
@ -302,7 +297,6 @@ export default {
DEPARTMENT_ID: null, DEPARTMENT_ID: null,
POST_ID: '', POST_ID: '',
USER_ID: [], USER_ID: [],
NICKNAME: '',
id: Math.random() id: Math.random()
} }
], ],
@ -385,7 +379,6 @@ export default {
DEPARTMENT_ID: data.coverpeople[i].DEPARTMENT_ID, DEPARTMENT_ID: data.coverpeople[i].DEPARTMENT_ID,
POST_ID: data.coverpeople[i].POST_ID, POST_ID: data.coverpeople[i].POST_ID,
USER_ID: [], USER_ID: [],
NICKNAME: data.coverpeople[i].NICKNAME,
id: data.coverpeople[i].PROMISEPEOPLE_ID id: data.coverpeople[i].PROMISEPEOPLE_ID
}) })
for (let j = 0; j < this.form.coverpeople.length; j++) { for (let j = 0; j < this.form.coverpeople.length; j++) {
@ -564,7 +557,7 @@ export default {
{ DEPARTMENT_ID: item.DEPARTMENT_ID, POST_ID: item.POST_ID, USER_ID: item.USER_ID } { DEPARTMENT_ID: item.DEPARTMENT_ID, POST_ID: item.POST_ID, USER_ID: item.USER_ID }
)) ))
const coverpeople = this.form.coverpeople.map(item => ( const coverpeople = this.form.coverpeople.map(item => (
{ DEPARTMENT_ID: item.DEPARTMENT_ID, POST_ID: item.POST_ID, USER_ID: item.USER_ID, NICKNAME: item.NICKNAME } { DEPARTMENT_ID: item.DEPARTMENT_ID, POST_ID: item.POST_ID, USER_ID: item.USER_ID }
)) ))
let url let url
if (this.$parent.PROMISE_ID) { if (this.$parent.PROMISE_ID) {

View File

@ -113,7 +113,7 @@ export default {
).then((data) => { ).then((data) => {
const DETAIL = data.COLLATERAL.map(item => ({ value: item.COLLATERAL, id: item.PROMISEDETAIL_ID })) const DETAIL = data.COLLATERAL.map(item => ({ value: item.COLLATERAL, id: item.PROMISEDETAIL_ID }))
this.dialog.visible = true this.dialog.visible = true
this.dialog.data = { ...data.varList, DETAIL, FILEPATH: data.ISGN.FILEPATH, SIGNTIME: data.ISGN.SIGNTIME, COVERPEOPLE: data.COVERPEOPLE[0].USERNAME, NICKNAME: data.COVERPEOPLE[0].NICKNAME } this.dialog.data = { ...data.varList, DETAIL, FILEPATH: data.ISGN.FILEPATH, SIGNTIME: data.ISGN.SIGNTIME, COVERPEOPLE: data.COVERPEOPLE[0].USERNAME }
}).catch((e) => { }).catch((e) => {
}) })
}, },

View File

@ -9,7 +9,7 @@
</div> </div>
</div> </div>
<h1 class="title">{{ dialogData.TYPE === '0' ? '安全生产承诺书' : '安全生产责任状' }}</h1> <h1 class="title">{{ dialogData.TYPE === '0' ? '安全生产承诺书' : '安全生产责任状' }}</h1>
<div v-if="dialogData.TYPE === '0'">{{ dialogData.COVERPEOPLE }}{{ dialogData.NICKNAME }}</div> <div v-if="dialogData.TYPE === '0'">{{ dialogData.COVERPEOPLE }}</div>
<div class="text">{{ dialogData.TEXT }}</div> <div class="text">{{ dialogData.TEXT }}</div>
<div class="collateral"> <div class="collateral">
<div v-for="(item,index) in dialogData.DETAIL" :key="index" class="item"> <div v-for="(item,index) in dialogData.DETAIL" :key="index" class="item">

View File

@ -39,8 +39,6 @@
<td class="trwidth">{{ item.POSTNAME }}</td> <td class="trwidth">{{ item.POSTNAME }}</td>
<td class="bbg">{{ '人员' + (index + 1) }}</td> <td class="bbg">{{ '人员' + (index + 1) }}</td>
<td class="trwidth">{{ item.USERNAME && item.USERNAME.join('、') }}</td> <td class="trwidth">{{ item.USERNAME && item.USERNAME.join('、') }}</td>
<td class="bbg">{{ '岗位名称' + (index + 1) }}</td>
<td class="trwidth">{{ item.NICKNAME }}</td>
</tr> </tr>
</table> </table>
<el-divider content-position="left">承诺内容</el-divider> <el-divider content-position="left">承诺内容</el-divider>
@ -121,7 +119,6 @@ export default {
DEPTNAME: data.coverpeople[i].DEPTNAME, DEPTNAME: data.coverpeople[i].DEPTNAME,
POST_ID: data.coverpeople[i].POST_ID, POST_ID: data.coverpeople[i].POST_ID,
POSTNAME: data.coverpeople[i].POSTNAME, POSTNAME: data.coverpeople[i].POSTNAME,
NICKNAME: data.coverpeople[i].NICKNAME,
USER_ID: [], USER_ID: [],
USERNAME: [], USERNAME: [],
id: data.coverpeople[i].PROMISEPEOPLE_ID id: data.coverpeople[i].PROMISEPEOPLE_ID
@ -138,7 +135,7 @@ export default {
}, },
goView() { goView() {
this.dialog.visible = true this.dialog.visible = true
this.dialog.data = { ...this.form, DETAIL: this.form.DETAIL, FILEPATH: '', SIGNTIME: '', COVERPEOPLE: this.form.coverpeople[0].USERNAME[0], NICKNAME: this.form.coverpeople[0].NICKNAME } this.dialog.data = { ...this.form, DETAIL: this.form.DETAIL, FILEPATH: '', SIGNTIME: '', COVERPEOPLE: this.form.coverpeople[0].USERNAME[0] }
}, },
goBack() { goBack() {
this.$parent.activeName = 'List' this.$parent.activeName = 'List'