From ac547f0629e21fa52ec0cb40f0ac59aaa6d573f4 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 31 十月 2023 11:40:44 +0800
Subject: [PATCH] 重订货规则新建、更新、重订购接口联调及公共组件优化
---
src/components/makepager/CommonFormTableView.vue | 245 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 160 insertions(+), 85 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 1962ce1..39f484e 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"
@@ -85,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"
@@ -106,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">
@@ -138,8 +143,11 @@
<!-- 浣嶇疆 -->
<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 ?? scope.row[item.prop]
+ }}</span>
<el-select
- v-if="!scope.row.isEdit && scope.row.isOrder"
+ v-else
v-model="scope.row[item.prop]"
placeholder="璇烽�夋嫨"
size="mini"
@@ -155,6 +163,35 @@
: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.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>
@@ -197,7 +234,11 @@
</div>
</el-form-item>
<!-- 浜у搧绫诲瀷 -->
- <el-form-item v-else-if="item.productType" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
+ <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
@@ -218,7 +259,7 @@
:label="item.name"
:value="{
value: item.id,
- label: item.name,
+ label: item.name
}"
>
</el-option>
@@ -254,7 +295,7 @@
style="width: 80%"
@change="
(val) => {
- selRoteClick(val, item.prop)
+ selRouteClick(val, item.prop)
}
"
>
@@ -286,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>
@@ -307,6 +348,7 @@
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",
@@ -341,6 +383,10 @@
islistingrules: {
type: Boolean,
default: false
+ },
+ isReorder: {
+ type: Boolean,
+ default: false
}
},
data() {
@@ -363,12 +409,19 @@
],
selLocationOptions: [], // 浣嶇疆
companyOptions: [], // 鍏徃
- selRouteOptions: [] // 璺嚎
+ 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()
@@ -415,14 +468,14 @@
})
},
// 鑾峰彇浜у搧绫诲瀷鍒楄〃
- async getProductCategoryList(){
+ async getProductCategoryList() {
await getProductCategoryList({
- categoryId:0,
- keyWord:"",
- page:1,
- pageSize:15
+ categoryId: 0,
+ keyWord: "",
+ page: 1,
+ pageSize: 15
}).then((res) => {
- console.log(res,"鐪嬬湅浜у搧绫诲瀷鍒楄〃")
+ console.log(res, "鐪嬬湅浜у搧绫诲瀷鍒楄〃")
if (res.code === 200) {
const list = res.data ? res.data : []
this.productTypeNameOptions = list
@@ -439,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")
+ }
}
})
},
@@ -466,16 +524,23 @@
},
// 閫夋嫨浜у搧
selProductClick(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,
@@ -502,13 +567,15 @@
if (this.isinventory) {
this.getProductCategoryList()
}
- console.log(this.tableList.tableData)
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,
@@ -517,31 +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)
},
- // 閫夋嫨璺嚎
- selRoteClick(item, prop) {
- console.log(item, prop)
+ // 鑾峰彇鍦ㄥ簱涓庨娴嬫暟閲�
+ getAmountAndPrediction(item, val, ite) {
+ console.log(item, val, ite)
+ console.log(this.productName)
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)
+ 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) {
@@ -639,7 +713,8 @@
},
setFormItem(val) {
console.log(val)
- }
+ },
+ commoInput() {}
}
}
</script>
--
Gitblit v1.8.0