From d68b036a3b3c67273b8effa3c9925ef3869a91ba Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 07 二月 2024 13:56:50 +0800
Subject: [PATCH] wms项目 wms系统参数设置的页面开发+路由+是否显示表头配置
---
src/components/makepager/CommonFormTableView.vue | 420 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 327 insertions(+), 93 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 9b8d311..2a8bd19 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -118,6 +118,7 @@
:controls="false"
size="mini"
style="width: 100%; margin-right: 5px"
+ :min="item.prop==='minInventory'?0:1"
@change="
(val) => {
commonInputChange(val, item.prop, scope.row)
@@ -151,6 +152,7 @@
v-model="scope.row[item.prop]"
placeholder="璇烽�夋嫨"
size="mini"
+ filterable
style="width: 80%"
@change="
(val) => {
@@ -161,8 +163,69 @@
<el-option
v-for="(item, index) in selLocationOptions"
:key="index"
- :label="item.name"
- :value="{ value: item.id, label: item.name }"
+ :label="item.jointName"
+ :value="{ value: item.id, label: item.jointName }"
+ >
+ </el-option>
+ </el-select>
+ </div>
+ </el-form-item>
+ <!-- 浜у搧鍒拌揪浣嶇疆 -->
+ <el-form-item v-else-if="item.toLocation" 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-else
+ v-model="scope.row[item.prop]"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ filterable
+ style="width: 80%"
+ @change="
+ (val) => {
+ selLocationClick(val, item.prop,scope.row)
+ }
+ "
+ >
+ <el-option
+ v-for="(item, index) in selToLocationOptions"
+ :key="index"
+ :label="item.jointName"
+ :value="{ value: item.id, label: item.jointName }"
+ >
+ </el-option>
+ </el-select>
+ </div>
+ </el-form-item>
+ <!-- 瀛愪綅缃� -->
+ <el-form-item
+ v-else-if="item.sonLocation"
+ 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-else
+ v-model="scope.row[item.prop]"
+ placeholder="璇烽�夋嫨"
+ size="mini"
+ style="width: 80%"
+ @change="
+ (val) => {
+ selSonLocationClick(val, item.prop)
+ }
+ "
+ >
+ <el-option
+ v-for="(item, index) in selSonLocationOptions"
+ :key="index"
+ :label="item.jointName"
+ :value="{ value: item.id, label: item.jointName }"
>
</el-option>
</el-select>
@@ -180,6 +243,7 @@
v-model="locacionName"
placeholder="璇烽�夋嫨"
size="mini"
+ filterable
style="width: 80%"
@change="
(val) => {
@@ -203,67 +267,64 @@
<!-- 浜у搧 -->
<el-form-item v-else-if="item.product" 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) => {
- selProductClick(val)
- }
- "
- >
- <el-option
- v-for="(item, index) in productNameOptions"
- :key="index"
- :label="item.name"
- :value="{
- value: item.id,
- label: item.name,
- amount: item.amount,
- unit: item.unit,
- categoryId: item.categoryId,
- categoryName: item.categoryName
- }"
+ <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row.productName }}</span>
+ <template v-else>
+ <SimpleSearchInput
+ v-model="scope.row[item.prop]"
+ :echoValue="scope.row[item.prop]"
+ :echoName="scope.row[item.prop]"
+ checkedNum="1"
+ :clearable="true"
+ @select-user="
+ (val) => {
+ selProductClick(val, scope.row)
+ }
+ "
>
- </el-option>
- </el-select>
+ </SimpleSearchInput>
+ </template>
</div>
</el-form-item>
- <!-- 浜у搧绫诲瀷 -->
+ <!-- 浠� -->
+ <el-form-item v-else-if="item.formLocation" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
+ <div class="custom-name">
+ <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row.formLocation }}</span>
+ <el-autocomplete
+ v-else
+ style="width: 100%"
+ v-model="scope.row.productCategory"
+ @focus="productTypeFocus"
+ :fetch-suggestions="
+ (queryString, callback) => {
+ querySearchAsync(queryString, callback, 'formLocation')
+ }
+ "
+ value-key="name"
+ @select="handleSelectClient('formLocation', $event)"
+ ></el-autocomplete>
+ </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
+ <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row.productCategory }}</span>
+ <el-autocomplete
v-else
- v-model="scope.row[item.prop]"
- placeholder="璇烽�夋嫨"
- size="mini"
- style="width: 80%"
- @change="
- (val) => {
- selProductTypeClick(val)
+ style="width: 100%"
+ v-model="scope.row.productCategory"
+ @focus="productTypeFocus"
+ :fetch-suggestions="
+ (queryString, callback) => {
+ querySearchAsync(queryString, callback, 'productType')
}
"
- >
- <el-option
- v-for="item in productTypeNameOptions"
- :key="item.id"
- :label="item.name"
- :value="{
- value: item.id,
- label: item.name
- }"
- >
- </el-option>
- </el-select>
+ value-key="name"
+ @select="handleSelectClient('productType', $event)"
+ ></el-autocomplete>
</div>
</el-form-item>
<!-- 鐢ㄦ埛 -->
@@ -327,7 +388,7 @@
<slot name="tableButton" />
</el-table>
</el-form>
- <div v-if="!detailEnter && !isinventory && !islistingrules && !isReorder" style="margin: 10px">
+ <div v-if="!detailEnter && !isinventory && !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>
@@ -408,12 +469,17 @@
{ id: 2, name: "鎵�" }
],
selLocationOptions: [], // 浣嶇疆
+ selSonLocationOptions: [], //瀛愪綅缃�
+ selToLocationOptions: [], // 浜у搧鍒拌揪浣嶇疆
companyOptions: [], // 鍏徃
selRouteOptions: [{ id: 1, name: "鍒堕��" }], // 璺嚎
locacionName: "",
locacionId: 0,
productName: "",
- productId: ""
+ productId: "",
+ initialPosition: "",
+ formLocationList:[],
+ toLocationList:[],
}
},
created() {
@@ -427,7 +493,7 @@
this.getProductCategoryList()
}
if (this.islistingrules) {
- this.getLocationList()
+ this.getToLocationList()
// this.getCompanyList()
}
this.tableList = this.productTableList
@@ -445,7 +511,6 @@
page: 1,
pageSize: 100
}).then((res) => {
- // console.log(res.data)
if (res.code === 200) {
if (res.data && res.data.length > 0) {
this.productNameOptions = res.data
@@ -453,16 +518,67 @@
}
})
},
+ // 涓嬫媺鎼滅储
+ async handleSelectClient(value, item) {
+ this.$emit("selProductClick", value, item)
+ if (value === "product") {
+ if (item.categoryId === 0 || item.categoryName === "") {
+ this.productTypeNameOptions = []
+ this.tableList.tableData[this.tableList.rowClickIndex].productCategory = ""
+ } else {
+ await getProductCategoryList({
+ categoryId: item.categoryId,
+ keyWord: item.categoryName,
+ page: 1,
+ pageSize: 15
+ }).then((res) => {
+ if (res.code === 200) {
+ const list = res.data ? res.data : []
+ this.productTypeNameOptions = list
+ this.tableList.tableData[this.tableList.rowClickIndex].productCategory = list[0].name
+ }
+ })
+ }
+ } else if (value === "productType") {
+ console.log("浜у搧绫诲瀷閫変腑")
+ }
+ },
+ querySearchAsync(queryString, cb, value) {
+ let restaurants = ""
+ if (value === "product") {
+ restaurants = this.productNameOptions
+ } else if (value === "productType") {
+ restaurants = this.productTypeNameOptions
+ }else if(value==="formLocation"){
+ restaurants = this.selLocationOptions
+ }
+ var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants
+ cb(results)
+ if (results.length === 0) {
+ this.productTypeNameOptions = []
+ }
+ this.$emit("querySearchData", queryString, results, value)
+ },
+ createStateFilter(queryString) {
+ return (state) => {
+ return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+ }
+ },
+ // 娓呴櫎閫変腑浜у搧
+ setValueNull(val) {
+ console.log(val, "鐪嬬湅val")
+ },
+
// 搴撳瓨璋冩暣鑾峰彇浣嶇疆鍜屼骇鍝�
async getRuleList() {
await getRuleList({
locationId: 0,
productId: ""
}).then((res) => {
- console.log(res)
if (res.code === 200) {
const list = res.data ? res.data : []
this.selLocationOptions = list.locationList
+ this.selSonLocationOptions = list.locationList
this.productNameOptions = list.productList
}
})
@@ -475,23 +591,28 @@
page: 1,
pageSize: 15
}).then((res) => {
- console.log(res, "鐪嬬湅浜у搧绫诲瀷鍒楄〃")
if (res.code === 200) {
const list = res.data ? res.data : []
this.productTypeNameOptions = list
}
})
},
+
// 浣嶇疆
async getLocationList() {
+ this.locacionName = ""
await getLocationList({
- keyword: "",
+ // keyword: "",
+ jointName: this.initialPosition ? this.initialPosition : null,
+ productId: this.queryProductId ? this.queryProductId : null,
+ productCategoryId: this.categoryId ? this.categoryId : null,
page: 1,
pageSize: 100
}).then((res) => {
if (res.code === 200) {
const list = res.data ? res.data : []
this.selLocationOptions = list
+ this.selSonLocationOptions = list
if (this.isReorder) {
this.locacionName = list[0]?.name
this.locacionId = list[0]?.id
@@ -500,10 +621,63 @@
}
})
},
+ // 浜у搧鍒拌揪浣嶇疆
+ async getToLocationList() {
+ await getLocationList({
+ // keyword: "",
+ type: 3,
+ page: 1,
+ pageSize: 100
+ }).then((res) => {
+ if (res.code === 200) {
+ const list = res.data ? res.data : []
+ this.selToLocationOptions = list
+ this.selSonLocationOptions = list
+ if (this.isReorder) {
+ this.locacionName = list[0]?.name
+ this.locacionId = list[0]?.id
+ this.$emit("selLocationClick", list[0], "locacionName")
+ }
+ }
+ })
+ },
+ // 璁剧疆瀛愪綅缃�/婧愪綅缃�
+ async setLocationList(jointName,tag) {
+ if(tag==="fromLocation"){
+ await getLocationList({
+ jointName: jointName,
+ page: 1,
+ pageSize: 100
+ }).then((res) => {
+ if (res.code === 200) {
+ this.selSonLocationOptions = res.data
+ }
+ })
+ }else if(tag==="toLocation"){
+ await getLocationList({
+ jointName: jointName,
+ page: 1,
+ pageSize: 100
+ }).then((res) => {
+ if (res.code === 200) {
+ this.selToLocationOptions = res.data
+ }
+ })
+ }else{
+ await getLocationList({
+ jointName: jointName,
+ page: 1,
+ pageSize: 100
+ }).then((res) => {
+ if (res.code === 200) {
+ this.selSonLocationOptions = res.data
+ }
+ })
+ }
+ },
// 鑾峰彇鍏徃鍒楄〃
async getCompanyList() {
await getCompanyList().then((res) => {
- console.log(res)
if (res.code === 200) {
this.companyOptions = res.data
}
@@ -512,7 +686,6 @@
selProductNameClick(item) {
this.productIndex = this.tableList.tableData.length - 1
this.tableList.tableData.map((ite, index) => {
- console.log(ite)
if (index === this.productIndex) {
ite.productId = item.id
ite.productName = item.name
@@ -522,22 +695,34 @@
})
},
// 閫夋嫨浜у搧
- selProductClick(item) {
+ selProductClick(item, row) {
if (this.isReorder) {
- this.productId = item.value
- this.productName = item.label
- this.getAmountAndPrediction(item, "product")
+ this.productId = item.id
+ this.productName = item.name
+ this.getAmountAndPrediction(item, "product", row)
} else {
- this.tableList.tableData.map((ite) => {
- if (ite.productName.label === item.label) {
- ite.productId = item.value
- ite.productName = item.label
+ let selIndex = 0
+ this.tableList.tableData.map((ite, index) => {
+ // ite.id 鏄笂鏋惰鍒欑殑, ite.productId鏄簱瀛樿皟鏁寸殑
+ if (ite.id === row.id&&ite.id!=undefined&&row.id!=undefined) {
+ selIndex = index
+ ite.productId = item.id
+ ite.productName = item.name
+ ite.categoryId = item.categoryId
+ ite.productCategory = item.categoryName
+ ite.amount = item.amount
+ ite.unit = item.unit
+ }else if(ite.productId===row.productId){
+ selIndex = index
+ ite.productId = item.id
+ ite.productName = item.name
ite.categoryId = item.categoryId
ite.productCategory = item.categoryName
ite.amount = item.amount
ite.unit = item.unit
}
})
+ this.$emit("selProductClick", "product", this.tableList.tableData[selIndex])
}
if (this.isinventory) {
@@ -545,15 +730,14 @@
locationId: 0,
productId: item.value
}).then((res) => {
- console.log(res)
if (res.code === 200) {
const list = res.data ? res.data : []
this.selLocationOptions = list.locationList
+ this.selSonLocationOptions = list.locationList
}
})
}
- console.log(this.tableList.tableData)
- this.$emit("selProductClick", item)
+ // this.$emit("selProductClick", item)
},
// 閫夋嫨浜у搧绫诲瀷
selProductTypeClick(item) {
@@ -566,12 +750,40 @@
if (this.isinventory) {
this.getProductCategoryList()
}
- this.$emit("selProductTypeClick", item)
+ // this.$emit("selProductTypeClick", item)
+ },
+ // 浜у搧绫诲瀷鑾峰彇鐒︾偣
+ productTypeFocus() {
+ getProductCategoryList({
+ categoryId: 0,
+ keyWord: "",
+ page: 1,
+ pageSize: 15
+ }).then((res) => {
+ if (res.code === 200) {
+ const list = res.data ? res.data : []
+ this.productTypeNameOptions = list
+ }
+ })
},
// 閫夋嫨浣嶇疆
selLocationClick(item, prop, row) {
+ if (prop === "areaName") {
+ getLocationList({
+ jointName: item.label,
+ page: 1,
+ pageSize: 100
+ }).then((res) => {
+ if (res.code === 200) {
+ const list = res.data ? res.data : []
+ this.selSonLocationOptions = list
+ }
+ })
+ }
if (this.isReorder) {
- if (this.productId !== 0) {
+ this.locacionId = item.value
+ this.productId = row.productId
+ if (this.productId.length !== 0) {
this.getAmountAndPrediction(row, "location", item)
}
}
@@ -580,7 +792,6 @@
locationId: item.value,
productId: ""
}).then((res) => {
- console.log(res)
if (res.code === 200) {
const list = res.data ? res.data : []
this.productNameOptions = list.productList
@@ -589,31 +800,42 @@
}
this.$emit("selLocationClick", item, prop)
},
+ // 閫夋嫨瀛愪綅缃�
+ selSonLocationClick(item) {
+ this.$emit("selSonLocationClick", item)
+ },
// 鑾峰彇鍦ㄥ簱涓庨娴嬫暟閲�
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) {
+ let selIndex = 0
+ getAmountAndPrediction({
+ locationId: val === "product" ? this.locacionId : ite.value,
+ productId: val === "product" ? item.id : this.productId
+ }).then((res) => {
+ if (res.code === 200) {
+ this.tableList.tableData.map((ite, index) => {
+ if (val === "product") {
+ if (index === 0) {
+ selIndex = index
ite.amount = res.data.amount
ite.prediction = res.data.prediction
+ ite.productId = item.id
+ ite.productName = item.name
ite.unit = item.unit
}
- })
- }
- })
- }
+ } else {
+ if (ite.id === item.id) {
+ selIndex = index
+ ite.amount = res.data.amount
+ ite.prediction = res.data.prediction
+ }
+ }
+ })
+ this.$emit("selProductClick", this.tableList.tableData[selIndex])
+ }
+ })
},
// 閫夋嫨璺嚎
selRouteClick(item, prop) {
- console.log("33333333333333")
this.$emit("selRouteClick", item, prop)
},
// 閫夋嫨鍗曚綅/鐢ㄦ埛
@@ -660,8 +882,6 @@
this.$emit("addProductClick")
},
commonInputChange(val, prop, row) {
- console.log(val, prop)
- console.log(row)
this.$emit("inputContent", val, prop, row)
},
// 娓呯┖
@@ -672,7 +892,6 @@
clearupClient(row, scope) {
this.productIndex = scope.$index
this.tableList.tableData.map((ite, index) => {
- console.log(scope.$index)
if (scope.$index && scope.$index >= 0) {
if (index === this.productIndex) {
ite.name = ""
@@ -704,6 +923,9 @@
},
// 琛岀偣鍑�
tableRowClick(row) {
+ if (this.isReorder) {
+ this.locacionName = row.location.name
+ }
this.$emit("tableRowClick", row, row.index)
},
// 鍗曢�夎鐩稿叧
@@ -743,6 +965,15 @@
}
}
::v-deep {
+ .el-autocomplete {
+ height: 28px;
+ .el-input {
+ height: 28px;
+ .el-input__inner {
+ height: 28px;
+ }
+ }
+ }
.el-form-item__label {
display: none;
}
@@ -780,4 +1011,7 @@
height: 35px;
text-align: center;
}
+::v-deep .el-table__body-wrapper {
+ height: unset !important;
+}
</style>
--
Gitblit v1.8.0