Merge remote-tracking branch 'origin/master'

王震

2023-09-08 4beefba67c39fc863b849e312b86d8f51a89005f

 src/components/view/record-content.vue

@@ -114,7 +114,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="addend">新增</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>
@@ -144,9 +144,9 @@
               <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.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>
@@ -157,7 +157,7 @@
               </el-table-column>
               <el-table-column type="index" label="序号" width="70">
               </el-table-column>
               <el-table-column prop="name" label="名称">
               <el-table-column prop="name" label="记录内容">
               </el-table-column>
               <el-table-column prop="unit" label="单位">
               </el-table-column>
@@ -178,7 +178,7 @@
               <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.type" placeholder="请选择类型" style="width: 310px;">
                        <el-select v-model="edit.type" placeholder="请选择" style="width: 310px;">
                            <el-option label="橡胶连接器" :value="0"></el-option>
                     <el-option label="金属连接器" :value="1"></el-option>
                     <el-option label="湿插拔电连接器" :value="2"></el-option>
@@ -192,7 +192,7 @@
               <el-col :span="16" :offset="1">
                  <template>
                        <el-select v-model="edit.techFather" 
                  placeholder="请选择类型" 
                  placeholder="请选择" 
                  @change="workevent"
                  style="width: 310px;">
                            <el-option
@@ -209,7 +209,7 @@
               <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="请选择类型" style="width: 310px;">
                        <el-select v-model="edit.techName" placeholder="请选择" style="width: 310px;">
                            <el-option
                            v-for="item in craftapi"
                            :key="item.id"
@@ -221,7 +221,7 @@
               </el-col>
            </el-row>
            <el-row style="line-height: 46px;">
               <el-col :span="4" style="font-size: 14px;text-align: right;">名称:</el-col>
               <el-col :span="4" style="font-size: 14px;text-align: right;">记录内容:</el-col>
               <el-col :span="16" :offset="1">
                  <el-input v-model="upData.name" size="small" clearable></el-input>
               </el-col>
@@ -250,7 +250,7 @@
            <el-form ref="form" :model="form" label-width="80px">
            <el-form-item label="类型">
               <template>
                        <el-select v-model="form.type" placeholder="请选择类型" style="width: 480px;">
                        <el-select v-model="form.type" placeholder="请选择" style="width: 480px;">
                            <el-option label="橡胶连接器" :value="0"></el-option>
                     <el-option label="金属连接器" :value="1"></el-option>
                     <el-option label="湿插拔电连接器" :value="2"></el-option>
@@ -262,7 +262,7 @@
               <template>
                        <el-select v-model="form.work" 
                  @change="workevent"
                  placeholder="请选择类型" style="width: 480px;">
                  placeholder="请选择" style="width: 480px;">
                            <el-option
                            v-for="item in process"
                            :key="item.name"
@@ -274,7 +274,7 @@
            </el-form-item>
            <el-form-item label="工艺名称">
               <template>
                        <el-select v-model="form.craft" placeholder="请选择类型" style="width: 480px;">
                        <el-select v-model="form.craft" placeholder="请选择" style="width: 480px;">
                            <el-option
                            v-for="item in craftapi"
                            :key="item.id"
@@ -307,7 +307,7 @@
            <el-form ref="form" :model="form" label-width="80px">
            <el-form-item label="类型">
               <template>
                        <el-select v-model="value" placeholder="请选择类型" style="width: 480px;">
                        <el-select v-model="value" placeholder="请选择" style="width: 480px;">
                            <el-option
                            v-for="item in options"
                            :key="item.value"
@@ -319,7 +319,7 @@
            </el-form-item>
            <el-form-item label="工序">
               <template>
                        <el-select v-model="value" placeholder="请选择类型" style="width: 480px;">
                        <el-select v-model="value" placeholder="请选择" style="width: 480px;">
                            <el-option
                            v-for="item in options"
                            :key="item.value"
@@ -331,7 +331,7 @@
            </el-form-item>
            <el-form-item label="工艺名称">
               <template>
                        <el-select v-model="value" placeholder="请选择类型" style="width: 480px;">
                        <el-select v-model="value" placeholder="请选择" style="width: 480px;">
                            <el-option
                            v-for="item in options"
                            :key="item.value"
@@ -366,8 +366,7 @@
         return {
            search: {
               type: 0,
               name: 2,
               technology: 2
               technology: null
            },
            options:[],
            value:{},
@@ -393,7 +392,7 @@
            typeselect:0,
            upDia: false,
            checkTreeNode:{
               id:2,
               id:1,
            },
            upData:{},
            edit:{
@@ -581,6 +580,7 @@
            this.tableData.splice(index,1)
            this.upData.id = rows.id
            this.delQueById()
            this.selectjilu()
         },

         upContent(ob) {