Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-09 c4355a18506cf0e8f63469a8a38f2e8d5e67d6f9

 src/components/view/Technicalindex.vue

@@ -5,7 +5,7 @@
            <el-col :span="12" style="line-height: 32px;">技术指标维护</el-col>
            <el-col :span="12" style="text-align: right;">
               <el-button type="primary" icon="el-icon-plus" style="background: #004EA2;" @click="event">新增</el-button>
               <el-button icon="el-icon-edit-outline" @click="modify">修改</el-button>
               <!-- <el-button icon="el-icon-edit-outline" @click="modify">修改</el-button> -->
               <el-button icon="el-icon-delete"  @click="dels" >删除</el-button>
            </el-col>
         </el-row>
@@ -22,7 +22,7 @@
            <el-form ref="form" :model="form" label-width="80px">
                <el-form-item label="类型">
                    <template>
                        <el-select v-model="value" placeholder="请选择类型" style="width: 560px;">
                        <el-select v-model="value" placeholder="请选择" style="width: 560px;">
                            <el-option
                            v-for="item in options"
                            :key="item.value"
@@ -47,8 +47,8 @@

                <el-row>
                    <el-col :span="11">
                        <el-form-item label="上级">
                            <el-input v-model="form.name"  placeholder="请选择上级"></el-input>
                        <el-form-item label="项目组">
                            <el-input v-model="form.name"  placeholder="请选择"></el-input>
                        </el-form-item>
                    </el-col>
                    <el-col :span="11" :offset="2">
@@ -91,7 +91,7 @@
                        <el-form-item label="工序">
                            <template>
                                <el-select v-model="form.work" 
                                placeholder="请选择类型" 
                                placeholder="请选择" 
                                allow-create
                                filterable
                                @change="workevent"
@@ -110,7 +110,7 @@
                        <el-form-item label="工艺">
                            <template>
                                <el-select v-model="form.name" 
                                placeholder="请选择类型" 
                                placeholder="请选择" 
                                allow-create
                                filterable
                                >
@@ -128,10 +128,10 @@

                <el-row>
                    <el-col :span="11">
                        <el-form-item label="上级">
                        <el-form-item label="项目组">
                            <template>
                                <el-select v-model="form.father" 
                                placeholder="请选择类型" 
                                placeholder="请选择" 
                                allow-create
                                filterable
                                >
@@ -192,11 +192,11 @@
                    @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.father}} {{ 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>
@@ -207,7 +207,6 @@
                    style="width: 100%;margin-bottom: 20px;"
                    row-key="name"
                    border
                    
                    @selection-change="handleSelectionChange"
                    default-expand-all
                    :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
@@ -271,7 +270,7 @@
               <el-col :span="16" :offset="1">
                  <template>
                                <el-select v-model="form.work" 
                                placeholder="请选择类型" 
                                placeholder="请选择" 
                                allow-create
                                filterable
                                @change="workevent"
@@ -291,7 +290,7 @@
               <el-col :span="16" :offset="1">
                  <template>
                                <el-select v-model="form.name" 
                                placeholder="请选择类型" 
                                placeholder="请选择" 
                                allow-create
                                filterable
                                >
@@ -333,12 +332,12 @@
      data() {
         return {
              search:{
                type:'',
                technology:'',
                type:0,
                technology:null,
              },
            //   handleClose:[],
                checkTreeNode :{
                    id:2,
                    id:1,
                },
                higherlevel:[],
                value:{},
@@ -373,6 +372,22 @@
            
      },
        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++
         },
            //编辑
            selecTech() {
            this.$axios.get(this.$api.url.selecTech,{
@@ -441,6 +456,7 @@
         }).then(res => {
            this.list = res.data;
                console.log(this.list);
                this.selectDataList()
         })
         },
            //