From 40f0147e880d83e8ffb341994ab37e9e712fccf9 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 12 九月 2023 17:51:59 +0800
Subject: [PATCH] modified: src/assets/api/controller.js modified: src/components/view/standard-table/product.vue modified: src/components/view/standard-table/target.vue modified: src/components/view/standard-table/technology.vue modified: src/components/view/standard.vue
---
src/components/view/standard.vue | 309 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 214 insertions(+), 95 deletions(-)
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index 56f6ba2..87691dc 100644
--- a/src/components/view/standard.vue
+++ b/src/components/view/standard.vue
@@ -7,7 +7,6 @@
<el-button type="primary" icon="el-icon-plus" style="background: #004EA2;"
@click="showBomAddModel">鏂板</el-button>
<el-button icon="el-icon-plus">鏂板鐗堟湰</el-button>
- <el-button @click="bomRightUp=true" icon="el-icon-edit-outline">淇敼</el-button>
<el-button @click="bomRightDl=true" icon="el-icon-delete">鍒犻櫎</el-button>
</el-col>
</el-row>
@@ -76,64 +75,97 @@
<div class="bom-add-model">
- <el-dialog title="BOM鏂板" :visible.sync="bomAddModelVisible" width="35%">
+ <el-dialog title="BOM鏂板" :visible.sync="bomAddModelVisible" width="45%">
<!-- 宸ヨ壓璺嚎 -->
- <div v-if="typeselect == 0">銆�
- <el-form :model="technologyForm" :inline="true" class="demo-form-inline" label-position="right"
- :rules="boomRules" ref="boomForm" label-width="90px">
- <el-form-item label="宸ュ簭:" prop="father" width="250">
- <el-select v-model="technologyForm.father"
- style="width:200px;" placeholder="璇疯緭鍏ユ垨閫夋嫨宸ュ簭">
+ <div v-if="typeselect == 0">
+ <el-form :model="technologyForm" :inline="true" label-position="right"
+ ref="technologyForm" :rules="technologyRules" label-width="90px">
+ <el-form-item label="宸ュ簭:" prop="tefather">
+ <el-select id="tefather" size="small"
+ filterable allow-create default-first-option
+ v-model="technologyForm.tefather" placeholder="璇疯緭鍏ユ垨閫夋嫨宸ュ簭">
<el-option :value="item.father" :label="item.father" v-for="(item,index) in fatherList" :key="index"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="宸ヨ壓鍚嶇О:" prop="name" width="250">
- <el-input placeholder="璇疯緭鍏ュ伐鑹哄悕绉�" style="width:200px;"
- v-model="technologyForm.name"></el-input>
+ <el-form-item label="宸ヨ壓鍚嶇О:" prop="tename">
+ <el-input id="tename" size="small" placeholder="璇疯緭鍏ュ伐鑹哄悕绉�"
+ clearable v-model="technologyForm.tename"></el-input>
</el-form-item>
- <el-form-item label="璁惧缁�:" prop="deviceGroup" width="250">
- <el-select placeholder="璇烽�夋嫨璁惧缁�"
- style="width:200px;"
+ <el-form-item label="璁惧缁�:" prop="deviceGroup">
+ <el-select id="deviceGroup" placeholder="璇烽�夋嫨璁惧缁�" size="small"
v-model="technologyForm.deviceGroup">
<el-option :value="item.father"
v-for="(item,index) in deviceList" :key="index" :label="item.father"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鐢熶骇瀹氶:" prop="productionQuota" width="250">
- <el-input style="width:200px;" v-model.number="technologyForm.productionQuota" placeholder="璇疯緭鍏ョ敓浜у畾棰�" />
+ <el-form-item label="鐢熶骇瀹氶:" prop="productionQuota">
+ <el-input id="productionQuota" size="small" clearable v-model.number="technologyForm.productionQuota" placeholder="璇疯緭鍏ョ敓浜у畾棰�" />
</el-form-item>
</el-form>
+ <div style="width:100%;text-align: right;">
+ <span slot="footer" class="dialog-footer" >
+ <el-button type="primary" @click="confirmAdd('technologyForm')">纭� 瀹�</el-button>
+ <el-button @click="bomAddModelVisible = false">鍙� 娑�</el-button>
+ </span>
+ </div>
</div>
<!-- 鎶�鏈寚鏍� -->
<div v-if="typeselect == 1">
- <el-form :model="targetForm" :inline="true" class="demo-form-inline" label-position="right"
- label-width="80px">
- <el-form-item label="鎸囨爣鍚嶇О:" prop="father" width="250">
- <el-input style="width:200px;" v-model="targetForm.pname" placeholder="璇疯緭鍏ュ崟浣�"/>
+ <el-form :model="targetForm" :inline="true" label-position="right"
+ :rules="targetRules" ref="targetForm" label-width="90px">
+ <el-form-item label="宸ュ簭:" prop="pfather">
+ <el-select v-model="targetForm.pfather"
+ @change="changeFather"
+ style="width:200px;" placeholder="璇烽�夋嫨宸ュ簭">
+ <el-option :value="item.name" :label="item.name" v-for="(item,index) in targetFormList" :key="index"></el-option>
+ </el-select>
</el-form-item>
- <el-form-item label="鍗曚綅:" prop="name" width="250">
+ <el-form-item label="宸ヨ壓鍚嶇О:" prop="technologyId">
+ <el-select v-model="targetForm.technologyId"
+ @change="changeTechnologyId"
+ style="width:200px;" placeholder="璇烽�夋嫨宸ヨ壓鍚嶇О">
+ <el-option :value="item.id" :label="item.name" v-for="(item,index) in technologyIdList" :key="index"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="椤圭洰:" prop="father">
+ <el-select v-model="targetForm.father"
+ filterable allow-create default-first-option
+ style="width:200px;" placeholder="璇疯緭鍏ユ垨閫夋嫨椤圭洰">
+ <el-option :value="item.father" :label="item.father" v-for="(item,index) in projectList" :key="index"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎸囨爣鍚嶇О:" prop="name">
+ <el-input style="width:200px;" v-model="targetForm.name" placeholder="璇疯緭鍏ユ寚鏍囧悕绉�"/>
+ </el-form-item>
+ <el-form-item label="鍗曚綅:" prop="unit">
<el-input style="width:200px;" v-model="targetForm.unit" placeholder="璇疯緭鍏ュ崟浣�"/>
</el-form-item>
- <el-form-item label="鍐呮帶鍊�:" prop="dg" width="250">
- <el-input style="width:200px;" v-model="targetForm.internal" placeholder="璇疯緭鍏ュ崟浣�"/>
+ <el-form-item label="鍐呮帶鍊�:" prop="internal">
+ <el-input style="width:200px;" v-model="targetForm.internal" placeholder="璇疯緭鍏ュ唴鎺у��"/>
</el-form-item>
- <el-form-item label="鏍囧噯鍊�:" prop="unit" width="250">
- <el-input style="width:200px;" v-model="targetForm.required" placeholder="璇疯緭鍏ュ崟浣�"/>
+ <el-form-item label="鏍囧噯鍊�:" prop="required">
+ <el-input style="width:200px;" v-model="targetForm.required" placeholder="璇疯緭鍏ユ爣鍑嗗��"/>
</el-form-item>
</el-form>
+ <div style="width:100%;text-align: right;">
+ <span slot="footer" class="dialog-footer" >
+ <el-button type="primary" @click="confirmAdd('targetForm')">纭� 瀹�</el-button>
+ <el-button @click="bomAddModelVisible = false">鍙� 娑�</el-button>
+ </span>
+ </div>
</div>
<!-- 鐗╂枡娓呭崟 -->
<div v-if="typeselect == 2">
- <el-form :model="materialForm" class="demo-form-inline" label-position="right"
- label-width="80px">
+ <el-form :model="materialForm" label-position="right"
+ :rules="materialRules" ref="materialForm" label-width="80px">
<el-row>
<el-col :span="12">
- <el-form-item label="瑙勬牸鍨嬪彿:" prop="father" width="250">
+ <el-form-item label="瑙勬牸鍨嬪彿:" width="250">
<el-input style="width:200px;" v-model="materialForm.pname" placeholder="璇疯緭鍏ュ崟浣�"/>
</el-form-item>
</el-col>
<el-col :span="12" style="text-align: right;">
- <el-form-item label="浜у搧澶х被:" prop="name" width="250">
+ <el-form-item label="浜у搧澶х被:" width="250">
<el-select placeholder="璇烽�夋嫨浜у搧澶х被"
style="width:240px;" v-model="materialForm.dg">
<el-option value="1">1</el-option>
@@ -163,13 +195,19 @@
</el-col>
</el-row>
</el-form>
+ <div style="width:100%;text-align: right;">
+ <span slot="footer" class="dialog-footer" >
+ <el-button type="primary" @click="confirmAdd('materialForm')">纭� 瀹�</el-button>
+ <el-button @click="bomAddModelVisible = false">鍙� 娑�</el-button>
+ </span>
+ </div>
</div>
<!-- 鐢熶骇宸ヨ壓 -->
<div v-if="typeselect == 3">
- <el-form :model="technologyForm" :inline="true" class="demo-form-inline" label-position="right"
+ <el-form :model="productForm" :inline="true" label-position="right"
label-width="80px">
- <el-form-item label="宸ュ簭:" prop="father" width="250">
- <el-select v-model="technologyForm.father"
+ <el-form-item label="宸ュ簭:" width="250">
+ <el-select v-model="productForm.father"
style="width:200px;"
placeholder="璇疯緭鍏ユ垨閫夋嫨鐢熶骇瀹氶">
<el-option value="1">1</el-option>
@@ -178,48 +216,50 @@
<el-option value="4">4</el-option>
</el-select>
</el-form-item>
- <el-form-item label="宸ヨ壓鍚嶇О:" prop="name" width="250">
+ <el-form-item label="宸ヨ壓鍚嶇О:" width="250">
<el-select placeholder="璇疯緭鍏ユ垨閫夋嫨宸ヨ壓鍚嶇О"
style="width:200px;"
- v-model="technologyForm.name">
+ v-model="productForm.name">
<el-option value="1">1</el-option>
<el-option value="2">2</el-option>
<el-option value="3">3</el-option>
<el-option value="4">4</el-option>
</el-select>
</el-form-item>
- <el-form-item label="璁惧:" prop="dg" width="250">
+ <el-form-item label="璁惧:" width="250">
<el-select placeholder="璇烽�夋嫨璁惧"
style="width:200px;"
- v-model="technologyForm.dg">
+ v-model="productForm.dg">
<el-option value="1">1</el-option>
<el-option value="2">2</el-option>
<el-option value="3">3</el-option>
<el-option value="4">4</el-option>
</el-select>
</el-form-item>
- <el-form-item label="椤圭洰:" prop="dg" width="250">
+ <el-form-item label="椤圭洰:" width="250">
<el-select placeholder="璇烽�夋嫨椤圭洰"
style="width:200px;"
- v-model="technologyForm.dg">
+ v-model="productForm.dg">
<el-option value="1">1</el-option>
<el-option value="2">2</el-option>
<el-option value="3">3</el-option>
<el-option value="4">4</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍗曚綅:" prop="unit" width="250">
- <el-input style="width:200px;" v-model="technologyForm.unit" placeholder="璇疯緭鍏ュ崟浣�"/>
+ <el-form-item label="鍗曚綅:" width="250">
+ <el-input style="width:200px;" v-model="productForm.unit" placeholder="璇疯緭鍏ュ崟浣�"/>
</el-form-item>
- <el-form-item label="鎸囨爣:" prop="pq" width="250">
- <el-input style="width:200px;" v-model="technologyForm.pq" placeholder="璇疯緭鍏ユ寚鏍�" />
+ <el-form-item label="鎸囨爣:" width="250">
+ <el-input style="width:200px;" v-model="productForm.pq" placeholder="璇疯緭鍏ユ寚鏍�" />
</el-form-item>
</el-form>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="bomAddModelVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="confirmAdd('boomForm')">纭� 瀹�</el-button>
- </span>
+ <div style="width:100%;text-align: right;">
+ <span slot="footer" class="dialog-footer" >
+ <el-button type="primary" @click="confirmAdd('productForm')">纭� 瀹�</el-button>
+ <el-button @click="bomAddModelVisible = false">鍙� 娑�</el-button>
+ </span>
+ </div>
+ </div>
</el-dialog>
<!-- 宸︿晶鐐瑰嚮+鎸夐挳 -->
<el-dialog title="BOM鏂板" :visible.sync="bomLeftAdd" width="29%">
@@ -245,16 +285,6 @@
<el-button type="primary" @click="submitForm('leftAdd')">纭� 瀹�</el-button>
</span>
</el-dialog>
- <!-- 鍙充笂渚х偣鍑讳慨鏀规寜閽� -->
- <el-dialog title="BOM淇敼" :visible.sync="bomRightUp" width="30%">
- <el-form>
- 淇敼
- </el-form>
- <span slot="footer" class="dialog-footer">
- <el-button @click="bomRightUp = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="bomRightUp = false">纭� 瀹�</el-button>
- </span>
- </el-dialog>
<!-- 鍙充笂渚х偣鍑诲垹闄ゆ寜閽� -->
<el-dialog title="BOM鍒犻櫎" :visible.sync="bomRightDl" width="30%">
<el-form>
@@ -278,33 +308,66 @@
export default {
components: { technology,material,target,product,bomClickAdd },
data() {
+ var checkPq = (rule,value,callback)=>{
+ if(value!='' && !Number.isInteger(value)){
+ return callback(new Error('璇疯緭鍏ユ暟瀛楀��'));
+ }
+ callback();
+ };
+ var checkVal = (rule,value,callback)=>{
+ let arr = [">","<","="];
+ if(value!='' && arr.indexOf(value.substring(0,1))==-1){
+ callback(new Error("寮�澶撮渶鍖呭惈 > 鎴� < 鎴� = "))
+ }
+ callback();
+ };
return {
+ //鎶�鏈寚鏍�-鏂板-宸ュ簭锛屽伐鑹轰笅鎷夋鏁版嵁
+ targetFormList:[],
+ technologyIdList:[],
+ //鎶�鏈寚鏍�-鏂板-椤圭洰涓嬫媺妗嗘暟鎹�
+ projectList:[],
//宸ュ簭鍒楄〃
fatherList:[],
//璁惧缁勫垪琛�
deviceList:[],
technologyForm:{
- father:'',
- name:'',
+ tefather:'',
+ tename:'',
deviceGroup:'',
productionQuota:''
},
targetForm:{
- pname:'',
+ pfather:'',
+ father: '',
+ technologyId:'',
+ name:'',
unit:'',
internal:'',
required: ''
},
- formTypeOptions:[],
materialForm:{},
- boomRules:{
- father:{required:true,message:'宸ュ簭涓嶈兘涓虹┖',trigger:'change'},
- name:{required:true,message:'宸ヨ壓鍚嶇О涓嶈兘涓虹┖',trigger:'blur'},
+ productForm:{},
+ technologyRules:{
+ tefather:{required:true,message:'宸ュ簭涓嶈兘涓虹┖',trigger:'change'},
+ tename:{required:true,message:'宸ヨ壓鍚嶇О涓嶈兘涓虹┖',trigger:'blur'},
deviceGroup:{required:true,message:'璁惧缁勪笉鑳戒负绌�',trigger:'change'},
- productionQuota:[
- {required:true,message:'鐢熶骇瀹氶涓嶈兘涓虹┖',trigger:'blur'},
- {type:'number',required:true,message:'鏁版嵁绫诲瀷蹇呴』鏄函鏁板瓧',trigger:'blur'}
- ]
+ productionQuota:{validator:checkPq,trigger:'change'}
+ },
+ targetRules:{
+ pfather:{required:true,message:'宸ュ簭涓嶈兘涓虹┖',trigger:'change'},
+ technologyId:{required:true,message:'宸ヨ壓鍚嶇О涓嶈兘涓虹┖',trigger:'change'},
+ 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'}
+ },
+ materialRules:{
+
+ },
+ productRules:{
+
},
// BOM鏍戞暟鎹粨鏋�
list: [],
@@ -339,19 +402,10 @@
isLeftAdd: true
}
},
- // watch: {
- // search(val) {
- // this.$refs.tree.filter(val);
- // },
- // tableType(val){
- // this.selectProductTableData()
- // }
- // },
mounted() {
this.tableType=0
this.selectMaterialTree()
this.selectVersion()
- console.log(this.formTypeOptions);
},
methods: {
changeLeftAdd(){
@@ -466,26 +520,77 @@
confirmAdd(formName){
this.$refs[formName].validate(valid=>{
if(valid){
- console.log(this.technologyForm);
- this.$axios.post(this.$api.url.addTechnology,
- {
- "specificationsId": this.returntree.id,
- "technologyDto": JSON.stringify({
+ let type = this.typeselect;
+ let obj = {}
+ if(type == 0){
+ obj = {
+ specificationsId: Number.parseInt(this.returntree.id),
deviceGroup: this.technologyForm.deviceGroup,
- father: this.technologyForm.father,
- name: this.technologyForm.name,
- productionQuota: this.technologyForm.productionQuota,
- })
- },{
- headers: { "Content-Type": "application/json" }
- }).then(res=>{
- this.$message.success(res.message);
- }).catch(error=>{
- this.$message.error(error.message);
- })
- this.bomAddModelVisible = false;
+ father: this.technologyForm.tefather,
+ name: this.technologyForm.tename,
+ productionQuota: Number.parseInt(this.technologyForm.productionQuota),
+ }
+ this.submitBomAdd(this.$api.url.addTechnology,obj);
+ }else if(type == 1){
+ this.submitBomAdd(this.$api.url.addProductByStandard,this.targetForm);
+ }
+
}
})
+ },
+ submitBomAdd(url,data){
+ this.$axios.post(
+ url,data,
+ {headers: { "Content-Type": "application/json" }}
+ ).then(res=>{
+ this.selectAll();
+ this.$message.success(res.message);
+ }).catch(error=>{
+ this.$message.error(error.message);
+ })
+ this.bomAddModelVisible = false;
+ },
+ clearBomAddModel(){
+ if(this.typeselect == 0){
+ this.$refs["technologyForm"].resetFields();
+ }else if(this.typeselect == 1){
+ this.$refs["targetForm"].resetFields();
+ }else if(this.typeselect == 2){
+ this.$refs["materialForm"].resetFields();
+ }else{
+ this.$refs["productForm"].resetFields();
+ }
+ },
+ changeTechnologyId(val){
+ this.$axios.get(this.$api.url.chooseFatherByStandard,{
+ params:{technologyId : val}
+ }).then(res=>{
+ this.projectList = res.data;
+ }).catch(error=>{
+ this.$message.error(error.message);
+ });
+ },
+ changeFather(val){
+ let arr = this.targetFormList.filter(item=>{
+ return item.name == val;
+ });
+ if(arr != undefined || arr.children != null){
+ this.technologyIdList = arr[0].children;
+ }
+ },
+ //鑾峰彇宸ュ簭锛屽伐鑹哄垪琛�
+ getTargetFormList(){
+ this.$axios.get(this.$api.url.chooseTechByStandard,{
+ params:{specificationsId : this.returntree.id}
+ }).then(res=>{
+ this.targetFormList = res.data;
+ }).catch(error=>{
+ this.$message.error(error.message);
+ })
+ },
+ //鑾峰彇椤圭洰鍒楄〃
+ getProjectFormList(){
+
},
//鑾峰彇宸ュ簭鍒楄〃
getFatherList(){
@@ -508,6 +613,7 @@
showBomAddModel(){
this.getFatherList();
this.getDeviceList();
+ this.getTargetFormList();
this.bomAddModelVisible = true
},
startLeftAdd(){
@@ -786,6 +892,11 @@
this.restaurants=this.loadFatherType()
}
}
+ },
+ bomAddModelVisible(newVal){
+ if(!newVal){
+ this.clearBomAddModel();
+ }
}
}
}
@@ -793,7 +904,15 @@
<style scoped>
-.standard {}
+
+.standard .bom-add-model{
+ width: 100%;
+}
+
+.standard .bom-add-model form{
+ width: 90%;
+ margin-left: 5%;
+}
.standard .title .el-button {
height: 32px;
--
Gitblit v1.9.3