From 3cbb9eb9e6f594721239bde5754db6df924472a6 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 27 八月 2022 10:33:06 +0800
Subject: [PATCH] 1.工序检验记录开发完成
---
src/views/zlgl/gxjybz.vue | 49 +++++++++++++++----------------------------------
1 files changed, 15 insertions(+), 34 deletions(-)
diff --git a/src/views/zlgl/gxjybz.vue b/src/views/zlgl/gxjybz.vue
index 59176f3..29e8212 100644
--- a/src/views/zlgl/gxjybz.vue
+++ b/src/views/zlgl/gxjybz.vue
@@ -127,8 +127,8 @@
:top="isIpad?'5vh':'15vh'"
:close-on-click-modal="false"
@closed="handleClose"
- @close="handleClose"
>
+ <!-- @close="handleClose"-->
<div style="margin-bottom: 10px">
<i class="el-icon-s-comment" style="color:#42b983;" /> 鏍囧噯淇℃伅锛�
</div>
@@ -159,7 +159,7 @@
<i class="el-icon-s-comment" style="color:#42b983;" /> 妫�楠岄」淇℃伅锛�
</div>
<div style="margin-bottom: 10px">
- <el-button v-if="operation==='add'" type="primary" @click="JYadd">鏂板</el-button>
+ <el-button v-if="operation==='add'||operation==='edit'" type="primary" @click="JYadd">鏂板</el-button>
</div>
<div>
<el-table
@@ -179,33 +179,6 @@
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="code"
label="妫�楠屾爣鍑嗙紪鐮�"
@@ -445,6 +418,8 @@
this.$nextTick(() => {
this.$refs.JYTableData.doLayout()
})
+
+ this.JYSelectArr = [...this.JYSelectArr].filter(x => [...this.JYTableData].every(y => y.code !== x.code))
},
// 鍒犻櫎鎸夐挳
async del(row) {
@@ -482,6 +457,7 @@
this.$refs.dialogForm.validate(valid => {
if (valid) {
const tableData = []
+ this.JYTableData = this.JYTableData.filter(item => item.code !== '')
this.JYTableData.forEach((item, index) => {
tableData.push({
STEPCHECKITEM_SEQ: (index + 1),
@@ -524,11 +500,6 @@
const { data: res } = await StepCheckItemSelect()
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) {
const res = this.JYSelectArr.find(item => {
@@ -551,6 +522,16 @@
this.JYIsCancel = false
},
JYedit(row) {
+ let flag = false
+ this.JYTableData.forEach((item, index) => {
+ if (item.isVisible === 1) {
+ flag = true
+ }
+ })
+ if (flag) {
+ return this.$message.info('璇峰厛纭鎴栧彇娑堝叾瀹冭锛�')
+ }
+
this.JYIsCancel = false
this.JYSelectArr.splice(0, 0, {
code: row.code,
--
Gitblit v1.9.3