Browse Source

计算仓储费修改

wengyuwen 4 years ago
parent
commit
fbe96ec02b

+ 1 - 0
src/views/finance/contrast/index.vue

@@ -297,6 +297,7 @@
           <el-button type="warning" size="small" @click="reconciliation" :disabled="notChange" v-if="queryParams.fBillstatus < '4'"
             >对账</el-button>
           <el-button type="primary" size="small" @click="confirmReconciliation" :disabled="notChange" v-if="queryParams.fBillstatus < '4'">确认对账</el-button>
+          <el-button type="warning" size="small" @click="">导出</el-button>
           <el-button type="success" size="small" @click="backrRconciliation" v-if="queryParams.fBillstatus === '6'">撤销对账</el-button>
 <!--          <el-button type="info" size="small" @click="exportData">导出</el-button>-->
           <el-button type="danger" size="small" :disabled="disappear" v-if="queryParams.fBillstatus === '4'" @click="backApproval">撤销审批</el-button>

+ 2 - 0
src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -1400,6 +1400,7 @@
           if (response.data.warehouseItemsList) {
             this.dataList = response.data.warehouseItemsList
             for (let li in this.dataList) {
+              this.$set(this.dataList[li], 'fBillingway',this.dataList[li].fBillingway + '')
               this.$set(this.dataList[li], 'fBsdate', Date.parse(this.dataList[li].fBsdate))
               this.$set(this.dataList[li], 'fChargedate', Date.parse(this.dataList[li].fChargedate))
               this.$set(this.dataList[li], 'fBillingDeadline', Date.parse(this.dataList[li].fBillingDeadline))
@@ -1442,6 +1443,7 @@
           if (response.data.warehouseItemsList) {
             this.dataList = response.data.warehouseItemsList
             for (let li in this.dataList) {
+              this.$set(this.dataList[li], 'fBillingway',this.dataList[li].fBillingway + '')
               this.$set(this.dataList[li], 'fBsdate', Date.parse(this.dataList[li].fBsdate))
               this.$set(this.dataList[li], 'fChargedate', Date.parse(this.dataList[li].fChargedate))
               this.$set(this.dataList[li], 'fBillingDeadline', Date.parse(this.dataList[li].fBillingDeadline))