From 1cfc50f9ff590935f5b3541284a0ae846faec027 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 15 九月 2023 14:26:02 +0800
Subject: [PATCH] modified: src/components/view/standard.vue
---
src/components/view/processInspectionUpdate.vue | 117 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 86 insertions(+), 31 deletions(-)
diff --git a/src/components/view/processInspectionUpdate.vue b/src/components/view/processInspectionUpdate.vue
index decd795..53bafbb 100644
--- a/src/components/view/processInspectionUpdate.vue
+++ b/src/components/view/processInspectionUpdate.vue
@@ -103,8 +103,8 @@
> -->
</el-col>
</el-row>
- <el-table :data="inspectionItems" max-height="420" :span-method="handleSpanMethod" height="calc(100vh - 550px)"
- style="width: 100%">
+ <el-table border :data="inspectionItems" max-height="420" :span-method="handleSpanMethod"
+ height="calc(100vh - 550px)" style="width: 100%">
<el-table-column type="index" label="搴忓彿" width="60"></el-table-column>
<el-table-column label="椤圭洰" prop="father"></el-table-column>
<el-table-column prop="name" label="鎸囨爣"></el-table-column>
@@ -123,9 +123,14 @@
</el-table-column>
<el-table-column prop="dname" label="璇曢獙璁惧" min-width="100">
<template slot-scope="scope">
- <el-button type="text" @click="clickTableSelect(scope)">{{
+ <el-button v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{
scope.row.dname == null ? "璇烽�夋嫨" : scope.row.dname
}}</el-button>
+ <el-select v-if="scope.row.isSelectDevice" style="width: 100%;" @change="clickNodeSure(scope.row)"
+ v-model="filterText" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
+ </el-option>
+ </el-select>
</template>
</el-table-column>
<el-table-column label="缁撹">
@@ -156,8 +161,9 @@
</template>
</el-table-column>
<el-table-column prop="operation" label="涓婃姤">
- <template slot-scope="scope">
- <el-button v-if="scope.row.conclusion === null || scope.row.conclusion === undefined" type="primary" @click="escalation" size="small">涓婃姤</el-button>
+ <template slot-scope="scope">
+ <el-button v-if="scope.row.conclusion === null || scope.row.conclusion === undefined" type="primary"
+ @click="escalation" size="small">涓婃姤</el-button>
<el-button v-else type="success" size="small">宸蹭笂鎶�</el-button>
</template>
</el-table-column>
@@ -165,22 +171,15 @@
</div>
<el-dialog title="璇烽�夋嫨璁惧" :visible.sync="centerDialogVisible" width="20%">
<div class="div_device_dialog">
- <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText" style="margin-bottom: 6px;">
- </el-input>
- <el-tree class="filter-tree" :data="materialOptions" :props="defaultProps" default-expand-all
- highlight-current @node-click="nodeClick" :filter-node-method="filterNode" ref="tree">
- <div class="custom-tree-node" slot-scope="{ data }">
- <span><i :class="`node_i ${data.children ? 'el-icon-folder-opened' : 'el-icon-tickets'
- }`
- "></i>
- {{ data.name }}</span>
- </div>
- </el-tree>
+ <el-select style="width: 100%;" @change="clickNodeSure()" v-model="filterText" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
+ </el-option>
+ </el-select>
</div>
- <span slot="footer" class="dialog-footer">
+ <!-- <span slot="footer" class="dialog-footer">
<el-button @click="centerDialogVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="clickNodeSure()">纭� 瀹�</el-button>
- </span>
+ </span> -->
</el-dialog>
</div>
</template>
@@ -266,7 +265,10 @@
children: "children",
label: "name"
},
- nodeData: "", // node鐐瑰嚮淇濆瓨褰撳墠鐐瑰嚮鏁版嵁
+ nodeData: {
+ id: 0,
+ name: null
+ }, // node鐐瑰嚮淇濆瓨褰撳墠鐐瑰嚮鏁版嵁
clickSelectDevice: {
index: "", // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岀储寮�
rpId: "" // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岄」鐩甀d
@@ -274,13 +276,13 @@
};
},
watch: {
- filterText(val) {
- this.$refs.tree.filter(val);
- }
+ // filterText(val) {
+ // this.$refs.tree.filter(val);
+ // }
},
created() {
- if(this.rowInfo.result!=null&&this.rowInfo.result!=''){
- this.isUpBtn=true
+ if (this.rowInfo.result != null && this.rowInfo.result != '') {
+ this.isUpBtn = true
}
this.processInspectVo.orderNumber = this.rowInfo.order_number
this.processInspectVo.material = this.rowInfo.material
@@ -297,10 +299,13 @@
// console.log(this.detailId);
},
mounted() {
- this.getOptions();
this.getTableData()
},
methods: {
+ // blurNode(row){
+ // console.log(1111);
+ // row.isSelectDevice=false
+ // },
escalation() {
let arr = this.inspectionItems
let bl = false
@@ -323,18 +328,26 @@
this.$axios.post(this.$api.url.processInspectUpdateProcessInspectsById, {
id: this.detailId
}).then(res => {
- console.log(res);
if (res.code == 200) {
+ if (res.message === '椤圭洰鏈楠屽畬!') {
+ this.$message({
+ message: res.message,
+ type: 'warning'
+ });
+ return
+ }
this.$message({
message: '涓婃姤鎴愬姛',
type: 'success'
});
+ this.$parent.combackMain(true)
} else {
this.$message({
message: res.message,
type: 'warning'
});
}
+
})
},
handleClick() { },
@@ -353,9 +366,16 @@
return data.name.indexOf(value) !== -1;
},
// 鑾峰彇璁惧鏍戝唴瀹�
- getOptions() {
- this.$axios.get(this.$api.url.rawSelectDevice).then(res => {
+ getOptions(row) {
+ this.$axios.get(this.$api.url.inspectionItemChooseDev, {
+ params: {
+ father: row.father,
+ name: row.name,
+ technologyId: this.processInspectVo.technologyId
+ }
+ }).then(res => {
this.materialOptions = res.data;
+ this.filterText = row.did
});
},
//杩斿洖
@@ -364,12 +384,19 @@
},
// 鐐瑰嚮琛ㄦ牸閫夋嫨瑙﹀彂
clickTableSelect(scope) {
- this.centerDialogVisible = true;
+ // this.centerDialogVisible = true;
+ scope.row.isSelectDevice = true
this.clickSelectDevice.index = scope.$index;
this.clickSelectDevice.rpId = scope.row.id;
+ this.getOptions(scope.row);
},
// 鐐瑰嚮鏍戦噷闈㈢殑纭畾
- clickNodeSure() {
+ clickNodeSure(row) {
+ let select = this.materialOptions.filter(item => {
+ return item.id === this.filterText
+ })[0]
+ this.nodeData.id = select.id
+ this.nodeData.name = select.device
if (this.detailId == null) {
this.inspectionItems[
this.clickSelectDevice.index
@@ -386,18 +413,35 @@
devId: this.nodeData.id
})
.then(res => {
+ row.isSelectDevice = false
+ this.filterText=0
this.getTableData()
this.centerDialogVisible = false;
});
}
},
changeState(row, index) {
- console.log(row);
if (row.did != null && row.did != '') {
+ // let val = row.empiricalValueAddss.filter(item => {
+ // return item != '' && item != null
+ // })
+ // let eq = val.filter(item => {
+ // return /^[^><=]/.test(item)
+ // })
+ // if (eq.length > 0) {
+ // this.$message({
+ // message: "妫�娴嬪�糩" + eq + "]鏍煎紡棣栦綅搴斿寘鍚�>,<鎴栬��=",
+ // type: 'warning'
+ // });
+ // return
+ // }
let str = ""
row.empiricalValueAddss.forEach(e => {
str += e + ","
})
+ if (str.slice(0, -1) === '' || str.slice(0, -1) === null || str.slice(0, -1) === undefined) {
+ return
+ }
this.$axios.post(this.$api.url.inspectionItemlose_focus_update, {
deviceId: row.did,
inspectionItemId: row.id,
@@ -497,6 +541,15 @@
})
},
getTableData() {
+ this.$axios.get(this.$api.url.processInspectSelectProcessInspectsListById, {
+ params: {
+ id: this.rowInfo.id
+ }
+ }).then(res => {
+ // console.log(res.data);
+ this.processInspectVo.technologyId = res.data[0].techId
+ // console.log(this.processInspectVo);
+ })
this.$axios.get(this.$api.url.inspectionItemListUser, {
params: {
id: this.detailId,
@@ -522,6 +575,8 @@
c.empiricalValueAddss.push("")
}
uName.push(c['username'])
+ c.isSelectDevice = false
+ this.filterText=0
arr.push(c)
})
})
--
Gitblit v1.9.3