From c0bc2331e9abb2ae003c8dc0ab4524d6101493a1 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 25 九月 2023 09:12:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/finishedProductInspectionAdd.vue | 132 +++++++++++++++++++++++++++++--------------
1 files changed, 88 insertions(+), 44 deletions(-)
diff --git a/src/components/view/finishedProductInspectionAdd.vue b/src/components/view/finishedProductInspectionAdd.vue
index 40a547d..b72612a 100644
--- a/src/components/view/finishedProductInspectionAdd.vue
+++ b/src/components/view/finishedProductInspectionAdd.vue
@@ -38,8 +38,8 @@
<el-row>
<el-col :span="7">
<el-form-item label="浜у搧鍚嶇О锛�">
- <el-select @change="changeOptionsSamplename" style="width: 180px;" v-model="processInspectVo.material" size="small"
- placeholder="璇烽�夋嫨浜у搧鍚嶇О">
+ <el-select @change="changeOptionsSamplename" style="width: 180px;"
+ v-model="processInspectVo.material" size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
<el-option v-for="item in optionsSamplename" :key="item.id" :label="item.name"
:value="item.id + '-' + item.name">
</el-option>
@@ -68,8 +68,8 @@
</el-col>
<el-col :span="7">
<el-form-item label="鍗曚綅锛�">
- <el-input disabled style="width: 180px;" v-model="processInspectVo.unit" placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�"
- autocomplete="off" />
+ <el-input disabled style="width: 180px;" v-model="processInspectVo.unit"
+ placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="7">
@@ -120,9 +120,13 @@
</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="缁撹">
@@ -151,22 +155,11 @@
</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">
- <el-button @click="centerDialogVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="clickNodeSure()">纭� 瀹�</el-button>
- </span>
</el-dialog>
</div>
</template>
@@ -207,11 +200,12 @@
mcode: null,
prname: null,
sname: null,
- orderNumber: "D-001",
+ orderNumber: "",
qualityTraceability: null,
quantity: null,
specificationsModel: null,
- unit: null
+ unit: null,
+ technologyId: null
},
InspectioniD: null,
addInspectionform: [
@@ -254,34 +248,37 @@
children: "children",
label: "name"
},
- nodeData: "", // node鐐瑰嚮淇濆瓨褰撳墠鐐瑰嚮鏁版嵁
+ nodeData: {
+ id: 0,
+ name: null
+ }, // node鐐瑰嚮淇濆瓨褰撳墠鐐瑰嚮鏁版嵁
clickSelectDevice: {
- index: "", // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岀储寮�
- rpId: "" // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岄」鐩甀d
+ index: null, // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岀储寮�
+ rpId: null // 鐐瑰嚮閫夋嫨瀛樺偍褰撳墠琛岄」鐩甀d
}
};
},
watch: {
- filterText(val) {
- this.$refs.tree.filter(val);
- }
+ // filterText(val) {
+ // this.$refs.tree.filter(val);
+ // }
},
mounted() {
this.getTableData()
- this.getOptions();
+ // this.getOptions();
},
methods: {
- changeOptionsSamplename(){
- let id=this.processInspectVo.material.split("-")[0]
- let sample=this.optionsSamplename.filter(o=>{
- return o.id==id
+ changeOptionsSamplename() {
+ let id = this.processInspectVo.material.split("-")[0]
+ let sample = this.optionsSamplename.filter(o => {
+ return o.id == id
})[0]
- this.processInspectVo.qualityTraceability=sample.qualityTraceability
- this.processInspectVo.mcode=sample.mcode
- this.processInspectVo.specificationsModel=sample.specifications
- this.processInspectVo.unit=sample.unit
+ this.processInspectVo.qualityTraceability = sample.qualityTraceability
+ this.processInspectVo.mcode = sample.mcode
+ this.processInspectVo.specificationsModel = sample.specifications
+ this.processInspectVo.unit = sample.unit
},
- comBack(){
+ comBack() {
this.$parent.comBackMain()
},
handleClick(row) {
@@ -311,19 +308,42 @@
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
+ if(this.materialOptions.length===1){
+ this.$message({
+ message: '璇ラ」鐩笅鍙湁涓�涓瘯楠岃澶囷紝鏃犻渶閫夋嫨锛�',
+ type: 'warning'
+ });
+ return
+ }
+ row.isSelectDevice = true
});
},
// 鐐瑰嚮琛ㄦ牸閫夋嫨瑙﹀彂
clickTableSelect(scope) {
- this.centerDialogVisible = true;
+ if(this.clickSelectDevice.index!=null){
+ this.$set(this.inspectionItems[this.clickSelectDevice.index],'isSelectDevice',false)
+ }
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
@@ -342,16 +362,32 @@
.then(res => {
this.getTableData()
this.centerDialogVisible = false;
+ row.isSelectDevice=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,
@@ -423,7 +459,7 @@
// this.isAddProject = true
let val = JSON.parse(JSON.stringify(this.processInspectVo))
val.material = this.processInspectVo.material.split("-")[1]
- val.id=this.processInspectVo.material.split("-")[0]
+ val.id = this.processInspectVo.material.split("-")[0]
this.$axios.post(this.$api.url.finishedInspectAddFinish, val, {
headers: { "Content-Type": "application/json" }
}).then(res => {
@@ -441,6 +477,13 @@
})
},
getTableData() {
+ this.$axios.get(this.$api.url.finishedInspectSelectFinishInspectsListById, {
+ params: {
+ id: this.detailId
+ }
+ }).then(res => {
+ this.processInspectVo.technologyId = res.data[0].techId
+ })
this.$axios.get(this.$api.url.inspectionItemListUser, {
params: {
id: this.detailId,
@@ -466,6 +509,7 @@
c.empiricalValueAddss.push("")
}
uName.push(c['username'])
+ c.isSelectDevice = false
arr.push(c)
})
})
--
Gitblit v1.9.3