From 05b72b58002a8733b8b31825ea5edabe7e279283 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期五, 22 三月 2024 18:56:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/WMS
---
src/components/makepager/CommonFormTableView.vue | 170 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 134 insertions(+), 36 deletions(-)
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 2a8bd19..aae5424 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,44 @@
@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="querySearchAsync"
+ value-key="name"
+ :disabled="!isOperate"
+ size="mini"
+ @select="
+ (val) => {
+ handleSelectClient(val, item.prop, scope.row)
+ }
+ "
+ ></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
@@ -118,7 +156,7 @@
:controls="false"
size="mini"
style="width: 100%; margin-right: 5px"
- :min="item.prop==='minInventory'?0:1"
+ :min="item.prop === 'minInventory' ? 0 : 1"
@change="
(val) => {
commonInputChange(val, item.prop, scope.row)
@@ -185,7 +223,7 @@
style="width: 80%"
@change="
(val) => {
- selLocationClick(val, item.prop,scope.row)
+ selLocationClick(val, item.prop, scope.row)
}
"
>
@@ -286,7 +324,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 +430,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" 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>
@@ -410,10 +454,10 @@
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,6 +492,21 @@
isReorder: {
type: Boolean,
default: false
+ },
+ // 鏍规嵁鎶ヤ环鍗曟煡璇骇鍝�
+ quotationNumber: {
+ type: [String, Number],
+ default: ""
+ },
+ // 鍒楄〃鏂板鏄惁澶氶��
+ addTypeIdMultiple: {
+ type: Boolean,
+ default: false
+ },
+ // 鏄惁鍙互鎿嶄綔 娣诲姞绛�
+ isOperate: {
+ type: Boolean,
+ default: true
}
},
data() {
@@ -457,6 +516,7 @@
tableList: [],
editSelCommonConfig: {
editVisible: false,
+ isSelectBox: false,
title: "",
infomation: {}
},
@@ -478,8 +538,8 @@
productName: "",
productId: "",
initialPosition: "",
- formLocationList:[],
- toLocationList:[],
+ formLocationList: [],
+ toLocationList: []
}
},
created() {
@@ -549,7 +609,7 @@
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
@@ -563,6 +623,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) {
@@ -642,8 +718,8 @@
})
},
// 璁剧疆瀛愪綅缃�/婧愪綅缃�
- async setLocationList(jointName,tag) {
- if(tag==="fromLocation"){
+ async setLocationList(jointName, tag) {
+ if (tag === "fromLocation") {
await getLocationList({
jointName: jointName,
page: 1,
@@ -653,7 +729,7 @@
this.selSonLocationOptions = res.data
}
})
- }else if(tag==="toLocation"){
+ } else if (tag === "toLocation") {
await getLocationList({
jointName: jointName,
page: 1,
@@ -663,7 +739,7 @@
this.selToLocationOptions = res.data
}
})
- }else{
+ } else {
await getLocationList({
jointName: jointName,
page: 1,
@@ -704,7 +780,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
@@ -712,7 +788,7 @@
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
@@ -879,7 +955,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)
@@ -889,24 +972,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
@@ -935,7 +1011,29 @@
setFormItem(val) {
console.log(val)
},
- commoInput() {}
+ commoInput() {},
+ selClient(item) {
+ let list = this.tableList.tableData.map((item) => item.number)
+ if (list.findIndex((v) => v == item.number) == -1) {
+ this.isRecalculate = true
+ // this.editConfig.infomation.client_name = row.name
+ this.tableList.tableData.map((ite, index) => {
+ if (index === this.productIndex) {
+ ite.name = item.name
+ ite.amount = item.amount || 1
+ ite.number = item.number
+ 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