From 7e40be9e47fc07045e5e434f6d894782e99cdb0a Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 13 十一月 2023 17:20:00 +0800
Subject: [PATCH] 重订货规则的产品下拉增加搜索功能+出入库明细报表的编辑报类型错误的修改
---
src/views/reportForm/inboundOutboundDetail/index.vue | 42 ++++++++++----------
src/api/data.js | 25 ++++++++++++
src/components/makepager/CommonFormTableView.vue | 3 +
src/views/productManage/product/AddProductDialog.vue | 7 +++
4 files changed, 55 insertions(+), 22 deletions(-)
diff --git a/src/api/data.js b/src/api/data.js
index afa04cb..d748f82 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -178,6 +178,29 @@
id: 9
}
]
+// 鍑哄叆搴撴槑缁� 涓氬姟绫诲瀷
+const baseOperationTypeTwo=[
+ {
+ name: "鏀惰揣",
+ id: 1
+ },
+ {
+ name: "浜よ揣",
+ id: 2
+ },
+ {
+ name: "鍐呴儴璋冩嫧",
+ id: 3
+ },
+ {
+ name: "鎶ュ簾",
+ id: 4
+ },
+ {
+ name: "搴撳瓨鐩樼偣",
+ id: 5
+ },
+]
export const getDataByType = (type) => {
if (type == "purchaseStatus") {
return purchaseStatus
@@ -199,5 +222,7 @@
return inventoryValuation
} else if (type == "positionType") {
return positionType
+ }else if(type=='baseOperationTypeTwo'){
+ return baseOperationTypeTwo
}
}
diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 9b8d311..61232d2 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -151,6 +151,7 @@
v-model="scope.row[item.prop]"
placeholder="璇烽�夋嫨"
size="mini"
+ filterable
style="width: 80%"
@change="
(val) => {
@@ -180,6 +181,7 @@
v-model="locacionName"
placeholder="璇烽�夋嫨"
size="mini"
+ filterable
style="width: 80%"
@change="
(val) => {
@@ -209,6 +211,7 @@
v-model="scope.row[item.prop]"
placeholder="璇烽�夋嫨"
size="mini"
+ filterable
style="width: 80%"
@change="
(val) => {
diff --git a/src/views/productManage/product/AddProductDialog.vue b/src/views/productManage/product/AddProductDialog.vue
index 62f996c..07ce3bf 100644
--- a/src/views/productManage/product/AddProductDialog.vue
+++ b/src/views/productManage/product/AddProductDialog.vue
@@ -549,7 +549,9 @@
{ name: "鍏朵粬", id: "鍏朵粬" }
],
statisticsMap: {
- inLibrary: 0 // 鍦ㄥ簱
+ inLibrary: 0,// 鍦ㄥ簱
+ enter:0,//杩�
+ exit:0,//鍑�
},
isView: false,
fileFormdata: null // 涓婁紶鍥剧墖鍏ュ弬
@@ -564,6 +566,9 @@
this.setTableForm()
this.setBottonView()
this.statisticsMap.inLibrary = this.editConfig?.infomation?.amount ?? 0
+ // 杩涘嚭鍙ｇ殑浜у搧 鏁伴噺 杩樻病鏈�
+ this.statisticsMap.enter = this.editConfig?.infomation?.amount ?? 0
+ this.statisticsMap.exit = this.editConfig?.infomation?.amount ?? 0
if (this.editConfig.autoEdit) {
this.editClick()
}
diff --git a/src/views/reportForm/inboundOutboundDetail/index.vue b/src/views/reportForm/inboundOutboundDetail/index.vue
index c6ee050..c354af5 100644
--- a/src/views/reportForm/inboundOutboundDetail/index.vue
+++ b/src/views/reportForm/inboundOutboundDetail/index.vue
@@ -34,7 +34,7 @@
// import { getProductOperatonList } from "@/api/product/product"
import AddOverviewDialog from "@/views/overview/AddOverviewDialog"
-
+import { getDataByType } from "@/api/data"
export default {
name: "InboundOutboundDetail",
props: {},
@@ -56,7 +56,8 @@
title: "鏂板缓",
infomation: {}
},
- params: {}
+ params: {},
+ baseOperationTypeList:getDataByType("baseOperationTypeTwo"),
}
},
created() {
@@ -71,7 +72,7 @@
sessionStorage.setItem("paramsList", JSON.stringify(params))
}
this.params = params
- console.log(this.params)
+ console.log(this.params,'====111')
this.getData()
},
// 椤甸潰閿�姣佷箣鍓�
@@ -121,7 +122,9 @@
label: "涓氬姟绫诲瀷",
prop: "baseOperationType",
isShowColumn: true,
- default: true
+ default: true,
+ conversion: true,
+ getStatus: this.getBaseOperationTypeList
},
{
label: "浠�",
@@ -170,6 +173,17 @@
this.showcol = val
this.tableList.tableColumn = this.setTableColumn(val)
},
+ getBaseOperationTypeList(val){
+ let string = "--"
+ if (val) {
+ for (let i in this.baseOperationTypeList) {
+ if (this.baseOperationTypeList[i].id == val) {
+ return this.baseOperationTypeList[i].name
+ }
+ }
+ }
+ return string
+ },
// 搴撳瓨鎶ヨ〃璺宠浆璇锋眰鏁版嵁
async getData() {
if (this.params.name === "鎶ヨ〃") {
@@ -212,21 +226,7 @@
pageSize: this.pagerOptions.pageSize
}).then((res) => {
if (res.code === 200) {
- // let arr=[]
- res.data.map((item)=>{
- if(item.baseOperationType===1){
- item.baseOperationType="鏀惰揣"
- }else if(item.baseOperationType===2){
- item.baseOperationType="浜よ揣"
- }else if(item.baseOperationType===3){
- item.baseOperationType="鍐呴儴璋冩嫧"
- }else if(item.baseOperationType===4){
- item.baseOperationType="鎶ュ簾"
- }else if(item.baseOperationType===5){
- item.baseOperationType="搴撳瓨鐩樼偣"
- }
- })
- this.tableList.tableInfomation = res.data
+ this.tableList.tableInfomation = res.data?res.data:[]
this.pagerOptions.totalCount = res.total
}
})
@@ -234,7 +234,8 @@
},
// 鎼滅储
getList(val) {
- console.log(val)
+ this.params.keyWord=val;
+ this.getData()
// getHistory({
// page: this.pagerOptions.currPage,
// pageSize: this.pagerOptions.pageSize
@@ -247,7 +248,6 @@
},
// 琛岀偣鍑�
tableRowClick(row) {
- console.log(row, "琛宺ow")
this.editConfig.visible = true
this.editConfig.title = "鏌ョ湅"
this.editConfig.infomation = { ...row }
--
Gitblit v1.8.0