|
|
@@ -33,7 +33,7 @@
|
|
|
</ws-button>
|
|
|
</template>
|
|
|
<template slot="right">
|
|
|
- <ws-input @keyup.enter.native="find()" class='findValue' v-model="searchKeyWord" placeholder="可按合同编号或任务编号查找" clearable maxlength="300" type="input"></ws-input>
|
|
|
+ <ws-input @keyup.enter.native="find()" class='findValue' v-model="searchKeyWord" placeholder="可按合同编号查找" clearable maxlength="300" type="input"></ws-input>
|
|
|
<ws-button class="find" type="primary" @click="lookUp()">
|
|
|
<img width="16" height="16" style="
|
|
|
vertical-align: text-top;
|
|
|
@@ -66,12 +66,13 @@
|
|
|
<span v-else>{{ scope.$index + 1 }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="goodsSource" label="货源" width="160"></el-table-column>
|
|
|
+ <el-table-column prop="contractNo" label="合同编号" width="160"></el-table-column>
|
|
|
+ <!-- <el-table-column prop="goodsSource" label="货源" width="160"></el-table-column> -->
|
|
|
<el-table-column prop="goodsName" label="货名" width="160">
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="surplusWeight" class="table_td" label="剩余重量（吨）"></el-table-column>
|
|
|
<el-table-column prop="avgCost" class="table_td" label="平均成本（吨）"></el-table-column>
|
|
|
- <el-table-column prop="issuingTimeOther" class="table_td" label="入库单日期"></el-table-column>
|
|
|
+ <!-- <el-table-column prop="issuingTimeOther" class="table_td" label="入库单日期"></el-table-column> -->
|
|
|
<el-table-column prop="outWeight" class="table_td" label="预计出库重量（吨）">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input @input='outweightchange' v-model="scope.row.estimateOutWarehouseWeight" placeholder="输入本次出库重量"></el-input>
|
|
|
@@ -134,7 +135,7 @@
|
|
|
showType: true,
|
|
|
// 年
|
|
|
year: '',
|
|
|
- goodsName:'0',
|
|
|
+ goodsName:'',
|
|
|
goodsList:[],
|
|
|
gainList: [],
|
|
|
gainList1:[],
|
|
|
@@ -266,7 +267,7 @@
|
|
|
pageSize: this.pageSize,
|
|
|
searchType: this.searchType,
|
|
|
searchKeyWord: this.searchKeyWord,
|
|
|
-
|
|
|
+ goodsName:this.goodsName,
|
|
|
// inOutType:this.inOutType,
|
|
|
baseId:this.baseId,
|
|
|
flag:this.flag
|
|
|
@@ -382,7 +383,7 @@
|
|
|
startDate:this.startDate,
|
|
|
endDate:this.endDate,
|
|
|
searchType: this.searchType,
|
|
|
- goodsName:this.goodsName==0?'':this.goodsName1,
|
|
|
+ goodsName:this.goodsName,
|
|
|
searchKeyWord: this.searchKeyWord,
|
|
|
// inOutType:this.inOutType,
|
|
|
baseId:this.baseId,
|
zhangyuewww