Qukatie 8 месяцев назад
Родитель
Сommit
d6c6313922
2 измененных файлов с 174 добавлено и 19 удалено
  1. 84 10
      src/views/ow/owPut/detailsPage.vue
  2. 90 9
      src/views/ow/owTask/detailsPage.vue

+ 84 - 10
src/views/ow/owPut/detailsPage.vue

@@ -121,8 +121,6 @@
                   @click="allClick('一键编辑')">一键编辑</el-button>
                 <el-button type="danger" plain size="small" :disabled="editDisabled || selectionList.length == 0"
                   @click="allClick('批量删除')">批量删除</el-button>
-                <el-button type="primary" plain size="small" :disabled="editDisabled">计算超期箱使费</el-button>
-                <el-button type="warning" plain size="small" :disabled="editDisabled">批量导入费用</el-button>
                 <!-- <el-button type="success" size="small">导入</el-button> -->
                 <!-- <el-button type="info" size="small" @click="allClick('启用')">启用</el-button> -->
                 <!-- <el-button type="primary" size="small" @click="allClick('卖箱')">卖箱</el-button> -->
@@ -232,6 +230,8 @@
                 <el-button type="primary" plain size="small"
                   :disabled="editDisabled || (selectionfeedList.length == 0 && selectionfeecList.length == 0)"
                   @click="allClick('D费用申请')">请核费用</el-button>
+                    <el-button type="primary" plain size="small" :disabled="editDisabled">计算超期箱使费</el-button>
+                <el-button type="warning" plain size="small" :disabled="editDisabled"  @click="allClick('批量导入费用')">批量导入费用</el-button>
                 <!-- <el-button type="primary" plain size="small" @click="$refs.printC.openDialog()">打印账单</el-button> -->
               </template>
               <template slot="indexHeader" slot-scope="{row,index}">
@@ -250,7 +250,7 @@
                 <span v-else>{{ row.billType }}</span>
               </template>
               <template slot="cntrNoForm" slot-scope="{row,index}">
-                <dic-select v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ')"
+                <dic-select v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ'|| row.feeCode == 'Pickup')"
                   v-model="row.cntrNo" key="id" label="code" :mockData="form.tradingBoxItemsList"
                   :filterable="true"></dic-select>
                 <span v-else>{{ row.cntrNo }}</span>
@@ -265,11 +265,11 @@
                 <span v-else>{{ row.corpCnName }}</span>
               </template>
               <template slot="feeCnNameForm" slot-scope="{ row }">
-                <dic-select v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ')"
+                <dic-select v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ'|| row.feeCode == 'Pickup')"
                   v-model="row.feeCnName" key="id" placeholder="费用名称" label="cnName" res="records"
                   url="/blade-los/bfees/list?status=0&current=1&size=20" :filterable="true" :remote="true"
                   dataName="cnName" @selectChange="rowDicChange('feeCnName', $event, row)"
-                  disabledLabel="押金,租箱费"></dic-select>
+                  disabledLabel="押金,租箱费,Pickup fee"></dic-select>
                 <span v-else>{{ row.feeCnName }}</span>
               </template>
               <template slot="curCodeForm" slot-scope="{ row }">
@@ -285,7 +285,7 @@
                 <span v-else>{{ row.exrate }}</span>
               </template>
               <template slot="unitNoForm" slot-scope="{row,index}">
-                <dic-select v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ')"
+                <dic-select v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ'|| row.feeCode == 'Pickup')"
                   v-model="row.unitNo" label="cnName" url="/blade-los/bunits/listAll?status=0"
                   :filterable="true"></dic-select>
                 <span v-else>{{ row.unitNo }}</span>
@@ -348,7 +348,7 @@
                 <span v-else>{{ row.billType }}</span>
               </template>
               <template slot="cntrNoForm" slot-scope="{row,index}">
-                <dic-select v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ')"
+                <dic-select v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ'|| row.feeCode == 'Pickup')"
                   v-model="row.cntrNo" key="id" label="code" :mockData="form.tradingBoxItemsList"
                   :filterable="true"></dic-select>
                 <span v-else>{{ row.cntrNo }}</span>
@@ -363,11 +363,11 @@
                 <span v-else>{{ row.corpCnName }}</span>
               </template>
               <template slot="feeCnNameForm" slot-scope="{ row }">
-                <dic-select v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ')"
+                <dic-select v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ'|| row.feeCode == 'Pickup')"
                   v-model="row.feeCnName" key="id" placeholder="费用名称" label="cnName" res="records"
                   url="/blade-los/bfees/list?status=0&current=1&size=20" :filterable="true" :remote="true"
                   dataName="cnName" @selectChange="rowDicChange('feeCnName', $event, row)"
-                  disabledLabel="押金,租箱费"></dic-select>
+                  disabledLabel="押金,租箱费,Pickup fee"></dic-select>
                 <span v-else>{{ row.feeCnName }}</span>
               </template>
               <template slot="curCodeForm" slot-scope="{ row }">
@@ -383,7 +383,7 @@
                 <span v-else>{{ row.exrate }}</span>
               </template>
               <template slot="unitNoForm" slot-scope="{row,index}">
-                <dic-select v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ')"
+                <dic-select v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ'|| row.feeCode == 'Pickup')"
                   v-model="row.unitNo" label="cnName" url="/blade-los/bunits/listAll?status=0"
                   :filterable="true"></dic-select>
                 <span v-else>{{ row.unitNo }}</span>
@@ -588,6 +588,7 @@ import dicSelect from "@/components/dicSelect/main";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
 import businessReports from "@/components/boxManagement/businessReports.vue";
 import reports from "@/components/boxManagement/reports.vue";
+import { bfeesList } from "@/api/iosBasicData/bfees";
 import {
   dateFormat
 } from "@/util/date";
@@ -2965,6 +2966,79 @@ export default {
           })
         });
       }
+      if (name == '批量导入费用') {
+        this.checkRate(null, this.form.effectiveDate, null, 1, this.deptId)
+        this.$confirm('是否批量导入费用?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          console.log(this.form.dc)
+          if (this.form.dc == 'd') {
+            bfeesList(1, 10, { cnName: 'Pickup fee' }).then(res => {
+              res.data.data.records.forEach(item => {
+                if (item.cnName == 'Pickup fee') {
+                  this.form.tradingBoxItemsList.forEach(e => {
+                    this.feeCenterListD.push({
+                      pid: this.form.id,
+                      feesType: 1,
+                      dc: 'D',
+                      billType: '箱东',
+                      corpId: this.form.purchaseCompanyId,
+                      shortName: this.form.purchaseCompanyName,
+                      corpCnName: this.form.purchaseCompanyName,
+                      cntrNo: e.code,
+                      unitNo: e.boxType,
+                      curCode: item.curNo,
+                      exrate: this.getExchangeRate(item.curNo, 'D', 1),
+                      feeId: item.id,
+                      feeCode: item.code,
+                      feeCnName: item.cnName,
+                      price: this.form.pickupFee,
+                      quantity: 1,
+                      amountCNY: item.curNo == this.getLocalCurrency() ? this.form.pickupFee : 0,
+                      amountUSD: item.curNo != this.getLocalCurrency() ? this.form.pickupFee : 0,
+                      $cellEdit: true
+                    })
+                  })
+                }
+              })
+            })
+
+          } else {
+            bfeesList(1, 10, { cnName: 'Pickup fee' }).then(res => {
+              res.data.data.records.forEach(item => {
+                if (item.cnName == 'Pickup fee') {
+                  this.form.tradingBoxItemsList.forEach(e => {
+                    this.feeCenterListC.push({
+                      pid: this.form.id,
+                      feesType: 1,
+                      dc: 'C',
+                      billType: '箱东',
+                      corpId: this.form.purchaseCompanyId,
+                      shortName: this.form.purchaseCompanyName,
+                      corpCnName: this.form.purchaseCompanyName,
+                      cntrNo: e.code,
+                      unitNo: e.boxType,
+                      curCode: item.curNo,
+                      exrate: this.getExchangeRate(item.curNo, 'C', 1),
+                      feeId: item.id,
+                      feeCode: item.code,
+                      feeCnName: item.cnName,
+                      price: this.form.pickupFee,
+                      quantity: 1,
+                      amountCNY: item.curNo == this.getLocalCurrency() ? this.form.pickupFee : 0,
+                      amountUSD: item.curNo != this.getLocalCurrency() ? this.form.pickupFee : 0,
+                      $cellEdit: true
+                    })
+                  })
+                }
+              })
+
+            })
+          }
+        })
+      }
     },
     submit(type) {
       this.$refs["form"].validate((valid, done) => {

+ 90 - 9
src/views/ow/owTask/detailsPage.vue

@@ -231,7 +231,8 @@
                 <el-button type="danger" plain size="small" @click="allClick('撤销租金')"
                   :disabled="editDisabled || form.tradingBoxItemsList.length == 0">撤销租金</el-button>
                 <el-button type="primary" plain size="small" :disabled="editDisabled">计算超期箱使费</el-button>
-                <el-button type="warning" plain size="small" :disabled="editDisabled">批量导入费用</el-button>
+                <el-button type="warning" plain size="small" :disabled="editDisabled"
+                  @click="allClick('批量导入费用')">批量导入费用</el-button>
                 <el-button type="primary" plain size="small"
                   :disabled="editDisabled || (selectionfeedList.length == 0 && selectionfeecList.length == 0)"
                   @click="allClick('D费用申请')">请核费用</el-button>
@@ -253,7 +254,8 @@
                 <span v-else>{{ row.billType }}</span>
               </template>
               <template slot="cntrNoForm" slot-scope="{row,index}">
-                <dic-select v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ')"
+                <dic-select
+                  v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ' || row.feeCode == 'Pickup')"
                   v-model="row.cntrNo" key="id" label="code" :mockData="form.tradingBoxItemsList"
                   :filterable="true"></dic-select>
                 <span v-else>{{ row.cntrNo }}</span>
@@ -268,11 +270,12 @@
                 <span v-else>{{ row.corpCnName }}</span>
               </template>
               <template slot="feeCnNameForm" slot-scope="{ row }">
-                <dic-select v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ')"
+                <dic-select
+                  v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ' || row.feeCode == 'Pickup')"
                   v-model="row.feeCnName" key="id" placeholder="费用名称" label="cnName" res="records"
                   url="/blade-los/bfees/list?status=0&current=1&size=20" :filterable="true" :remote="true"
                   dataName="cnName" @selectChange="rowDicChange('feeCnName', $event, row)"
-                  disabledLabel="押金,租箱费"></dic-select>
+                  disabledLabel="押金,租箱费,Pickup fee"></dic-select>
                 <span v-else>{{ row.feeCnName }}</span>
               </template>
               <template slot="curCodeForm" slot-scope="{ row }">
@@ -288,7 +291,8 @@
                 <span v-else>{{ row.exrate }}</span>
               </template>
               <template slot="unitNoForm" slot-scope="{row,index}">
-                <dic-select v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ')"
+                <dic-select
+                  v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ' || row.feeCode == 'Pickup')"
                   v-model="row.unitNo" label="cnName" url="/blade-los/bunits/listAll?status=0"
                   :filterable="true"></dic-select>
                 <span v-else>{{ row.unitNo }}</span>
@@ -351,7 +355,8 @@
                 <span v-else>{{ row.billType }}</span>
               </template>
               <template slot="cntrNoForm" slot-scope="{row,index}">
-                <dic-select v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ')"
+                <dic-select
+                  v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ' || row.feeCode == 'Pickup')"
                   v-model="row.cntrNo" key="id" label="code" :mockData="form.tradingBoxItemsList"
                   :filterable="true"></dic-select>
                 <span v-else>{{ row.cntrNo }}</span>
@@ -366,11 +371,12 @@
                 <span v-else>{{ row.corpCnName }}</span>
               </template>
               <template slot="feeCnNameForm" slot-scope="{ row }">
-                <dic-select v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ')"
+                <dic-select
+                  v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ' || row.feeCode == 'Pickup')"
                   v-model="row.feeCnName" key="id" placeholder="费用名称" label="cnName" res="records"
                   url="/blade-los/bfees/list?status=0&current=1&size=20" :filterable="true" :remote="true"
                   dataName="cnName" @selectChange="rowDicChange('feeCnName', $event, row)"
-                  disabledLabel="押金,租箱费"></dic-select>
+                  disabledLabel="押金,租箱费,Pickup fee"></dic-select>
                 <span v-else>{{ row.feeCnName }}</span>
               </template>
               <template slot="curCodeForm" slot-scope="{ row }">
@@ -386,7 +392,8 @@
                 <span v-else>{{ row.exrate }}</span>
               </template>
               <template slot="unitNoForm" slot-scope="{row,index}">
-                <dic-select v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ')"
+                <dic-select
+                  v-if="row.$cellEdit && !(row.feeCode == 'BOX-YJ' || row.feeCode == 'BOX-ZJ' || row.feeCode == 'Pickup')"
                   v-model="row.unitNo" label="cnName" url="/blade-los/bunits/listAll?status=0"
                   :filterable="true"></dic-select>
                 <span v-else>{{ row.unitNo }}</span>
@@ -594,6 +601,7 @@ import reports from "@/components/boxManagement/reports.vue";
 import { bcurrencyGetExrate } from "@/api/iosBasicData/rateManagement";
 import { getToken } from "@/util/auth";
 import { dateFormat } from "@/util/date";
+import { bfeesList } from "@/api/iosBasicData/bfees";
 import _ from "lodash";
 import { Header } from "element-ui";
 export default {
@@ -2951,6 +2959,79 @@ export default {
           })
         });
       }
+      if (name == '批量导入费用') {
+        this.checkRate(null, this.form.effectiveDate, null, 1, this.deptId)
+        this.$confirm('是否批量导入费用?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          console.log(this.form.dc)
+          if (this.form.dc == 'd') {
+            bfeesList(1, 10, { cnName: 'Pickup fee' }).then(res => {
+              res.data.data.records.forEach(item => {
+                if (item.cnName == 'Pickup fee') {
+                  this.form.tradingBoxItemsList.forEach(e => {
+                    this.feeCenterListD.push({
+                      pid: this.form.id,
+                      feesType: 1,
+                      dc: 'D',
+                      billType: '箱东',
+                      corpId: this.form.purchaseCompanyId,
+                      shortName: this.form.purchaseCompanyName,
+                      corpCnName: this.form.purchaseCompanyName,
+                      cntrNo: e.code,
+                      unitNo: e.boxType,
+                      curCode: item.curNo,
+                      exrate: this.getExchangeRate(item.curNo, 'D', 1),
+                      feeId: item.id,
+                      feeCode: item.code,
+                      feeCnName: item.cnName,
+                      price: this.form.pickupFee,
+                      quantity: 1,
+                      amountCNY: item.curNo == this.getLocalCurrency() ? this.form.pickupFee : 0,
+                      amountUSD: item.curNo != this.getLocalCurrency() ? this.form.pickupFee : 0,
+                      $cellEdit: true
+                    })
+                  })
+                }
+              })
+            })
+
+          } else {
+            bfeesList(1, 10, { cnName: 'Pickup fee' }).then(res => {
+              res.data.data.records.forEach(item => {
+                if (item.cnName == 'Pickup fee') {
+                  this.form.tradingBoxItemsList.forEach(e => {
+                    this.feeCenterListC.push({
+                      pid: this.form.id,
+                      feesType: 1,
+                      dc: 'C',
+                      billType: '箱东',
+                      corpId: this.form.purchaseCompanyId,
+                      shortName: this.form.purchaseCompanyName,
+                      corpCnName: this.form.purchaseCompanyName,
+                      cntrNo: e.code,
+                      unitNo: e.boxType,
+                      curCode: item.curNo,
+                      exrate: this.getExchangeRate(item.curNo, 'C', 1),
+                      feeId: item.id,
+                      feeCode: item.code,
+                      feeCnName: item.cnName,
+                      price: this.form.pickupFee,
+                      quantity: 1,
+                      amountCNY: item.curNo == this.getLocalCurrency() ? this.form.pickupFee : 0,
+                      amountUSD: item.curNo != this.getLocalCurrency() ? this.form.pickupFee : 0,
+                      $cellEdit: true
+                    })
+                  })
+                }
+              })
+
+            })
+          }
+        })
+      }
     },
     submit(type) {
       this.$refs["form"].validate((valid, done) => {