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 | 267 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 204 insertions(+), 63 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 26afa06..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,7 +160,7 @@
:controls="false"
size="mini"
style="width: 100%; margin-right: 5px"
- :min="item.prop==='minInventory'?0:1"
+ :min="item.prop === 'minInventory' ? 0 : 0"
@change="
(val) => {
commonInputChange(val, item.prop, scope.row)
@@ -156,7 +198,7 @@
style="width: 80%"
@change="
(val) => {
- selLocationClick(val, item.prop)
+ selLocationClick(val, item.prop,scope.row)
}
"
>
@@ -185,7 +227,7 @@
style="width: 80%"
@change="
(val) => {
- selLocationClick(val, item.prop)
+ selLocationClick(val, item.prop, scope.row)
}
"
>
@@ -217,7 +259,7 @@
style="width: 80%"
@change="
(val) => {
- selSonLocationClick(val, item.prop)
+ selSonLocationClick(val, item.prop,scope.row,scope)
}
"
>
@@ -286,7 +328,11 @@
</div>
</el-form-item>
<!-- 浠� -->
- <el-form-item v-else-if="item.formLocation" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
+ <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
@@ -388,17 +434,19 @@
<slot name="tableButton" />
</el-table>
</el-form>
- <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 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>
@@ -406,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,
@@ -448,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 {
@@ -457,6 +525,7 @@
tableList: [],
editSelCommonConfig: {
editVisible: false,
+ isSelectBox: false,
title: "",
infomation: {}
},
@@ -478,7 +547,8 @@
productName: "",
productId: "",
initialPosition: "",
- formLocationList:[],
+ formLocationList: [],
+ toLocationList: []
}
},
created() {
@@ -500,10 +570,19 @@
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({
@@ -518,8 +597,8 @@
})
},
// 涓嬫媺鎼滅储
- async handleSelectClient(value, item) {
- this.$emit("selProductClick", value, item)
+ async handleSelectClient(value, item,row,scope) {
+ this.$emit("selProductClick", value, item,row,scope)
if (value === "product") {
if (item.categoryId === 0 || item.categoryName === "") {
this.productTypeNameOptions = []
@@ -548,10 +627,10 @@
restaurants = this.productNameOptions
} else if (value === "productType") {
restaurants = this.productTypeNameOptions
- }else if(value==="formLocation"){
+ } else if (value === "formLocation") {
restaurants = this.selLocationOptions
}
- var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants
+ var results = (queryString&&restaurants) ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants
cb(results)
if (results.length === 0) {
this.productTypeNameOptions = []
@@ -562,6 +641,22 @@
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) {
@@ -602,6 +697,7 @@
this.locacionName = ""
await getLocationList({
// keyword: "",
+ type:3,
jointName: this.initialPosition ? this.initialPosition : null,
productId: this.queryProductId ? this.queryProductId : null,
productCategoryId: this.categoryId ? this.categoryId : null,
@@ -640,24 +736,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() {
@@ -680,6 +791,7 @@
},
// 閫夋嫨浜у搧
selProductClick(item, row) {
+ console.log("閫夋嫨浜у搧",row,item)
if (this.isReorder) {
this.productId = item.id
this.productName = item.name
@@ -688,7 +800,7 @@
let selIndex = 0
this.tableList.tableData.map((ite, index) => {
// ite.id 鏄笂鏋惰鍒欑殑, ite.productId鏄簱瀛樿皟鏁寸殑
- if (ite.id === row.id&&ite.id!=undefined&&row.id!=undefined) {
+ if (ite.id === row.id && ite.id != undefined && row.id != undefined) {
selIndex = index
ite.productId = item.id
ite.productName = item.name
@@ -696,19 +808,18 @@
ite.productCategory = item.categoryName
ite.amount = item.amount
ite.unit = item.unit
- }else if(ite.productId===row.productId){
+ } 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.amount = item.amount
ite.unit = item.unit
}
})
this.$emit("selProductClick", "product", this.tableList.tableData[selIndex])
}
-
if (this.isinventory) {
getRuleList({
locationId: 0,
@@ -721,6 +832,7 @@
}
})
}
+
// this.$emit("selProductClick", item)
},
// 閫夋嫨浜у搧绫诲瀷
@@ -752,6 +864,7 @@
},
// 閫夋嫨浣嶇疆
selLocationClick(item, prop, row) {
+ console.log("浣嶇疆閫夋嫨",item,row)
if (prop === "areaName") {
getLocationList({
jointName: item.label,
@@ -763,6 +876,8 @@
this.selSonLocationOptions = list
}
})
+ }else if(prop==='locationName'){
+ console.log("locationName")
}
if (this.isReorder) {
this.locacionId = item.value
@@ -785,8 +900,8 @@
this.$emit("selLocationClick", item, prop)
},
// 閫夋嫨瀛愪綅缃�
- selSonLocationClick(item) {
- this.$emit("selSonLocationClick", item)
+ selSonLocationClick(item,prop,row,scope) {
+ this.$emit("selSonLocationClick", item,prop,row,scope)
},
// 鑾峰彇鍦ㄥ簱涓庨娴嬫暟閲�
getAmountAndPrediction(item, val, ite) {
@@ -863,7 +978,14 @@
},
// 鏂板
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) {
this.$emit("inputContent", val, prop, row)
@@ -873,24 +995,17 @@
this.$emit("emptyProductClick")
},
// 娓呴櫎宸查�夋嫨鐢ㄦ埛
- clearupClient(row, scope) {
+ clearupClient(scope) {
this.productIndex = scope.$index
this.tableList.tableData.map((ite, 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
@@ -919,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>
--
Gitblit v1.8.0