修改bug

src/api/iosBasicData/advanceCharge.js

@@ -0,0 +1,38 @@
+import request from '@/router/axios';
+//贸易预付款列表
+export const getList = (current, size, params) => {
+    return request({
+        url: '/api/blade-los/advancecharge/list',
+        method: 'get',
+        params: {
+            ...params,
+            current,
+            size
+        }
+    })
+}
+//贸易预付款明细
+export const getDetail = (data) => {
+    return request({
+        url: '/api/blade-los/advancecharge/detail',
+        method: 'get',
+        params: data
+    })
+}
+
+//贸易预付款保存
+export const submit = (data) => {
+    return request({
+        url: '/api/blade-los/advancecharge/submit',
+        method: 'post',
+        data: data
+    })
+}
+//贸易预付款删除
+export const remove = (data) => {
+  return request({
+      url: '/api/blade-los/advancecharge/remove',
+      method: 'post',
+      params: data
+  })
+}

src/components/tradeAgency/businessReports.vue

@@ -473,8 +473,8 @@ export default {
         billId: this.id,
         reportCode: this.form.code,
         groupCode: this.form.groupCode,
-        itemIds:this.itemIds,
-        type:this.businessValue
+        itemIds: this.itemIds,
+        type: this.businessValue
       })
       // 获取的数据赋值
       console.log(res.data.data, 584)
@@ -517,14 +517,14 @@ export default {
     },
     // 打印报表获取数据
     reportsGetReportDatafun(url, row) {
-      if(row.groupCode=='首款'&&this.itemIds==null) return    this.$message.error("请选择明细");
-      if(row.groupCode=='尾款'&&this.itemIds==null) return    this.$message.error("请选择明细");
+      if (row.groupCode == '首款' && this.itemIds == null) return this.$message.error("请选择明细");
+      if (row.groupCode == '尾款' && this.itemIds == null) return this.$message.error("请选择明细");
       reportsGetReportData({
         billId: this.id,
         reportCode: row.classifyCode,
         groupCode: row.groupCode,
-        itemIds:this.itemIds,
-        type:this.businessValue
+        itemIds: this.itemIds,
+        type: this.businessValue
       }).then(res => {
         this.handleReportPreview(url, res.data.data.data)
       })

src/components/tradeAgency/businessReportsJK.vue

@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove,reportsGetReportDat,reportsGetReportData } from "@/api/iosBasicData/reports";
+import { getList, getDetail, add, update, remove, reportsGetReportDat, reportsGetReportData } from "@/api/iosBasicData/reports";
 import { getUserApprovalList } from "@/api/approval/processConfig";
 import { mapGetters } from "vuex";
 import { billsDetail } from '@/api/iosBasicData/bills'
@@ -468,7 +468,7 @@ export default {
         billId: this.id,
         reportCode: this.form.code,
         groupCode: this.form.groupCode,
-        type:this.businessValue
+        type: this.businessValue
       })
       // 获取的数据赋值
       console.log(res.data.data, 584)
@@ -515,7 +515,7 @@ export default {
         billId: this.id,
         reportCode: row.classifyCode,
         groupCode: row.groupCode,
-        type:this.businessValue
+        type: this.businessValue
       }).then(res => {
         this.handleReportPreview(url, res.data.data.data)
       })

src/components/tradeAgency/fee-infosimple.vue

@@ -47,7 +47,7 @@
             </tempalte>
             <template slot="curCode" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.curCode" placeholder="币别" key="id" label="code"
-                    :url="'/blade-los/bcurrency/getExrate?date=' + form.businessDate  + '&dc=' + row.dc" :filterable="true"
+                    :url="'/blade-los/bcurrency/getExrate?date=' + form.businessDate + '&dc=' + row.dc" :filterable="true"
                     @selectChange="rowDicChange('curCode', $event, row)"></dic-select>
                 <span v-else>{{ row.curCode }}</span>
             </template>
@@ -129,8 +129,8 @@
                 <span v-else>{{ row.exrate }}</span>
             </tempalte>
             <tempalte slot="stlExrate" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit" v-model="row.stlExrate" @change="countChange(row,'C')" :controls="false"
-                    placeholder="请输入 结算汇率" size="small" style="width: 100%;"></el-input-number>
+                <el-input-number v-if="row.$cellEdit" v-model="row.stlExrate" @change="countChange(row, 'C')"
+                    :controls="false" placeholder="请输入 结算汇率" size="small" style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.stlExrate }}</span>
             </tempalte>
         </avue-crud>
@@ -440,15 +440,15 @@ export default {
                 })
             }
         },
-        countChange(row,type) {
+        countChange(row, type) {
             row.amount = _.multiply(Number(row.quantity ? row.quantity : 0), Number(row.price ? row.price : 0))
-            if (row.feeCode== 'SFK' || row.feeCode == 'WK') {
-                if(type=='C'){
+            if (row.feeCode == 'SFK' || row.feeCode == 'WK') {
+                if (type == 'C') {
                     row.amount = _.multiply(Number(row.amountLoc ? row.amountLoc : 0), Number(row.stlExrate ? row.stlExrate : 0))
-                }else{
+                } else {
                     row.amount = _.multiply(Number(row.amountLoc ? row.amountLoc : 0), Number(row.exrate ? row.exrate : 0))
                 }
-               
+
             }
         },
         selectionDChange(list) {
@@ -481,7 +481,7 @@ export default {
                     el.elementsCode = row.elementsCode
                     el.elementsCnName = row.accElementName
                     el.elementsEnName = row.elementsEnName
-                    bcurrencyGetExrate({ date: this.form.businessDate , dc: el.dc }).then(res => {
+                    bcurrencyGetExrate({ date: this.form.businessDate, dc: el.dc }).then(res => {
                         res.data.data.forEach(e => {
                             if (row.curNo == e.code) {
                                 this.$set(el, 'exrate', e.exrate)
@@ -501,7 +501,7 @@ export default {
             }
             if (name == 'curCode') {
                 if (row) {
-                    bcurrencyGetExrate({ date: this.form.businessDate , dc: el.dc }).then(res => {
+                    bcurrencyGetExrate({ date: this.form.businessDate, dc: el.dc }).then(res => {
                         res.data.data.forEach(e => {
                             if (el.curCode == e.code) {
                                 this.$set(el, 'exrate', e.exrate)
@@ -518,7 +518,7 @@ export default {
                 if (type == 'C') {
                     for (let index in this.form.feeCenterListC) {
                         if (this.form.feeCenterListC[index].feeCnName == '首款' || this.form.feeCenterListC[index].feeCnName == '尾款') {
-                            if (!this.form.feeCenterListC[index].discountExrate) return this.$message.error("第" + (Number(index) + 1) + "行"+this.form.feeCenterListC[index].feeCnName+"费用优惠汇率不能为空");
+                            if (!this.form.feeCenterListC[index].discountExrate) return this.$message.error("第" + (Number(index) + 1) + "行" + this.form.feeCenterListC[index].feeCnName + "费用优惠汇率不能为空");
                         }
                     }
                     this.form.feeCenterListC.forEach(e => {

src/components/tradeAgency/fee-oceanFreight.vue

@@ -96,7 +96,7 @@
                     @click="allClick('生成账单', 'C')">生成账单</el-button>
                 <el-button type="danger" plain size="small" :disabled="disabled || selectionCList.length == 0"
                     @click="allClick('撤销账单', 'C')">撤销账单</el-button>
-                    <el-button type="primary" plain size="small" :disabled="disabled"
+                <el-button type="primary" plain size="small" :disabled="disabled"
                     @click="allClick('增值税', 'C')">增值税</el-button>
                 <el-button type="danger" plain size="small" :disabled="disabled" @click="allClick('关税', 'C')">关税</el-button>
                 <!-- <el-button type="primary" plain size="small" :disabled="disabled"
@@ -176,7 +176,8 @@
                 </el-row>
             </div>
             <span slot="footer" class="dialog-footer">
-                <el-button size="mini" @click="templateVisible = false; feesselectionList = []; templateRightData = []">取 消</el-button>
+                <el-button size="mini" @click="templateVisible = false; feesselectionList = []; templateRightData = []">取
+                    消</el-button>
                 <el-button type="primary" size="mini" @click="templateExport">导 入</el-button>
             </span>
         </el-dialog>
@@ -186,10 +187,10 @@
 <script>
 import dicSelect from "@/components/dicSelect/main";
 import { bcurrencyGetExrate } from "@/api/iosBasicData/rateManagement";
-import { submitListTrade, feeRemove, generateBill, revokeBill, synchronization,feecenterTemplateImport  } from "@/api/tradeAgency/tradeAgency";
+import { submitListTrade, feeRemove, generateBill, revokeBill, synchronization, feecenterTemplateImport } from "@/api/tradeAgency/tradeAgency";
 import { defaultDate } from "@/util/date";
 import { losbfeestemplateDetail } from "@/api/iosBasicData/losbfeestemplate";
-import { losbfeestemplateGetListTemplate} from "@/api/iosBasicData/bills";
+import { losbfeestemplateGetListTemplate } from "@/api/iosBasicData/bills";
 import _ from "lodash";
 export default {
     components: {
@@ -223,9 +224,9 @@ export default {
                 }
             },
             templateOption: {
-                height:400,
+                height: 400,
                 menu: false,
-                tip:false,
+                tip: false,
                 stripe: true,
                 addBtn: false,
                 editBtn: false,
@@ -233,7 +234,7 @@ export default {
                 viewBtn: false,
                 index: true,
                 selection: true,
-                header:false,
+                header: false,
                 column: [
                     {
                         label: '客户',
@@ -523,8 +524,8 @@ export default {
         this.optionC = await this.getColumnData(this.getColumnName(393), this.optionCBack);
     },
     methods: {
-         // 模板导入
-         templateExport() {
+        // 模板导入
+        templateExport() {
             if (!this.lefttemplate.id) {
                 this.$message.warning('请选择左侧客户')
                 return
@@ -601,7 +602,7 @@ export default {
         },
         countChange(row) {
             row.amount = _.multiply(Number(row.quantity ? row.quantity : 0), Number(row.price ? row.price : 0))
-            if (row.feeCode== 'SFK' || row.feeCode == 'WK') {
+            if (row.feeCode == 'SFK' || row.feeCode == 'WK') {
                 row.amount = _.multiply(Number(row.amountLoc ? row.amountLoc : 0), Number(row.exrate ? row.exrate : 0))
             }
         },
@@ -631,10 +632,10 @@ export default {
                     el.feeCode = row.code
                     el.feeEnName = row.enName
                     el.curCode = row.curNo
-                    el.elementsId=row.accElementId
-                    el.elementsCode=row.elementsCode
-                    el.elementsCnName=row.accElementName
-                    el.elementsEnName=row.elementsEnName
+                    el.elementsId = row.accElementId
+                    el.elementsCode = row.elementsCode
+                    el.elementsCnName = row.accElementName
+                    el.elementsEnName = row.elementsEnName
                     bcurrencyGetExrate({ date: this.form.contractDate, dc: el.dc }).then(res => {
                         res.data.data.forEach(e => {
                             if (row.curNo == e.code) {
@@ -647,10 +648,10 @@ export default {
                     el.feeCode = null
                     el.feeEnName = null
                     el.curCode = null
-                    el.elementsId=null
-                    el.elementsCode=null
-                    el.elementsCnName=null
-                    el.elementsEnName=null
+                    el.elementsId = null
+                    el.elementsCode = null
+                    el.elementsCnName = null
+                    el.elementsEnName = null
                 }
             }
             if (name == 'curCode') {

src/components/tradeAgency/reports.vue

@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import { getList, reportsDetail, add, update, reportsRemove} from "@/api/iosBasicData/reports";
+import { getList, reportsDetail, add, update, reportsRemove } from "@/api/iosBasicData/reports";
 import { getUserApprovalList } from "@/api/approval/processConfig";
 import { mapGetters } from "vuex";
 import { billsDetail } from '@/api/iosBasicData/bills'
@@ -94,11 +94,11 @@ export default {
       selectionList: [],
       option: {},
       optionBack: {
-        height:400,
+        height: 400,
         calcHeight: 30,
         tip: false,
-        search:false,
-        searchShow:false,
+        search: false,
+        searchShow: false,
         searchMenuSpan: 6,
         border: true,
         index: true,
@@ -236,7 +236,7 @@ export default {
         ]
       },
       data: [],
-      previewDialog:false,
+      previewDialog: false,
     };
   },
   async created() {
@@ -268,8 +268,8 @@ export default {
     }
   },
   methods: {
-    openDialog(){
-      this.previewDialog=true
+    openDialog() {
+      this.previewDialog = true
     },
     // 设计报表
     async reportDesignButton(url) {

src/enums/column-name.js

@@ -1820,7 +1820,13 @@ const columnName = [{
   },{
     code: 398,
     name: '贸易代理-贸易代理-设计报表'
-  }
+  },{
+    code: 399,
+    name: '财务管理(F)-预付款管理(T)'
+  },{
+    code: 400,
+    name: '财务管理(F)-预付款管理(T)-明细'
+  },
 ]
 export const getColumnName = (key) => {
   for (let index = 0; index < columnName.length; index++) {

src/router/views/index.js

@@ -3655,4 +3655,18 @@ export default [{
     component: () => import( /* webpackChunkName: "views" */ '@/views/tradeAgency/oceanFreightImport/index')
   }]
 },
+{
+  path: '/iosBasicData/advanceCharge/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/iosBasicData/advanceCharge/index',
+    name: '预付款管理(T)',
+    meta: {
+      i18n: '/iosBasicData/advanceCharge/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/advanceCharge/index')
+  }]
+},
 ]