From af54416d2cc8872ca18d7c39231198faff7c5247 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 17 六月 2024 09:15:52 +0800
Subject: [PATCH] 修复导入；增加重置
---
src/components/view/b2-standard.vue | 72 +++++++++++++++++++++++++++++++----
src/assets/api/controller.js | 2 +
2 files changed, 65 insertions(+), 9 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index cf0ed4b..60cde49 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -210,6 +210,8 @@
selectStandardProductEnumByMethodId: "/standardTree/selectStandardProductEnumByMethodId", //鎵归噺缂栬緫鏌ヨ鎵�鏈夋楠岄」鐩拰妫�楠屽瓙椤规灇涓�
getStandTreeBySampleType: "/standardTree/getStandTreeBySampleType", //浠呰幏鍙栧厜绾ょ殑鍨嬪彿
inExcelOfTree: "/standardTree/inExcelOfTree", //瀵煎叆鏍囧噯搴�
+ resetTreeOfPrice: "/standardTree/resetTreeOfPrice", //閲嶇疆鏍囧噯搴撳崟浠�
+ resetTreeOfHour: "/standardTree/resetTreeOfHour", //閲嶇疆鏍囧噯搴撳伐鏃剁郴鏁�
}
const standardMethod = {
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index 2d3cc6f..345c03a 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -85,7 +85,6 @@
}
.search {
- height: 20%;
border-bottom: 1px solid #ebeef5;
margin-bottom: 16px;
display: flex;
@@ -197,7 +196,7 @@
{{ data.label }}
</span>
</el-col>
- <el-col :span="2" style="text-align: right;" v-if="delStandardTree&&node.level==5">
+ <el-col :span="2" style="text-align: right;" v-if="delStandardTree&&(node.data.children===null||node.data.children===undefined)">
<el-button type="text" size="mini" @click.stop="remove(node, data)">
<i class="el-icon-delete"></i>
</el-button>
@@ -342,7 +341,7 @@
</span>
</el-dialog>
<el-dialog title="鎵归噺缂栬緫" :visible.sync="moreEdit" width="90%" class="more-edit">
- <div class="body" style="display: flex;flex-direction: column;height: 80vh;">
+ <div class="body" style="display: flex;flex-direction: column;height: 85vh;">
<div class="search">
<div class="search-item">
<el-row style="width: 25%;margin-bottom: 16px;">
@@ -368,7 +367,7 @@
璇曢獙鏂规硶锛�</el-col>
<el-col :span="16">
<el-select v-model="moreInfo.methodS" size="small" filterable style="width: 100%;"
- :disabled="moreSelects.length==0">
+ :disabled="moreSelects.length==0" clearable>
<el-option v-for="(a, ai) in methodList" :key="ai" :label="a.label" :value="a.value"></el-option>
</el-select>
</el-col>
@@ -401,8 +400,21 @@
</el-select>
</el-col>
</el-row>
- <el-row style="width: 50%;">
- <el-col :span="23" style="display: flex;align-items: center;justify-content: end;">
+ <el-row style="width: 25%;">
+ <el-col :span="6" style="text-align: right;">
+ 鏄惁鍚敤锛�</el-col>
+ <el-col :span="16">
+ <el-select v-model="moreInfo.state" size="small" filterable placeholder="妯℃澘" style="width: 100%;"
+ :disabled="moreSelects.length==0" clearable>
+ <el-option label="鍚敤" :value="1"></el-option>
+ <el-option label="涓嶅惎鐢�" :value="0"></el-option>
+ </el-select>
+ </el-col>
+ </el-row>
+ <el-row style="width: 100%;margin-top: 8px;">
+ <el-col :span="24" style="display: flex;align-items: center;justify-content: end;">
+ <el-button @click="clearProduct(1)" size="small" type="danger">閲嶇疆鍗曚环</el-button>
+ <el-button @click="clearProduct(2)" size="small" type="danger">閲嶇疆宸ユ椂绯绘暟</el-button>
<el-button type="primary" size="small" @click="sectionUp(moreSelects)">璁剧疆鍖洪棿</el-button>
<el-button @click="moreEdit = false" size="small">鍙� 娑�</el-button>
<el-button type="primary" @click="subMoreEdit" :loading="moreEditLoad" size="small">淇� 瀛�</el-button>
@@ -411,7 +423,7 @@
</div>
</div>
<div style="flex: 1;overflow-y: auto;" v-loading="productTableLoading0">
- <el-table :data="productList0" ref="productTable0" style="width: 100%;" height="94%" tooltip-effect="dark"
+ <el-table :data="productList0" ref="productTable0" style="width: 100%;" height="96%" tooltip-effect="dark"
stripe :fit="true" border @select-all="handleSelectAll0" @select="handleSelectionChange0"
header-row-class-name="header-class" :row-key="row=>row.id" @filter-change="filterHandler" highlight-current-row>
<el-table-column type="selection" width="50">
@@ -602,7 +614,8 @@
methodS: '',
price: '',
manHour: '',
- templateId: ''
+ templateId: '',
+ state: null
},
methodList: [],
productTableLoading0: false,
@@ -616,7 +629,7 @@
token: null,
fileList: [],
inExcelOfTreePower: false,
- uploading: false
+ uploading: false,
}
},
watch: {
@@ -1476,6 +1489,8 @@
return
}
this.$message.success('涓婁紶鎴愬姛')
+ this.standardList = []
+ this.productList = []
this.selectStandardTreeList()
},
onError(err, file, fileList) {
@@ -1483,6 +1498,45 @@
this.$refs.upload.clearFiles()
this.uploading = false
},
+ clearProduct(type){
+ this.$confirm('鏄惁娓呯┖?', "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ }).then(() => {
+ if(type === 1){
+ this.$axios.post(this.$api.standardTree.resetTreeOfPrice, {
+ tree: this.selectTree,
+ standardId: this.standardId
+ }).then(res => {
+ if (res.code == 201) {
+ return
+ }
+ this.$message.success('宸叉竻绌�')
+ this.currentPage0 = 1;
+ this.getList()
+ this.rowClick({
+ id: this.standardId
+ })
+ })
+ }else if(type === 2){
+ this.$axios.post(this.$api.standardTree.resetTreeOfHour, {
+ tree: this.selectTree,
+ standardId: this.standardId
+ }).then(res => {
+ if (res.code == 201) {
+ return
+ }
+ this.$message.success('宸叉竻绌�')
+ this.currentPage0 = 1;
+ this.getList()
+ this.rowClick({
+ id: this.standardId
+ })
+ })
+ }
+ }).catch(() => {})
+ }
}
}
</script>
--
Gitblit v1.9.3