Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-08 253b9c48b02d995540b84c1831e54e6baf8a1000

 src/components/view/record-content.vue

@@ -142,7 +142,7 @@
               @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen" @node-collapse="nodeClose" :filter-node-method="filterNode"
               :key="upIndex">
               <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)">
                     <i class="el-icon-delete"></i>
@@ -161,12 +161,12 @@
               </el-table-column>
               <el-table-column prop="unit" label="单位">
               </el-table-column>
               <el-table-column prop="thing" label="备注">
               <el-table-column prop="note" label="备注">
               </el-table-column>
               <el-table-column label="操作" width="130">
                  <template slot-scope="scope">
                     <span class="table_do" @click="upContent(scope.row)">编辑&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                     <span class="table_do" @click="deleteRow(scope.$index, tableData)">删除</span>
                     <span class="table_do" @click="deleteRow(scope.$index, scope.row)">删除</span>
                  </template>
               </el-table-column>
            </el-table>
@@ -174,6 +174,52 @@
      </div>
      <el-dialog title="编辑记录内容" :visible.sync="upDia" width="500px">
         <div class="body">
            <el-row style="line-height: 46px;">
               <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-option label="橡胶连接器" :value="0"></el-option>
                     <el-option label="金属连接器" :value="1"></el-option>
                     <el-option label="湿插拔电连接器" :value="2"></el-option>
                     <el-option label="分支组件" :value="3"></el-option>
                        </el-select>
                        </template>
               </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="16" :offset="1">
                  <template>
                        <el-select v-model="edit.techFather" 
                  placeholder="请选择类型" 
                  @change="workevent"
                  style="width: 310px;">
                            <el-option
                            v-for="item in process"
                            :key="item.name"
                            :label="item.name"
                            :value="item.name">
                            </el-option>
                        </el-select>
                        </template>
               </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="16" :offset="1">
                  <template>
                        <el-select v-model="edit.techName" placeholder="请选择类型" style="width: 310px;">
                            <el-option
                            v-for="item in craftapi"
                            :key="item.id"
                            :label="item.name"
                            :value="item.id">
                            </el-option>
                         </el-select>
                        </template>
               </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="16" :offset="1">
@@ -189,7 +235,7 @@
            <el-row style="line-height: 46px;">
               <el-col :span="4" style="font-size: 14px;text-align: right;">备注:</el-col>
               <el-col :span="16" :offset="1">
                  <el-input v-model="upData.thing" size="small" clearable></el-input>
                  <el-input v-model="upData.note" size="small" clearable></el-input>
               </el-col>
            </el-row>
         </div>
@@ -204,53 +250,53 @@
            <el-form ref="form" :model="form" label-width="80px">
            <el-form-item label="类型">
               <template>
                        <el-select v-model="value" placeholder="请选择类型" style="width: 480px;">
                            <el-option
                            v-for="item in options"
                            :key="item.value"
                            :label="item.label"
                            :value="item.value">
                            </el-option>
                        <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>
                     <el-option label="分支组件" :value="3"></el-option>
                        </el-select>
                        </template>
            </el-form-item>
            <el-form-item label="工序">
               <template>
                        <el-select v-model="value" placeholder="请选择类型" style="width: 480px;">
                        <el-select v-model="form.work" 
                  @change="workevent"
                  placeholder="请选择类型" style="width: 480px;">
                            <el-option
                            v-for="item in options"
                            :key="item.value"
                            :label="item.label"
                            :value="item.value">
                            v-for="item in process"
                            :key="item.name"
                            :label="item.name"
                            :value="item.name">
                            </el-option>
                        </el-select>
                        </template>
            </el-form-item>
            <el-form-item label="工艺名称">
               <template>
                        <el-select v-model="value" placeholder="请选择类型" style="width: 480px;">
                        <el-select v-model="form.craft" placeholder="请选择类型" style="width: 480px;">
                            <el-option
                            v-for="item in options"
                            :key="item.value"
                            :label="item.label"
                            :value="item.value">
                            v-for="item in craftapi"
                            :key="item.id"
                            :label="item.name"
                            :value="item.id">
                            </el-option>
                        </el-select>
                        </template>
            </el-form-item>
            <el-form-item label="记录">
               <el-input v-model="form.name"></el-input>
               <el-input v-model="form.record"></el-input>
            </el-form-item>
            <el-form-item label="备注">
               <el-input v-model="form.vvvv"></el-input>
               <el-input v-model="form.remarks"></el-input>
            </el-form-item>
            <el-form-item label="单位">
               <el-input v-model="form.aaaa"></el-input>
               <el-input v-model="form.unit"></el-input>
            </el-form-item>
            </el-form>
         </div>
         <span slot="footer" class="dialog-footer">
            <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
            <el-button type="primary" @click="add">确 定</el-button>
            <el-button @click="dialogVisible = false">取 消</el-button>
         </span>
      </el-dialog>
@@ -296,13 +342,13 @@
                        </template>
            </el-form-item>
            <el-form-item label="记录">
               <el-input v-model="form.name"></el-input>
               <el-input v-model="form.record"></el-input>
            </el-form-item>
            <el-form-item label="备注">
               <el-input v-model="form.vvvv"></el-input>
               <el-input v-model="form.remarks"></el-input>
            </el-form-item>
            <el-form-item label="单位">
               <el-input v-model="form.aaaa"></el-input>
               <el-input v-model="form.unit"></el-input>
            </el-form-item>
            </el-form>
         </div>
@@ -325,18 +371,39 @@
            },
            options:[],
            value:{},
            form:{},
            craftapi:[],
            form:{
               type:'',
               work:'',
               craft:'',
               name:'',
               record:'',
               remarks:'',
               unit:'',
            },
            modifyVisible:false,
            dialogVisible:false,
            process: [],
            process: {},
            list: [],
            checkTreeNode: {},
            tableData: [],
            upIndex: 0,
            selects: [],
            delete:[],
            typeselect:0,
            upDia: false,
            checkTreeNode:[],
            checkTreeNode:{
               id:2,
            },
            upData:{},
            edit:{
               name:'',
               note:'',
               techFather:'',
               techName:'',
               type:'',
               unit:'',
            },
            upData: {
               id: 0,
               name: null,
@@ -347,8 +414,62 @@
      },
      mounted() {
         this.selectAllleft()
         this.selectjilu()
      },
      methods: {
         delQueById() {
            this.$axios.get(this.$api.url.delQueById,)
         },
         childrenClick() {},
         //新增
         workevent(val){
                console.log(val);
                let idx = this.process.findIndex(el => el.name === val)
                this.craftapi = this.process[idx].children
            },
         chooseTechFath() {
         this.$axios.get(this.$api.url.chooseTechFath,{
                params:{type:this.typeselect}
            }).then(res => {
            this.process = res.data;
                console.log(this.process);
         }, {
            headers: {
                      "Content-Type": "application/json"
                    }
            })
         },
         addRecord() {
            this.$axios.post(this.$api.url.addRecord,{
               name:this.form.record,
               note:this.form.remarks,
               techTemId:this.form.craft,
               unit:this.form.unit,
            }
            , {
               headers: {
                      "Content-Type": "application/json"
                    }
            }
            )
         },
         add() {
            this.dialogVisible = false
            this.addRecord()
            this.selectjilu()
            this.form = {};
         },
         //编辑   this.upData
         selecRecord() {
            this.$axios.get(this.$api.url.selecRecord,{
               params:{
                  id:this.upData.id
               }
            }).then(res => {
               this.edit = res.data[0]
               // console.log(this.edit);
            })
         },
         TYpe(val) {
                this.typeselect = val
                console.log(this.typeselect);
@@ -361,6 +482,7 @@
         }).then(res => {
            this.list = res.data;
                console.log(this.list);
            this.selectDataList()
         })
         },
         //selectjilu  checkTreeNode
@@ -377,6 +499,7 @@
            },
         addend(){
            this.dialogVisible = true
            this.chooseTechFath()
         },
         filterNode(value, data) {
           if (!value) return true;
@@ -433,13 +556,38 @@
                  }
               }
            })
            let cc = this.selects.map(el => {
               return el.id
            })
            this.delete = cc.join(',')
            console.log(this.delete);
            this.delAllRecord()
            this.$message.success('删除完成')
         },
         deleteRow(index, rows) {
            rows.splice(index, 1);
         //批量删除
         delAllRecord() {
            this.$axios.post(this.$api.url.delAllRecord,{
                  ids:this.delete
            })
         },

         //删除
         delQueById() {
            this.$axios.post(this.$api.url.delQueById,{
                  id:this.upData.id
            })
         },
         deleteRow(index, rows) {
            this.tableData.splice(index,1)
            this.upData.id = rows.id
            this.delQueById()
         },

         upContent(ob) {
            this.upData = this.HaveJson(ob)
            this.upData = ob
            console.log(this.upData);
            this.selecRecord()
            this.chooseTechFath()
            this.upDia = true
         },
         submitUpData() {