From 2b78cf0cd68e1809bc4cad7d730bef6ab9c4c118 Mon Sep 17 00:00:00 2001 From: zzq <a13193816592@163.com> Date: 星期四, 28 九月 2023 15:30:45 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/WMS --- src/views/reportForm/locationReport/index.vue | 134 ++++++++++++++++++-------------------------- 1 files changed, 56 insertions(+), 78 deletions(-) diff --git a/src/views/reportForm/locationReport/index.vue b/src/views/reportForm/locationReport/index.vue index 63d46c0..e652ded 100644 --- a/src/views/reportForm/locationReport/index.vue +++ b/src/views/reportForm/locationReport/index.vue @@ -15,42 +15,35 @@ </div> </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" + > + <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> <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> @@ -86,7 +79,7 @@ inStorage: "00.00", toStore: 65432.0, forecast: "0.00", - unit: "浠�", + unit: "浠�" }, { product: "HC閿�鍞尯/A鍖�", @@ -98,19 +91,19 @@ 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, @@ -118,8 +111,8 @@ }; }, created() { - this.setTable(); - this.getData(); + this.setTable() + this.getData() }, methods: { setTable() { @@ -129,16 +122,16 @@ 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: "鍦ㄥ簱鏁伴噺", @@ -186,7 +179,7 @@ prop: "unit", width: 120, default: false, - isShowColumn: showcol.includes("浠峰��"), + isShowColumn: showcol.includes("浠峰��") }, { label: "浠峰��", @@ -200,33 +193,33 @@ 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, + pageSize: this.pagerOptions.pageSize }).then((res) => { if (res.code === 200) { const list = res.data; this.tableList.tableInfomation = list || []; this.pagerOptions.totalCount = res.total; } - }); + }) }, // 鎼滅储 getList(val) { - console.log(val); + console.log(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() { @@ -236,7 +229,7 @@ }, // 鐘舵�� getStatus(val) { - return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚"; + return val === 1 ? "鑽夌" : val === 3 ? "灏辩华" : "瀹屾垚" }, // 鍘嗗彶 handleHistoryClick(row) { @@ -267,25 +260,10 @@ }); }, // 琛ヨ揣 - 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> +<style lang="scss" scoped></style> -- Gitblit v1.8.0