From 52c492586cc33a909e8192ef6d83ac609ce8126c Mon Sep 17 00:00:00 2001 From: zuozhengqing <a13193816592@163.com> Date: 星期五, 01 十二月 2023 18:20:31 +0800 Subject: [PATCH] 修改库存调整,选择产品会修改列表所有产品的bug,新建出库单添加表单校验 --- src/components/makepager/CommonFormTableView.vue | 591 +++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 433 insertions(+), 158 deletions(-) diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue index 4d58971..06667cc 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,11 +143,15 @@ <!-- 浣嶇疆 --> <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" + filterable style="width: 80%" @change=" (val) => { @@ -153,8 +162,99 @@ <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) + } + " + > + <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> + </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" + filterable + 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> @@ -166,60 +266,45 @@ <!-- 浜у搧 --> <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.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 + <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="item.id" - > - </el-option> - </el-select> + value-key="name" + @select="handleSelectClient('productType', $event)" + ></el-autocomplete> </div> </el-form-item> <!-- 鐢ㄦ埛 --> @@ -251,7 +336,7 @@ style="width: 80%" @change=" (val) => { - selRoteClick(val, item.prop) + selRouteClick(val, item.prop) } " > @@ -283,7 +368,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> @@ -304,6 +389,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", @@ -338,6 +424,10 @@ islistingrules: { type: Boolean, default: false + }, + isReorder: { + type: Boolean, + default: false } }, data() { @@ -359,19 +449,29 @@ { id: 2, name: "鎵�" } ], selLocationOptions: [], // 浣嶇疆 + selSonLocationOptions: [], //瀛愪綅缃� + selToLocationOptions: [], // 浜у搧鍒拌揪浣嶇疆 companyOptions: [], // 鍏徃 - selRouteOptions: [] // 璺嚎 + selRouteOptions: [{ id: 1, name: "鍒堕��" }], // 璺嚎 + locacionName: "", + locacionId: 0, + productName: "", + productId: "", + initialPosition: "" } }, created() { if (this.isinventory) { this.getRuleList() + } else if (this.isReorder) { + this.getProductList() + this.getLocationList() } else { this.getProductList() this.getProductCategoryList() } if (this.islistingrules) { - this.getLocationList() + this.getToLocationList() // this.getCompanyList() } this.tableList = this.productTableList @@ -389,7 +489,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 @@ -397,29 +496,76 @@ } }) }, + 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 + } + 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 } }) }, // 鑾峰彇浜у搧绫诲瀷鍒楄〃 - 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,"鐪嬬湅浜у搧绫诲瀷鍒楄〃") if (res.code === 200) { const list = res.data ? res.data : [] this.productTypeNameOptions = list @@ -428,112 +574,228 @@ }, // 浣嶇疆 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 + this.$emit("selLocationClick", list[0], "locacionName") + } + } + }) + }, + // 浜у搧鍒拌揪浣嶇疆 + 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) { + 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 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) => { - 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 + this.productIndex = this.tableList.tableData.length - 1 + this.tableList.tableData.map((ite, index) => { + if (index === this.productIndex) { + ite.productId = item.id + ite.productName = item.name ite.amount = item.amount ite.unit = item.unit } }) + }, + // 閫夋嫨浜у搧 + selProductClick(item, row) { + if (this.isReorder) { + this.productId = item.id + this.productName = item.name + this.getAmountAndPrediction(item, "product", row) + } else { + 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) { getRuleList({ 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) { + this.tableList.tableData.map((ite) => { + if (ite.productCategory.label === item.label) { + ite.productCategoryId = item.value + ite.productCategory = item.label + } + }) if (this.isinventory) { this.getProductCategoryList() } - console.log(this.tableList.tableData) - 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) { - console.log(item) - console.log(this.tableList.tableData) + 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) { + this.locacionId = item.value + this.productId = row.productId + if (this.productId.length !== 0) { + this.getAmountAndPrediction(row, "location", item) + } + } 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) }, + // 閫夋嫨瀛愪綅缃� + selSonLocationClick(item) { + this.$emit("selSonLocationClick", item) + }, + // 鑾峰彇鍦ㄥ簱涓庨娴嬫暟閲� + getAmountAndPrediction(item, val, ite) { + 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]) + } + }) + }, // 閫夋嫨璺嚎 - selRoteClick(item, prop) { - console.log(item, prop) - 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) + selRouteClick(item, prop) { + this.$emit("selRouteClick", item, prop) }, // 閫夋嫨鍗曚綅/鐢ㄦ埛 selCommonClick(item) { @@ -579,8 +841,6 @@ this.$emit("addProductClick") }, commonInputChange(val, prop, row) { - console.log(val, prop) - console.log(row) this.$emit("inputContent", val, prop, row) }, // 娓呯┖ @@ -591,7 +851,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 = "" @@ -623,6 +882,9 @@ }, // 琛岀偣鍑� tableRowClick(row) { + if (this.isReorder) { + this.locacionName = row.location.name + } this.$emit("tableRowClick", row, row.index) }, // 鍗曢�夎鐩稿叧 @@ -631,7 +893,8 @@ }, setFormItem(val) { console.log(val) - } + }, + commoInput() {} } } </script> @@ -661,6 +924,15 @@ } } ::v-deep { + .el-autocomplete { + height: 28px; + .el-input { + height: 28px; + .el-input__inner { + height: 28px; + } + } + } .el-form-item__label { display: none; } @@ -698,4 +970,7 @@ height: 35px; text-align: center; } +::v-deep .el-table__body-wrapper { + height: unset !important; +} </style> -- Gitblit v1.8.0