Merge remote-tracking branch 'origin/master'

zss

2023-09-14 4c5c20a7c03539104df74072b1b8a81b51c19ab8

 src/components/view/record-content.vue

@@ -39,7 +39,6 @@
      height: calc(100% - 120px);
      background-color: #fff;
      display: flex;
		
   }

   .thing .left {
@@ -47,7 +46,7 @@
      height: calc(100% - 20px);
      border-right: 3px solid rgb(245, 247, 251);
      padding: 16px;
      /* height:calc(50vh - 250px) */
      overflow-y: auto;
   }

   .thing .left .custom-tree-node span {
@@ -120,7 +119,7 @@
               <el-button icon="el-icon-delete" @click="dels">删除</el-button>
            </el-col>
         </el-row>
      </div>		
      </div>
      <div class="choose">
         <span>类型：</span>
         <el-select v-model="search.type" size="small" @change="TYpe" placeholder="请选择" style="width: 224px;margin-right: 30px;">
@@ -142,14 +141,13 @@
      <div class="thing">
         <div class="left">
            <el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="请输入搜索内容" size="small" clearable @input="query"></el-input>
            <el-tree :data="list" ref="tree" 
            style="height: 500px;overflow-y: auto;"
            <el-tree :data="list" ref="tree"
            :props="{children: 'children',label: 'name'}" node-key="name" default-expand-all
               @node-click="handleNodeClick" highlight-current 
               @node-click="handleNodeClick" highlight-current
               :key="upIndex">
               <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>
                     {{ data.cord }}{{ data.name }}</span>
                     {{ data.code }}{{ data.name }}</span>
                  <!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
                     <i class="el-icon-delete"></i>
                  </el-button> -->
@@ -197,8 +195,8 @@
               <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="请选择" 
                        <el-select v-model="edit.techFather"
                  placeholder="请选择"
                  disabled
                  @change="workevent"
                  style="width: 310px;">
@@ -267,7 +265,7 @@
            </el-form-item>
            <el-form-item label="工序">
               <template>
                        <el-select v-model="form.work" 
                        <el-select v-model="form.work"
                  @change="workevent"
                  placeholder="请选择" style="width: 480px;">
                            <el-option
@@ -391,7 +389,6 @@
            dialogVisible:false,
            process: {},
            list: [],
            checkTreeNode: {},
            tableData: [],
            upIndex: 0,
            selects: [],
@@ -428,10 +425,9 @@
         TYpe(val) {
                this.typeselect = val
                console.log(this.typeselect);
                this.selectAllleft()				
                this.selectAllleft()
            },
         edittype(val) {
            // this.typeselect = ''
            this.typeselect = val
            this.chooseTechFath()
         },
@@ -453,7 +449,7 @@
                      "Content-Type": "application/json"
                    }
            }).then(res =>{
				

         })
         },
         addRecord() {
@@ -468,12 +464,13 @@
                      "Content-Type": "application/json"
                    }
            }
            )
            ).then(res =>{
               this.selectjilu()
            })
         },
         add() {
            this.dialogVisible = false
            this.addRecord()
            this.selectjilu()
            this.form = {};
         },
         query() {
@@ -497,6 +494,7 @@
         console.log(one);
         let name=one.children[0].id
         console.log(name);
         this.checkTreeNode.id = name
         this.selectjiluStart(name)
         this.selectDataList();
         });
@@ -512,6 +510,7 @@
         },
         //selectjilu  checkTreeNode
         selectjilu() {
            console.log(this.checkTreeNode.id);
         this.$axios.get(this.$api.url.selectjilu,{
            params:{id:this.checkTreeNode.id}
         }).then(res => {
@@ -643,7 +642,7 @@
         submitUpData() {
            this.writeRecordById()
            this.$message.success('修改成功')
				

            this.upDia = false
               // this.tableData.forEach(a => {
            //    if (a.id == this.upData.id) {