From 301cbea766080fb65b8c6af563388b61606322f3 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期四, 19 十月 2023 14:23:25 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/warehouseManage/listingRules/index.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/views/warehouseManage/listingRules/index.vue b/src/views/warehouseManage/listingRules/index.vue
index f523377..78e234e 100644
--- a/src/views/warehouseManage/listingRules/index.vue
+++ b/src/views/warehouseManage/listingRules/index.vue
@@ -23,11 +23,11 @@
@selProductClick="selProductClick"
>
<template slot="tableButton">
- <el-table-column label="鎿嶄綔" width="90" fixed="right" align="center">
+ <el-table-column label="鎿嶄綔" width="90" align="center">
<template slot-scope="scope">
- <el-button v-if="scope.row.isEdit" @click.stop="delClick(scope)" type="text" size="small"
- >鍒犻櫎</el-button
- >
+ <span v-if="scope.row.isEdit" @click.stop="delClick(scope)" class="yes-cursor">
+ <span style="color: #2a78fb">鍒犻櫎</span>
+ </span>
</template>
</el-table-column>
</template>
@@ -122,8 +122,8 @@
const list = res.data.map((item) => {
return {
...item,
- areaName: item.area.jointName,
- subLocation: item.location.jointName,
+ areaName: {label:item.area.jointName,value:item.area.id},
+ subLocation: {label:item.location.jointName,value:item.location.id},
productName: item.product.name,
productCategory: item.productCategory.name,
isSet: false,
@@ -155,7 +155,7 @@
this.isRowClick = false
this.currentRowId = 0
this.countId++
- this.tableData.push({
+ this.tableData.unshift({
countId: this.countId,
areaId: 0,
areaName: "",
@@ -201,9 +201,9 @@
}).then((res) => {
console.log(res)
if (res.code === 200) {
+ this.getData()
let tipStr = this.currentRowId === 0 ? "娣诲姞鎴愬姛" : "淇敼鎴愬姛"
this.$message.success(tipStr)
- this.getData()
}
})
}
@@ -227,7 +227,7 @@
item.isEdit = true
})
} else {
- this.tableData.splice(this.tableData.length - 1, 1)
+ this.tableData.splice(0, 1)
}
this.addTitle = "鏂板缓"
this.showDiscard = false
--
Gitblit v1.8.0