Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-09 c4355a18506cf0e8f63469a8a38f2e8d5e67d6f9

 src/components/view/mbom.vue

@@ -32,7 +32,7 @@
               <el-form-item label="工序">
                            <template>
                                <el-select v-model="search.work" 
                                placeholder="请选择类型" 
                                placeholder="请选择" 
                                allow-create
                                filterable
                                @change="workevent"
@@ -141,11 +141,11 @@
            :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>
@@ -181,7 +181,10 @@
export default {
      data() {
         return {
              search:{},
              search:{
               type: 0,
               technology: null
            },
              list:[],
            process:{},
            // handleClose:[],
@@ -196,12 +199,6 @@
               specifications:'',
               unit:'',
               }],
            search:{
               type:'',
               work:'',
               craft:'',

            },
            addsearch:{},
            upData:{},
            form:{},
@@ -216,6 +213,22 @@
         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)
@@ -278,6 +291,7 @@
         }).then(res => {
            this.list = res.data;
            console.log(this.list);
            this.selectDataList()
         }, {
            headers: {
                      "Content-Type": "application/json"