From 4b4438e7231bff0f260b0c17761072503e2af7b1 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期六, 28 十月 2023 15:55:01 +0800
Subject: [PATCH] 上架规则，产品类别下拉框可编辑，出入库明细调整
---
src/components/makepager/CommonFormTableView.vue | 102 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 75 insertions(+), 27 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 263508c..93c4b3c 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -59,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
@@ -121,7 +110,6 @@
v-else
v-model="scope.row[item.prop]"
placeholder=""
- :min="0"
:precision="2"
:controls="false"
size="mini"
@@ -149,7 +137,9 @@
<!-- 浣嶇疆 -->
<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].label }}</span>
+ <span v-if="scope.row.isEdit || scope.row.editable">{{
+ scope.row[item.prop]?.label ?? scope.row[item.prop]
+ }}</span>
<el-select
v-else
v-model="scope.row[item.prop]"
@@ -200,6 +190,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.name"
>
</el-option>
</el-select>
@@ -259,10 +275,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,
@@ -307,6 +325,7 @@
},
productIndex: 0,
productNameOptions: [],
+ productTypeNameOptions: [],
memberOptions: [{ id: 1, name: "绠＄悊鍛�" }],
selOptions: [
{ id: 1, name: "浠�" },
@@ -321,6 +340,7 @@
this.getRuleList()
} else {
this.getProductList()
+ this.getProductCategoryList()
}
if (this.islistingrules) {
this.getLocationList()
@@ -363,6 +383,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({
@@ -386,13 +421,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)
},
@@ -423,6 +460,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) {
@@ -536,6 +581,9 @@
// 鍗曢�夎鐩稿叧
tableRowClassName({ row, rowIndex }) {
row.index = rowIndex
+ },
+ setFormItem(val) {
+ console.log(val)
}
}
}
--
Gitblit v1.8.0