|
|
@@ -48,9 +48,9 @@
|
|
|
`warehouseManagement.warehousingOrder.View`
|
|
|
">盘亏
|
|
|
</ws-button>
|
|
|
- <ws-button :type="searchType === '1' ? 'primary' : ''" @click="handle('1')" v-hasPermission="
|
|
|
+ <!-- <ws-button :type="searchType === '1' ? 'primary' : ''" @click="handle('1')" v-hasPermission="
|
|
|
`warehouseManagement.warehousingOrder.View`">待审核
|
|
|
- </ws-button>
|
|
|
+ </ws-button> -->
|
|
|
</el-col>
|
|
|
<el-col style='text-align:right;' :span="12">
|
|
|
|
|
|
@@ -87,8 +87,8 @@
|
|
|
<span v-else>{{ scope.$index + 1 }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="goodsSource" label="货源" width="80"></el-table-column>
|
|
|
- <el-table-column prop="deliveryWarehouse" label="发货库" width="80"></el-table-column>
|
|
|
+ <el-table-column prop="goodsSource" label="货源" width="150"></el-table-column>
|
|
|
+ <el-table-column prop="deliveryWarehouse" label="发货库" width="200"></el-table-column>
|
|
|
<el-table-column prop="goodsName" label="货名" width="80">
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="inWarehouseWeight1" width="130" class="table_td" label="入库重量（吨）"></el-table-column>
|
|
|
@@ -100,24 +100,22 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="surplusWeight" width="130" class="table_td" label="剩余重量（吨）"></el-table-column>
|
|
|
- <el-table-column prop="approveStatus" label="状态" width="90">
|
|
|
+ <!-- <el-table-column prop="approveStatus" label="状态" width="90">
|
|
|
<template slot-scope="scope">
|
|
|
<template>
|
|
|
- <!-- <span v-if='scope.row.approveStatus'>{{ scope.row.approveStatus }}</span> -->
|
|
|
- <!-- <span v-else>{{ scope.row.inventoryStatus }}</span> -->
|
|
|
<span>{{ scope.row.inventoryStatus }}</span>
|
|
|
</template>
|
|
|
<img v-if="scope.row.taskStatus == '执行中'" width="17" height="18"
|
|
|
style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
|
|
|
@click="editClick(scope.row)" alt />
|
|
|
</template>
|
|
|
- </el-table-column>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column prop="seller" label="操作" width="230">
|
|
|
<template slot-scope="scope">
|
|
|
<ws-button type="primary" v-if="scope.row.inventoryStatus == '待审核'" @click="aduit(scope.row)" v-hasPermission="`warehouseManagement.warehousingOrder.adiut`">
|
|
|
审核</ws-button>
|
|
|
</template>
|
|
|
- </el-table-column>
|
|
|
+ </el-table-column>-->
|
|
|
</el-table>
|
|
|
</div>
|
|
|
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
|
|
|
@@ -743,7 +741,7 @@
|
|
|
// data[q].surplusWeight=(data[q].inWarehouseWeight/1000)-data[q].outWarehouseWeight+data[q].profitAndLoss
|
|
|
// }else{
|
|
|
data[q].inWarehouseWeight1=data[q].inWarehouseWeight.toFixed(3)
|
|
|
- data[q].surplusWeight=parseInt((data[q].inWarehouseWeight-data[q].outWarehouseWeight+data[q].profitAndLoss)*100)/100
|
|
|
+ data[q].surplusWeight=(data[q].inWarehouseWeight-data[q].outWarehouseWeight+data[q].profitAndLoss).toFixed(3)
|
|
|
// }
|
|
|
data[q].select=false
|
|
|
data[q].weightedit=false
|
