From ed2f5cbcb482a22fbf799cf14ff3d3152669e7ac Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 27 九月 2023 18:17:02 +0800
Subject: [PATCH] modified: src/assets/api/controller.js modified: src/components/view/mbom.vue modified: src/components/view/standard.vue
---
src/components/view/standard.vue | 66 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index 00b294b..a2b6cc0 100644
--- a/src/components/view/standard.vue
+++ b/src/components/view/standard.vue
@@ -44,19 +44,19 @@
<div class="choose">
<span>绫诲瀷锛�</span>
<el-select v-model="tableType" size="small" placeholder="璇烽�夋嫨" @change="TYPE"
- style="width: 224px;margin-right: 52px;">
+ style="width: 13vw;margin-right: 15px;">
<el-option :value="0" label="宸ヨ壓璺嚎"></el-option>
<el-option :value="1" label="鎶�鏈寚鏍�"></el-option>
<el-option :value="2" label="鐗╂枡娓呭崟"></el-option>
<el-option :value="3" label="鐢熶骇宸ヨ壓"></el-option>
</el-select>
<span>鐗堟湰锛�</span>
- <el-select v-model="versionVal" @change="verevent" size="small" style="width: 280px;margin-right: 52px;" placeholder="璇烽�夋嫨">
+ <el-select v-model="versionVal" @change="verevent" size="small" style="width: 13vw;margin-right: 15px;" placeholder="璇烽�夋嫨">
<el-option v-for="(item,index) in versionData" :key="index" :label="item.label" :value="item.value">
</el-option>
</el-select>
<span>{{ tableType == 1 ? '椤圭洰锛�' : '宸ヨ壓鍚嶇О锛�' }}</span>
- <el-input v-model="searchName" size="small" placeholder="璇疯緭鍏�" style="width: 224px;margin-right:10px"
+ <el-input v-model="searchName" size="small" placeholder="璇疯緭鍏�" style="width: 13vw;margin-right:15px"
clearable></el-input>
<el-button size="mini" @click="() => { searchName = ''; selectAll() }">
<span>閲� 缃�</span>
@@ -70,7 +70,7 @@
<technology @childData="getChildData" @updateDevice="updateDevice" :tableType="tableType" :tableData="tableData"></technology>
</div>
<div class="contentTable" v-if="this.typeselect == 1">
- <target @childData="getChildData" :tableType="tableType" :tableData="tableData"></target>
+ <target @childData="getChildData" :tableType="tableType" :tableData="tableData"></target>
</div>
<div class="contentTable" v-if="this.typeselect == 2">
<material @childData="getChildData" :tableType="tableType" :tableData="tableData"></material>
@@ -89,7 +89,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="宸ュ簭:" prop="tefather" style="display: flex;">
- <el-select size="small"
+ <el-select size="small"
filterable allow-create default-first-option style="width: 100%;"
v-model="technologyForm.tefather" placeholder="璇疯緭鍏ユ垨閫夋嫨宸ュ簭">
<el-option :value="item.father" :label="item.father" v-for="(item,index) in fatherList" :key="index"></el-option>
@@ -98,7 +98,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="宸ヨ壓鍚嶇О:" prop="tename" style="display: flex;">
- <el-input style="width: 100%;" size="small" placeholder="璇疯緭鍏ュ伐鑹哄悕绉�"
+ <el-input style="width: 100%;" size="small" placeholder="璇疯緭鍏ュ伐鑹哄悕绉�"
clearable v-model="technologyForm.tename"></el-input>
</el-form-item>
</el-col>
@@ -108,7 +108,7 @@
<el-form-item label="璁惧缁�:" prop="deviceGroup" style="display: flex;">
<el-select placeholder="璇烽�夋嫨璁惧缁�" size="small" style="width: 100%;"
v-model="technologyForm.deviceGroup">
- <el-option :value="item.father"
+ <el-option :value="item.father"
v-for="(item,index) in deviceList" :key="index" :label="item.father"></el-option>
</el-select>
</el-form-item>
@@ -132,7 +132,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="宸ュ簭:" prop="pfather">
- <el-select v-model="targetForm.pfather"
+ <el-select v-model="targetForm.pfather"
@change="changeFather" size="small" placeholder="璇烽�夋嫨宸ュ簭">
<el-option :value="item.name" :label="item.name" v-for="(item,index) in targetFormList" :key="index"></el-option>
</el-select>
@@ -151,7 +151,7 @@
<el-col :span="12">
<el-form-item label="椤圭洰:" prop="father">
<el-select v-model="targetForm.father"
- filterable allow-create default-first-option
+ filterable allow-create default-first-option
size="small" placeholder="璇疯緭鍏ユ垨閫夋嫨椤圭洰">
<el-option :value="item.father" :label="item.father" v-for="(item,index) in projectList" :key="index"></el-option>
</el-select>
@@ -159,7 +159,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鎸囨爣鍚嶇О:" prop="name">
- <el-input size="small" v-model="targetForm.name" placeholder="璇疯緭鍏ユ寚鏍囧悕绉�"/>
+ <el-input size="small" v-model="targetForm.name" placeholder="璇疯緭鍏ユ寚鏍囧悕绉�"/>
</el-form-item>
</el-col>
</el-row>
@@ -200,16 +200,16 @@
style="width:100%;" v-model="materialForm.mfather" size="small">
<el-option v-for="(item,index) in materialFormList" :key="index"
:label="item.name" :value="item.name" ></el-option>
- </el-select>
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="宸ヨ壓鍚嶇О:" prop="mtechnologyId">
- <el-select placeholder="璇烽�夋嫨宸ヨ壓鍚嶇О" style="width:100%;"
+ <el-select placeholder="璇烽�夋嫨宸ヨ壓鍚嶇О" style="width:100%;"
v-model="materialForm.mtechnologyId" size="small">
- <el-option v-for="(item,index) in mIdList" :key="index"
+ <el-option v-for="(item,index) in mIdList" :key="index"
:value="item.id" :label="item.name"></el-option>
- </el-select>
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -226,12 +226,12 @@
<el-table :data="materialForm.tableList" border max-height="470"
:cell-style="{height:'20px',textAlign:'left'}"
:header-cell-style="{height:'20px'}">
- <el-table-column label="渚涘簲鍟嗗悕绉�">
+ <!-- <el-table-column label="渚涘簲鍟嗗悕绉�">
<template slot-scope="scope">
<el-input size="mini" v-model="scope.row.supplier"
placeholder="璇疯緭鍏�"></el-input>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column label="璐ㄩ噺杩芥函鍙�">
<template slot-scope="scope">
<el-input size="mini" v-model="scope.row.qualityTraceability"
@@ -283,7 +283,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="宸ュ簭:" prop="profather">
- <el-select v-model="productForm.profather"
+ <el-select v-model="productForm.profather"
@change="changeProduct" placeholder="璇烽�夋嫨宸ュ簭" size="small">
<el-option v-for="(item,index) in productFormList" :key="index"
:value="item.name" :label="item.name"></el-option>
@@ -442,8 +442,8 @@
father:{required:true,message:'椤圭洰涓嶈兘涓虹┖',trigger:'change'},
name:{required:true,message:'鎸囨爣鍚嶇О涓嶈兘涓虹┖',trigger:'blur'},
unit:{required:true,message:'鍗曚綅涓嶈兘涓虹┖',trigger:'change'},
- internal:{validator:checkVal,trigger:'change'},
- required:{validator:checkVal,trigger:'change'}
+ internal:{required:true,message:'鍐呮帶鍊间笉鑳戒负绌�',trigger:'change'},
+ required:{required:true,message:'鏍囧噯鍊间笉鑳戒负绌�',trigger:'change'}
},
//鐗╂枡娓呭崟
materialForm:{
@@ -559,8 +559,8 @@
this.leftAdd.name=null
this.leftAdd.specifications=null
this.selectMaterialTree()
- this.bomLeftAdd=false
- this.selectVersion()
+ this.bomLeftAdd=false
+ this.selectVersion()
})
return
}
@@ -587,8 +587,8 @@
this.leftAdd.name=null
this.leftAdd.specifications=null
this.selectMaterialTree()
- this.bomLeftAdd=false
- this.selectVersion()
+ this.bomLeftAdd=false
+ this.selectVersion()
})
}else{
let three=two.children.filter(item=>{
@@ -610,7 +610,7 @@
this.leftAdd.name=null
this.leftAdd.specifications=null
this.selectMaterialTree()
- this.bomLeftAdd=false
+ this.bomLeftAdd=false
this.selectVersion()
})
}else{
@@ -637,8 +637,8 @@
this.leftAdd.name=null
this.leftAdd.specifications=null
this.selectMaterialTree()
- this.bomLeftAdd=false
- this.selectVersion()
+ this.bomLeftAdd=false
+ this.selectVersion()
})
}else{
let specificationsDto={
@@ -658,7 +658,7 @@
this.leftAdd.name=null
this.leftAdd.specifications=null
this.selectMaterialTree()
- this.bomLeftAdd=false
+ this.bomLeftAdd=false
this.selectVersion()
})
}
@@ -676,7 +676,7 @@
this.$refs[formName].resetFields();
},
leftAddBom(){
-
+
},
//鑾峰彇瀛愮粍浠舵暟鎹�
getChildData(data){
@@ -845,7 +845,7 @@
"num": null,
"qualityTraceability": "",
"specifications": "",
- "supplier": "",
+ // "supplier": "",
"unit": ""
}
this.materialForm.tableList.push(obj);
@@ -975,7 +975,7 @@
}
},
startLeftAdd(){
-
+
},
getType(typeName){
return typeName==="鎴愬搧"?1:2
@@ -1042,6 +1042,10 @@
this.typeselect = val
this.searchName = '';
this.selectVersion()
+ let versionArr = this.versionData;
+ if(versionArr == null || versionArr.length < 1){
+ this.versionVal = '';
+ }
},
handleNodeClick(val) {//鏍戠殑鍊�
if(val.code==='[5]'&&val.children===undefined){
@@ -1312,7 +1316,7 @@
height: calc(100% - 48px);
background-color: #fff;
display: flex;
-
+
}
.thing .left {
--
Gitblit v1.9.3