|
@@ -334,63 +334,72 @@
|
|
|
<el-table
|
|
|
v-loading="loading"
|
|
|
:data="warehousebillsList"
|
|
|
+ @filter-change="filterChange"
|
|
|
@selection-change="handleSelectionChange"
|
|
|
show-summary :summary-method="getSum"
|
|
|
>
|
|
|
<el-table-column type="selection" width="60" fixed align="center" />
|
|
|
<el-table-column type="index" label="行号" align="center" fixed/>
|
|
|
+ <el-table-column
|
|
|
+ v-for="(item, index) in getRowList"
|
|
|
+ :key="index"
|
|
|
+ :label="item.name"
|
|
|
+ :width="item.width"
|
|
|
+ :prop="item.label"
|
|
|
+ align="center"
|
|
|
+ sortable
|
|
|
+ />
|
|
|
+
|
|
|
+<!-- <el-table-column label="制单人" align="center" prop="createBy" fixed/>-->
|
|
|
<!-- <el-table-column-->
|
|
|
-<!-- v-for="(item, index) in getRowList"-->
|
|
|
-<!-- :key="index"-->
|
|
|
-<!-- :label="item.name"-->
|
|
|
-<!-- :width="item.width"-->
|
|
|
-<!-- :fixed="item.fixed"-->
|
|
|
-<!-- :prop="item.label"-->
|
|
|
-<!-- sortable-->
|
|
|
+<!-- label="仓管员"-->
|
|
|
+<!-- width="100"-->
|
|
|
<!-- align="center"-->
|
|
|
-<!-- :show-overflow-tooltip="true"-->
|
|
|
-<!-- />-->
|
|
|
-
|
|
|
- <el-table-column label="制单人" align="center" prop="createBy" fixed/>
|
|
|
- <el-table-column label="仓管员" width="100" align="center" sortable prop="fStorekeeper" fixed/>
|
|
|
- <el-table-column width="100" label="入库状态" fixed sortable align="center" prop="fItemsStatus">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span v-if="scope.row.fItemsStatus === 1">计划</span>
|
|
|
- <span v-if="scope.row.fItemsStatus === 2">待入库</span>
|
|
|
- <span v-if="scope.row.fItemsStatus === 3">入库中</span>
|
|
|
- <span v-if="scope.row.fItemsStatus === 4">已入库</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="货权方" fixed sortable width="220" align="center" prop="fCorpid"/>
|
|
|
- <el-table-column label="提单号" sortable fixed width="216" align="center" prop="fMblno" show-overflow-tooltip />
|
|
|
- <el-table-column label="计划品名" sortable fixed align="center" prop="fGoodsid" width="100" />
|
|
|
- <el-table-column label="品名" fixed :show-overflow-tooltip="true" align="center" prop="fProductName" />
|
|
|
- <el-table-column label="品牌" fixed align="center" prop="fMarks" />
|
|
|
- <el-table-column label="入库日期" fixed sortable align="center" prop="fBsdate" width="100">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="仓库" fixed sortable align="center" prop="fWarehouseid" />
|
|
|
- <el-table-column label="计划件数" align="center" prop="fPlanqty" />
|
|
|
- <el-table-column label="入库件数" align="center" prop="fQty" />
|
|
|
- <el-table-column label="入库毛重(kg)" align="center" width="100" prop="fGrossweight" />
|
|
|
- <el-table-column label="入库净重(kg)" align="center" width="100" prop="fNetweight" />
|
|
|
- <el-table-column label="车号" align="center" prop="fTruckno" width="100"/>
|
|
|
- <el-table-column label="司机名称" align="center" prop="fDriverName" />
|
|
|
- <el-table-column label="司机电话" align="center" prop="fDriverTel" width="120"/>
|
|
|
- <el-table-column label="司机身份证" align="center" prop="fDriverIdCar" width="180"/>
|
|
|
- <el-table-column label="业务类别" align="center" prop="fBusinessType" :formatter="fBusinessTypeFormat"/>
|
|
|
- <el-table-column width="100" label="费用状态" align="center" prop="fBillstatus">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span v-if="scope.row.fBillstatus === 1">录入</span>
|
|
|
- <span v-if="scope.row.fBillstatus === 2">暂存</span>
|
|
|
- <span v-if="scope.row.fBillstatus === 3">驳回</span>
|
|
|
- <span v-if="scope.row.fBillstatus === 4">请核</span>
|
|
|
- <span v-if="scope.row.fBillstatus === 5">审核中</span>
|
|
|
- <span v-if="scope.row.fBillstatus === 6">全部入账</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
+<!-- :filter-multiple="false"-->
|
|
|
+<!-- :filters="[{text:this.fStorekeeper,value: this.fStorekeeper}]"-->
|
|
|
+<!-- filter-placement="bottom-end"-->
|
|
|
+<!-- :filter-method="filterHandler"-->
|
|
|
+<!-- :column-key="'fStorekeeper'"-->
|
|
|
+<!-- prop="fStorekeeper"-->
|
|
|
+<!-- fixed/>-->
|
|
|
+<!-- <el-table-column width="100" label="入库状态" fixed sortable align="center" prop="fItemsStatus">-->
|
|
|
+<!-- <template slot-scope="scope">-->
|
|
|
+<!-- <span v-if="scope.row.fItemsStatus === 1">计划</span>-->
|
|
|
+<!-- <span v-if="scope.row.fItemsStatus === 2">待入库</span>-->
|
|
|
+<!-- <span v-if="scope.row.fItemsStatus === 3">入库中</span>-->
|
|
|
+<!-- <span v-if="scope.row.fItemsStatus === 4">已入库</span>-->
|
|
|
+<!-- </template>-->
|
|
|
+<!-- </el-table-column>-->
|
|
|
+<!-- <el-table-column label="货权方" fixed sortable width="220" align="center" prop="fCorpid"/>-->
|
|
|
+<!-- <el-table-column label="提单号" sortable fixed width="216" align="center" prop="fMblno" show-overflow-tooltip />-->
|
|
|
+<!-- <el-table-column label="计划品名" sortable fixed align="center" prop="fGoodsid" width="100" />-->
|
|
|
+<!-- <el-table-column label="品名" fixed :show-overflow-tooltip="true" align="center" prop="fProductName" />-->
|
|
|
+<!-- <el-table-column label="品牌" fixed align="center" prop="fMarks" />-->
|
|
|
+<!-- <el-table-column label="入库日期" fixed sortable align="center" prop="fBsdate" width="100">-->
|
|
|
+<!-- <template slot-scope="scope">-->
|
|
|
+<!-- <span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>-->
|
|
|
+<!-- </template>-->
|
|
|
+<!-- </el-table-column>-->
|
|
|
+<!-- <el-table-column label="仓库" fixed sortable align="center" prop="fWarehouseid" />-->
|
|
|
+<!-- <el-table-column label="计划件数" align="center" prop="fPlanqty" />-->
|
|
|
+<!-- <el-table-column label="入库件数" align="center" prop="fQty" />-->
|
|
|
+<!-- <el-table-column label="入库毛重(kg)" align="center" width="100" prop="fGrossweight" />-->
|
|
|
+<!-- <el-table-column label="入库净重(kg)" align="center" width="100" prop="fNetweight" />-->
|
|
|
+<!-- <el-table-column label="车号" align="center" prop="fTruckno" width="100"/>-->
|
|
|
+<!-- <el-table-column label="司机名称" align="center" prop="fDriverName" />-->
|
|
|
+<!-- <el-table-column label="司机电话" align="center" prop="fDriverTel" width="120"/>-->
|
|
|
+<!-- <el-table-column label="司机身份证" align="center" prop="fDriverIdCar" width="180"/>-->
|
|
|
+<!-- <el-table-column label="业务类别" align="center" prop="fBusinessType" :formatter="fBusinessTypeFormat"/>-->
|
|
|
+<!-- <el-table-column width="100" label="费用状态" align="center" prop="fBillstatus">-->
|
|
|
+<!-- <template slot-scope="scope">-->
|
|
|
+<!-- <span v-if="scope.row.fBillstatus === 1">录入</span>-->
|
|
|
+<!-- <span v-if="scope.row.fBillstatus === 2">暂存</span>-->
|
|
|
+<!-- <span v-if="scope.row.fBillstatus === 3">驳回</span>-->
|
|
|
+<!-- <span v-if="scope.row.fBillstatus === 4">请核</span>-->
|
|
|
+<!-- <span v-if="scope.row.fBillstatus === 5">审核中</span>-->
|
|
|
+<!-- <span v-if="scope.row.fBillstatus === 6">全部入账</span>-->
|
|
|
+<!-- </template>-->
|
|
|
+<!-- </el-table-column>-->
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="180">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
@@ -3645,7 +3654,8 @@ export default {
|
|
|
fTocorpid: [{ required: true, message: " ", trigger: "blur", },],
|
|
|
fGoodsid: [{ required: true, message: " ", trigger: "blur", },],
|
|
|
},
|
|
|
- defaultTitle:[]
|
|
|
+ defaultTitle:[],
|
|
|
+ fStorekeeper:''
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
@@ -3706,6 +3716,23 @@ export default {
|
|
|
this.adoPt()
|
|
|
},
|
|
|
methods: {
|
|
|
+ filterChange(filters){
|
|
|
+ console.log(filters.fStorekeeper);
|
|
|
+ console.log(filters);
|
|
|
+ //调用接口获取数据
|
|
|
+ listWarehousebills().then(response => {
|
|
|
+ console.log(response)
|
|
|
+ for(let item in response.rows){
|
|
|
+ console.log(response.rows[item].fStorekeeper)
|
|
|
+ this.fStorekeeper = response.rows[item].fStorekeeper
|
|
|
+ }
|
|
|
+ })
|
|
|
+
|
|
|
+ },
|
|
|
+ filterHandler(value, row, column) {
|
|
|
+ const property = column['property'];
|
|
|
+ return row[property] === value;
|
|
|
+ },
|
|
|
full(){
|
|
|
this.dialogFull = !this.dialogFull
|
|
|
},
|
|
@@ -4467,8 +4494,8 @@ export default {
|
|
|
pageNum:1,
|
|
|
pageSize:10,
|
|
|
fTaskType:Number(fTaskType),
|
|
|
- fFleet:this.form.fFleet
|
|
|
-
|
|
|
+ fFleet:this.form.fFleet,
|
|
|
+ fBilltype:'SJRK'
|
|
|
}
|
|
|
}else {
|
|
|
this.Navigation = false
|
|
@@ -4476,7 +4503,7 @@ export default {
|
|
|
data = {
|
|
|
pageNum:1,
|
|
|
pageSize:10,
|
|
|
- fCorpid:this.form.fCorpid
|
|
|
+ fCorpid:this.form.fCorpid,
|
|
|
}
|
|
|
}
|
|
|
operationAgreement(data).then( response => {
|