Merge remote-tracking branch 'origin/master'

王震

2023-09-24 941fff624eddc4b9f369f1b91f65fdb50309851d

 src/components/view/Technicalindex.vue

@@ -7,6 +7,8 @@
               <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-delete" @click="dels">删除</el-button>
               <el-button icon="el-icon-download" @click="clickDownload">导出</el-button>
               <el-button icon="el-icon-upload2">导入</el-button>
            </el-col>
         </el-row>
      </div>
@@ -18,7 +20,8 @@
                  <el-form-item label="类型">
                     <template>
                        <el-select v-model="value" placeholder="请选择" style="width: 560px;">
                           <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
                           <el-option v-for="item in options" :key="item.value" :label="item.label"
                              :value="item.value">
                           </el-option>
                        </el-select>
                     </template>
@@ -72,7 +75,8 @@
               <el-tree :data="list" ref="tree" :props="{children: 'children',label: 'father'}" node-key="name"
                  default-expand-all @node-click="handleNodeClick" highlight-current>
                  <div class="custom-tree-node" slot-scope="{ node, data }">
                     <span><i :class="`node_i ${data.code != '[2]'?'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>
                  </div>
               </el-tree>
@@ -103,7 +107,8 @@
                     <template slot-scope="scope" style="text-align: center;">
                        <div v-if="!scope.row.children">
                           <el-button type="text" size="mini" @click="childrenClick(scope.row)">编辑</el-button>
                           <el-button type="text" size="mini" @click="deleteRow(scope.$index, scope.row)">删除</el-button>
                           <el-button type="text" size="mini"
                              @click="deleteRow(scope.$index, scope.row)">删除</el-button>
                        </div>
                     </template>
                  </el-table-column>
@@ -127,9 +132,10 @@
                        <el-col :span="4" style="font-size: 14px;text-align: right;">工序:</el-col>
                        <el-col :span="16" :offset="1">
                           <template>
                              <el-select v-model="edit.techFather" placeholder="请选择" allow-create disabled style="width: 306px;"
                                 filterable @change="workevent">
                                 <el-option v-for="(item,index) in process" :key="item.name" :label="item.name" :value="item.name">
                              <el-select v-model="edit.techFather" placeholder="请选择" allow-create disabled
                                 style="width: 306px;" 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>
@@ -139,9 +145,10 @@
                        <el-col :span="4" style="font-size: 14px;text-align: right;">工艺:</el-col>
                        <el-col :span="16" :offset="1">
                           <template>
                              <el-select v-model="edit.techName" placeholder="请选择" disabled style="width: 306px;" allow-create
                                 filterable>
                                 <el-option v-for="item in craftapi" :key="item.id" :label="item.name" :value="item.id">
                              <el-select v-model="edit.techName" placeholder="请选择" disabled style="width: 306px;"
                                 allow-create filterable>
                                 <el-option v-for="item in craftapi" :key="item.id" :label="item.name"
                                    :value="item.id">
                                 </el-option>
                              </el-select>
                           </template>
@@ -189,8 +196,8 @@
                           <el-form-item label="工序">
                              <template>
                                 <el-select v-model="form.work" placeholder="请选择" @change="workevent">
                                    <el-option v-for="(item,index) in process" :key="item.name" :label="item.name"
                                       :value="item.name">
                                    <el-option v-for="(item, index) in process" :key="item.name"
                                       :label="item.name" :value="item.name">
                                    </el-option>
                                 </el-select>
                              </template>
@@ -199,8 +206,10 @@
                        <el-col :span="11" :offset="2">
                           <el-form-item label="工艺">
                              <template>
                                 <el-select v-model="form.name" style="width: 95%;" placeholder="请选择" @change="craftrow">
                                    <el-option v-for="item in craftapi" :key="item.id" :label="item.name" :value="item.id">
                                 <el-select v-model="form.name" style="width: 95%;" placeholder="请选择"
                                    @change="craftrow">
                                    <el-option v-for="item in craftapi" :key="item.id" :label="item.name"
                                       :value="item.id">
                                    </el-option>
                                 </el-select>
                              </template>
@@ -211,8 +220,10 @@
                        <el-col :span="11">
                           <el-form-item label="项目组">
                              <template>
                                 <el-select v-model="form.father" placeholder="请选择" allow-create filterable @create="electadd">
                                    <el-option v-for="item in higherlevel" :key="item" :label="item" :value="item">
                                 <el-select v-model="form.father" placeholder="请选择" allow-create filterable
                                    @create="electadd">
                                    <el-option v-for="item in higherlevel" :key="item" :label="item"
                                       :value="item">
                                    </el-option>
                                 </el-select>
                              </template>
@@ -231,6 +242,20 @@
                  <span slot="footer" class="dialog-footer">
                     <el-button @click="dialogVisible = false">取 消</el-button>
                     <el-button type="primary" @click="add">确 定</el-button>
                  </span>
               </el-dialog>
            </div>
            <div>
               <el-dialog title="导出类型选择" :visible.sync="isDownload" width="30%">
                  <el-col>
                     请选择类型：
                  </el-col>
                  <el-select v-model="downloadTypeSelect" style="width: 100%;margin-top: 10px;" placeholder="请选择">
                     <el-option v-for="(a, ai) in typeTable" :key="ai" :value="a"></el-option>
                  </el-select>
                  <span slot="footer" class="dialog-footer">
                     <el-button @click="isDownload = false">取 消</el-button>
                     <el-button type="primary" @click="downloadSelect">确 定</el-button>
                  </span>
               </el-dialog>
            </div>
@@ -265,6 +290,9 @@
            children: [],
            modifyevent: false,
            dialogVisible: false,
         isDownload: false,//导出按钮
         downloadTypeSelect: null,
         typeTable: [],
            tableData: [],
            crafval: '',
            typeselect: 0,
@@ -287,6 +315,20 @@
         this.chooseType()
      },
      methods: {
      clickDownload() {
         this.isDownload = true
         this.typeTable = []
         let data=JSON.parse(JSON.stringify(this.bigType))
         data.unshift("全部")
         this.typeTable=data
      },
      downloadSelect() {
         console.log(this.downloadTypeSelect);
			
      },
      handleSelectionChange() {

      },
         chooseType() {
            this.$axios.get(this.$api.url.chooseType).then(res => {
               this.bigType = res.data
@@ -331,7 +373,6 @@
         },
         //递归子级
         toggleSelect(data, flag, type) {
            // console.log('222');
            if (type === "all") {
               if (data.length > 0) {
                  data.forEach((item) => {
@@ -377,7 +418,6 @@
               }
            }).then(res => {
               this.edit = res.data[0]
               console.log(this.edit);
            })
         },
         childrenClick(val) {
@@ -386,7 +426,6 @@
            this.upDia = true
         },
         writeTechByIdskill() {
            // console.log(this.upData.id);
            this.$axios.post(this.$api.url.writeTechByIdskill + '?id=' + this.upData.id, {
               name: this.edit.name,
               father: this.edit.father,
@@ -407,7 +446,6 @@
         },
         //删除
         delTechBy() {
            console.log(this.$api.url.delTechBy, this.upData.id);
            this.$axios.post(this.$api.url.delTechBy, {
               id: this.upData.id
            }).then(res => {
@@ -432,9 +470,7 @@
            })
         },
         dels() {

            let ee = []
            console.log(this.selects);
            this.selects.forEach(el => {
               if (el.children) {
                  el.children.forEach(ele => {
@@ -444,7 +480,6 @@
            })
            // cc.splice(0,1)
            this.delete = ee.join(',')
            console.log(this.delete);
            this.delAllTechskill()
            this.$message.success('删除完成')
         },
@@ -454,7 +489,6 @@
            this.form = {};
         },
         electadd(value) {
            console.log(value);
            this.higherlevel.push({});
            this.form.father = value;
         },
@@ -476,7 +510,6 @@
         },
         TYpe(val) {
            this.typeselect = val
            console.log(this.typeselect);
            this.selectAllleft()
         },
         edittype(val) {
@@ -492,7 +525,6 @@
               }
            }).then(res => {
               this.list = res.data;
               console.log(this.list);
               this.selectDataList()
               this.$nextTick(() => {
                  this.$refs.tree.setCurrentKey(this.list[0].children[0].name) // 默认选中节点第一个
@@ -500,10 +532,8 @@
               let one = this.list.filter(item => {
                  return item.children.length > 0
               })[0]
               console.log(one);
               let name = one.children[0].id
               this.checkTreeNode.id = name
               console.log(name);
               this.selectAllrightStart(name)
               this.selectDataList();
            });
@@ -515,7 +545,6 @@
               }
            }).then(res => {
               this.tableData = res.data;
               console.log(this.tableData);
            });
         },
         //
@@ -531,7 +560,6 @@
               }
            }).then(res => {
               this.tableData = res.data;
               console.log(this.tableData);
            });
         },
         craftrow(val) {
@@ -540,14 +568,12 @@
         },
         //上级
         chooseProFath() {
            console.log(this.checkTreeNode.id);
            this.$axios.get(this.$api.url.chooseProFath, {
               params: {
                  techTemId: this.crafval
               }
            }).then(res => {
               this.higherlevel = res.data;
               console.log(this.higherlevel);
            }, {
               headers: {
                  "Content-Type": "application/json"
@@ -562,7 +588,6 @@
               }
            }).then(res => {
               this.process = res.data;
               console.log(this.process);
            }, {
               headers: {
                  "Content-Type": "application/json"
@@ -570,14 +595,12 @@
            })
         },
         workevent(val) {
            console.log(val);
            let idx = this.process.findIndex(el => el.name === val)
            this.craftapi = this.process[idx].children
         },

         handleNodeClick(data) {
            this.checkTreeNode = data
            console.log(this.checkTreeNode.id);
            this.selectAllright()
         },
         event() {