From 02ff4d3b3c4829e6f97a704c60fe76433e65c4e6 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 07 九月 2023 18:03:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/record-content.vue | 55 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/src/components/view/record-content.vue b/src/components/view/record-content.vue
index ff679d3..12b98b3 100644
--- a/src/components/view/record-content.vue
+++ b/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>
@@ -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;">
+ 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"
@@ -387,9 +389,13 @@
tableData: [],
upIndex: 0,
selects: [],
+ delete:[],
typeselect:0,
upDia: false,
- checkTreeNode:[],
+ checkTreeNode:{
+ id:2,
+ },
+ upData:{},
edit:{
name:'',
note:'',
@@ -408,10 +414,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 +466,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 +482,7 @@
}).then(res => {
this.list = res.data;
console.log(this.list);
+ this.selectDataList()
})
},
//selectjilu checkTreeNode
@@ -548,15 +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 = ob
console.log(this.upData);
this.selecRecord()
+ this.chooseTechFath()
this.upDia = true
},
submitUpData() {
--
Gitblit v1.9.3