From 4477a4a90fe3c441c25c5cddddee05aa32c8113c Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期六, 28 十月 2023 18:24:50 +0800
Subject: [PATCH] 上架规则列表编辑，产品和产品类别只能展开有数据的
---
src/components/makepager/CommonFormTableView.vue | 196 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 157 insertions(+), 39 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index c569190..4d58971 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -9,7 +9,9 @@
>
<el-table
:data="tableList.tableData"
+ border
style="width: 100%"
+ :height="'calc(100% - 0px)'"
:class="{ setHeight: isinventory || islistingrules }"
:header-cell-style="{ background: '#f1f3f8', color: '#000009' }"
:row-class-name="tableRowClassName"
@@ -57,25 +59,14 @@
:prop="'tableData.' + scope.$index + '.' + item.prop"
>
<div class="custom-name">
- <el-select
- v-model="scope.row[item.prop]"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 80%"
- @change="
- (val) => {
- selProductNameClick(val)
- }
- "
+ <SimpleSearchInput
+ :echoValue="scope.row[item.prop]"
+ :echoName="scope.row[item.prop]"
+ checkedNum="1"
+ :clearable="true"
+ @select-user="selProductNameClick"
>
- <el-option
- v-for="item in productNameOptions"
- :key="item.id"
- :label="item.name"
- :value="{ value: item.id, label: item.name, amount: item.amount, unit: item.unit }"
- >
- </el-option>
- </el-select>
+ </SimpleSearchInput>
</div>
</el-form-item>
<el-form-item
@@ -119,7 +110,6 @@
v-else
v-model="scope.row[item.prop]"
placeholder=""
- :min="0"
:precision="2"
:controls="false"
size="mini"
@@ -140,16 +130,16 @@
style="width: 63%"
@change="selCommonClick"
>
- <el-option v-for="item in selOptions" :key="item.id" :label="item.name" :value="item"> </el-option>
+ <el-option v-for="(item, index) in selOptions" :key="index" :label="item.name" :value="item">
+ </el-option>
</el-select>
</div>
</el-form-item>
<!-- 浣嶇疆 -->
<el-form-item v-else-if="item.location" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
<div class="custom-name">
- <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row[item.prop] }}</span>
<el-select
- v-else
+ v-if="!scope.row.isEdit && scope.row.isOrder"
v-model="scope.row[item.prop]"
placeholder="璇烽�夋嫨"
size="mini"
@@ -168,6 +158,9 @@
>
</el-option>
</el-select>
+ <span v-else-if="scope.row.isEdit || scope.row.editable">{{
+ scope.row[item.prop]?.label ?? scope.row[item.prop]
+ }}</span>
</div>
</el-form-item>
<!-- 浜у搧 -->
@@ -187,8 +180,8 @@
"
>
<el-option
- v-for="item in productNameOptions"
- :key="item.id"
+ v-for="(item, index) in productNameOptions"
+ :key="index"
:label="item.name"
:value="{
value: item.id,
@@ -198,6 +191,32 @@
categoryId: item.categoryId,
categoryName: item.categoryName
}"
+ >
+ </el-option>
+ </el-select>
+ </div>
+ </el-form-item>
+ <!-- 浜у搧绫诲瀷 -->
+ <el-form-item v-else-if="item.productType" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
+ <div class="custom-name">
+ <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row[item.prop] }}</span>
+ <el-select
+ v-else
+ v-model="scope.row[item.prop]"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 80%"
+ @change="
+ (val) => {
+ selProductTypeClick(val)
+ }
+ "
+ >
+ <el-option
+ v-for="item in productTypeNameOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
>
</el-option>
</el-select>
@@ -220,12 +239,38 @@
</el-select> -->
</div>
</el-form-item>
+ <!-- 璺嚎 -->
+ <el-form-item v-else-if="item.route" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
+ <div class="custom-name">
+ <span v-if="scope.row.isEdit">{{ scope.row[item.prop]?.label ?? scope.row[item.prop] }}</span>
+ <el-select
+ v-else
+ v-model="scope.row[item.prop]"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 80%"
+ @change="
+ (val) => {
+ selRoteClick(val, item.prop)
+ }
+ "
+ >
+ <el-option
+ v-for="(item, index) in selRouteOptions"
+ :key="index"
+ :label="item.name"
+ :value="{ value: item.id, label: item.name }"
+ >
+ </el-option>
+ </el-select>
+ </div>
+ </el-form-item>
<!-- 鍏徃 -->
<el-form-item v-else-if="item.company" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
<div class="custom-name">
<span v-if="scope.row.isEdit">{{ scope.row[item.prop] }}</span>
<el-select v-else v-model="scope.row[item.prop]" placeholder="璇烽�夋嫨" size="mini" style="width: 80%">
- <el-option v-for="item in companyOptions" :key="item.id" :label="item.name" :value="item">
+ <el-option v-for="(item, index) in companyOptions" :key="index" :label="item.name" :value="item">
</el-option>
</el-select>
</div>
@@ -257,10 +302,12 @@
import { getLocationList } from "@/api/warehouseManage/warehouse"
import { getCompanyList } from "@/api/common/other"
import { getRuleList } from "@/api/operate/inventoryAdjustment"
+import { getProductCategoryList } from "@/api/product/productCategory"
+import SimpleSearchInput from "@/components/makepager/SimpleSearchInput"
// import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
export default {
name: "CommmonFormTableView",
- components: {},
+ components: { SimpleSearchInput },
props: {
detailEnter: {
type: Boolean,
@@ -305,13 +352,15 @@
},
productIndex: 0,
productNameOptions: [],
+ productTypeNameOptions: [],
memberOptions: [{ id: 1, name: "绠＄悊鍛�" }],
selOptions: [
{ id: 1, name: "浠�" },
{ id: 2, name: "鎵�" }
],
selLocationOptions: [], // 浣嶇疆
- companyOptions: [] // 鍏徃
+ companyOptions: [], // 鍏徃
+ selRouteOptions: [] // 璺嚎
}
},
created() {
@@ -319,6 +368,7 @@
this.getRuleList()
} else {
this.getProductList()
+ this.getProductCategoryList()
}
if (this.islistingrules) {
this.getLocationList()
@@ -361,6 +411,21 @@
}
})
},
+ // 鑾峰彇浜у搧绫诲瀷鍒楄〃
+ async getProductCategoryList(){
+ await getProductCategoryList({
+ categoryId:0,
+ keyWord:"",
+ page:1,
+ pageSize:15
+ }).then((res) => {
+ console.log(res,"鐪嬬湅浜у搧绫诲瀷鍒楄〃")
+ if (res.code === 200) {
+ const list = res.data ? res.data : []
+ this.productTypeNameOptions = list
+ }
+ })
+ },
// 浣嶇疆
async getLocationList() {
await getLocationList({
@@ -384,13 +449,15 @@
})
},
selProductNameClick(item) {
+ console.log(item)
this.tableList.tableData.map((ite) => {
- if (ite.productName.label === item.label) {
- ite.productId = item.value
- ite.productName = item.label
- ite.amount = item.amount
- ite.unit = item.unit
- }
+ console.log(ite)
+ // if (ite.productName === item.name) {
+ ite.productId = item.id
+ ite.productName = item.name
+ ite.amount = item.amount
+ ite.unit = item.unit
+ // }
})
console.log(this.tableList.tableData)
},
@@ -422,6 +489,14 @@
console.log(this.tableList.tableData)
this.$emit("selProductClick", item)
},
+ // 閫夋嫨浜у搧绫诲瀷
+ selProductTypeClick(item) {
+ if (this.isinventory) {
+ this.getProductCategoryList()
+ }
+ console.log(this.tableList.tableData)
+ this.$emit("selProductTypeClick", item)
+ },
// 閫夋嫨浣嶇疆
selLocationClick(item, prop) {
console.log(item)
@@ -440,6 +515,25 @@
})
}
this.$emit("selLocationClick", item, prop)
+ },
+ // 閫夋嫨璺嚎
+ selRoteClick(item, prop) {
+ console.log(item, prop)
+ console.log(this.tableList.tableData)
+ // if (this.isinventory) {
+ // getRuleList({
+ // locationId: item.value,
+ // productId: ""
+ // }).then((res) => {
+ // console.log(res)
+ // if (res.code === 200) {
+ // const list = res.data ? res.data : []
+ // // this.selLocationOptions = list.locationList
+ // this.productNameOptions = list.productList
+ // }
+ // })
+ // }
+ // this.$emit("selLocationClick", item, prop)
},
// 閫夋嫨鍗曚綅/鐢ㄦ埛
selCommonClick(item) {
@@ -534,6 +628,9 @@
// 鍗曢�夎鐩稿叧
tableRowClassName({ row, rowIndex }) {
row.index = rowIndex
+ },
+ setFormItem(val) {
+ console.log(val)
}
}
}
@@ -552,9 +649,12 @@
.custom-name {
display: flex;
justify-content: center;
+ font-size: 12px;
+ line-height: 17px;
+ font-family: PingFangSC;
.common-select-btn {
margin-left: 5px;
- font-size: 18px;
+ font-size: 13px;
cursor: pointer;
}
}
@@ -564,20 +664,38 @@
.el-form-item__label {
display: none;
}
+ .el-form-item__content {
+ // height: 28px; /* 璁剧疆楂樺害 */
+ line-height: 22px; /* 璁剧疆琛岄珮 */
+ }
.el-table__footer-wrapper tbody td.el-table__cell {
background-color: #fff;
// text-align: right;
font-weight: bold;
}
- .el-input--suffix .el-input__inner {
- padding-right: 0px;
- }
.el-table .cell,
.el-table th.el-table__cell > .cell {
padding: 0 5px;
}
- .el-input__inner {
- text-align: left;
+ // .el-input__inner {
+ // text-align: left;
+ // }
+}
+
+::v-deep .el-table .cell {
+ font-size: 12px;
+ line-height: 17px;
+ font-family: PingFangSC;
+ color: rgba(0, 0, 0, 0.9);
+ .el-button--text {
+ width: auto;
+ height: auto;
+ font-family: PingFangSC-Medium, sans-serif;
}
}
+::v-deep .el-table .el-table__cell {
+ padding: 6px 0 !important;
+ height: 35px;
+ text-align: center;
+}
</style>
--
Gitblit v1.8.0