From de79a0aa1d62c2130b47c667fd10c0fce0587c35 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 14 九月 2023 10:35:46 +0800
Subject: [PATCH] modified: src/assets/api/controller.js modified: src/components/view/finishedProductInspection.vue modified: src/components/view/finishedProductInspectionAdd.vue modified: src/components/view/finishedProductInspectionLook.vue modified: src/components/view/finishedProductInspectionUp.vue modified: src/components/view/processInspectionUpdate.vue modified: src/main.js
---
src/components/view/technology.vue | 77 +++++++++++++++++++++-----------------
1 files changed, 42 insertions(+), 35 deletions(-)
diff --git a/src/components/view/technology.vue b/src/components/view/technology.vue
index 221ebe2..c0ad40a 100644
--- a/src/components/view/technology.vue
+++ b/src/components/view/technology.vue
@@ -46,6 +46,7 @@
height: calc(100% - 20px);
border-right: 3px solid rgb(245, 247, 251);
padding: 16px;
+ overflow-y: auto;
}
.thing .left .custom-tree-node span {
@@ -171,10 +172,11 @@
:data="towTree"
ref="tree"
:props="{ children: 'children', label: 'father' }"
- node-key="id"
+ node-key="name"
default-expand-all
@node-click="handleNodeClick"
:key="upIndex"
+ highlight-current
>
<div class="custom-tree-node" slot-scope="{ node, data }">
<span
@@ -185,7 +187,7 @@
: 'el-icon-tickets'
}`"
></i>
- {{ data.name }}{{ data.father }}</span
+ {{data.code}}{{ data.name }}</span
>
<!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
<i class="el-icon-delete"></i>
@@ -232,6 +234,7 @@
<el-select
v-model="edit.type"
placeholder="璇烽�夋嫨"
+ disabled
style="width: 310px"
>
<el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
@@ -250,12 +253,14 @@
<el-select
v-model="edit.father"
style="width: 310px"
+ disabled
placeholder="璇烽�夋嫨"
>
<el-option
v-for="item in procedure"
:key="item"
:label="item"
+ disabled
:value="item"
>
</el-option>
@@ -268,8 +273,9 @@
>
<el-col :span="16" :offset="1">
<el-select
- v-model="AAA.id"
+ v-model="edit.children"
style="width: 310px"
+ disabled
multiple
placeholder="璇烽�夋嫨"
>
@@ -277,7 +283,7 @@
v-for="item in element"
:key="item.id"
:label="item.name"
- :value="item.id"
+ :value="item.name"
>
</el-option>
</el-select>
@@ -320,6 +326,7 @@
v-model="form.type"
placeholder="璇烽�夋嫨"
style="width: 480px"
+ @change="edittype"
>
<el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
<el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
@@ -332,6 +339,8 @@
<template>
<el-select
v-model="form.father"
+ allow-create
+ filterable
placeholder="璇烽�夋嫨"
style="width: 480px"
>
@@ -368,12 +377,13 @@
<template>
<el-select
v-model="form.elementId"
+ multiple
placeholder="璇烽�夋嫨"
style="width: 200px"
>
<el-option
v-for="item in element"
- :key="item.value"
+ :key="item.id"
:label="item.name"
:value="item.id"
>
@@ -516,11 +526,10 @@
],
edit: {
deviceGroup: "",
- elementId: "",
father: "",
name: "",
type: "",
- // children:[],
+ children:[],
},
upData: {
name: "",
@@ -567,11 +576,11 @@
Neworder() {
this.dialogVisible = false;
this.addTechTemp();
- // this.form = '';
+ this.form = {};
},
Deleteapi() {
this.dialogVisible = false;
- this.form = "";
+ this.form = {};
},
addTechTemp() {
// console.log(this.$api.url.addTechTemp);
@@ -581,7 +590,7 @@
{
deviceGroup: this.form.deviceGroup,
- elementId: this.form.elementId,
+ elementId: JSON.stringify(this.form.elementId).replace("[","").replace("]",""),
father: this.form.father,
name: this.form.name,
type: this.form.type,
@@ -593,7 +602,7 @@
}
)
.then((res) => {
- console.log(res);
+ this.$parent.removeAllTab()
this.selectAllTechNam();
this.form = {};
});
@@ -616,24 +625,32 @@
//宸ュ簭
chooseTech() {
- this.$axios.get(this.$api.url.chooseTech).then((res) => {
- this.procedure = res.data;
- console.log(this.procedure);
- });
+ this.$axios.get(this.$api.url.chooseTech,{
+ params:{
+ type:this.typeselect
+ }
+ }).then(res =>{
+ console.log(res);
+ this.procedure = res.data
+ })
},
+ edittype(val) {
+ this.typeselect = val
+ this.chooseTech()
+ },
//鎵归噺鍒犻櫎
delAllTech() {
- console.log(this.delete);
this.$axios.post(this.$api.url.delAllTech, {
- ids: this.delete,
+ ids: this.delete
});
+ this.$parent.removeAllTab()
},
//鍒犻櫎
delTechById() {
- console.log(this.$api.url.delTechById, this.upData.id);
this.$axios.post(this.$api.url.delTechById, {
- id: this.upData.id,
+ id: this.upData.id
});
+ this.$parent.removeAllTab()
},
//缂栬緫
writeTechById() {
@@ -660,7 +677,7 @@
}
)
.then((res) => {
- console.log(res);
+ this.$parent.removeAllTab()
});
},
@@ -674,7 +691,10 @@
})
.then((res) => {
this.towTree = res.data;
- console.log(this.towTree);
+ console.log(this.towTree);
+ this.$nextTick(() => {
+ this.$refs.tree.setCurrentKey(this.towTree[0].children[0].name) // 榛樿閫変腑鑺傜偣绗竴涓�
+ })
let one=this.towTree.filter(item=>{
return item.children.length>0
})[0]
@@ -769,7 +789,6 @@
return el.id;
});
this.delete = cc.join(",");
- console.log(this.delete);
this.delAllTech();
this.$message.success("鍒犻櫎瀹屾垚");
},
@@ -787,25 +806,13 @@
})
.then((res) => {
this.edit = res.data[0];
- this.AAA = res.data[0].children;
console.log(this.edit);
- console.log(this.AAA);
- // this.edit.forEach(el => {
- // // el.children.forEach(ele =>{
- // // this.AAA.push(ele)
- // console.log(el);
- // })
- // console.log(this.AAA.id);
- // })
- // console.log(this.edit);
});
},
//缂栬緫鍐呭
upContent(ob) {
this.upData = ob;
- this.selecTechById();
- this.selecTechById();
- console.log(this.upData);
+ this.selecTechById()
this.upDia = true;
},
--
Gitblit v1.9.3