Merge remote-tracking branch 'origin/master'

王震

2023-09-08 4beefba67c39fc863b849e312b86d8f51a89005f

 src/components/view/mbom.vue

@@ -29,22 +29,33 @@
               </el-form-item>
            </el-col>
            <el-col :span="8">
               <el-form-item label="工序:">
               <el-select v-model="search.type" size="small" placeholder="请选择" style="width: 224px;margin-right: 30px;">
                  <el-option label="橡胶连接器" :value="0"></el-option>
                  <el-option label="金属连接器" :value="1"></el-option>
                  <el-option label="湿插拔电连接器" :value="2"></el-option>
                  <el-option label="分支组件" :value="3"></el-option>
               </el-select>
            </el-form-item>
               <el-form-item label="工序">
                            <template>
                                <el-select v-model="search.work" 
                                placeholder="请选择" 
                                allow-create
                                filterable
                                @change="workevent"
                                >
                                    <el-option
                                    v-for="(item,index) in process"
                                    :key="item.name"
                                    :label="item.name"
                                    :value="item.name">
                                    </el-option>
                                </el-select>
                                </template>
                        </el-form-item>
            </el-col>
            <el-col :span="8">
               <el-form-item label="工艺名称:">
               <el-select v-model="search.type" size="small" placeholder="请选择" style="width: 224px;margin-right: 30px;">
                  <el-option label="橡胶连接器" :value="0"></el-option>
                  <el-option label="金属连接器" :value="1"></el-option>
                  <el-option label="湿插拔电连接器" :value="2"></el-option>
                  <el-option label="分支组件" :value="3"></el-option>
               <el-select v-model="search.craft" size="small" placeholder="请选择" style="width: 224px;margin-right: 30px;">
                  <el-option
                     v-for="item in craftapi"
                     :key="item.id"
                     :label="item.name"
                     :value="item.id">
                     </el-option>
               </el-select>
            </el-form-item>
            </el-col>
@@ -56,7 +67,7 @@
            <template>
               <el-table
               border
               :data="tableData"
               :data="tableapi"
               height="calc(80vh - 250px)"
               style="width: 100%">
               <el-table-column type="index" label="序号" width="70">
@@ -66,28 +77,37 @@
                  label="供应商名称"
                  width="180">
                  <template slot-scope="scope">
                     <el-input v-model="scope.row.input" placeholder="请输入内容" ></el-input>
                     <el-input v-model="scope.row.supplier" placeholder="" ></el-input>
                  </template>
               </el-table-column>
               <el-table-column
                  prop=""
                  label="质量追溯号"
                  width="180">
                  <template slot-scope="scope">
                     <el-input v-model="scope.row.qualityTraceability" placeholder="" ></el-input>
                  </template>
               </el-table-column>
               <el-table-column
                  prop="name"
                  label="质量追溯号"
                  width="180">
                  label="原材料名称">
                  <template slot-scope="scope">
                     <el-input v-model="scope.row.name" placeholder="请输入内容" ></el-input>
                     <el-input v-model="scope.row.name" placeholder="" ></el-input>
                  </template>
               </el-table-column>
               <el-table-column
                  prop="address"
                  label="原材料名称">
               </el-table-column>
               <el-table-column
                  prop="address"
                  label="规格型号">
                  <template slot-scope="scope">
                     <el-input v-model="scope.row.specifications" placeholder="" ></el-input>
                  </template>
               </el-table-column>
               <el-table-column
                  prop="address"
                  prop="unit"
                  label="单位">
                  <template slot-scope="scope">
                     <el-input v-model="scope.row.unit" placeholder="" ></el-input>
                  </template>
               </el-table-column>
               </el-table>
            </template>
@@ -101,29 +121,31 @@

      <div class="choose">
            <span>类型：</span>
         <el-select v-model="search.type" size="small" placeholder="请选择" style="width: 224px;margin-right: 30px;">
         <el-select v-model="search.type" size="small" @change="TYpe" placeholder="请选择" style="width: 224px;margin-right: 30px;">
            <el-option label="橡胶连接器" :value="0"></el-option>
            <el-option label="金属连接器" :value="1"></el-option>
            <el-option label="湿插拔电连接器" :value="2"></el-option>
            <el-option label="分支组件" :value="3"></el-option>
         </el-select>
         <span>原材料名称：</span>
         <!-- <span>原材料名称：</span>
         <el-select v-model="search.name" size="small" placeholder="请选择" style="width: 224px;margin-right: 30px;">
            <el-option v-for="(a, ai) in process" key="ai" :label="a.name" :value="a.id"></el-option>
         </el-select>
         <el-button size="mini"><span>重 置</span></el-button>
         <el-button size="mini" type="primary" style="background: #004EA2;"><span>查询</span></el-button>
         <el-button size="mini" type="primary" style="background: #004EA2;"><span>查询</span></el-button> -->
      </div>
      <div class="thing">
         <div class="left">
            <el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="请输入搜索内容" size="small" clearable ></el-input>
                <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'name'}" node-key="id" default-expand-all>
                <el-tree :data="list" ref="tree" 
            :props="{children: 'children',label: 'name'}" 
            node-key="id" default-expand-all  @node-click="handleNodeClick" >
               <div class="custom-tree-node" slot-scope="{ node, data }">
                  <span><i :class="`node_i ${data.code != '[3]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
                  <span><i :class="`node_i ${data.code != '[2]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
                     {{data.code}} {{ data.name }}</span>
                  <el-button type="text" size="mini" @click.stop="remove(node, data)">
                  <!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
                     <i class="el-icon-delete"></i>
                  </el-button>
                  </el-button> -->
               </div>
            </el-tree>
         </div>
@@ -141,7 +163,7 @@
               <el-table-column label="操作" width="130">
                  <template slot-scope="scope">
                     <!-- <span class="table_do" @click="upContent(scope.row)">编辑&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> -->
                     <span class="table_do" @click="deleteRow(scope.$index, tableData)">删除</span>
                     <span class="table_do" @click="deleteRow(scope.$index, scope.row)">删除</span>
                  </template>
               </el-table-column>
            </el-table>
@@ -159,77 +181,141 @@
export default {
      data() {
         return {
              search:{},
              list: [{
               id: 0,
               name: "原材料",
               children: [{
                  id: 3,
                  name: "工艺",
                  children: [{
                     id: 6,
                     name: "设备1"
                  }]
               }]
            }, {
               id: 1,
               name: "成品",
               children: [{
                  id: 4,
                  name: "工艺"
               }]
            }, {
               id: 2,
               name: "半成品",
               children: [{
                  id: 5,
                  name: "工艺"
               }]
            }],
            process:[],
              search:{
               type: 0,
               technology: null
            },
              list:[],
            process:{},
            // handleClose:[],
            search:{},
            checkTreeNode:{
               id:2,
            },
            tableData:[],
            tableapi:[{
               supplier:'',
               qualityTraceability:'',
               name:'',
               specifications:'',
               unit:'',
               }],
            addsearch:{},
            upData:{},
            form:{},
            dialogVisible:false,
                tableData: [{
               id: 1,
               name: "质量追溯号",
               unit: "单位",
               thing: "dajskda",
               input:'你好1'
            }, {
               id: 2,
               name: "作业人员",
               unit: "单位",
               thing: "dajskda",
               input:'你好2'
					
            }, {
               id: 3,
               name: "规格",
               unit: "单位",
               thing: "dajskda",
               input:'你好3'
					
            }, {
               id: 4,
               name: "规格",
               unit: "单位",
               thing: "dajskda",
               input:'你好4'

            }, {
               id: 5,
               name: "规格",
               unit: "单位",
               thing: "dajskda",
               input:'你好5'

            }],
            input:''
            typeselect:0,
            input:'',
            craftapi:[],
            }
        },
      mounted() {
         this.selectAllleft() 
         this.selectAllMbom()         
      },
      methods:{
         selectDataList() {
            this.list.forEach(a => {
               a.code = '[1]'
               if (a.children != undefined) {
                  a.children.forEach(b => {
                     b.code = '[2]'
                     if (b.children != undefined) {
                        b.children.forEach(c => {
                           c.code = '[3]'
                        })
                     }
                  })
               }
            })
            this.upIndex++
         },
          workevent(val){
                console.log(val);
                let idx = this.process.findIndex(el => el.name === val)
                this.craftapi = this.process[idx].children
            },
         //新增
         chooseTechFath() {
         this.$axios.get(this.$api.url.chooseTechFath,{
                params:{type:this.typeselect}
            }).then(res => {
            this.process = res.data;
                console.log(this.process);
         }, {
            headers: {
                      "Content-Type": "application/json"
                    }
            })
         },
         addMbom(data) {
            this.$axios.post(this.$api.url.addMbom,data
            // {
               // name:this.tableapi.name,
               // qualityTraceability:this.tableapi.qualityTraceability,
               // specifications:this.tableapi.specifications,
               // supplier:this.tableapi.supplier,
               // techTemId:this.craftapi.id,
               // unit:this.tableapi.unit,
            // }
            , {
               headers: {
                      "Content-Type": "application/json"
                    }
            }).then(res =>{
               console.log(res);
               this.$message.success('添加完成')
               this.selectAllMbom()
               this.tableapi = [{}]
            })
         },
         //删除
         material(index) {
            console.log(this.upData.id);
            this.$axios.post(this.$api.url.material,{
               id:this.upData.id
            }).then(res =>{
               this.$message.success(res.message)
               this.tableData.splice(index,1)

               // console.log(res);
            })
         },
         TYpe(val) {
            this.typeselect = val
            this.selectAllleft()
         },
         //左边
         selectAllleft() {
         this.$axios.get(this.$api.url.selectAllleft,{
            params:{type:this.typeselect}
         }).then(res => {
            this.list = res.data;
            console.log(this.list);
            this.selectDataList()
         }, {
            headers: {
                      "Content-Type": "application/json"
                    }
            })
         },
         //右边
         selectAllMbom() {
         this.$axios.get(this.$api.url.selectAllMbom,{
            params:{id:this.checkTreeNode.id}
         }).then(res => {
            this.tableData = res.data;
            console.log(this.tableData);
         }, {
            headers: {
                      "Content-Type": "application/json"
                    }
            })
         },
         handleNodeClick(data){
                this.checkTreeNode = data
            console.log(this.checkTreeNode.id);
            this.selectAllMbom()
            },
         handleClose(done) {
            this.$confirm('确认关闭？')
            .then(_ => {
@@ -239,19 +325,25 @@
         },
            event(){
                this.dialogVisible = true
            this.chooseTechFath()
            },
          Addrow() {
         if (this.tableData == undefined) {
            this.tableData = new Array();
         if (this.tableapi == undefined) {
            this.tableapi = new Array();
         }
         let obj = [];
         
         this.tableData.push(obj);
         this.tableapi.push(obj);
         },
         skipshow(){
            console.log('666');
            const data = this.tableData.at(-1)
            console.log(data);
            let data = this.tableapi.at(-1)
            // this.addMbom()
            data.techTemId = this.search.craft
            // console.log(this.search.craft);
            // console.log(data);

            this.addMbom(data)
            
            this.dialogVisible = false
         },
@@ -270,7 +362,11 @@
            this.selects = val;
         },
         deleteRow(index, rows) {
            rows.splice(index, 1);
            console.log(rows);
            // this.tableData.splice(index,1)
            this.upData.id = rows.id
            console.log(this.upData);
            this.material(index)
         },

        }