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/locationReport/index.vue | 242 ++++++++++++++++++++++------------------------- 1 files changed, 113 insertions(+), 129 deletions(-) diff --git a/src/views/reportForm/locationReport/index.vue b/src/views/reportForm/locationReport/index.vue index 63d46c0..6efd9ed 100644 --- a/src/views/reportForm/locationReport/index.vue +++ b/src/views/reportForm/locationReport/index.vue @@ -2,62 +2,54 @@ <template> <div class="rightContent"> <div class="top"> - <div> - <SearchCommonView - :add-title="'鏂板缓'" - :showAdd="true" - :placeholder="'璇疯緭鍏ュ弬鑰�'" - :amount-view="false" - @addCommonClick="addBtnClick" - @searchClick="getList" - :isDisabled="true" - /> - </div> + <SearchCommonView + :add-title="'鏂板缓'" + :showAdd="false" + :placeholder="'璇疯緭鍏ヤ綅缃悕绉般�佷骇鍝佸悕绉版垨浜у搧绫诲埆'" + :amount-view="false" + @addCommonClick="addBtnClick" + @searchClick="getList" + :isDisabled="true" + /> </div> <div class="list-view"> - <TableCommonView - ref="tableListRef" - :table-list="tableList" - @selTableCol="selTableCol" - @tableRowClick="tableRowClick" - :showSummary="true" - > - <template slot="tableButton"> - <el-table-column label="鎿嶄綔" width="210" align="center"> - <template slot-scope="scope"> - <span @click="handleHistoryClick(scope.row)"> - <i class="el-icon-refresh-left"></i> - <span>鍘嗗彶</span> - </span> - <span @click="handleAddGoods(scope)" class="margin_left_5px"> - <i class="el-icon-refresh"></i> - <span>琛ヨ揣</span> - </span> - </template> - </el-table-column> - </template> - </TableCommonView> + <div class="table"> + <TableCommonView + ref="tableListRef" + :table-list="tableList" + @selTableCol="selTableCol" + @tableRowClick="tableRowClick" + :showSummary="true" + > + <template slot="tableButton"> + <el-table-column label="鎿嶄綔" width="210" align="center"> + <template slot-scope="scope"> + <span @click="handleHistoryClick(scope.row)" class="yes-cursor"> + <i class="el-icon-refresh-left"></i> + <span>鍘嗗彶</span> + </span> + <span @click="handleAddGoods(scope)" class="margin_left_5px no-cursor"> + <i class="el-icon-refresh"></i> + <span>琛ヨ揣</span> + </span> + </template> + </el-table-column> + </template> + </TableCommonView> + </div> <div class="btn-pager"> - <PagerView - class="page" - :pager-options="pagerOptions" - v-on="pagerEvents" - /> + <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" - /> + <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 { getLocationData } from "@/api/locationApi/locationApi"; -import AddOverviewDialog from "@/views/overview/AddOverviewDialog"; +import pageMixin from "@/components/makepager/pager/mixin/pageMixin" +import { getLocationData } from "@/api/locationApi/locationApi" +import AddOverviewDialog from "@/views/overview/AddOverviewDialog" export default { name: "InventoryReport", @@ -86,7 +78,7 @@ inStorage: "00.00", toStore: 65432.0, forecast: "0.00", - unit: "浠�", + unit: "浠�" }, { product: "HC閿�鍞尯/A鍖�", @@ -98,47 +90,48 @@ inStorage: "0.00", toStore: 32618.0, forecast: "0.00", - unit: "浠�", - }, + unit: "浠�" + } ], searchOptions: [], commonDetail: { visible: false, title: "鏂板缓", - infomation: {}, + infomation: {} }, editConfig: { visible: false, title: "鏂板缓", - infomation: {}, + infomation: {} }, productId: this.$route.params.id, productName: this.$route.params.name, - metaTitle: this.$route.meta.title, - }; + metaTitle: this.$route.meta.title + } }, created() { - this.setTable(); - this.getData(); + this.setTable() + this.getData() }, methods: { setTable() { this.tableList = { tableInfomation: [], - selectBox: true, + selectBox: false, + selectIndex: true, showcol: this.showcol, countcol: this.countcol, allcol: [], - tableColumn: this.setTableColumn(this.showcol), - }; - let allcol = []; + tableColumn: this.setTableColumn(this.showcol) + } + let allcol = [] for (let i = 0; i < this.tableList.tableColumn.length; i++) { if (!this.tableList.tableColumn[i].default) { - const label = this.tableList.tableColumn[i].label; - allcol.push(label); + const label = this.tableList.tableColumn[i].label + allcol.push(label) } } - this.tableList.allcol = allcol; + this.tableList.allcol = allcol }, setTableColumn(showcol) { let tableColumn = [ @@ -146,26 +139,26 @@ label: "浣嶇疆", prop: "locationName", default: true, - isShowColumn: true, + isShowColumn: true }, { label: "瀛樺偍绫诲埆", prop: "category", default: false, - isShowColumn: showcol.includes("瀛樺偍绫诲埆"), + isShowColumn: showcol.includes("瀛樺偍绫诲埆") }, { label: "浜у搧", prop: "productName", default: true, - isShowColumn: true, + isShowColumn: true }, { label: "浜у搧绫诲埆", prop: "productTypeName", default: false, - isShowColumn: showcol.includes("浜у搧绫诲埆"), + isShowColumn: showcol.includes("浜у搧绫诲埆") }, { label: "鍦ㄥ簱鏁伴噺", @@ -173,6 +166,7 @@ isShowColumn: true, default: true, unit: "", + textAlign:"right" }, { label: "棰勭暀鏁伴噺", @@ -180,13 +174,14 @@ isShowColumn: true, default: true, unit: "", + textAlign:"right" }, { label: "鍗曚綅", prop: "unit", width: 120, default: false, - isShowColumn: showcol.includes("浠峰��"), + isShowColumn: showcol.includes("鍗曚綅") }, { label: "浠峰��", @@ -194,98 +189,87 @@ width: 120, default: false, isShowColumn: showcol.includes("浠峰��"), - unit: "锟�", - }, - ]; - return tableColumn; + textAlign:"right", + unit: "锟�" + } + ] + return tableColumn }, selTableCol(val) { - this.showcol = val; - this.tableList.tableColumn = this.setTableColumn(val); + this.showcol = val + this.tableList.tableColumn = this.setTableColumn(val) }, // 璇锋眰鏁版嵁 - async getData() { - await getLocationData({ - page: this.pagerOptions.currPage, - pageSize: this.pagerOptions.pageSize, - }).then((res) => { + async getLocationData(params) { + await getLocationData(params).then((res) => { if (res.code === 200) { - const list = res.data; - this.tableList.tableInfomation = list || []; - this.pagerOptions.totalCount = res.total; + const list = res.data + this.tableList.tableInfomation = list || [] + this.pagerOptions.totalCount = res.total } - }); + }) + }, + getData() { + if(this.$route.params.name==="搴撳瓨鎶ヨ〃"){ + this.getLocationData({ + wareHouseCode:this.$route.params.wareHouseCode, + productId:this.$route.params.productId, + page: this.pagerOptions.currPage, + pageSize: this.pagerOptions.pageSize + }) + }else{ + this.getLocationData({ + page: this.pagerOptions.currPage, + pageSize: this.pagerOptions.pageSize + }) + } }, // 鎼滅储 getList(val) { - console.log(val); + this.getLocationData({ + page: 1, + pageSize: this.pagerOptions.pageSize, + keyWord: val + }) }, // 琛岀偣鍑� tableRowClick(row) { - console.log(row); + console.log(row) // this.editConfig.visible = true; - this.editConfig.title = "鏌ョ湅"; - this.editConfig.infomation = { ...row }; + this.editConfig.title = "鏌ョ湅" + this.editConfig.infomation = { ...row } }, // 鏂板缓 addBtnClick() { - this.editConfig.visible = true; - this.editConfig.title = "鏂板缓"; - this.getData(); + this.editConfig.visible = true + this.editConfig.title = "鏂板缓" + this.getData() }, // 鐘舵�� getStatus(val) { - return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚"; + return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚" }, // 鍘嗗彶 handleHistoryClick(row) { + console.log(row) this.$router.push({ name: "inboundOutboundDetail", params: { - name: this.metaTitle, - pageName:"鎶ヨ〃", - product: { - page: this.pagerOptions.currPage, - pageSize: this.pagerOptions.pageSize, - produceId: row.produceId, - productName: row.productName, - unit: row.unit, - }, - paramsKey: { - amount: "amount", - productName:"productName", - status: "status", - contactedName: "contactedName", - date: "date", - fromLocation: "fromLocation", - number: "number", - toLocation: "toLocation", - unit: "unit", - }, - }, - }); + keyWord:row.productTypeName, + produceId:row.produceId, + productName:row.productName, + unit:row.unit, + name: "鎶ヨ〃" + } + }) }, // 琛ヨ揣 - handleAddGoods() {}, - }, -}; + handleAddGoods() {} + } +} </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% - 150px); - } -} </style> -- Gitblit v1.8.0