From f9971e230a549754cc985db1e625336f5fd38ff2 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 19 九月 2023 11:22:46 +0800
Subject: [PATCH] modified: src/components/view/Processingproducts.vue modified: src/components/view/equipmentmaintain.vue modified: src/components/view/sale.vue modified: src/components/view/standard.vue modified: src/components/view/technology.vue
---
src/components/view/standard.vue | 842 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 539 insertions(+), 303 deletions(-)
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index 2018424..00b294b 100644
--- a/src/components/view/standard.vue
+++ b/src/components/view/standard.vue
@@ -5,32 +5,40 @@
<el-col :span="12" style="line-height: 32px;">鏍囧噯BOM</el-col>
<el-col :span="12" style="text-align: right;">
<el-button type="primary" icon="el-icon-plus" style="background: #004EA2;"
- @click="bomAddModelVisible = true">鏂板</el-button>
- <el-button icon="el-icon-plus">鏂板鐗堟湰</el-button>
- <el-button @click="bomRightDl=true" icon="el-icon-delete">鍒犻櫎</el-button>
+ @click="showBomAddModel">鏂板</el-button>
+ <el-button icon="el-icon-plus" @click="addVersionBtn">鏂板鐗堟湰</el-button>
+ <el-button @click="deleteDataBtn" icon="el-icon-delete">鍒犻櫎</el-button>
</el-col>
</el-row>
</div>
<div class="thing">
<div class="left">
- <el-row>
- <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-tree style="width: ;" :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>
+ <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">
@@ -42,123 +50,154 @@
<el-option :value="2" label="鐗╂枡娓呭崟"></el-option>
<el-option :value="3" label="鐢熶骇宸ヨ壓"></el-option>
</el-select>
- <span>{{ tableType == 1 ? '椤圭洰锛�' : '宸ヨ壓鍚嶇О锛�' }}</span>
- <el-input v-model="searchName" size="small" placeholder="璇疯緭鍏�" style="width: 224px;margin-right: 50px;"
- clearable></el-input>
<span>鐗堟湰锛�</span>
- <el-select v-model="version2" @change="verevent" size="small" style="width: 280px;margin-right: 10px;" placeholder="璇烽�夋嫨">
- <el-option v-for="item in version" :key="item" :label="item" :value="item">
+ <el-select v-model="versionVal" @change="verevent" size="small" style="width: 280px;margin-right: 52px;" placeholder="璇烽�夋嫨">
+ <el-option v-for="(item,index) in versionData" :key="index" :label="item.label" :value="item.value">
</el-option>
</el-select>
- <el-button size="mini" @click="() => { searchName = ''; selectProductTableData() }"><span>閲� 缃�</span></el-button>
- <el-button size="mini" type="primary" style="background: #004EA2;" @click="selectProductTableData"><span>鏌�
- 璇�</span></el-button>
+ <span>{{ tableType == 1 ? '椤圭洰锛�' : '宸ヨ壓鍚嶇О锛�' }}</span>
+ <el-input v-model="searchName" size="small" placeholder="璇疯緭鍏�" style="width: 224px;margin-right:10px"
+ clearable></el-input>
+ <el-button size="mini" @click="() => { searchName = ''; selectAll() }">
+ <span>閲� 缃�</span>
+ </el-button>
+ <el-button size="mini" type="primary" style="background: #004EA2;" @click="selectAll">
+ <span>鏌� 璇�</span>
+ </el-button>
</div>
<div class="contentTable" v-if="this.typeselect == 0">
- <technology :tableType="tableType" :tableData="tableData"></technology>
+ <technology @childData="getChildData" @updateDevice="updateDevice" :tableType="tableType" :tableData="tableData"></technology>
</div>
- <div v-if="this.typeselect == 1">
- <target :tableType="tableType" :tableData="tableData"></target>
+ <div class="contentTable" v-if="this.typeselect == 1">
+ <target @childData="getChildData" :tableType="tableType" :tableData="tableData"></target>
</div>
- <div v-if="this.typeselect == 2">
- <bom :tableType="tableType" :tableData="tableData"></bom>
+ <div class="contentTable" v-if="this.typeselect == 2">
+ <material @childData="getChildData" :tableType="tableType" :tableData="tableData"></material>
</div>
- <div v-if="this.typeselect == 3">鐢熶骇宸ヨ壓</div>
-
+ <div class="contentTable" v-if="this.typeselect == 3">
+ <product @childData="getChildData" :tableType="tableType" :tableData="tableData"></product>
+ </div>
</div>
</div>
-
<div class="bom-add-model">
- <el-dialog title="BOM鏂板" :visible.sync="bomAddModelVisible" width="45%">
- <!-- 宸ヨ壓璺嚎 -->
- <div v-if="typeselect == 0">
+ <!-- 宸ヨ壓璺嚎 -->
+ <el-dialog title="BOM鏂板" :visible.sync="technologyVisible" width="45%">
<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="tename">
- <el-input id="tename" size="small" placeholder="璇疯緭鍏ュ伐鑹哄悕绉�"
- clearable v-model="technologyForm.tename"></el-input>
- </el-form-item>
- <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">
- <el-input id="productionQuota" size="small" clearable v-model.number="technologyForm.productionQuota" placeholder="璇疯緭鍏ョ敓浜у畾棰�" />
- </el-form-item>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="宸ュ簭:" prop="tefather" style="display: flex;">
+ <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>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="宸ヨ壓鍚嶇О:" prop="tename" style="display: flex;">
+ <el-input style="width: 100%;" size="small" placeholder="璇疯緭鍏ュ伐鑹哄悕绉�"
+ clearable v-model="technologyForm.tename"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <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"
+ v-for="(item,index) in deviceList" :key="index" :label="item.father"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐢熶骇瀹氶:" prop="productionQuota" style="display: flex;">
+ <el-input style="width: 100%;" size="small" clearable v-model.number="technologyForm.productionQuota" placeholder="璇疯緭鍏ョ敓浜у畾棰�" />
+ </el-form-item>
+ </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('technologyForm')">纭� 瀹�</el-button>
- <el-button @click="bomAddModelVisible = false">鍙� 娑�</el-button>
- </span>
- </div>
- </div>
+ <span slot="footer" class="dialog-footer" >
+ <el-button type="primary" @click="confirmAdd('technologyForm')">纭� 瀹�</el-button>
+ <el-button @click="technologyVisible = false">鍙� 娑�</el-button>
+ </span>
+ </el-dialog>
<!-- 鎶�鏈寚鏍� -->
- <div v-if="typeselect == 1">
+ <el-dialog title="BOM鏂板" :visible.sync="targetVisible" width="45%">
<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="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="internal">
- <el-input style="width:200px;" v-model="targetForm.internal" placeholder="璇疯緭鍏ュ唴鎺у��"/>
- </el-form-item>
- <el-form-item label="鏍囧噯鍊�:" prop="required">
- <el-input style="width:200px;" v-model="targetForm.required" placeholder="璇疯緭鍏ユ爣鍑嗗��"/>
- </el-form-item>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="宸ュ簭:" prop="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>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="宸ヨ壓鍚嶇О:" prop="technologyId">
+ <el-select v-model="targetForm.technologyId"
+ @change="changeTechnologyId" size="small" 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-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="椤圭洰:" prop="father">
+ <el-select v-model="targetForm.father"
+ 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>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎸囨爣鍚嶇О:" prop="name">
+ <el-input size="small" v-model="targetForm.name" placeholder="璇疯緭鍏ユ寚鏍囧悕绉�"/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="鍗曚綅:" prop="unit">
+ <el-input size="small" v-model="targetForm.unit" placeholder="璇疯緭鍏ュ崟浣�"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍐呮帶鍊�:" prop="internal">
+ <el-input size="small" v-model="targetForm.internal" placeholder="璇疯緭鍏ュ唴鎺у��"/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="鏍囧噯鍊�:" prop="required">
+ <el-input size="small" v-model="targetForm.required" placeholder="璇疯緭鍏ユ爣鍑嗗��"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12"></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('targetForm')">纭� 瀹�</el-button>
- <el-button @click="bomAddModelVisible = false">鍙� 娑�</el-button>
- </span>
- </div>
- </div>
+ <span slot="footer" class="dialog-footer" >
+ <el-button type="primary" @click="confirmAdd('targetForm')">纭� 瀹�</el-button>
+ <el-button @click="targetVisible = false">鍙� 娑�</el-button>
+ </span>
+ </el-dialog>
<!-- 鐗╂枡娓呭崟 -->
- <div v-if="typeselect == 2">
+ <el-dialog title="BOM鏂板" :visible.sync="materialVisible" width="45%">
<el-form :model="materialForm" label-position="right"
:rules="materialRules" ref="materialForm" label-width="90px">
<el-row :gutter="100">
<el-col :span="12">
<el-form-item label="宸ュ簭:" prop="mfather">
<el-select placeholder="璇烽�夋嫨宸ュ簭" @change="changeMName"
- style="width:100%;" v-model="materialForm.mfather">
+ 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>
@@ -167,7 +206,7 @@
<el-col :span="12">
<el-form-item label="宸ヨ壓鍚嶇О:" prop="mtechnologyId">
<el-select placeholder="璇烽�夋嫨宸ヨ壓鍚嶇О" style="width:100%;"
- v-model="materialForm.mtechnologyId">
+ v-model="materialForm.mtechnologyId" size="small">
<el-option v-for="(item,index) in mIdList" :key="index"
:value="item.id" :label="item.name"></el-option>
</el-select>
@@ -179,13 +218,12 @@
<el-form-item label="鏉愭枡淇℃伅" style="font-weight: bold;"></el-form-item>
</el-col>
<el-col :span="12" style="text-align: right;">
- <el-button size="mini" @click="addRowByMaterial">娣诲姞琛�</el-button>
+ <el-button size="small" @click="addRowByMaterial">娣诲姞琛�</el-button>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-table :data="materialForm.tableList" border max-height="470"
- style="width:100%;text-align: left;margin: 0;padding: 0;"
:cell-style="{height:'20px',textAlign:'left'}"
:header-cell-style="{height:'20px'}">
<el-table-column label="渚涘簲鍟嗗悕绉�">
@@ -224,73 +262,87 @@
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>
</el-col>
</el-row>
</el-form>
- <div style="width:100%;margin-top: 20px;margin-left:75%">
- <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>
+ <span slot="footer" class="dialog-footer" >
+ <el-button type="primary" @click="confirmAdd('materialForm')">纭� 瀹�</el-button>
+ <el-button @click="materialVisible = false">鍙� 娑�</el-button>
+ </span>
+ </el-dialog>
<!-- 鐢熶骇宸ヨ壓 -->
- <div v-if="typeselect == 3">
+ <el-dialog title="BOM鏂板" :visible.sync="productVisible" width="45%">
<el-form :model="productForm" :inline="true" label-position="right"
:rules="productRules" ref="productForm" label-width="90px">
- <el-form-item label="宸ュ簭:" prop="profather">
- <el-select v-model="productForm.profather"
- style="width:200px;" @change="changeProduct"
- placeholder="璇烽�夋嫨宸ュ簭">
- <el-option v-for="(item,index) in productFormList" :key="index"
- :value="item.name" :label="item.name"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="宸ヨ壓鍚嶇О:" prop="protechnologyId">
- <el-select placeholder="璇烽�夋嫨宸ヨ壓鍚嶇О"
- style="width:200px;" @change="getProductDeviceList"
- v-model="productForm.protechnologyId">
- <el-option v-for="(item,index) in proIdList" :key="index"
- :value="item.id" :label="item.name"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="璁惧:" prop="device">
- <el-select placeholder="璇烽�夋嫨璁惧"
- style="width:200px;"
- v-model="productForm.device">
- <el-option v-for="(item,index) in productDeviceList" :key="index"
- :value="item.device" :label="item.device"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="椤圭洰:" prop="productFather">
- <el-select placeholder="璇烽�夋嫨椤圭洰"
- style="width:200px;" @change="changeProductFather"
- v-model="productForm.productFather">
- <el-option v-for="(item,index) in productProjectList" :key="index"
- :value="item.name" :label="item.name"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鎸囨爣:" prop="product">
- <el-select placeholder="璇烽�夋嫨鎸囨爣"
- style="width:200px;" @change="changeProProduct"
- v-model="productForm.product">
- <el-option v-for="(item,index) in proProductList" :key="index"
- :value="item.name" :label="item.name"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鍗曚綅:" prop="unit">
- <el-input style="width:200px;" disabled v-model="productForm.unit"/>
- </el-form-item>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="宸ュ簭:" prop="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>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="宸ヨ壓鍚嶇О:" prop="protechnologyId">
+ <el-select placeholder="璇烽�夋嫨宸ヨ壓鍚嶇О" @change="getProductDeviceList"
+ v-model="productForm.protechnologyId" size="small">
+ <el-option v-for="(item,index) in proIdList" :key="index"
+ :value="item.id" :label="item.name"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="璁惧:" prop="device">
+ <el-select placeholder="璇烽�夋嫨璁惧" size="small"
+ v-model="productForm.device">
+ <el-option v-for="(item,index) in productDeviceList" :key="index"
+ :value="item.device" :label="item.device"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="椤圭洰:" prop="productFather">
+ <el-select placeholder="璇烽�夋嫨椤圭洰" size="small" @change="changeProductFather"
+ v-model="productForm.productFather">
+ <el-option v-for="(item,index) in productProjectList" :key="index"
+ :value="item.name" :label="item.name"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="鎸囨爣:" prop="product">
+ <el-select placeholder="璇烽�夋嫨鎸囨爣" size="small" @change="changeProProduct"
+ v-model="productForm.product">
+ <el-option v-for="(item,index) in proProductList" :key="index"
+ :value="item.name" :label="item.name"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍗曚綅:" prop="unit">
+ <el-input style="width:100%" size="small" disabled v-model="productForm.unit"/>
+ </el-form-item>
+ </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('productForm')">纭� 瀹�</el-button>
- <el-button @click="bomAddModelVisible = false">鍙� 娑�</el-button>
- </span>
- </div>
- </div>
+ <span slot="footer" class="dialog-footer" >
+ <el-button type="primary" @click="confirmAdd('productForm')">纭� 瀹�</el-button>
+ <el-button @click="productVisible = false">鍙� 娑�</el-button>
+ </span>
</el-dialog>
+
<!-- 宸︿晶鐐瑰嚮+鎸夐挳 -->
<el-dialog title="BOM鏂板" :visible.sync="bomLeftAdd" width="29%">
<el-form ref="leftAdd" :model="leftAdd">
@@ -332,10 +384,11 @@
<script>
import technology from "./standard-table/technology.vue"
import material from "./standard-table/material.vue"
-// import bom from "./standard-table/bom.vue"
+import target from "./standard-table/target.vue"
+import product from "./standard-table/product.vue"
import bomClickAdd from '@/components/view/standard-box/bomClickAdd'
export default {
- components: { technology,material,bomClickAdd },
+ components: { technology,material,target,product,bomClickAdd },
data() {
var checkPq = (rule,value,callback)=>{
@@ -352,8 +405,10 @@
callback();
};
return {
+ //瀛愮粍浠朵紶鐨刬d鍒楄〃
+ childIds:[],
+ isUpdateDevice:false,
//宸ュ簭鍒楄〃
- technologyIdList:[],
fatherList:[],
deviceList:[],
technologyForm:{
@@ -370,6 +425,7 @@
},
//鎶�鏈寚鏍�
targetFormList:[],
+ technologyIdList:[],
projectList:[],
targetForm:{
pfather:'',
@@ -429,20 +485,20 @@
// BOM鏍戞暟鎹粨鏋�
list: [],
search: null,
- tableType: 1, // 琛ㄦ牸绫诲瀷 1锛氭妧鏈寚鏍囷紝0锛氬伐鑹鸿矾绾�
+ tableType: 0, // 琛ㄦ牸绫诲瀷 1锛氭妧鏈寚鏍囷紝0锛氬伐鑹鸿矾绾�
searchName: "",// 鏌ヨ鏉′欢-鍚嶇О
checkTreeNode: {},// 鐐瑰嚮閫変腑鏍戣妭鐐�
tableData: [],
- bomAddModelVisible: false,// 鎺у埗bom鏂板妯℃�佹鏄惁鏄剧ず
+ technologyVisible: false,// 鎺у埗宸ヨ壓璺嚎鏂板妯℃�佹鏄惁鏄剧ず
+ targetVisible: false,// 鎺у埗鎶�鏈寚鏍囨柊澧炴ā鎬佹鏄惁鏄剧ず
+ materialVisible: false,// 鎺у埗鐗╂枡娓呭崟鏂板妯℃�佹鏄惁鏄剧ず
+ productVisible: false,// 鎺у埗鐢熶骇宸ヨ壓鏂板妯℃�佹鏄惁鏄剧ず
bomLeftAdd: false,
bomRightUp: false,
bomRightDl: false,
formTypeOptions: null,
typeselect: 0,
- returntree: {
- id:28,
- },
- version: {},
+ returntree: {id:28},
leftAdd:{
type: [],
father: null,
@@ -450,9 +506,8 @@
name: null,
specifications: null
},
- version2: {},
- verdata: {},
- character: 0,
+ versionData: [],
+ versionVal: null,
restaurants: [],
bomName:[],
bomStandard:[],
@@ -465,6 +520,9 @@
this.selectVersion()
},
methods: {
+ updateDevice(val){
+ this.isUpdateDevice = val;
+ },
changeLeftAdd(){
if(this.leftAdd.type.length===2){
this.leftAdd.father=null
@@ -486,7 +544,26 @@
this.$refs[formName].validate((valid) => {
if (valid) {
let obj=JSON.parse(JSON.stringify(this.leftAdd))
- console.log(obj);
+ if(obj.type.length===1){
+ obj.type=this.getType(obj.type[0])
+ this.$axios.post(this.$api.url.leftAddOneTwo,obj,{
+ headers: { "Content-Type": "application/json" }
+ }).then(res=>{
+ this.$message({
+ message: res.message,
+ type: 'success'
+ });
+ this.leftAdd.type=[]
+ this.leftAdd.father=null
+ this.leftAdd.standard=null
+ this.leftAdd.name=null
+ this.leftAdd.specifications=null
+ this.selectMaterialTree()
+ this.bomLeftAdd=false
+ this.selectVersion()
+ })
+ return
+ }
let one=this.list.filter(item=>{
return item.name===obj.type[0]
})[0]
@@ -504,7 +581,14 @@
message: res.message,
type: 'success'
});
- this.selectMaterialTree()
+ this.leftAdd.type=[]
+ this.leftAdd.father=null
+ this.leftAdd.standard=null
+ this.leftAdd.name=null
+ this.leftAdd.specifications=null
+ this.selectMaterialTree()
+ this.bomLeftAdd=false
+ this.selectVersion()
})
}else{
let three=two.children.filter(item=>{
@@ -520,7 +604,14 @@
message: res.message,
type: 'success'
});
- this.selectMaterialTree()
+ this.leftAdd.type=[]
+ this.leftAdd.father=null
+ this.leftAdd.standard=null
+ this.leftAdd.name=null
+ this.leftAdd.specifications=null
+ this.selectMaterialTree()
+ this.bomLeftAdd=false
+ this.selectVersion()
})
}else{
//鏂板鏍囧噯鍨嬪彿
@@ -540,7 +631,14 @@
message: res.message,
type: 'success'
});
- this.selectMaterialTree()
+ this.leftAdd.type=[]
+ this.leftAdd.father=null
+ this.leftAdd.standard=null
+ this.leftAdd.name=null
+ this.leftAdd.specifications=null
+ this.selectMaterialTree()
+ this.bomLeftAdd=false
+ this.selectVersion()
})
}else{
let specificationsDto={
@@ -554,7 +652,13 @@
message: res.message,
type: 'success'
});
+ this.leftAdd.type=[]
+ this.leftAdd.father=null
+ this.leftAdd.standard=null
+ this.leftAdd.name=null
+ this.leftAdd.specifications=null
this.selectMaterialTree()
+ this.bomLeftAdd=false
this.selectVersion()
})
}
@@ -574,6 +678,70 @@
leftAddBom(){
},
+ //鑾峰彇瀛愮粍浠舵暟鎹�
+ getChildData(data){
+ this.childIds = data;
+ },
+ //鐗╂枡娓呭崟-鏂板bom-琛ㄦ牸鍒犻櫎琛�
+ removeMTableRow(index){
+ this.materialForm.tableList.splice(index,1);
+ },
+ //鍒犻櫎鎸夐挳
+ deleteDataBtn(){
+ let ids;
+ let url;
+ ids = this.childIds.filter(item=>{
+ return item != undefined;
+ });
+ if(ids.length < 1){
+ this.$message.error("璇峰厛閫夋嫨鏁版嵁锛�");
+ return;
+ }
+ switch(this.typeselect){
+ case 0:
+ url = this.$api.url.delAllByTechnology;
+ break;
+ case 1:
+ url = this.$api.url.delAllByTarget;
+ break;
+ case 2:
+ url = this.$api.url.delAllByMBom;
+ break;
+ case 3:
+ url = this.$api.url.delAllByProduct;
+ break;
+ }
+ this.$confirm('纭鍒犻櫎宸查�変腑鐨勬暟鎹悧', '鍒犻櫎', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ this.$axios.post(url,{
+ ids : ids.join(",")
+ }).then(res=>{
+ this.selectAll();
+ this.$message.success(res.message);
+ }).catch(error=>{
+ this.$message.error(error.message);
+ })
+ }).catch(() => {});
+ },
+ //鏂板鐗堟湰
+ addVersionBtn(){
+ this.$confirm('纭鏂板鐗堟湰鍚�', '鏂板鐗堟湰', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'info'
+ }).then(() => {
+ this.$axios.post(this.$api.url.addVersion,{
+ specificationsId : this.returntree.id,
+ version : this.versionVal,
+ }).then(res=>{
+ this.selectVersion();
+ this.$message.success(res.message);
+ })
+ })
+ },
//鍙充晶bom,纭鏂板
confirmAdd(formName){
this.$refs[formName].validate(valid=>{
@@ -582,19 +750,23 @@
let obj = {}
if(type == 0){
obj = {
+ version : this.versionVal,
specificationsId: Number.parseInt(this.returntree.id),
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){
- this.submitBomAdd(this.$api.url.addProductByStandard,this.targetForm);
+ obj = this.targetForm;
+ obj.version = this.versionVal;
+ this.submitBomAdd(this.$api.url.addProductByStandard,obj);
}else if(type == 2){
obj = {
mbomDto2List:this.materialForm.tableList,
- technologyId:this.materialForm.mtechnologyId
+ technologyId:this.materialForm.mtechnologyId,
+ version : this.versionVal
}
this.submitBomAdd(this.$api.url.addMBomByStandard,obj);
}else if(type == 3){
@@ -604,12 +776,17 @@
product: form.product,
productFather: form.productFather,
technologyId: form.protechnologyId,
- unit: form.unit
+ unit: form.unit,
+ version : this.versionVal
}
this.submitBomAdd(this.$api.url.addTechniqueByStandard,obj);
}else{
return
}
+ this.technologyVisible = false;
+ this.targetVisible = false;
+ this.materialVisible = false;
+ this.productVisible = false;
}
})
},
@@ -621,18 +798,26 @@
this.selectAll();
this.$message.success(res.message);
}).catch(error=>{
- this.$message.error(error.message);
})
- this.bomAddModelVisible = false;
},
+ //娓呯┖鏂板bom琛ㄥ崟
clearBomAddModel(){
if(this.typeselect == 0){
+ this.deviceList=[];
this.$refs["technologyForm"].resetFields();
}else if(this.typeselect == 1){
+ this.technologyIdList = [];
+ this.projectList = [];
this.$refs["targetForm"].resetFields();
}else if(this.typeselect == 2){
+ this.mIdList = [];
+ this.materialForm.tableList = [];
this.$refs["materialForm"].resetFields();
}else{
+ this.productDeviceList=[];
+ this.proIdList=[];
+ this.productProjectList=[];
+ this.proProductList=[];
this.$refs["productForm"].resetFields();
}
},
@@ -668,7 +853,10 @@
//鐗╂枡娓呭崟--鑾峰彇宸ュ簭锛屽伐鑹哄垪琛�
getMaterialFormList(){
this.$axios.get(this.$api.url.chooseTechByMBom,{
- params:{specificationsId : this.returntree.id}
+ params:{
+ specificationsId : this.returntree.id,
+ version : this.versionVal
+ }
}).then(res=>{
this.materialFormList = res.data;
}).catch(error=>{
@@ -684,7 +872,10 @@
//鎶�鏈寚鏍�--鑾峰彇宸ュ簭锛屽伐鑹哄垪琛�
getTargetFormList(){
this.$axios.get(this.$api.url.chooseTechByStandard,{
- params:{specificationsId : this.returntree.id}
+ params:{
+ specificationsId : this.returntree.id,
+ version : this.versionVal
+ }
}).then(res=>{
this.targetFormList = res.data;
}).catch(error=>{
@@ -694,7 +885,10 @@
//1.鐢熶骇宸ヨ壓-->閫夋嫨宸ュ簭,宸ヨ壓
getProductFormList(){
this.$axios.get(this.$api.url.chooseTechByProduct,{
- params:{specificationsId : this.returntree.id}
+ params:{
+ specificationsId : this.returntree.id,
+ version : this.versionVal
+ }
}).then(res=>{
this.productFormList = res.data;
}).catch(error=>{
@@ -746,7 +940,10 @@
//宸ヨ壓璺嚎--鑾峰彇宸ュ簭鍒楄〃
getFatherList(){
this.$axios.get(this.$api.url.chooseFather,{
- params:{specificationsId : this.returntree.id}
+ params:{
+ specificationsId : this.returntree.id,
+ version: this.versionVal
+ }
}).then(res=>{
this.fatherList = res.data;
}).catch(error=>{
@@ -762,12 +959,20 @@
})
},
showBomAddModel(){
- this.getFatherList();
- this.getDeviceList();
- this.getTargetFormList();
- this.getMaterialFormList();
- this.getProductFormList();
- this.bomAddModelVisible = true
+ if(this.typeselect == 0){
+ this.getFatherList();
+ this.getDeviceList();
+ this.technologyVisible = true
+ }else if(this.typeselect == 1){
+ this.getTargetFormList();
+ this.targetVisible = true
+ }else if(this.typeselect == 2){
+ this.getMaterialFormList();
+ this.materialVisible = true
+ }else{
+ this.getProductFormList();
+ this.productVisible = true
+ }
},
startLeftAdd(){
@@ -777,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]'
@@ -829,42 +1034,41 @@
})
}
})
- },
+ },
handleSelectionChange() {
},
TYPE(val) {//绫诲瀷.鏁版嵁
- // console.log(val);
this.typeselect = val
-
- // console.log(this.typeselect);
+ this.searchName = '';
this.selectVersion()
},
handleNodeClick(val) {//鏍戠殑鍊�
if(val.code==='[5]'&&val.children===undefined){
- console.log(val);
this.returntree = val
- this.typeselect=0
this.selectVersion()
}
},
async selectVersion() {//鐗堟湰
- let v=await this.$axios.get(this.$api.url.selectVersion, {
+ this.versionData = [];
+ await this.$axios.get(this.$api.url.selectVersion, {
params: {
specificationsId: this.returntree.id,
type: this.typeselect,
}
}).then(res => {
- this.verdata = res.data
- this.version = this.verdata.map(el => {
- return el = `v${el}`
- })
- // console.log("鐗堟湰");
- return this.verdata[0]
+ //鍒濆鍖栫増鏈�夋嫨鍒楄〃
+ if(res.data != null){
+ res.data.forEach(item=>{
+ this.versionData.push({
+ label:"v"+item,
+ value:item
+ })
+ this.versionVal = res.data[0];
+ })
+ }
+ this.selectAll()
})
- this.character=v
- this.version2="v"+v
- this.selectAll()
},
//鍙充晶鏁版嵁
selectAll() {
@@ -872,7 +1076,8 @@
params: {
specificationsId: this.returntree.id,//tree鐨勭偣鍑诲弽棣�
type: this.typeselect,//绫诲瀷
- version: this.character,//鐗堟湰
+ version: this.versionVal,//鐗堟湰
+ message: this.searchName//鎼滅储鏉′欢
}
}).then(res => {
let arr = res.data;
@@ -890,14 +1095,8 @@
}
},
verevent(val) {
- // console.log(val);
- let cc = val.replace('v', '')
- // console.log(cc);
- this.character = cc
+ this.versionVal = val
this.selectAll()
- // const { v, ...newObj } = val;
- // delete newObj.v
- // console.log(newObj);
},
//浜旂骇鏍�
selectMaterialTree() {
@@ -911,6 +1110,28 @@
arr[idx].name = '鍗婃垚鍝�'
}
})
+ if(res.data.length<1){
+ let obj={
+ name: '鎴愬搧',
+ }
+ let obj2={
+ name: '鍗婃垚鍝�',
+ }
+ this.list.push(obj)
+ this.list.push(obj2)
+ }
+ if(res.data.length===1){
+ if(res.data[0].name==='鎴愬搧'){
+ this.list.push({
+ name: '鍗婃垚鍝�',
+ })
+ }
+ if(res.data[0].name==='鍗婃垚鍝�'){
+ this.list.push({
+ name: '鎴愬搧',
+ })
+ }
+ }
this.selectDataList()
// 榛樿绗竴涓簲绾ц妭鐐规悳绱紝鏂板閰嶇疆椤�
const treeOptions = JSON.parse(JSON.stringify(this.list));
@@ -941,10 +1162,10 @@
},
filterNode(value, data) {
if (!value) return true;
- return data.label.indexOf(value) !== -1;
+ return data.name.indexOf(value) !== -1;
},
remove(node, data) {
- this.$confirm("鏄惁鍒犻櫎", "璀﹀憡", {
+ this.$confirm("鏄惁鍒犻櫎", "鎻愮ず", {
type: "warning"
}).then(res => {
const parent = node.parent;
@@ -958,26 +1179,6 @@
},
nodeClose(data, node, el) {
$($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder')
- },
- async selectProductTableData() {
- switch (this.tableType) {
- case 0:
- const { data: technologyList } = await this.$axios.get(this.$api.url.selectTechnologyByMaterial, { params: { specificationId: this.checkTreeNode.id, technologyName: this.searchName } })
- this.tableData = technologyList
- break;
- case 1:
- const { data: productList } = await this.$axios.get(this.$api.url.selectProductByMaterial, { params: { specifications: this.checkTreeNode.id, project: this.searchName } })
- productList.forEach((item, index) => {
- item.name = item.father
- item.index = index + 1
- item.id = item.father
- if (item.children.length === 1) {
- productList[index] = { ...item.children[0], index: index + 1, name: item.father }
- }
- })
- this.tableData = productList
- break;
- }
},
// 閫掑綊鏇存敼娣诲姞绾ц仈鎵�闇�灞炴��
replaceProp(arr){
@@ -996,16 +1197,28 @@
}
},
watch:{
+ isUpdateDevice(val){
+ if(val){
+ this.selectAll();
+ }
+ },
+ search(val) {
+ this.$refs.tree.filter(val);
+ },
leftAdd: {
handler(newVal, oldVal) {
if(this.isLeftAdd){
let tree=JSON.parse(JSON.stringify(this.list))
+ console.log(tree);
let father=null;
if(newVal.father!=null&&newVal.father!=''&&newVal.type.length>0){
let one=tree.filter(item=>{
return item.name===newVal.type[0]
})[0]
console.log(one);
+ if(one.children===undefined){
+ return
+ }
let two=one.children.filter(item=>{
return item.name===newVal.father
})[0]
@@ -1036,43 +1249,53 @@
}
},
deep: true // 娣卞害鐩戝惉瀵硅薄鍐呴儴灞炴�х殑鍙樺寲锛屽彲閫夌殑
- },
- bomLeftAdd:{
- handler(newval,oldVal){
- if(newval){
- let treeOptions = JSON.parse(JSON.stringify(this.list));
- this.replaceProp(treeOptions)
- this.formTypeOptions=treeOptions
- this.restaurants=this.loadFatherType()
+ },
+ bomLeftAdd:{
+ handler(newval,oldVal){
+ if(newval){
+ let treeOptions = JSON.parse(JSON.stringify(this.list));
+ this.replaceProp(treeOptions)
+ this.formTypeOptions=treeOptions
+ this.restaurants=this.loadFatherType()
+ }
+ }
+ },
+ technologyVisible(newVal){
+ if(!newVal){
+ this.clearBomAddModel();
+ }
+ },
+ targetVisible(newVal){
+ if(!newVal){
+ this.clearBomAddModel();
+ }
+ },
+ materialVisible(newVal){
+ if(!newVal){
+ this.clearBomAddModel();
+ }
+ },
+ productVisible(newVal){
+ if(!newVal){
+ this.clearBomAddModel();
}
}
- },
- bomAddModelVisible(newVal){
- if(!newVal){
- this.clearBomAddModel();
- }
- }
}
}
</script>
-
<style scoped>
-
-.standard .bom-add-model{
- width: 100%;
-}
-
-.standard .bom-add-model form{
- width: 90%;
- margin-left: 5%;
-}
.standard .title .el-button {
height: 32px;
border: 1px solid rgba(190, 190, 190, 0.44);
box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
padding: 0 12px;
+}
+
+ .contentTable{
+ width:98%;
+ margin-left:1%;
}
.standard .title {
@@ -1089,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