|
|
@@ -343,7 +343,7 @@
|
|
|
v-if="
|
|
|
scope.row.fBillstatus == '录入' ||
|
|
|
scope.row.fBillstatus == '暂存' ||
|
|
|
- scope.row.fBillstatus == '驳回'
|
|
|
+ scope.row.fBillstatus == '审核驳回'
|
|
|
"
|
|
|
@click="handleUpdate(scope.row, false)"
|
|
|
v-hasPermi="['warehouseBusiness:storageFeeCalculation:edit']"
|
|
|
@@ -356,7 +356,7 @@
|
|
|
v-if="
|
|
|
scope.row.fBillstatus == '录入' ||
|
|
|
scope.row.fBillstatus == '暂存' ||
|
|
|
- scope.row.fBillstatus == '驳回'
|
|
|
+ scope.row.fBillstatus == '审核驳回'
|
|
|
"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
v-hasPermi="['warehouseBusiness:storageFeeCalculation:remove']"
|
|
|
@@ -585,6 +585,15 @@
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
+ prop="warehouseName"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="140px"
|
|
|
+ label="仓库"
|
|
|
+ v-if="showWarehouse == '0'"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
prop="fMarks"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
@@ -1134,6 +1143,7 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ showWarehouse: null,
|
|
|
tableHeight: '600',
|
|
|
dialogFull: false,
|
|
|
drag: false,
|
|
|
@@ -1430,6 +1440,9 @@ export default {
|
|
|
this.getDicts('data_unitfees').then((response) => {
|
|
|
this.fFeetunitOptions = response.data
|
|
|
})
|
|
|
+ this.getConfigKey("agreement.warehouse").then((response) => {
|
|
|
+ this.showWarehouse = response.msg;
|
|
|
+ });
|
|
|
this.register()
|
|
|
},
|
|
|
activated() {
|
lichao