From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 14:50:31 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token
---
src/views/reportForm/inboundOutboundDetail/index.vue | 200 +++++++++++++++++++++++++++++++++----------------
1 files changed, 135 insertions(+), 65 deletions(-)
diff --git a/src/views/reportForm/inboundOutboundDetail/index.vue b/src/views/reportForm/inboundOutboundDetail/index.vue
index 8ac2cc1..c6ee050 100644
--- a/src/views/reportForm/inboundOutboundDetail/index.vue
+++ b/src/views/reportForm/inboundOutboundDetail/index.vue
@@ -4,35 +4,41 @@
<SearchCommonView
:add-title="'鏂板缓'"
:showAdd="false"
- :placeholder="'璇疯緭鍏ュ弬鑰�'"
+ :placeholder="'璇锋牴鎹崟鍙枫�佷骇鍝併�佷笟鍔＄被鍨嬭繘琛屾悳绱�'"
:amount-view="false"
@addCommonClick="addBtnClick"
@searchClick="getList"
/>
</div>
<div class="list-view">
- <TableCommonView
- ref="tableListRef"
- :table-list="tableList"
- @selTableCol="selTableCol"
- @tableRowClick="tableRowClick"
- ></TableCommonView>
+ <div class="table">
+ <TableCommonView
+ ref="tableListRef"
+ :table-list="tableList"
+ @selTableCol="selTableCol"
+ @tableRowClick="tableRowClick"
+ ></TableCommonView>
+ </div>
<div class="btn-pager">
<PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
</div>
+ <!-- 缂栬緫 -->
+ <AddOverviewDialog v-if="editConfig.visible" :edit-common-config="editConfig" :add-name="this.$route.params.name" />
</div>
</template>
<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
-import { getProductList } from "@/api/product/product"
-// import DetailProduct from "@/views/productManage/product/DetailProduct"
+import { getHistory } from "@/api/reportForm/inventoryRwport"
+// import { getProductOperatonList } from "@/api/product/product"
+
+import AddOverviewDialog from "@/views/overview/AddOverviewDialog"
export default {
name: "InboundOutboundDetail",
props: {},
- components: {},
+ components: { AddOverviewDialog },
mixins: [pageMixin],
computed: {},
data() {
@@ -49,12 +55,28 @@
visible: false,
title: "鏂板缓",
infomation: {}
- }
+ },
+ params: {}
}
},
created() {
this.setTable()
+ console.log(this.$route.params)
+ var paramsList = sessionStorage.getItem("paramsList")
+ let params = {}
+ if (paramsList) {
+ params = JSON.parse(sessionStorage.getItem("paramsList"))
+ } else {
+ params = this.$route.params
+ sessionStorage.setItem("paramsList", JSON.stringify(params))
+ }
+ this.params = params
+ console.log(this.params)
this.getData()
+ },
+ // 椤甸潰閿�姣佷箣鍓�
+ beforeDestroy() {
+ sessionStorage.removeItem("paramsList")
},
methods: {
setTable() {
@@ -78,43 +100,50 @@
let tableColumn = [
{
label: "鏃ユ湡",
- prop: "id",
+ prop: "date",
isShowColumn: true,
- default: true
+ default: true,
+ date: true
},
{
- label: "鍙傝��",
- prop: "id",
+ label: "鍗曞彿",
+ prop: "number",
isShowColumn: true,
default: true
},
{
label: "浜у搧",
- prop: "id",
+ prop: "productName",
+ isShowColumn: true,
+ default: true
+ },
+ {
+ label: "涓氬姟绫诲瀷",
+ prop: "baseOperationType",
isShowColumn: true,
default: true
},
{
label: "浠�",
- prop: "deviceName",
+ prop: "fromLocation",
isShowColumn: true,
default: true
},
{
label: "鑷�",
- prop: "id",
+ prop: "toLocation",
isShowColumn: true,
default: true
},
{
- label: "鍏徃",
- prop: "shopName",
- isShowColumn: showcol.includes("鍏徃"),
- default: false
+ label: "鏁伴噺",
+ prop: "amount",
+ isShowColumn: true,
+ default: true
},
{
- label: "鏁伴噺",
- prop: "deviceId",
+ label: "鍗曚綅",
+ prop: "unit",
isShowColumn: true,
default: true
},
@@ -124,11 +153,13 @@
width: 120,
isShowColumn: showcol.includes("鐘舵��"),
default: false,
- status: true
+ status: true,
+ isCallMethod: true,
+ getCallMethod: this.getStatus
},
{
label: "瀹屾垚鑰�",
- prop: "preTime",
+ prop: "contactedName",
isShowColumn: showcol.includes("瀹屾垚鑰�"),
default: false
}
@@ -139,61 +170,100 @@
this.showcol = val
this.tableList.tableColumn = this.setTableColumn(val)
},
- // 璇锋眰鏁版嵁
- async getData(val, content) {
- await getProductList({
- [val]: content,
- page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize
- }).then((res) => {
- if (res.data.code === 200) {
- const list = res.data.data.list.map((item) => {
- return {
- ...item,
- supplierNumber: item.supplier.number,
- status: "灏辩华",
- preTime: "2023-09-04 11:20:00"
- }
- })
- this.tableList.tableInfomation = list || []
- this.pagerOptions.totalCount = res.data.data.total
- }
- })
+ // 搴撳瓨鎶ヨ〃璺宠浆璇锋眰鏁版嵁
+ async getData() {
+ if (this.params.name === "鎶ヨ〃") {
+ await getHistory({
+ keyWord:this.params.keyWord,
+ produceId:this.params.produceId,
+ unit:this.params.unit,
+ productName:this.params.productName,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ }).then((res) => {
+ if (res.code === 200) {
+ this.tableList.tableInfomation = res.data
+ this.pagerOptions.totalCount = res.total
+ }
+ })
+ } else {
+ // await getProductOperatonList({
+ // productId: this.params.id,
+ // page: this.pagerOptions.currPage,
+ // pageSize: this.pagerOptions.pageSize
+ // }).then((res) => {
+ // if (res.code === 200) {
+ // const list = res.data.map((item) => {
+ // return {
+ // ...item,
+ // fromLocation: item.fromLocation.name,
+ // toLocation: item.toLocation.name,
+ // productName: this.params.name,
+ // amount: item.details[0].product.amount,
+ // unit: item.details[0].product.unit
+ // }
+ // })
+ // this.tableList.tableInfomation = list || []
+ // this.pagerOptions.totalCount = res.total
+ // }
+ // })
+ await getHistory({
+ page: this.pagerOptions.currPage,
+ 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.pagerOptions.totalCount = res.total
+ }
+ })
+ }
},
// 鎼滅储
getList(val) {
console.log(val)
+ // getHistory({
+ // page: this.pagerOptions.currPage,
+ // pageSize: this.pagerOptions.pageSize
+ // }).then((res) => {
+ // if (res.code === 200) {
+ // this.tableList.tableInfomation = res.data
+ // this.pagerOptions.totalCount = res.total
+ // }
+ // })
},
// 琛岀偣鍑�
tableRowClick(row) {
- console.log(row)
+ console.log(row, "琛宺ow")
this.editConfig.visible = true
- this.editConfig.title = "缂栬緫"
+ this.editConfig.title = "鏌ョ湅"
this.editConfig.infomation = { ...row }
},
// 鏂板缓
addBtnClick() {
- this.editConfig.visible = true
+ // this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
+ },
+ // 鐘舵��
+ getStatus(val) {
+ return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚"
}
}
}
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style lang="scss" scoped>
-// .rightContent {
-// height: 100%;
-// background: #e6ecf2;
-// padding: 10px;
-// .top {
-// margin-bottom: 20px;
-// height: 60px;
-// background: #fff;
-// border-radius: 8px;
-// }
-// .list-view {
-// height: calc(100% - 120px);
-// }
-// }
-</style>
+<style lang="scss" scoped></style>
--
Gitblit v1.8.0