From ecd4e0f81c47fcb4ae41e7b4377f49b8a326c0d9 Mon Sep 17 00:00:00 2001 From: yangfeng <wanwan926_4@163.com> Date: 星期三, 27 九月 2023 17:33:27 +0800 Subject: [PATCH] 上架规则、库存调整模块接口联调 --- src/components/makepager/CommonFormTableView.vue | 62 +++++++++++++++++++++--------- 1 files changed, 43 insertions(+), 19 deletions(-) diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue index ff7f169..997cf9e 100644 --- a/src/components/makepager/CommonFormTableView.vue +++ b/src/components/makepager/CommonFormTableView.vue @@ -57,7 +57,7 @@ style="width: 80%" @change=" (val) => { - selProductClick(val) + selProductNameClick(val) } " > @@ -78,7 +78,7 @@ :rules="[{ required: item.isRequird ? true : false, message: '杈撳叆涓嶈兘涓虹┖' }]" > <span v-if="scope.row.isEdit">{{ scope.row[item.prop] }}</span> - <el-date-picker v-else v-model="scope.row[item.prop]" type="date" size="mini" style="width: 110px"> + <el-date-picker v-else v-model="scope.row[item.prop]" type="date" size="mini" style="width: 100%"> </el-date-picker> </el-form-item> <el-form-item @@ -140,16 +140,25 @@ <!-- 浣嶇疆 --> <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[item.prop] }}</span> + <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="selLocationClick" + @change=" + (val) => { + selLocationClick(val, item.prop) + } + " > - <el-option v-for="item in selLocationOptions" :key="item.id" :label="item.name" :value="item.name"> + <el-option + v-for="item in selLocationOptions" + :key="item.id" + :label="item.name" + :value="{ value: item.id, label: item.name }" + > </el-option> </el-select> </div> @@ -157,7 +166,7 @@ <!-- 浜у搧 --> <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[item.prop] }}</span> + <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row[item.prop] }}</span> <el-select v-else v-model="scope.row[item.prop]" @@ -174,7 +183,14 @@ v-for="item in productNameOptions" :key="item.id" :label="item.name" - :value="{ value: item.id, label: item.name, amount: item.amount, unit: item.unit }" + :value="{ + value: item.id, + label: item.name, + amount: item.amount, + unit: item.unit, + categoryId: item.categoryId, + categoryName: item.categoryName + }" > </el-option> </el-select> @@ -297,7 +313,7 @@ } if (this.islistingrules) { this.getLocationList() - this.getCompanyList() + // this.getCompanyList() } this.tableList = this.productTableList }, @@ -344,8 +360,7 @@ } }) }, - // 閫夋嫨浜у搧 - selProductClick(item) { + selProductNameClick(item) { this.tableList.tableData.map((ite) => { if (ite.productName.label === item.label) { ite.productId = item.value @@ -356,18 +371,27 @@ }) 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 + } + }) + console.log(this.tableList.tableData) + this.$emit("selProductClick", item) + }, // 閫夋嫨浣嶇疆 - selLocationClick(item) { + selLocationClick(item, prop) { console.log(item) console.log(this.tableList.tableData) - // this.tableList.tableData.map((ite) => { - // if (ite.location.label === item.label) { - // ite.location = item.label - // } - // if (ite.subLocation.label === item.label) { - // ite.subLocation = item.label - // } - // }) + this.$emit("selLocationClick", item, prop) }, // 閫夋嫨鍗曚綅/鐢ㄦ埛 selCommonClick(item) { -- Gitblit v1.8.0