From 20437e176e886ee7c8a374bdd17c0c6296bb2e9c Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 15 九月 2023 17:09:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/standard.vue | 137 +++++++++++++++++++++++++++------------------
1 files changed, 81 insertions(+), 56 deletions(-)
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index f3355c9..412a673 100644
--- a/src/components/view/standard.vue
+++ b/src/components/view/standard.vue
@@ -13,26 +13,32 @@
</div>
<div class="thing">
<div class="left">
- <el-row :gutter="5" >
- <el-col :span="21">
- <el-input v-model="search" suffix-icon="el-icon-search" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" size="small" clearable></el-input>
- </el-col>
- <el-col :span="2">
- <el-button size="mini" icon="el-icon-plus" @click="bomLeftAdd=true"></el-button>
- </el-col>
- </el-row>
- <el-row style="margin-top: 16px;">
- <el-tree :data="list" ref="tree" default-expand-all :props="{ children: 'children', label: 'name' }"
- node-key="id" :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current>
- <div class="custom-tree-node" slot-scope="{ node, data }">
- <span><i :class="`node_i ${data.code != '[5]' ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
- {{ data.code }}{{ data.name }}</span>
- <el-button type="text" size="mini" @click.stop="remove(node, data)">
- <i class="el-icon-delete"></i>
- </el-button>
- </div>
- </el-tree>
- </el-row>
+ <div class="left_search">
+ <el-row :gutter="5">
+ <el-col :span="21">
+ <el-input v-model="search" suffix-icon="el-icon-search" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" size="small" clearable></el-input>
+ </el-col>
+ <el-col :span="2">
+ <el-button size="mini" icon="el-icon-plus" @click="bomLeftAdd=true"></el-button>
+ </el-col>
+ </el-row>
+ </div>
+ <div class="left_tree">
+ <el-row>
+ <el-col :span="24">
+ <el-tree :data="list" ref="tree" default-expand-all :props="{ children: 'children', label: 'name' }"
+ node-key="id" :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current>
+ <div class="custom-tree-node" slot-scope="{ node, data }">
+ <span><i :class="`node_i ${data.code != '[5]' ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
+ {{ data.code }}{{ data.name }}</span>
+ <el-button type="text" size="mini" @click.stop="remove(node, data)">
+ <i class="el-icon-delete"></i>
+ </el-button>
+ </div>
+ </el-tree>
+ </el-col>
+ </el-row>
+ </div>
</div>
<div class="right">
<div class="choose">
@@ -254,6 +260,11 @@
<template slot-scope="scope">
<el-input size="mini" v-model="scope.row.num"
placeholder="璇疯緭鍏�"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" width="60">
+ <template slot-scope="scope">
+ <el-button type="text" @click="removeMTableRow(scope.$index)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -671,6 +682,10 @@
getChildData(data){
this.childIds = data;
},
+ //鐗╂枡娓呭崟-鏂板bom-琛ㄦ牸鍒犻櫎琛�
+ removeMTableRow(index){
+ this.materialForm.tableList.splice(index,1);
+ },
//鍒犻櫎鎸夐挳
deleteDataBtn(){
let ids;
@@ -724,10 +739,8 @@
}).then(res=>{
this.selectVersion();
this.$message.success(res.message);
- }).catch(error=>{
- this.$message.error(error.message);
})
- }).catch(() => {});
+ })
},
//鍙充晶bom,纭鏂板
confirmAdd(formName){
@@ -742,7 +755,7 @@
deviceGroup: this.technologyForm.deviceGroup,
father: this.technologyForm.tefather,
name: this.technologyForm.tename,
- productionQuota: Number.parseInt(this.technologyForm.productionQuota),
+ productionQuota: this.technologyForm.productionQuota,
}
this.submitBomAdd(this.$api.url.addTechnology,obj);
}else if(type == 1){
@@ -785,7 +798,6 @@
this.selectAll();
this.$message.success(res.message);
}).catch(error=>{
- this.$message.error(error.message);
})
},
//娓呯┖鏂板bom琛ㄥ崟
@@ -970,34 +982,34 @@
},
handleSelect(item) {
console.log(item);
- },
- querySearch(queryString, cb) {
- var restaurants = this.restaurants;
- var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
- // 璋冪敤 callback 杩斿洖寤鸿鍒楄〃鐨勬暟鎹�
- cb(results);
- },
- querySearchName(queryString, cb) {
- var restaurants = this.bomName;
- var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
- // 璋冪敤 callback 杩斿洖寤鸿鍒楄〃鐨勬暟鎹�
- cb(results);
- },
- querySearchStandar(queryString, cb) {
- var restaurants = this.bomStandard;
- var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
- // 璋冪敤 callback 杩斿洖寤鸿鍒楄〃鐨勬暟鎹�
- cb(results);
- },
- loadFatherType(){
- return [{label:"姗¤兌杩炴帴鍣�",value: "姗¤兌杩炴帴鍣�"},{label:"閲戝睘杩炴帴鍣�",value: "閲戝睘杩炴帴鍣�"},
- {label:"婀挎彃鎷旂數杩炴帴鍣�",value: "婀挎彃鎷旂數杩炴帴鍣�"},{label:"鍒嗘敮缁勪欢",value: "鍒嗘敮缁勪欢"}]
- },
- createFilter(queryString) {
- return (restaurant) => {
- return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
- };
- },
+ },
+ querySearch(queryString, cb) {
+ var restaurants = this.restaurants;
+ var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+ // 璋冪敤 callback 杩斿洖寤鸿鍒楄〃鐨勬暟鎹�
+ cb(results);
+ },
+ querySearchName(queryString, cb) {
+ var restaurants = this.bomName;
+ var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+ // 璋冪敤 callback 杩斿洖寤鸿鍒楄〃鐨勬暟鎹�
+ cb(results);
+ },
+ querySearchStandar(queryString, cb) {
+ var restaurants = this.bomStandard;
+ var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+ // 璋冪敤 callback 杩斿洖寤鸿鍒楄〃鐨勬暟鎹�
+ cb(results);
+ },
+ loadFatherType(){
+ return [{label:"姗¤兌杩炴帴鍣�",value: "姗¤兌杩炴帴鍣�"},{label:"閲戝睘杩炴帴鍣�",value: "閲戝睘杩炴帴鍣�"},
+ {label:"婀挎彃鎷旂數杩炴帴鍣�",value: "婀挎彃鎷旂數杩炴帴鍣�"},{label:"鍒嗘敮缁勪欢",value: "鍒嗘敮缁勪欢"}]
+ },
+ createFilter(queryString) {
+ return (restaurant) => {
+ return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+ };
+ },
selectDataList() {
this.list.forEach(a => {
a.code = '[1]'
@@ -1022,7 +1034,7 @@
})
}
})
- },
+ },
handleSelectionChange() {
},
@@ -1055,8 +1067,8 @@
this.versionVal = res.data[0];
})
}
+ this.selectAll()
})
- this.selectAll()
},
//鍙充晶鏁版嵁
selectAll() {
@@ -1300,16 +1312,29 @@
height: calc(100% - 48px);
background-color: #fff;
display: flex;
+
}
.thing .left {
width: 295px;
height: calc(100% - 32px);
- overflow-y: auto;
border-right: 3px solid rgb(245, 247, 251);
padding: 16px;
}
+.thing .left .left_search{
+ width:95%;
+ height: 32px;
+ line-height: 32px;
+ margin-bottom: 5px;
+}
+
+.thing .left .left_tree{
+ width: 100%;
+ height: calc(100% - 32px);
+ overflow-y: scroll;
+}
+
.thing .left .custom-tree-node span {
font-size: 14px;
}
--
Gitblit v1.9.3