From d0dfd0feb2914fb969722b2521763a23288081a4 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 14 九月 2023 10:36:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/technology.vue | 76 +++++++++++++++++-------
src/components/view/mbom.vue | 29 +++------
src/components/view/equipmentmaintain.vue | 13 +++
src/components/view/record-content.vue | 2
src/main.js | 2
src/assets/api/controller.js | 2
src/components/view/standard-table/product.vue | 11 ---
7 files changed, 80 insertions(+), 55 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index ae557e1..f4cdb13 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -138,7 +138,7 @@
selectAllMbom:"/mbomModel/selectAllMbom",//鐗╂枡缁存姢--銆嬪彸杈�
addMbom:"/mbomModel/addMbom",//鐗╂枡--->鏂板
material:"/mbomModel/delMbomById",//鐗╂枡娓呭崟鍒犻櫎
- delAllMbom:"/mbom/delAllMbom",//鎵归噺鍒犻櫎
+ delAllMbom:"/mbomModel/delAllMbom",//鎵归噺鍒犻櫎
selectAllTeque:"/techniqueModel/selectAllTeque",//鐢熶骇宸ヨ壓缁存姢---銆傚彸杈�
diff --git a/src/components/view/equipmentmaintain.vue b/src/components/view/equipmentmaintain.vue
index 30759c4..528295c 100644
--- a/src/components/view/equipmentmaintain.vue
+++ b/src/components/view/equipmentmaintain.vue
@@ -263,7 +263,7 @@
<el-table
:data="tableData"
style="width: 100%;margin-bottom: 20px;height: 600px;overflow: auto;"
- row-key="name"
+ row-key="rowId"
border
@select="selectTr"
@selection-change="handleSelectionChange"
@@ -549,12 +549,21 @@
}).then(res => {
this.tableData = res.data;
console.log(this.tableData);
-
+ this.formatData(res.data)
})
},
modify(){
this.modifyevent = true
},
+ formatData(data){
+ let arr = data;
+ for(var i=0;i<arr.length;i++){
+ arr[i].rowId = Math.random();
+ if(arr[i].children != undefined){
+ this.formatData(arr[i].children);
+ }
+ }
+ },
//delQueById
delQueById() {
this.$axios.post(this.$api.url.delQueById,{
diff --git a/src/components/view/mbom.vue b/src/components/view/mbom.vue
index 4e8c3ba..9acb7cb 100644
--- a/src/components/view/mbom.vue
+++ b/src/components/view/mbom.vue
@@ -219,24 +219,17 @@
}
})
},
- addMbom(data) {
- this.$axios.post(this.$api.url.addMbom,data,{
- // params:{
- // techTemId:this.craftapi.id,
- // mbomModelDto2List:[{
- // name:this.tableapi.name,
- // qualityTraceability:this.tableapi.qualityTraceability,
- // specifications:this.tableapi.specifications,
- // supplier:this.tableapi.supplier,
- // unit:this.tableapi.unit,
- // }]
- // }
+ addMbom(data,cc) {
+ this.$axios.post(this.$api.url.addMbom,{
+ mbomModelDto2List:data,
+ techTemId:cc,
+
}, {
headers: {
"Content-Type": "application/json"
}
}).then(res =>{
- console.log(res);
+ // console.log(res);
this.$message.success('娣诲姞瀹屾垚')
this.selectAllMbom()
this.tableapi = [{}]
@@ -338,14 +331,14 @@
if (this.tableapi == undefined) {
this.tableapi = new Array();
}
- let obj = [];
+ let obj = {};
this.tableapi.push(obj);
},
skipshow() {
- console.log('666');
- let data = this.tableapi.at(-1)
- data.techTemId = this.search.craft
- this.addMbom(data)
+ // let data = this.tableapi.at(-1)
+ // console.log(this.tableapi);
+ let cc = this.search.craft
+ this.addMbom(this.tableapi,cc)
this.dialogVisible = false
},
//delAllMbom 鎵归噺鍒犻櫎
diff --git a/src/components/view/record-content.vue b/src/components/view/record-content.vue
index 504470a..921e8f3 100644
--- a/src/components/view/record-content.vue
+++ b/src/components/view/record-content.vue
@@ -494,6 +494,7 @@
console.log(one);
let name=one.children[0].id
console.log(name);
+ this.checkTreeNode.id = name
this.selectjiluStart(name)
this.selectDataList();
});
@@ -509,6 +510,7 @@
},
//selectjilu checkTreeNode
selectjilu() {
+ console.log(this.checkTreeNode.id);
this.$axios.get(this.$api.url.selectjilu,{
params:{id:this.checkTreeNode.id}
}).then(res => {
diff --git a/src/components/view/standard-table/product.vue b/src/components/view/standard-table/product.vue
index 62990fd..c3c13d2 100644
--- a/src/components/view/standard-table/product.vue
+++ b/src/components/view/standard-table/product.vue
@@ -73,14 +73,8 @@
<span>{{scope.row.productFather}}</span>
</template>
</el-table-column>
- <el-table-column prop="productFather" hidden></el-table-column>
<el-table-column prop="unit" label="鍗曚綅"></el-table-column>
<el-table-column prop="product" label="鎸囨爣"></el-table-column>
- <el-table-column label="鎿嶄綔">
- <template slot-scope="scope">
- <el-button type="text" @click="updateProduct(scope.row)">缂栬緫</el-button>
- </template>
- </el-table-column>
</el-table>
</div>
</template>
@@ -96,10 +90,7 @@
},
props:['tableData','tableType'],
methods:{
- updateProduct(row){
- console.log(row);
- },
- // 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆
+ // 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆
// 鍏ㄩ��/鍙栨秷閫夋搷浣�
selectAll(val) {
this.isAllSelect = !this.isAllSelect;
diff --git a/src/components/view/technology.vue b/src/components/view/technology.vue
index c0ad40a..09c9d13 100644
--- a/src/components/view/technology.vue
+++ b/src/components/view/technology.vue
@@ -223,6 +223,9 @@
</el-table>
</div>
</div>
+
+
+
<el-dialog title="缂栬緫璁板綍鍐呭" :visible.sync="upDia" width="500px">
<div class="body">
<el-row style="line-height: 46px">
@@ -273,7 +276,7 @@
>
<el-col :span="16" :offset="1">
<el-select
- v-model="edit.children"
+ v-model="cell"
style="width: 310px"
disabled
multiple
@@ -283,7 +286,7 @@
v-for="item in element"
:key="item.id"
:label="item.name"
- :value="item.name"
+ :value="item.id"
>
</el-option>
</el-select>
@@ -297,18 +300,35 @@
<el-input v-model="edit.name" size="small" clearable></el-input>
</el-col>
</el-row>
+
<el-row style="line-height: 46px">
<el-col :span="4" style="font-size: 14px; text-align: right"
>璁惧缁�:</el-col
>
<el-col :span="16" :offset="1">
- <el-input
+ <!-- <el-input
v-model="upData.device_group"
size="small"
clearable
- ></el-input>
+ ></el-input> -->
+ <template>
+ <el-select
+ v-model="upData.device_group"
+ placeholder="璇烽�夋嫨"
+ style="width: 306px"
+ >
+ <el-option
+ v-for="item in equipment"
+ :key="item.index"
+ :label="item.father"
+ :value="item.father"
+ >
+ </el-option>
+ </el-select>
+ </template>
</el-col>
</el-row>
+
</div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitUpData">纭� 瀹�</el-button>
@@ -519,6 +539,7 @@
upDia: false,
element: [],
equipment: [0],
+ cell:[],
AAA: [
{
id: "",
@@ -602,7 +623,7 @@
}
)
.then((res) => {
- this.$parent.removeAllTab()
+ console.log(res);
this.selectAllTechNam();
this.form = {};
});
@@ -640,35 +661,36 @@
},
//鎵归噺鍒犻櫎
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() {
+ // console.log(JSON.stringify(this.edit.children));
+ // console.log(JSON.stringify(this.edit.children));
+ // var str = ''
+ // this.edit.children.forEach((a,ai)=>{
+ // str += a.id
+ // if(ai!=this.edit.children.length-1) str+=','
+ // })
this.$axios
.post(
- this.$api.url.writeTechById,
- {
- params: {
- id: this.upData.id,
- technologyTemplateDto: {
+ this.$api.url.writeTechById + `?id=${this.upData.id}`,
+ {
deviceGroup: this.upData.device_group,
- elementId: this.edit.elementId,
+ elementId:this.cell.join(','),
father: this.edit.father,
name: this.edit.name,
- type: this.edit.type,
- },
- // id:this.upData.id,
- },
+ type: this.edit.type
},
{
headers: {
@@ -677,14 +699,14 @@
}
)
.then((res) => {
- this.$parent.removeAllTab()
+ this.selectAllTechNam()
});
},
query(val) {
this.selectAllTechTem();
},
- selectAllTechTem() {
+ selectAllTechTem() {
this.$axios
.get(this.$api.url.selectAllTechTem, {
params: { type: this.typeselect, message: this.search.technology },
@@ -789,6 +811,7 @@
return el.id;
});
this.delete = cc.join(",");
+ console.log(this.delete);
this.delAllTech();
this.$message.success("鍒犻櫎瀹屾垚");
},
@@ -806,7 +829,14 @@
})
.then((res) => {
this.edit = res.data[0];
- console.log(this.edit);
+ console.log(this.edit.children);
+ this.cell = this.edit.children.map(el => {
+ return el.id
+ })
+ // this.cell = this.cell.join(',')
+ // this.cell = nn
+ // console.log(this.cell);
+
});
},
//缂栬緫鍐呭
@@ -831,4 +861,4 @@
},
},
};
-</script>
\ No newline at end of file
+</script>
diff --git a/src/main.js b/src/main.js
index 0578c6b..61dbbb7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -26,7 +26,7 @@
const javaApi = 'http://192.168.0.23:8001'
// localhost 127.0.0.1
-// const javaApi = 'http://127.0.0.1:8001'
+// const javaApi = 'http://127.0.0.1:8001/'
--
Gitblit v1.9.3