From 87f9b1b02fd972668d504260c624f25f102cbf72 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期四, 19 十月 2023 16:16:07 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into zzq
---
src/views/overview/OverviewListView.vue | 47 ++++++++++-
src/views/productManage/product/index.vue | 33 ++++++--
src/views/overview/index.vue | 6 +
src/views/productManage/productCategory/AddProductCategoryDialog.vue | 20 ++++-
src/views/operate/inventoryAdjustment/index.vue | 16 ++--
src/views/productManage/product/AddProductDialog.vue | 28 +++++-
src/views/productManage/productCategory/index.vue | 31 ++++++-
7 files changed, 142 insertions(+), 39 deletions(-)
diff --git a/src/views/operate/inventoryAdjustment/index.vue b/src/views/operate/inventoryAdjustment/index.vue
index d31d459..a4b1734 100644
--- a/src/views/operate/inventoryAdjustment/index.vue
+++ b/src/views/operate/inventoryAdjustment/index.vue
@@ -88,7 +88,7 @@
differenceAmount: 0,
amount: 0,
operationId: 0,
- adjustAmount:0,
+ adjustAmount: 0
}
},
created() {
@@ -122,7 +122,7 @@
if (res.code === 200) {
console.log(res)
const list = res.data.map((item) => {
- item.adjustAmount=0
+ item.adjustAmount = 0
return {
...item,
isSet: false,
@@ -140,9 +140,9 @@
// 鎿嶄綔杈撳叆
inputContent(val, prop, row) {
console.log(val, prop, row)
- console.log(val-row.amount,"缁撴灉")
- this.adjustAmount=val-row.amount
- this.tableList.tableData[row.index].adjustAmount=this.adjustAmount
+ console.log(val - row.amount, "缁撴灉")
+ this.adjustAmount = val - row.amount
+ this.tableList.tableData[row.index].adjustAmount = this.adjustAmount
// this.differenceAmount = val
},
// 鏂板
@@ -180,7 +180,7 @@
let requestUrl = this.currentRowId === 0 ? addInventoryAdjustment : updateInventoryAdjustment
requestUrl({
// amount: this.amount,
- adjustAmount:this.adjustAmount,
+ adjustAmount: this.adjustAmount,
// differenceAmount: this.differenceAmount,
locationId: this.locationId,
operationId: this.operationId,
@@ -204,7 +204,7 @@
// 鏄惁閫夋嫨浜у搧
isSel() {
for (let i = 0; i < this.tableData.length; i++) {
- if (this.tableData[i].productName.length === 0) {
+ if (this.tableData && this.tableData[i].productName.length === 0) {
this.isNoProduct = false
break
} else {
@@ -268,7 +268,7 @@
},
// 琛岀偣鍑�
tableRowClick(row, rowIndex) {
- this.rowIndex=rowIndex
+ this.rowIndex = rowIndex
this.isSel()
if (!this.isNoProduct && this.currentRowId === 0) {
this.$message.error("璇峰畬鎴愬綋鍓嶆柊寤烘垨鍙栨秷鏂板缓")
diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index 2cfd31b..9519c51 100644
--- a/src/views/overview/OverviewListView.vue
+++ b/src/views/overview/OverviewListView.vue
@@ -1,5 +1,8 @@
<template>
<div class="rightContent">
+ <div class="label-fixed-element">
+ <span>{{ params.name }}</span>
+ </div>
<div class="top">
<SearchCommonView
:add-title="'鏂板缓'"
@@ -58,7 +61,7 @@
data() {
return {
tableList: {},
- showcol: ["浠�", "鑷�", "鑱旂郴浜�", "鏃ユ湡", "鏉ユ簮鍗曟嵁", "鐘舵��"],
+ showcol: ["浠撳簱浣嶇疆", "璋冨嚭浣嶇疆", "璋冨叆浣嶇疆", "鑱旂郴浜�", "鏃ユ湡", "鏉ユ簮鍗曟嵁", "鐘舵��"],
searchOptions: [],
commonDetail: {
visible: false,
@@ -73,10 +76,14 @@
workType: this.$route.params.workType,
keyword: "",
params: {},
- displayEdit: false
+ displayEdit: false,
+ formLabel: "",
+ toLabel: ""
}
},
created() {
+ console.log(this.workType)
+ this.setFormToLabel()
this.setTable()
var paramsData = sessionStorage.getItem("paramsData")
let params = {}
@@ -95,6 +102,18 @@
sessionStorage.removeItem("paramsData")
},
methods: {
+ setFormToLabel() {
+ if (this.workType === 1) {
+ this.formLabel = "渚涘簲鍟嗕綅缃�"
+ this.toLabel = "浠撳簱浣嶇疆"
+ } else if (this.workType === 2) {
+ this.formLabel = "浠撳簱浣嶇疆"
+ this.toLabel = "瀹㈡埛浣嶇疆"
+ } else {
+ this.formLabel = "璋冨嚭浣嶇疆"
+ this.toLabel = "璋冨叆浣嶇疆"
+ }
+ },
setTable() {
this.tableList = {
tableInfomation: [],
@@ -122,15 +141,15 @@
default: true
},
{
- label: "浠�",
+ label: this.formLabel,
prop: "from",
- isShowColumn: showcol.includes("浠�"),
+ isShowColumn: showcol.includes(this.formLabel),
default: false
},
{
- label: "鑷�",
+ label: this.toLabel,
prop: "to",
- isShowColumn: showcol.includes("鑷�"),
+ isShowColumn: showcol.includes(this.toLabel),
default: false
},
{
@@ -258,4 +277,18 @@
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.label-fixed-element {
+ background: #e6ecf2;
+ position: fixed;
+ font-size: 14px;
+ width: calc(100% - 530px);
+ height: 45px;
+ line-height: 45px;
+ font-size: 18px;
+ font-weight: 700;
+ color: #171718;
+ margin-top: -60px;
+ margin-left: -5px;
+}
+</style>
diff --git a/src/views/overview/index.vue b/src/views/overview/index.vue
index baee3a7..6cf6cf0 100644
--- a/src/views/overview/index.vue
+++ b/src/views/overview/index.vue
@@ -41,7 +41,7 @@
</div>
</div>
<div class="btn-pager">
- <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
+ <PagerView class="page" :page-sizes="pageSizes" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
</div>
</div>
@@ -65,10 +65,12 @@
title: "鏂板缓",
infomation: {},
keyword: ""
- }
+ },
+ pageSizes: [30, 45]
}
},
created() {
+ this.pagerOptions.pageSize = 30
this.getData()
},
methods: {
diff --git a/src/views/productManage/product/AddProductDialog.vue b/src/views/productManage/product/AddProductDialog.vue
index 27f441a..a1d1117 100644
--- a/src/views/productManage/product/AddProductDialog.vue
+++ b/src/views/productManage/product/AddProductDialog.vue
@@ -1,14 +1,14 @@
<template>
<div class="add-common">
<el-dialog
- :title="editCommonConfig.title + '浜у搧'"
+ :title="modalTitle + '浜у搧'"
:visible.sync="editConfig.visible"
:width="dialogWidth"
:before-close="handleClose"
>
<!-- 澶� -->
<div slot="title" class="dialog-header">
- <span>{{ editCommonConfig.title + "浜у搧" }}</span>
+ <span>{{ modalTitle + "浜у搧" }}</span>
<div class="header_btns">
<span class="btn">
<i class="el-icon-printer"></i>
@@ -165,7 +165,7 @@
:disabled="!showFooter"
>
<el-option
- v-for="item in productCategoryOptions"
+ v-for="item in productCategoryListWithDefault"
:key="item.id"
:label="item.name"
:value="item.id"
@@ -474,13 +474,27 @@
return {
visible: false,
title: "鏂板缓",
- infomation: {}
+ infomation: {},
+ autoEdit:false
}
}
}
},
components: {},
- computed: {},
+ computed: {
+ productCategoryListWithDefault(){
+ return [{id:0,name:'璇烽�夋嫨'},...(this.productCategoryOptions ?? [])]
+ },
+ modalTitle(){
+ if (this.editConfig.title === '缂栬緫' && this.editConfig.autoEdit){
+ return '缂栬緫'
+ }else if (this.editConfig.title === '缂栬緫') {
+ return !this.showEdit ? '缂栬緫' : '鏌ョ湅'
+ }else {
+ return '鏂板缓'
+ }
+ }
+ },
data() {
return {
dialogWidth: "50%",
@@ -494,6 +508,7 @@
memberOptions: [{ name: "绠＄悊鍛�", id: 1 }],
productCategoryOptions: [], // 浜у搧绫诲埆
productTypeOptions: [
+ { name: "璇烽�夋嫨", id: 0 },
{ name: "鑳芥秷鑰�", id: 1 },
{ name: "鏈嶅姟", id: 2 },
{ name: "鍙簱瀛樹骇鍝�", id: 3 }
@@ -538,6 +553,9 @@
this.setTableForm()
this.setBottonView()
this.statisticsMap.inLibrary = this.editConfig?.infomation?.amount ?? 0
+ if (this.editConfig.autoEdit){
+ this.editClick()
+ }
},
methods: {
// 鑾峰彇浜у搧绫诲埆
diff --git a/src/views/productManage/product/index.vue b/src/views/productManage/product/index.vue
index 5a49b4d..0c79ece 100644
--- a/src/views/productManage/product/index.vue
+++ b/src/views/productManage/product/index.vue
@@ -29,7 +29,7 @@
</div>
<!-- 鍥捐〃褰㈠紡 -->
<div v-if="isIconIndex === '1'" class="product-view">
- <div class="product-box" v-for="item in tableList.tableInfomation" :key="item.id" @click="tableRowClick(item)">
+ <div class="product-box" v-for="item in tableList.tableInfomation" :key="item.id" @click="showDetail(item)">
<div class="left">
<!-- <el-image style="width: 60px; height: 80px" :src="url"></el-image> -->
<div class="img-view">
@@ -58,12 +58,20 @@
ref="tableListRef"
:table-list="tableList"
@selTableCol="selTableCol"
- @tableRowClick="tableRowClick"
>
+ <template slot="tableButton">
+ <el-table-column label="鎿嶄綔" width="90" align="center">
+ <template slot-scope="scope">
+ <span @click.stop="showDetail(scope.row)" class="cursor_pointer" style="margin-right: 10px">
+ <span style="color: #2a78fb">鏌ョ湅</span>
+ </span>
+ <span @click.stop="editRow(scope.row)" class="cursor_pointer">
+ <span style="color: #2a78fb">缂栬緫</span>
+ </span>
+ </template>
+ </el-table-column>
+ </template>
</TableCommonView>
- <!-- <div class="btn-pager">
- <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
- </div> -->
</div>
<div class="btn-pager">
<PagerView class="page" :pager-options="pagerOptions" :page-size="pageSizes" v-on="pagerEvents" />
@@ -99,7 +107,8 @@
editConfig: {
visible: false,
title: "鏂板缓",
- infomation: {}
+ infomation: {},
+ autoEdit: false
},
isIconIndex: "2", // 1 鍥炬爣 2 鍒楄〃
url: "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
@@ -254,13 +263,21 @@
this.editConfig.title = "鏂板缓"
this.editConfig.infomation = {}
},
- // 琛岀偣鍑�
- tableRowClick(row) {
+ // 璇︽儏
+ showDetail(row) {
console.log(row)
this.editConfig.visible = true
+ this.editConfig.autoEdit = false
this.editConfig.title = "缂栬緫"
this.editConfig.infomation = { ...row }
},
+ // 缂栬緫
+ editRow(row){
+ this.editConfig.autoEdit = true
+ this.editConfig.title = "缂栬緫"
+ this.editConfig.infomation = { ...row }
+ this.editConfig.visible = true
+ },
// 鍒囨崲鍒楄〃灞曠幇褰㈠紡
selIconSwitchClick(value) {
this.pagerOptions.currPage = 1
diff --git a/src/views/productManage/productCategory/AddProductCategoryDialog.vue b/src/views/productManage/productCategory/AddProductCategoryDialog.vue
index 31356cf..2f86a71 100644
--- a/src/views/productManage/productCategory/AddProductCategoryDialog.vue
+++ b/src/views/productManage/productCategory/AddProductCategoryDialog.vue
@@ -1,14 +1,14 @@
<template>
<div class="add-common">
<el-dialog
- :title="editCommonConfig.title + '浜у搧绫诲埆'"
+ :title="modalTitle + '浜у搧绫诲埆'"
:visible.sync="editConfig.visible"
:width="dialogWidth"
:before-close="handleClose"
>
<!-- 澶� -->
<div slot="title" class="dialog-header">
- <span>{{ editCommonConfig.title + "浜у搧绫诲埆" }}</span>
+ <span>{{ modalTitle + "浜у搧绫诲埆" }}</span>
<div class="header_btns">
<!-- <span class="btn">
<i class="el-icon-printer"></i>
@@ -183,7 +183,8 @@
return {
visible: false,
title: "鏂板缓",
- infomation: { type: [] }
+ infomation: { type: [] },
+ autoEdit: false,
}
}
},
@@ -197,8 +198,16 @@
components: {},
computed: {
productCategoryListWithDefault(){
- console.log(this.productCategoryList)
return [{id:0,name:'璇烽�夋嫨'},...(this.productCategoryList?? [])]
+ },
+ modalTitle(){
+ if (this.editConfig.title === '缂栬緫' && this.editConfig.autoEdit){
+ return '缂栬緫'
+ }else if (this.editConfig.title === '缂栬緫') {
+ return !this.showEdit ? '缂栬緫' : '鏌ョ湅'
+ }else {
+ return '鏂板缓'
+ }
}
},
data() {
@@ -227,6 +236,9 @@
created() {
this.setBottonView()
this.getProductCount()
+ if (this.editConfig.autoEdit){
+ this.editClick()
+ }
},
methods: {
// 鑾峰彇浜у搧鏁伴噺
diff --git a/src/views/productManage/productCategory/index.vue b/src/views/productManage/productCategory/index.vue
index 0f14b1c..7d77f4e 100644
--- a/src/views/productManage/productCategory/index.vue
+++ b/src/views/productManage/productCategory/index.vue
@@ -15,8 +15,20 @@
ref="tableListRef"
:table-list="tableList"
:show-checkcol="false"
- @tableRowClick="tableRowClick"
- ></TableCommonView>
+ >
+ <template slot="tableButton">
+ <el-table-column label="鎿嶄綔" width="90" align="center">
+ <template slot-scope="scope">
+ <span @click.stop="showDetail(scope.row)" class="cursor_pointer" style="margin-right: 10px">
+ <span style="color: #2a78fb">鏌ョ湅</span>
+ </span>
+ <span @click.stop="editRow(scope.row)" class="cursor_pointer">
+ <span style="color: #2a78fb">缂栬緫</span>
+ </span>
+ </template>
+ </el-table-column>
+ </template>
+ </TableCommonView>
</div>
<div class="btn-pager">
<PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
@@ -45,7 +57,8 @@
editConfig: {
visible: false,
title: "鏂板缓",
- infomation: {}
+ infomation: {},
+ autoEdit: false
}
}
},
@@ -93,8 +106,16 @@
this.pagerOptions.currPage=1
this.getData()
},
- // 琛岀偣鍑�
- tableRowClick(row) {
+ // 鏌ョ湅
+ showDetail(row) {
+ this.editConfig.autoEdit = false
+ this.editConfig.title = "缂栬緫"
+ this.editConfig.infomation = { ...row }
+ this.editConfig.visible = true
+ },
+ // 缂栬緫
+ editRow(row){
+ this.editConfig.autoEdit = true
this.editConfig.title = "缂栬緫"
this.editConfig.infomation = { ...row }
this.editConfig.visible = true
--
Gitblit v1.8.0