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 | 127 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 111 insertions(+), 16 deletions(-)
diff --git a/src/views/reportForm/inboundOutboundDetail/index.vue b/src/views/reportForm/inboundOutboundDetail/index.vue
index 0c7cc70..059c3cf 100644
--- a/src/views/reportForm/inboundOutboundDetail/index.vue
+++ b/src/views/reportForm/inboundOutboundDetail/index.vue
@@ -6,6 +6,9 @@
:showAdd="false"
:placeholder="'璇锋牴鎹崟鍙枫�佷骇鍝併�佷笟鍔＄被鍨嬭繘琛屾悳绱�'"
:amount-view="false"
+ :inputName="params.keyWord"
+ :showDownload="true"
+ @downloadClick="downHttpClick"
@addCommonClick="addBtnClick"
@searchClick="getList"
/>
@@ -17,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" />
@@ -34,11 +67,15 @@
<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
-import { getHistory } from "@/api/reportForm/inventoryRwport"
+import { getHistory,getOperationInfo } from "@/api/reportForm/inventoryRwport"
// import { getProductOperatonList } from "@/api/product/product"
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: {},
@@ -47,6 +84,7 @@
computed: {},
data() {
return {
+ unitList:[],
tableList: {},
showcol: ["鐘舵��"],
searchOptions: [],
@@ -77,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: [],
@@ -130,11 +206,11 @@
},
{
label: "涓氬姟绫诲瀷",
- prop: "baseOperationType",
+ prop: "operationTypeName",
isShowColumn: true,
default: true,
- conversion: true,
- getStatus: this.getBaseOperationTypeList
+ // conversion: true,
+ // getStatus: this.getBaseOperationTypeList
},
{
label: "浠�",
@@ -148,7 +224,7 @@
isShowColumn: true,
default: true
},
- {
+ /*{
label: "鏁伴噺",
prop: "amount",
isShowColumn: true,
@@ -159,7 +235,7 @@
prop: "unit",
isShowColumn: true,
default: true
- },
+ },*/
{
label: "閲嶉噺",
prop: "weight",
@@ -211,15 +287,17 @@
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
- if (res.code === 200) {
+ if (res.code === 200&&res.data) {
res.data.map((item)=>{
let dateObject = new Date(item.date);
let formattedDateString = dateObject.toISOString().split('T')[0];
item.date=formattedDateString
})
- this.tableList.tableInfomation = res.data
- this.pagerOptions.totalCount = res.total
+ this.tableList.tableInfomation = res.data||[]
+ }else{
+ this.tableList.tableInfomation = res.data||[]
}
+ this.pagerOptions.totalCount = res.total
})
} else {
await getHistory({
@@ -228,7 +306,7 @@
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
- if (res.code === 200) {
+ if (res.code === 200&&res.data) {
res.data.map((item)=>{
if(item.status===""){
item.status=4
@@ -237,9 +315,11 @@
let formattedDateString = dateObject.toISOString().split('T')[0];
item.date=formattedDateString
})
- this.tableList.tableInfomation = res.data?res.data:[]
- this.pagerOptions.totalCount = res.total
+ this.tableList.tableInfomation = res.data||[]
+ }else{
+ this.tableList.tableInfomation = res.data||[]
}
+ this.pagerOptions.totalCount = res.total
})
}
},
@@ -249,10 +329,25 @@
this.getData()
},
// 琛岀偣鍑�
- tableRowClick(row) {
+ async tableRowClick(row) {
+ console.log(row,"鐪嬬湅row")
+ // window.sessionStorage.sessionStorage.setItem('paramsData', {
+ // // name: "鎷煎澶曚粨搴�-鍑哄簱",
+ // workType: row.baseOperationType,
+ // id: row.operationId,
+ // // code: "PX"
+ // });
+
+ 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
this.editConfig.title = "鏌ョ湅"
- this.editConfig.infomation = { ...row }
},
// 鏂板缓
addBtnClick() {
--
Gitblit v1.8.0