From 83f8bc7010db6a1aacca3f1038e15e340685ec9b Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 09 九月 2023 17:05:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/record-content.vue | 87 +++++++++++++++++++++++++++++--------------
1 files changed, 59 insertions(+), 28 deletions(-)
diff --git a/src/components/view/record-content.vue b/src/components/view/record-content.vue
index ff679d3..9fb2af3 100644
--- a/src/components/view/record-content.vue
+++ b/src/components/view/record-content.vue
@@ -114,11 +114,11 @@
<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>
- </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,11 +142,11 @@
@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)">
+ <!-- <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>
@@ -166,7 +166,7 @@
<el-table-column label="鎿嶄綔" width="130">
<template slot-scope="scope">
<span class="table_do" @click="upContent(scope.row)">缂栬緫 </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>
@@ -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.techFathe" 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>
@@ -188,11 +188,13 @@
</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">
<template>
- <el-select v-model="edit.techFather"
- placeholder="璇烽�夋嫨绫诲瀷" style="width: 310px;">
+ <el-select v-model="edit.techFather"
+ placeholder="璇烽�夋嫨"
+ @change="workevent"
+ style="width: 310px;">
<el-option
v-for="item in process"
:key="item.name"
@@ -207,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.techFathe" placeholder="璇烽�夋嫨绫诲瀷" style="width: 310px;">
+ <el-select v-model="edit.techName" placeholder="璇烽�夋嫨" style="width: 310px;">
<el-option
v-for="item in craftapi"
:key="item.id"
@@ -219,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>
@@ -248,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>
@@ -258,9 +260,9 @@
</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;">
+ placeholder="璇烽�夋嫨" style="width: 480px;">
<el-option
v-for="item in process"
:key="item.name"
@@ -272,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"
@@ -305,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"
@@ -317,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"
@@ -329,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"
@@ -364,8 +366,7 @@
return {
search: {
type: 0,
- name: 2,
- technology: 2
+ technology: null
},
options:[],
value:{},
@@ -387,9 +388,13 @@
tableData: [],
upIndex: 0,
selects: [],
+ delete:[],
typeselect:0,
upDia: false,
- checkTreeNode:[],
+ checkTreeNode:{
+ id:1,
+ },
+ upData:{},
edit:{
name:'',
note:'',
@@ -408,10 +413,11 @@
},
mounted() {
this.selectAllleft()
+ this.selectjilu()
},
methods: {
delQueById() {
- this.$axios.get(this.$api.url.chooseTechFath)
+ this.$axios.get(this.$api.url.delQueById,)
},
childrenClick() {},
//鏂板
@@ -459,8 +465,8 @@
id:this.upData.id
}
}).then(res => {
- this.edit = res.data
- console.log(this.edit);
+ this.edit = res.data[0]
+ // console.log(this.edit);
})
},
TYpe(val) {
@@ -475,6 +481,7 @@
}).then(res => {
this.list = res.data;
console.log(this.list);
+ this.selectDataList()
})
},
//selectjilu checkTreeNode
@@ -548,15 +555,39 @@
}
}
})
+ 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()
+ this.selectjilu()
+ },
+
upContent(ob) {
this.upData = ob
console.log(this.upData);
this.selecRecord()
+ this.chooseTechFath()
this.upDia = true
},
submitUpData() {
--
Gitblit v1.9.3