From d9493eb7905545e5509689eae73a450c576418e0 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 26 八月 2022 17:16:02 +0800
Subject: [PATCH] 1.修改bug2.新增工序检验记录
---
src/views/zlgl/gxjybz.vue | 205 +++++++++++++++++++++++++++++++--------------------
1 files changed, 125 insertions(+), 80 deletions(-)
diff --git a/src/views/zlgl/gxjybz.vue b/src/views/zlgl/gxjybz.vue
index 60806ff..59176f3 100644
--- a/src/views/zlgl/gxjybz.vue
+++ b/src/views/zlgl/gxjybz.vue
@@ -90,9 +90,12 @@
>
<template slot-scope="{row}">
<div class="operationClass">
-
<el-tooltip class="item" effect="dark" content="鏌ョ湅" placement="top">
- <i class="el-icon-view" style="color: #42b983;cursor: pointer;margin-right: 15px;" @click="check('check',row)" />
+ <i
+ class="el-icon-view"
+ style="color: #42b983;cursor: pointer;margin-right: 15px;"
+ @click="check('check',row)"
+ />
</el-tooltip>
<el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
<i class="el-icon-edit-outline" @click="edit('edit',row)" />
@@ -144,7 +147,12 @@
<el-input v-model="dialogForm.name" :disabled="operation==='check'" style="width: 200px" />
</el-form-item>
<el-form-item label="鎻忚堪">
- <el-input v-model="dialogForm.description" :disabled="operation==='check'" type="textarea" style="width: 200px" />
+ <el-input
+ v-model="dialogForm.description"
+ :disabled="operation==='check'"
+ type="textarea"
+ style="width: 200px"
+ />
</el-form-item>
</el-form>
<div style="margin-bottom: 10px">
@@ -171,58 +179,77 @@
width="100"
fixed
/>
- <el-table-column
- prop="code"
- label="妫�楠屾爣鍑嗙紪鐮�(鍚嶇О)"
- >
- <template slot-scope="{row}">
- <div v-if="row.isVisible===0" style="display: flex;">
- <div>{{ row.code }}</div>
- <div style="margin-left: 10px">{{ row.name }}</div>
- </div>
-
- <el-select
- v-if="row.isVisible===1"
- v-model="row.code"
- filterable
- :popper-append-to-body="false"
- style="width: 400px;"
- placeholder="璇烽�夋嫨"
- @change="val=>changeCode(val,row)"
- >
- <el-option
- v-for="item in JYSelectArr"
- :key="item.code"
- :label="item.code+''+item.name"
- :value="item.code"
- />
- </el-select>
- </template>
- </el-table-column>
<!-- <el-table-column-->
- <!-- prop="name"-->
- <!-- label="妫�楠屾爣鍑嗗悕绉�"-->
+ <!-- prop="code"-->
+ <!-- label="妫�楠屾爣鍑嗙紪鐮�(鍚嶇О)"-->
<!-- >-->
<!-- <template slot-scope="{row}">-->
- <!-- <div v-if="row.isVisible===0">{{ row.name }}</div>-->
+ <!-- <div v-if="row.isVisible===0" style="display: flex;">-->
+ <!-- <div>{{ row.code }}</div>-->
+ <!-- <div style="margin-left: 10px">{{ row.name }}</div>-->
+ <!-- </div>-->
<!-- <el-select-->
<!-- v-if="row.isVisible===1"-->
- <!-- v-model="row.name"-->
+ <!-- v-model="row.code"-->
<!-- filterable-->
<!-- :popper-append-to-body="false"-->
- <!-- style="width: 200px;"-->
+ <!-- style="width: 400px;"-->
<!-- placeholder="璇烽�夋嫨"-->
- <!-- @change="val=>changeName(val,row)"-->
+ <!-- @change="val=>changeCode(val,row)"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in JYSelectArr"-->
<!-- :key="item.code"-->
- <!-- :label="item.name"-->
+ <!-- :label="item.code+''+item.name"-->
<!-- :value="item.code"-->
<!-- />-->
<!-- </el-select>-->
<!-- </template>-->
<!-- </el-table-column>-->
+ <el-table-column
+ prop="code"
+ label="妫�楠屾爣鍑嗙紪鐮�"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">{{ row.code }}</div>
+ <el-select
+ v-if="row.isVisible===1"
+ v-model="row.code"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ @change="val=>changeName(val,row)"
+ >
+ <el-option
+ v-for="item in JYSelectArr"
+ :key="item.name"
+ :label="item.code"
+ :value="item.name"
+ />
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="妫�楠屾爣鍑嗗悕绉�"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">{{ row.name }}</div>
+ <el-select
+ v-if="row.isVisible===1"
+ v-model="row.name"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ @change="val=>changeName(val,row)"
+ >
+ <el-option
+ v-for="item in JYSelectArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </template>
+ </el-table-column>
<el-table-column
prop="descr"
label="妫�楠屾弿杩版弿杩�"
@@ -235,6 +262,7 @@
<el-table-column
v-if="operation!=='check'"
label="鎿嶄綔"
+ fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -326,7 +354,7 @@
},
JYTableData: [], // 瀵硅瘽妗嗘楠屼俊鎭〃鏍�
JYSelectArr: [], // 妫�楠岄」鐩笅鎷夋暟缁�
- JYSelectedArr: [] // 宸查�夋楠岄」鐩暟缁�
+ JYIsCancel: true
}
},
created() {
@@ -413,7 +441,6 @@
item.isVisible = 0
item.descr = item.stepcheckitem_desc
item.number = number
- this.JYSelectedArr.push(item.code)
})
this.$nextTick(() => {
this.$refs.JYTableData.doLayout()
@@ -443,7 +470,7 @@
this.dialogForm.enable = ''
this.dialogForm.description = ''
this.JYTableData = []
- this.JYSelectedArr = []
+ this.getStepCheckItemSelect()
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -498,15 +525,19 @@
this.JYSelectArr = res
},
// 妫�楠屾爣鍑嗙紪鐮佸�兼敼鍙�
- changeCode(val, row) {
- row.name = this.JYSelectArr.find(it => it.code === val).name
- row.descr = this.JYSelectArr.find(it => it.code === val).descr
- },
- // 妫�楠屾爣鍑嗗悕绉板�兼敼鍙�
- // changeName(val, row) {
- // row.code = this.JYSelectArr.find(it => it.code === val).code
+ // changeCode(val, row) {
+ // row.name = this.JYSelectArr.find(it => it.code === val).name
// row.descr = this.JYSelectArr.find(it => it.code === val).descr
// },
+ // 妫�楠屾爣鍑嗗悕绉板�兼敼鍙�
+ changeName(val, row) {
+ const res = this.JYSelectArr.find(item => {
+ return item.code === val || item.name === val
+ })
+ row.code = res.code
+ row.name = res.name
+ row.descr = res.descr
+ },
// 妫�楠屾柊澧�
JYadd() {
if (this.JYTableData.length > 0 && this.JYTableData[this.JYTableData.length - 1].isVisible === 1) {
@@ -517,46 +548,54 @@
number = number === 0 ? (10 + Math.random()) : number
const data = { code: '', name: '', descr: '', isVisible: 1, number }
this.JYTableData.push(data)
+ this.JYIsCancel = false
},
JYedit(row) {
- this.JYSelectedArr.forEach((item, index) => {
- if (item === row.code) {
- this.JYSelectedArr.splice(index, 1)
- }
+ this.JYIsCancel = false
+ this.JYSelectArr.splice(0, 0, {
+ code: row.code,
+ name: row.name,
+ descr: row.descr
})
this.JYTableData.forEach((item, index) => {
- if (item.code === row.code) {
- item.isVisible = 1
+ if (item.code === row.code && item.number === row.number) {
+ this.JYTableData.splice(index, 1, {
+ code: row.code,
+ name: row.name,
+ descr: row.descr,
+ isVisible: 1,
+ number: row.number
+ })
}
})
},
JYdel(row) {
+ this.JYSelectArr.splice(0, 0, {
+ code: row.code,
+ name: row.name,
+ descr: row.descr
+ })
+
this.JYTableData.forEach((item, index) => {
if (item.number === row.number) {
this.JYTableData.splice(index, 1)
}
})
-
- this.JYSelectedArr.forEach((item, index) => {
- if (item === row.code) {
- this.JYSelectedArr.splice(index, 1)
- }
- })
},
JYsave(row) {
if (row.code === '') {
- return this.$message.info('妫�楠屾爣鍑嗙紪鐮�(鍚嶇О)涓嶈兘涓虹┖锛�')
+ return this.$message.info('妫�楠屾爣鍑嗙紪鐮佷笉鑳戒负绌猴紒')
}
- // if (row.name === '') {
- // return this.$message.info('妫�楠屾爣鍑嗗悕绉颁笉鑳戒负绌猴紒')
- // }
+ if (row.name === '') {
+ return this.$message.info('妫�楠屾爣鍑嗗悕绉颁笉鑳戒负绌猴紒')
+ }
- if (this.JYSelectedArr.find(item => item === row.code) !== undefined) {
- return this.$message.info('妫�楠屾爣鍑嗙紪鐮�(鍚嶇О)涓嶈兘閲嶅锛�')
- } else {
- this.JYSelectedArr.push(row.code)
- }
+ this.JYSelectArr.forEach((item, index) => {
+ if (item.code === row.code) {
+ this.JYSelectArr.splice(index, 1)
+ }
+ })
this.JYTableData.forEach((item, index) => {
if (item.number === row.number) {
@@ -577,12 +616,15 @@
this.JYTableData.splice(index, 1)
}
})
-
- this.JYSelectedArr.forEach((item, index) => {
- if (item === row.code) {
- this.JYSelectedArr.splice(index, 1)
- }
- })
+ console.log(this.JYIsCancel)
+ if (this.JYIsCancel && row.code.toString().length > 0) {
+ this.JYSelectArr.splice(0, 0, {
+ code: row.code,
+ name: row.name,
+ descr: row.descr
+ })
+ }
+ this.JYIsCancel = true
}
}
}
@@ -591,21 +633,23 @@
<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
-.el-button--text{
+.el-button--text {
font-size: 14px;
cursor: pointer;
}
+
::v-deep .el-select__caret {
display: flex;
align-items: center;
justify-content: center;
}
-.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
color: $main_color;
cursor: pointer;
}
-.el-icon-edit-outline{
+
+.el-icon-edit-outline {
margin-right: 15px;
}
@@ -666,8 +710,8 @@
background-color: #f8f8fa;
}
-::v-deep .el-table__body .el-table__row.hover-row td{
- background-color: #eaecef ;
+::v-deep .el-table__body .el-table__row.hover-row td {
+ background-color: #eaecef;
}
::v-deep .el-form--inline .el-form-item__label {
@@ -683,6 +727,7 @@
.body ::v-deep .el-form-item {
margin-bottom: 0;
}
+
.userDialogVisible ::v-deep .el-form-item {
margin-bottom: 0;
}
--
Gitblit v1.9.3