From 03cfba0f636b42417070fc8caef44bcdd792a085 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 07 五月 2024 17:34:37 +0800
Subject: [PATCH] 概述 出库模块 编辑的时候循环处理对应产品调用接口获取在库数量的逻辑处理
---
src/components/makepager/CommonFormTableView.vue | 605 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 482 insertions(+), 123 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 9b8d311..500bf19 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -55,7 +55,7 @@
></el-input>
</div>
</el-form-item>
- <el-form-item
+ <!-- <el-form-item
v-else-if="item.productName"
label=" "
:prop="'tableData.' + scope.$index + '.' + item.prop"
@@ -69,6 +69,48 @@
@select-user="selProductNameClick"
>
</SimpleSearchInput>
+ </div>
+ </el-form-item> -->
+ <el-form-item
+ v-else-if="item.productName"
+ label=" "
+ :prop="'tableData.' + scope.$index + '.' + item.prop"
+ >
+ <div class="custom-name">
+ <el-autocomplete
+ v-model="scope.row[item.prop]"
+ :fetch-suggestions="
+ (queryString, callback) => {
+ querySearchAsync(queryString, callback, 'product')
+ }
+ "
+ value-key="name"
+ :disabled="!isOperate"
+ size="mini"
+ @select="
+ (val) => {
+ handleSelectClient(val, item.prop, scope.row,scope)
+ }
+ "
+ ></el-autocomplete>
+
+ <div
+ v-if="scope.row[item.prop] && scope.row[item.prop].length > 0 && isOperate"
+ class="common-select-btn"
+ @click="handleEditClient(scope, item.prop)"
+ >
+ <i class="el-icon-edit" title="缂栬緫"></i>
+ </div>
+ <div
+ v-if="scope.row[item.prop] && scope.row[item.prop].length > 0 && isOperate"
+ class="common-select-btn"
+ @click="clearupClient(scope)"
+ >
+ <i class="el-icon-remove-outline" title="娓呴櫎"></i>
+ </div>
+ <div class="common-select-btn" v-else @click="selClientClick(scope, item.prop)">
+ <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i>
+ </div>
</div>
</el-form-item>
<el-form-item
@@ -104,12 +146,12 @@
</div>
</el-form-item>
<el-form-item
- v-else-if="item.inputFloat"
+ v-else-if="item.inputFloat||item.inputFloatValue"
label=" "
:prop="'tableData.' + scope.$index + '.' + item.prop"
:rules="[{ required: item.isRequird ? true : false, message: '杈撳叆涓嶈兘涓虹┖' }]"
>
- <span v-if="scope.row.isEdit">{{ scope.row[item.prop] }}</span>
+ <span v-if="scope.row.isEdit||(item.inputFloatValue&&!scope.row[item.isInputFloat])">{{ scope.row[item.prop] }}</span>
<div v-else @click.stop="commoInput">
<el-input-number
v-model="scope.row[item.prop]"
@@ -118,6 +160,7 @@
:controls="false"
size="mini"
style="width: 100%; margin-right: 5px"
+ :min="item.prop === 'minInventory' ? 0 : 0"
@change="
(val) => {
commonInputChange(val, item.prop, scope.row)
@@ -151,18 +194,80 @@
v-model="scope.row[item.prop]"
placeholder="璇烽�夋嫨"
size="mini"
+ filterable
style="width: 80%"
@change="
(val) => {
- selLocationClick(val, item.prop)
+ selLocationClick(val, item.prop,scope.row)
}
"
>
<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,scope.row,scope)
+ }
+ "
+ >
+ <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 +285,7 @@
v-model="locacionName"
placeholder="璇烽�夋嫨"
size="mini"
+ filterable
style="width: 80%"
@change="
(val) => {
@@ -203,67 +309,68 @@
<!-- 浜у搧 -->
<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,17 +434,19 @@
<slot name="tableButton" />
</el-table>
</el-form>
- <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 v-if="!detailEnter && !isinventory && !isReorder&&isOperateAdd" style="margin: 10px">
+ <el-button size="small" type="primary" @click="add">鏂板</el-button>
+ <el-button size="small" type="primary" @click="empty">娓呯┖</el-button>
</div>
<!-- 浜у搧鍚嶇О -->
- <!-- <SelectCommonDialog
+ <SelectCommonDialog
v-if="editSelCommonConfig.editVisible"
:edit-common-config="editSelCommonConfig"
- :sign="sign"
+ :selectBoxList="tableList.tableData"
+ :quotationNumber="quotationNumber"
@selClient="selClient"
- /> -->
+ @getSelectArray="getSelectArray"
+ />
</div>
</template>
@@ -345,14 +454,14 @@
import { getProductList } from "@/api/product/product"
import { getLocationList } from "@/api/warehouseManage/warehouse"
import { getCompanyList } from "@/api/common/other"
-import { getRuleList } from "@/api/operate/inventoryAdjustment"
+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"
+import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
export default {
name: "CommmonFormTableView",
- components: { SimpleSearchInput },
+ components: { SimpleSearchInput, SelectCommonDialog },
props: {
detailEnter: {
type: Boolean,
@@ -387,7 +496,27 @@
isReorder: {
type: Boolean,
default: false
- }
+ },
+ // 鏍规嵁鎶ヤ环鍗曟煡璇骇鍝�
+ quotationNumber: {
+ type: [String, Number],
+ default: ""
+ },
+ // 鍒楄〃鏂板鏄惁澶氶��
+ addTypeIdMultiple: {
+ type: Boolean,
+ default: false
+ },
+ // 鏄惁鍙互鎿嶄綔 娣诲姞绛�
+ isOperate: {
+ type: Boolean,
+ default: true
+ },
+ // 鏄惁鏈夋柊澧炲拰娓呯┖鎿嶄綔
+ isOperateAdd: {
+ type: Boolean,
+ default: true
+ },
},
data() {
return {
@@ -396,6 +525,7 @@
tableList: [],
editSelCommonConfig: {
editVisible: false,
+ isSelectBox: false,
title: "",
infomation: {}
},
@@ -408,12 +538,17 @@
{ id: 2, name: "鎵�" }
],
selLocationOptions: [], // 浣嶇疆
+ selSonLocationOptions: [], //瀛愪綅缃�
+ selToLocationOptions: [], // 浜у搧鍒拌揪浣嶇疆
companyOptions: [], // 鍏徃
selRouteOptions: [{ id: 1, name: "鍒堕��" }], // 璺嚎
locacionName: "",
locacionId: 0,
productName: "",
- productId: ""
+ productId: "",
+ initialPosition: "",
+ formLocationList: [],
+ toLocationList: []
}
},
created() {
@@ -427,7 +562,7 @@
this.getProductCategoryList()
}
if (this.islistingrules) {
- this.getLocationList()
+ this.getToLocationList()
// this.getCompanyList()
}
this.tableList = this.productTableList
@@ -435,17 +570,25 @@
computed: {},
watch: {
productTableList() {
- this.tableList = this.productTableList
+ // this.showcol = this.productTableList.showcol
+ this.getTableInfo()
}
},
methods: {
+ getTableInfo(){
+ this.tableList = this.productTableList
+ if (this.tableList.tableData.length === 1 && this.tableList.tableData[0].name === "") {
+ this.isRecalculate = false
+ } else {
+ this.isRecalculate = true
+ }
+ },
// 浜у搧鍚嶇О
async getProductList() {
await getProductList({
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 +596,83 @@
}
})
},
+ // 涓嬫媺鎼滅储
+ async handleSelectClient(value, item,row,scope) {
+ this.$emit("selProductClick", value, item,row,scope)
+ 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) ? 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
+ }
+ },
+ // 鏂板
+ selClientClick(scope, prop) {
+ console.log(scope, prop)
+ this.productIndex = scope.$index
+ this.editSelCommonConfig.title = "浜у搧鍚嶇О"
+ this.editSelCommonConfig.isSelectBox = true
+ this.editSelCommonConfig.editVisible = true
+ },
+ // 缂栬緫
+ handleEditClient(scope, prop) {
+ console.log(scope, prop)
+ this.productIndex = scope.$index
+ this.editSelCommonConfig.title = "浜у搧鍚嶇О"
+ this.editSelCommonConfig.isSelectBox = false
+ this.editSelCommonConfig.editVisible = true
+ },
+ // 娓呴櫎閫変腑浜у搧
+ 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 +685,29 @@
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: "",
+ type:3,
+ 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 +716,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 +781,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,38 +790,50 @@
})
},
// 閫夋嫨浜у搧
- selProductClick(item) {
+ selProductClick(item, row) {
+ console.log("閫夋嫨浜у搧",row,item)
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) {
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) {
@@ -566,12 +846,43 @@
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) {
+ console.log("浣嶇疆閫夋嫨",item,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
+ }
+ })
+ }else if(prop==='locationName'){
+ console.log("locationName")
+ }
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 +891,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 +899,42 @@
}
this.$emit("selLocationClick", item, prop)
},
+ // 閫夋嫨瀛愪綅缃�
+ selSonLocationClick(item,prop,row,scope) {
+ this.$emit("selSonLocationClick", item,prop,row,scope)
+ },
// 鑾峰彇鍦ㄥ簱涓庨娴嬫暟閲�
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)
},
// 閫夋嫨鍗曚綅/鐢ㄦ埛
@@ -657,11 +978,16 @@
},
// 鏂板
add() {
- this.$emit("addProductClick")
+ if (this.addTypeIdMultiple) {
+ this.productIndex = this.tableList.tableData.length
+ this.editSelCommonConfig.title = "浜у搧鍚嶇О"
+ this.editSelCommonConfig.isSelectBox = true
+ this.editSelCommonConfig.editVisible = true
+ } else {
+ this.$emit("addProductClick")
+ }
},
commonInputChange(val, prop, row) {
- console.log(val, prop)
- console.log(row)
this.$emit("inputContent", val, prop, row)
},
// 娓呯┖
@@ -669,25 +995,17 @@
this.$emit("emptyProductClick")
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
- clearupClient(row, scope) {
+ clearupClient(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 = ""
- ite.amount = 1
- ite.number = ""
- ite.purchasePrice = 0
- ite.unit = ""
- ite.deliveryTime = 0
- ite.shippingDuration = 0
- }
- } else {
+ if (index === this.productIndex) {
+ ite.productName = ""
+ ite.id = ""
ite.name = ""
ite.amount = 1
ite.number = ""
- ite.purchasePrice = 0
+ ite.model = ""
+ ite.specs = ""
ite.unit = ""
ite.deliveryTime = 0
ite.shippingDuration = 0
@@ -704,6 +1022,9 @@
},
// 琛岀偣鍑�
tableRowClick(row) {
+ if (this.isReorder) {
+ this.locacionName = row.location.name
+ }
this.$emit("tableRowClick", row, row.index)
},
// 鍗曢�夎鐩稿叧
@@ -713,7 +1034,33 @@
setFormItem(val) {
console.log(val)
},
- commoInput() {}
+ commoInput() {},
+ selClient(item) {
+ let list = this.tableList.tableData.map((item) => item.id)
+ if (list.findIndex((v) => v == item.id) == -1) {
+ this.isRecalculate = true
+ // this.editConfig.infomation.client_name = row.name
+ this.tableList.tableData.map((ite, index) => {
+ if (index === this.productIndex) {
+ ite.productName = item.name
+ ite.productId = item.id
+ ite.name = item.name
+ ite.amount = 1
+ ite.number = item.id
+ ite.specs = item.specs
+ ite.model = item.model
+ // ite.price = item.price
+ // ite.total = item.amount ? item.amount * item.price : 1 * item.price
+ ite.unit = item.unit
+ }
+ })
+ } else {
+ this.$message.error("涓嶈兘閫夋嫨閲嶅鐨勪骇鍝侊紝 璇烽噸鏂伴�夋嫨")
+ }
+ },
+ getSelectArray(val) {
+ this.$emit("getSelectArray", val, this.productIndex)
+ }
}
}
</script>
@@ -743,6 +1090,15 @@
}
}
::v-deep {
+ .el-autocomplete {
+ height: 28px;
+ .el-input {
+ height: 28px;
+ .el-input__inner {
+ height: 28px;
+ }
+ }
+ }
.el-form-item__label {
display: none;
}
@@ -780,4 +1136,7 @@
height: 35px;
text-align: center;
}
+::v-deep .el-table__body-wrapper {
+ height: unset !important;
+}
</style>
--
Gitblit v1.8.0