From 392f9468875a8721c17c4e15c288333017cac4a1 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 16 七月 2022 15:11:44 +0800
Subject: [PATCH] 1.修改bug2.工序检验实现部分3.缺陷定义实现部分
---
src/views/zzmx/gxdy.vue | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index f98d964..f6aef7c 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -55,7 +55,7 @@
<el-divider />
<div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+ <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<el-divider />
<div class="elTableDiv">
@@ -123,23 +123,28 @@
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
+ width="160"
sortable="custom"
/>
<el-table-column
label="鍏宠仈宸ヤ綔绔�"
+ prop="is_eqp"
>
<template slot-scope="{row}">
<div class="operationClass">
- <i class="el-icon-share" @click="workClick(row)" />
+ <i v-if="row.is_eqp==='Y'" class="el-icon-share" @click="workClick(row)" />
+ <i v-if="row.is_eqp==='N'" class="el-icon-share" style="color: #E4E7ED" @click="workClick(row)" />
</div>
</template>
</el-table-column>
<el-table-column
label="鍏宠仈缂洪櫡"
+ prop="is_defect"
>
<template slot-scope="{row}">
<div class="operationClass">
- <i class="el-icon-share" @click="defectClick(row)" />
+ <i v-if="row.is_defect==='Y'" class="el-icon-share" @click="defectClick(row)" />
+ <i v-if="row.is_defect==='N'" class="el-icon-share" style="color: #E4E7ED;" @click="defectClick(row)" />
</div>
</template>
</el-table-column>
@@ -408,7 +413,7 @@
'stepcode': '',
'stepname': '',
'steptypecode': '',
- 'enable': '',
+ 'enable': 'Y',
'description': '',
'OperType': ''
},
@@ -533,7 +538,7 @@
this.dialogForm.stepcode = ''
this.dialogForm.stepname = ''
this.dialogForm.steptypecode = ''
- this.dialogForm.enable = ''
+ this.dialogForm.enable = 'Y'
this.dialogForm.description = ''
this.$refs.dialogForm.clearValidate()
},
@@ -805,7 +810,7 @@
console.log('3.绗笁绉嶆儏鍐� 鍗婂彾涓洪浂 鍏ㄥ彾涓嶄负闆�')
console.log(obj.code, 12)
this.workDialogForm.workGatherArr.forEach((item, index) => {
- if (item.code === obj.code) {
+ if (item.code === checkedFatherCode) {
this.workDialogForm.workGatherArr[index].isSelected2 = true
this.workDialogForm.workCodeSelectedGatherArr.push(obj.code)
this.$nextTick(() => {
@@ -862,6 +867,7 @@
const res = await SaveStepAssociationEqp(this.workDialogForm.stepcode, data)
if (res.code === '200') {
this.$message.success('淇濆瓨鎴愬姛锛�')
+ await this.getStepSearch()
this.workDialogVisible = false
}
},
@@ -908,6 +914,7 @@
const res = await SaveStepAssociationDefect(this.defectTreeCode, data)
if (res.code === '200') {
this.$message.success('淇濆瓨鎴愬姛锛�')
+ await this.getStepSearch()
this.defectDialogVisible = false
}
}
--
Gitblit v1.9.3