From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 14:50:31 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token
---
src/components/makepager/CommonFormTableView.vue | 355 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 266 insertions(+), 89 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 7c82937..d2d5e5b 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -1,18 +1,18 @@
<template>
- <div class="page-view" :class="{ setHeight: isinventory || islistingrules }">
+ <div class="page-view" :class="{ setHeight: isinventory || islistingrules || isReorder }">
<el-form
ref="form"
:model="tableList"
:show-message="false"
label-position="right"
- :class="{ setHeight: isinventory || islistingrules }"
+ :class="{ setHeight: isinventory || islistingrules || isReorder }"
>
<el-table
:data="tableList.tableData"
border
style="width: 100%"
:height="'calc(100% - 0px)'"
- :class="{ setHeight: isinventory || islistingrules }"
+ :class="{ setHeight: isinventory || islistingrules || isReorder }"
:header-cell-style="{ background: '#f1f3f8', color: '#000009' }"
:row-class-name="tableRowClassName"
@row-click="tableRowClick"
@@ -42,16 +42,18 @@
:prop="'tableData.' + scope.$index + '.' + item.prop"
:rules="[{ required: item.isRequird ? true : false, message: '杈撳叆涓嶈兘涓虹┖' }]"
>
- <el-input
- v-model.trim="scope.row[item.prop]"
- maxlength="50"
- size="mini"
- @change="
- (val) => {
- commonInputChange(val, item.prop, scope.row)
- }
- "
- ></el-input>
+ <div @click.stop="commoInput">
+ <el-input
+ v-model.trim="scope.row[item.prop]"
+ maxlength="50"
+ size="mini"
+ @change="
+ (val) => {
+ commonInputChange(val, item.prop, scope.row)
+ }
+ "
+ ></el-input>
+ </div>
</el-form-item>
<el-form-item
v-else-if="item.productName"
@@ -59,25 +61,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
@@ -96,19 +87,21 @@
:prop="'tableData.' + scope.$index + '.' + item.prop"
:rules="[{ required: item.isRequird ? true : false, message: '杈撳叆涓嶈兘涓虹┖' }]"
>
- <el-input-number
- v-model="scope.row[item.prop]"
- placeholder=""
- :min="0"
- :controls="false"
- size="mini"
- style="width: 100%; margin-right: 5px"
- @change="
- (val) => {
- commonInputChange(val, item.prop, scope.row)
- }
- "
- ></el-input-number>
+ <div @click.stop="commoInput">
+ <el-input-number
+ v-model="scope.row[item.prop]"
+ placeholder=""
+ :min="0"
+ :controls="false"
+ size="mini"
+ style="width: 100%; margin-right: 5px"
+ @change="
+ (val) => {
+ commonInputChange(val, item.prop, scope.row)
+ }
+ "
+ ></el-input-number>
+ </div>
</el-form-item>
<el-form-item
v-else-if="item.inputFloat"
@@ -117,20 +110,21 @@
:rules="[{ required: item.isRequird ? true : false, message: '杈撳叆涓嶈兘涓虹┖' }]"
>
<span v-if="scope.row.isEdit">{{ scope.row[item.prop] }}</span>
- <el-input-number
- v-else
- v-model="scope.row[item.prop]"
- placeholder=""
- :precision="2"
- :controls="false"
- size="mini"
- style="width: 100%; margin-right: 5px"
- @change="
- (val) => {
- commonInputChange(val, item.prop, scope.row)
- }
- "
- ></el-input-number>
+ <div v-else @click.stop="commoInput">
+ <el-input-number
+ v-model="scope.row[item.prop]"
+ placeholder=""
+ :precision="2"
+ :controls="false"
+ size="mini"
+ style="width: 100%; margin-right: 5px"
+ @change="
+ (val) => {
+ commonInputChange(val, item.prop, scope.row)
+ }
+ "
+ ></el-input-number>
+ </div>
</el-form-item>
<el-form-item v-else-if="item.select" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
<div class="custom-name">
@@ -141,7 +135,8 @@
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>
@@ -173,6 +168,38 @@
</el-select>
</div>
</el-form-item>
+ <!-- 閲嶈璐ц鍒�-浣嶇疆 -->
+ <el-form-item
+ v-else-if="item.defaultLocation"
+ label=" "
+ :prop="'tableData.' + scope.$index + '.' + item.prop"
+ >
+ <div class="custom-name">
+ <el-select
+ v-if="!scope.row.isEdit && scope.row.isOrder"
+ v-model="locacionName"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 80%"
+ @change="
+ (val) => {
+ selLocationClick(val, item.prop, scope.row)
+ }
+ "
+ >
+ <el-option
+ v-for="(ite, index) in selLocationOptions"
+ :key="index"
+ :label="ite.name"
+ :value="{ value: ite.id, label: ite.name }"
+ >
+ </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>
<!-- 浜у搧 -->
<el-form-item v-else-if="item.product" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
<div class="custom-name">
@@ -190,8 +217,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,
@@ -200,6 +227,39 @@
unit: item.unit,
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="{
+ value: item.id,
+ label: item.name
}"
>
</el-option>
@@ -223,12 +283,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) => {
+ selRouteClick(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>
@@ -241,7 +327,7 @@
<slot name="tableButton" />
</el-table>
</el-form>
- <div v-if="!detailEnter && !isinventory && !islistingrules" style="margin: 10px">
+ <div v-if="!detailEnter && !isinventory && !islistingrules && !isReorder" style="margin: 10px">
<el-button size="small" type="primary" @click="add">娣诲姞鏄庣粏琛�</el-button>
<!-- <el-button size="small" type="primary" @click="empty">娓呯┖</el-button> -->
</div>
@@ -260,10 +346,13 @@
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 { getAmountAndPrediction } from "@/api/product/reorderRules"
// import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
export default {
name: "CommmonFormTableView",
- components: {},
+ components: { SimpleSearchInput },
props: {
detailEnter: {
type: Boolean,
@@ -294,6 +383,10 @@
islistingrules: {
type: Boolean,
default: false
+ },
+ isReorder: {
+ type: Boolean,
+ default: false
}
},
data() {
@@ -308,20 +401,30 @@
},
productIndex: 0,
productNameOptions: [],
+ productTypeNameOptions: [],
memberOptions: [{ id: 1, name: "绠＄悊鍛�" }],
selOptions: [
{ id: 1, name: "浠�" },
{ id: 2, name: "鎵�" }
],
selLocationOptions: [], // 浣嶇疆
- companyOptions: [] // 鍏徃
+ companyOptions: [], // 鍏徃
+ selRouteOptions: [{ id: 1, name: "鍒堕��" }], // 璺嚎
+ locacionName: "",
+ locacionId: 0,
+ productName: "",
+ productId: ""
}
},
created() {
if (this.isinventory) {
this.getRuleList()
+ } else if (this.isReorder) {
+ this.getProductList()
+ this.getLocationList()
} else {
this.getProductList()
+ this.getProductCategoryList()
}
if (this.islistingrules) {
this.getLocationList()
@@ -364,6 +467,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({
@@ -374,6 +492,11 @@
if (res.code === 200) {
const list = res.data ? res.data : []
this.selLocationOptions = list
+ if (this.isReorder) {
+ this.locacionName = list[0]?.name
+ this.locacionId = list[0]?.id
+ this.$emit("selLocationClick", list[0], "locacionName")
+ }
}
})
},
@@ -381,35 +504,43 @@
async getCompanyList() {
await getCompanyList().then((res) => {
console.log(res)
- if (res.data.code === 200) {
- this.companyOptions = res.data.data
+ if (res.code === 200) {
+ this.companyOptions = res.data
}
})
},
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)
},
// 閫夋嫨浜у搧
selProductClick(item) {
- console.log(item)
- this.tableList.tableData.map((ite) => {
- if (ite.productName.label === item.label) {
- ite.productId = item.value
- ite.productName = item.label
- ite.categoryId = item.categoryId
- ite.productCategory = item.categoryName
- ite.amount = item.amount
- ite.unit = item.unit
- }
- })
+ if (this.isReorder) {
+ this.productId = item.value
+ this.productName = item.label
+ this.getAmountAndPrediction(item, "product")
+ } else {
+ this.tableList.tableData.map((ite) => {
+ if (ite.productName.label === item.label) {
+ ite.productId = item.value
+ ite.productName = item.label
+ ite.categoryId = item.categoryId
+ ite.productCategory = item.categoryName
+ ite.amount = item.amount
+ ite.unit = item.unit
+ }
+ })
+ }
+
if (this.isinventory) {
getRuleList({
locationId: 0,
@@ -425,10 +556,26 @@
console.log(this.tableList.tableData)
this.$emit("selProductClick", item)
},
+ // 閫夋嫨浜у搧绫诲瀷
+ selProductTypeClick(item) {
+ this.tableList.tableData.map((ite) => {
+ if (ite.productCategory.label === item.label) {
+ ite.productCategoryId = item.value
+ ite.productCategory = item.label
+ }
+ })
+ if (this.isinventory) {
+ this.getProductCategoryList()
+ }
+ this.$emit("selProductTypeClick", item)
+ },
// 閫夋嫨浣嶇疆
- selLocationClick(item, prop) {
- console.log(item)
- console.log(this.tableList.tableData)
+ selLocationClick(item, prop, row) {
+ if (this.isReorder) {
+ if (this.productId !== 0) {
+ this.getAmountAndPrediction(row, "location", item)
+ }
+ }
if (this.isinventory) {
getRuleList({
locationId: item.value,
@@ -437,12 +584,38 @@
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)
+ },
+ // 鑾峰彇鍦ㄥ簱涓庨娴嬫暟閲�
+ getAmountAndPrediction(item, val, ite) {
+ console.log(item, val, ite)
+ console.log(this.productName)
+ console.log(this.tableList.tableData)
+ if (this.productName.length > 0) {
+ getAmountAndPrediction({
+ locationId: val === "product" ? this.locacionId : ite.value,
+ productId: val === "product" ? item.value : this.productId
+ }).then((res) => {
+ if (res.code === 200) {
+ this.tableList.tableData.map((ite) => {
+ if (ite.productName.label === this.productName) {
+ ite.amount = res.data.amount
+ ite.prediction = res.data.prediction
+ ite.unit = item.unit
+ }
+ })
+ }
+ })
+ }
+ },
+ // 閫夋嫨璺嚎
+ selRouteClick(item, prop) {
+ console.log("33333333333333")
+ this.$emit("selRouteClick", item, prop)
},
// 閫夋嫨鍗曚綅/鐢ㄦ埛
selCommonClick(item) {
@@ -537,7 +710,11 @@
// 鍗曢�夎鐩稿叧
tableRowClassName({ row, rowIndex }) {
row.index = rowIndex
- }
+ },
+ setFormItem(val) {
+ console.log(val)
+ },
+ commoInput() {}
}
}
</script>
--
Gitblit v1.8.0