From 5ecb7958c96d3f0b6d47b79aff7eb306c2cf690f Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期二, 06 八月 2024 11:16:58 +0800
Subject: [PATCH] gitlab上面的wms转移到公司git
---
src/views/reportForm/inboundOutboundDetail/index.vue | 88 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 84 insertions(+), 4 deletions(-)
diff --git a/src/views/reportForm/inboundOutboundDetail/index.vue b/src/views/reportForm/inboundOutboundDetail/index.vue
index 0c487e5..059c3cf 100644
--- a/src/views/reportForm/inboundOutboundDetail/index.vue
+++ b/src/views/reportForm/inboundOutboundDetail/index.vue
@@ -7,6 +7,8 @@
:placeholder="'璇锋牴鎹崟鍙枫�佷骇鍝併�佷笟鍔＄被鍨嬭繘琛屾悳绱�'"
:amount-view="false"
:inputName="params.keyWord"
+ :showDownload="true"
+ @downloadClick="downHttpClick"
@addCommonClick="addBtnClick"
@searchClick="getList"
/>
@@ -18,7 +20,37 @@
:table-list="tableList"
@selTableCol="selTableCol"
@tableRowClick="tableRowClick"
- ></TableCommonView>
+ >
+ <template slot="tableButton">
+ <el-table-column label="鏁伴噺" prop='amount'>
+ <el-table-column v-for="unit in unitList" :label="unit.name" prop='amount' min="90">
+ <template slot-scope="scope">
+ {{getUnitValue(scope.row.amountMoreUnits,unit.name,scope.row.amount,scope.row.unit)}}
+ </template>
+ </el-table-column>
+ <!--<el-table-column label="浠�" prop='amount' min="90">
+ <template slot-scope="scope">
+ {{getUnitValue(scope.row.amountMoreUnits,'浠�',scope.row.amount,scope.row.unit)}}
+ </template>
+ </el-table-column>
+ <el-table-column label="鍖�" prop='amount' min="90">
+ <template slot-scope="scope">
+ {{getUnitValue(scope.row.amountMoreUnits,'鍖�',scope.row.amount,scope.row.unit)}}
+ </template>
+ </el-table-column>
+ <el-table-column label="绫虫暟" prop='amount' min="90">
+ <template slot-scope="scope">
+ {{getUnitValue(scope.row.amountMoreUnits,'绫虫暟',scope.row.amount,scope.row.unit)}}
+ </template>
+ </el-table-column>
+ <el-table-column label="閲嶉噺" prop='amount' min="90">
+ <template slot-scope="scope">
+ {{getUnitValue(scope.row.beginMoreUnitsArr,'閲嶉噺',scope.row.beginAmount,scope.row.unit)}}
+ </template>
+ </el-table-column>-->
+ </el-table-column>
+ </template>
+ </TableCommonView>
</div>
<div class="btn-pager">
<PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
@@ -40,6 +72,10 @@
import AddOverviewDialog from "@/views/overview/AddOverviewDialog"
import { getDataByType } from "@/api/data"
+import { downloadHistory } from "@/api/downFile"
+import FileSaver from 'file-saver'
+import _ from 'lodash'
+import { getUnitInfo } from "@/api/basic/standard";
export default {
name: "InboundOutboundDetail",
props: {},
@@ -48,6 +84,7 @@
computed: {},
data() {
return {
+ unitList:[],
tableList: {},
showcol: ["鐘舵��"],
searchOptions: [],
@@ -78,13 +115,51 @@
}
this.params = params
console.log(this.params,'====111')
- this.getData()
+ this.getData();
+ this.getUnitInfo();
},
// 椤甸潰閿�姣佷箣鍓�
beforeDestroy() {
sessionStorage.removeItem("paramsList")
},
methods: {
+ async getUnitInfo(){
+ const { code,data }=await getUnitInfo();
+ if(code===200){
+ this.unitList=data;
+ }
+ },
+ getUnitValue(list,val,num,unit){
+ let string='--'
+ if(list){
+ if(list.length>0){
+ for(let i in list){
+ if(list[i].unit==val){
+ string=list[i].amount
+ break;
+ }
+ }
+ }
+ }
+ if(unit==val){
+ string=num
+ }
+ return string
+ },
+ // 涓嬭浇
+ downHttpClick: _.debounce(function(){
+ downloadHistory({
+ keyWord:this.params.keyWord,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize,
+ baseOperationType:1
+ }).then(res => {
+ if (res) {
+ FileSaver.saveAs(res, '鍏ュ簱鏄庣粏鎶ヨ〃.xlsx');
+ this.$message.success("涓嬭浇鎴愬姛锛�");
+ }
+ })
+ }, 1000),
setTable() {
this.tableList = {
tableInfomation: [],
@@ -149,7 +224,7 @@
isShowColumn: true,
default: true
},
- {
+ /*{
label: "鏁伴噺",
prop: "amount",
isShowColumn: true,
@@ -160,7 +235,7 @@
prop: "unit",
isShowColumn: true,
default: true
- },
+ },*/
{
label: "閲嶉噺",
prop: "weight",
@@ -264,6 +339,11 @@
// });
await getOperationInfo(row.operationId).then((res)=>{
+ res.data.location=res.data.toLocation.id;
+ res.data.toLocation=res.data.toLocation.id;
+ res.data.details.forEach(item=>{
+ item.toLocationId=item.toLocation.name;
+ })
this.editConfig.infomation = { ...res.data,workType:res.baseOperationType }
})
this.editConfig.visible = true
--
Gitblit v1.8.0