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 | 185 +++++++++++++++++++++++++++------------------ 1 files changed, 110 insertions(+), 75 deletions(-) diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue index 7a7cf80..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) @@ -184,7 +185,7 @@ style="width: 80%" @change=" (val) => { - selLocationClick(val, item.prop) + selLocationClick(val, item.prop,scope.row) } " > @@ -274,10 +275,33 @@ :echoName="scope.row[item.prop]" checkedNum="1" :clearable="true" - @select-user="selProductClick" + @select-user=" + (val) => { + selProductClick(val, scope.row) + } + " > </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> <!-- 浜у搧绫诲埆 --> @@ -288,30 +312,6 @@ > <div class="custom-name"> <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row.productCategory }}</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> - </el-select> --> <el-autocomplete v-else style="width: 100%" @@ -388,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> @@ -477,7 +477,9 @@ locacionId: 0, productName: "", productId: "", - initialPosition: "" + initialPosition: "", + formLocationList:[], + toLocationList:[], } }, created() { @@ -516,6 +518,7 @@ } }) }, + // 涓嬫媺鎼滅储 async handleSelectClient(value, item) { this.$emit("selProductClick", value, item) if (value === "product") { @@ -546,6 +549,8 @@ 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) @@ -592,8 +597,10 @@ } }) }, + // 浣嶇疆 async getLocationList() { + this.locacionName = "" await getLocationList({ // keyword: "", jointName: this.initialPosition ? this.initialPosition : null, @@ -634,24 +641,39 @@ } }) }, - // 璁剧疆瀛愪綅缃� - async setLocationList(jointName) { - await getLocationList({ - // keyword: "", - jointName: jointName, - page: 1, - pageSize: 100 - }).then((res) => { - if (res.code === 200) { - const list = res.data ? res.data : [] - 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() { @@ -673,14 +695,25 @@ }) }, // 閫夋嫨浜у搧 - selProductClick(item) { + selProductClick(item, row) { if (this.isReorder) { this.productId = item.id this.productName = item.name - this.getAmountAndPrediction(item, "product") + this.getAmountAndPrediction(item, "product", row) } else { + let selIndex = 0 this.tableList.tableData.map((ite, index) => { - if (index === 0) { + // 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 @@ -689,7 +722,7 @@ ite.unit = item.unit } }) - this.$emit("selProductClick", "product", this.tableList.tableData[0]) + this.$emit("selProductClick", "product", this.tableList.tableData[selIndex]) } if (this.isinventory) { @@ -697,7 +730,6 @@ locationId: 0, productId: item.value }).then((res) => { - console.log(res) if (res.code === 200) { const list = res.data ? res.data : [] this.selLocationOptions = list.locationList @@ -705,7 +737,6 @@ } }) } - console.log(this.tableList.tableData) // this.$emit("selProductClick", item) }, // 閫夋嫨浜у搧绫诲瀷 @@ -737,9 +768,7 @@ }, // 閫夋嫨浣嶇疆 selLocationClick(item, prop, row) { - console.log(item, prop, row, "璧峰浣嶇疆") if (prop === "areaName") { - // this.initialPosition=item.label getLocationList({ jointName: item.label, page: 1, @@ -748,16 +777,13 @@ if (res.code === 200) { const list = res.data ? res.data : [] this.selSonLocationOptions = list - if (this.isReorder) { - this.locacionName = list[0]?.name - this.locacionId = list[0]?.id - this.$emit("selLocationClick", list[0], "locacionName") - } } }) } 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) } } @@ -780,26 +806,33 @@ }, // 鑾峰彇鍦ㄥ簱涓庨娴嬫暟閲� getAmountAndPrediction(item, val, ite) { - console.log(item, val, ite) - 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, index) => { - if (index == 0) { + 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 } - }) - this.$emit("selProductClick", this.tableList.tableData[0]) - } - }) - } + } 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) { @@ -849,7 +882,6 @@ this.$emit("addProductClick") }, commonInputChange(val, prop, row) { - console.log(val, prop) this.$emit("inputContent", val, prop, row) }, // 娓呯┖ @@ -891,6 +923,9 @@ }, // 琛岀偣鍑� tableRowClick(row) { + if (this.isReorder) { + this.locacionName = row.location.name + } this.$emit("tableRowClick", row, row.index) }, // 鍗曢�夎鐩稿叧 -- Gitblit v1.8.0