发票申请修改币别联动 付费申请新加字段

src/views/iosBasicData/PaymentApplication/index.vue

@@ -244,24 +244,36 @@ export default {
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
           },
-          // {
-          //   label: "应付",
-          //   prop: "amountCr",
-          //   width: "160",
-          //   overHidden: true
-          // },
+          {
+            label: "本币应付",
+            prop: "amountCr",
+            width: "160",
+            overHidden: true
+          },
+           {
+            label: "外币应付",
+            prop: "amountCrUsd",
+            width: "160",
+            overHidden: true
+          },
           {
             label: "合计应付",
             prop: "amountCrLoc",
             width: "160",
             overHidden: true
           },
-          // {
-          //   label: "应收",
-          //   prop: "amountDr",
-          //   width: "160",
-          //   overHidden: true
-          // },
+          {
+            label: "本币应收",
+            prop: "amountDr",
+            width: "160",
+            overHidden: true
+          },
+             {
+            label: "外币应收",
+            prop: "amountDrUsd",
+            width: "160",
+            overHidden: true
+          },
           {
             label: "合计应收",
             prop: "amountDrLoc",

src/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems.vue

@@ -133,8 +133,8 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "BOOKINGNO",
-                        prop: "bookingNo",
+                        label: "HB/L NO",
+                        prop: "hblno",
                         width: 120,
                         overHidden: true
                     },

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -293,8 +293,8 @@
                                                 </el-form-item>
                                             </el-col>
                                             <el-col :span="9">
-                                                <el-form-item label="开船日期" prop="accountDateFrom">
-                                                    <el-date-picker v-model="form.accountDateFrom" clearable
+                                                <el-form-item label="开船日期" prop="billDateStart">
+                                                    <el-date-picker v-model="form.billDateStart" clearable
                                                         style="width: 100%;" type="date" size="small"
                                                         :disabled="editSave || tableData.length"
                                                         value-format="yyyy-MM-dd" placeholder="选择业务日期">
@@ -302,8 +302,8 @@
                                                 </el-form-item>
                                             </el-col>
                                             <el-col :span="7">
-                                                <el-form-item label="-" prop="accountDateTo" label-width="30px">
-                                                    <el-date-picker v-model="form.accountDateTo" clearable
+                                                <el-form-item label="-" prop="billDateEnd" label-width="30px">
+                                                    <el-date-picker v-model="form.billDateEnd" clearable
                                                         style="width: 100%;" type="date" size="small"
                                                         :disabled="editSave || tableData.length"
                                                         value-format="yyyy-MM-dd" placeholder="选择业务日期">
@@ -672,6 +672,7 @@ export default {
                 branchName: JSON.parse(localStorage.getItem('sysitemData')).deptName,
                 dc: 'D',
                 invCurCode: 'CNY',
+                curCode:'CNY',
                 isRp: 1,
                 invType: '全电发票',
                 taxRate: 0,
@@ -720,8 +721,8 @@ export default {
                 taxRate: [
                     { required: true, message: '请输入所属税率', trigger: 'blur' },
                 ],
-                invCurCode: [
-                    { required: true, message: '请输入所属发票币别', trigger: 'blur' },
+                curCode: [
+                    { required: true, message: '请选择币别', trigger: 'blur' },
                 ],
             },
             roleName: [], // 当前的角色权限
@@ -757,7 +758,7 @@ export default {
         // 获取当前登录人个人信息
         this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
         if (!this.form.id) {
-            this.form.invCurCode = this.getLocalCurrency()
+            this.form.curCode = this.getLocalCurrency()
             this.$set(this.form, 'exrate', this.getExchangeRate(this.getLocalCurrency(), this.form.dc, 2))
         }
         if (this.$route.query.mblno) {
@@ -782,6 +783,7 @@ export default {
         ResetFilter() {
             this.form = {
                 invCurCode: this.getLocalCurrency(),
+                curCode: this.getLocalCurrency(),
                 isRp: 1,
                 invType: '全电发票',
                 taxRate: 0,
@@ -789,13 +791,14 @@ export default {
                 isExchangeToCny: 0,
                 billDate: getCurrentDate(),
             }
-            getRateList({ current: 1, size: 30 }).then(res => {
-                for (let item of res.data.data.records) {
-                    if (item.code == "USD") {
-                        this.$set(this.form, 'exrate', item.exrate)
-                    }
-                }
-            })
+             this.$set(this.form, 'exrate', this.getExchangeRate(this.getLocalCurrency(), this.form.dc, 2))
+            // getRateList({ current: 1, size: 30 }).then(res => {
+            //     for (let item of res.data.data.records) {
+            //         if (item.code == "USD") {
+            //             this.$set(this.form, 'exrate', item.exrate)
+            //         }
+            //     }
+            // })
         },
         //请核关闭
         choceScheduleFun() {
@@ -870,11 +873,11 @@ export default {
                 obj.invoiceDate = this.form.invoiceDate.slice(0, 10) + ' 00:00:00'
             }
             // 业务日期
-            if (this.form.accountDateFrom) {
-                this.form.accountDateFrom = this.form.accountDateFrom.slice(0, 10) + ' 00:00:00'
+            if (this.form.billDateStart) {
+                this.form.billDateStart = this.form.billDateStart.slice(0, 10) + ' 00:00:00'
             }
-            if (this.form.accountDateTo) {
-                this.form.accountDateTo = this.form.accountDateTo.slice(0, 10) + ' 00:00:00'
+            if (this.form.billDateEnd) {
+                this.form.billDateEnd = this.form.billDateEnd.slice(0, 10) + ' 00:00:00'
             }
             for (let item of this.handleSelectionData) {
                 // 拿未开票的数据
@@ -913,11 +916,11 @@ export default {
                 obj.invoiceDate = this.form.invoiceDate.slice(0, 10) + ' 00:00:00'
             }
             // 业务日期
-            if (this.form.accountDateFrom) {
-                obj.accountDateFrom = this.form.accountDateFrom.slice(0, 10) + ' 00:00:00'
+            if (this.form.billDateStart) {
+                obj.billDateStart = this.form.billDateStart.slice(0, 10) + ' 00:00:00'
             }
-            if (this.form.accountDateTo) {
-                obj.accountDateTo = this.form.accountDateTo.slice(0, 10) + ' 00:00:00'
+            if (this.form.billDateEnd) {
+                obj.billDateEnd = this.form.billDateEnd.slice(0, 10) + ' 00:00:00'
             }
             for (let item of this.handleSelectionData) {
                 // 拿未开票的数据
@@ -1150,8 +1153,8 @@ export default {
                     }
                 }
             }
-            else if (name == 'invCurCode') {
-                this.$set(this.form, 'invCurCode', value)
+            else if (name == 'curCode') {
+                this.$set(this.form, 'curCode', value)
                 this.$set(this.form, 'exrate', this.getExchangeRate(value, this.form.dc, 2))
             }
             else {
@@ -1227,11 +1230,11 @@ export default {
                     this.form.invoiceDate = this.form.invoiceDate.slice(0, 10) + ' 00:00:00'
                 }
                 // 业务日期
-                if (this.form.accountDateFrom) {
-                    this.form.accountDateFrom = this.form.accountDateFrom.slice(0, 10) + ' 00:00:00'
+                if (this.form.billDateStart) {
+                    this.form.billDateStart = this.form.billDateStart.slice(0, 10) + ' 00:00:00'
                 }
-                if (this.form.accountDateTo) {
-                    this.form.accountDateTo = this.form.accountDateTo.slice(0, 10) + ' 00:00:00'
+                if (this.form.billDateEnd) {
+                    this.form.billDateEnd = this.form.billDateEnd.slice(0, 10) + ' 00:00:00'
                 }
                 if (this.form.id) {
                     if (this.handleSelectionData.length) {
@@ -1313,11 +1316,11 @@ export default {
         },
         finstlbillslistAccBillByCorpfun() {
             let obj = {}
-            if (this.form.accountDateFrom) {
-                obj.accountDateFrom = this.form.accountDateFrom.slice(0, 10) + ' 00:00:00'
+            if (this.form.billDateStart) {
+                obj.billDateStart = this.form.billDateStart.slice(0, 10) + ' 00:00:00'
             }
-            if (this.form.accountDateTo) {
-                obj.accountDateTo = this.form.accountDateTo.slice(0, 10) + ' 00:00:00'
+            if (this.form.billDateEnd) {
+                obj.billDateEnd = this.form.billDateEnd.slice(0, 10) + ' 00:00:00'
             }
             obj.type = '3'
             obj.branchId = this.form.branchId
@@ -1357,11 +1360,11 @@ export default {
                 //     obj.invoiceDate = this.form.invoiceDate.slice(0,10) + ' 00:00:00'
                 // }
                 // 业务日期
-                if (this.form.accountDateFrom) {
-                    obj.accountDateFrom = this.form.accountDateFrom.slice(0, 10) + ' 00:00:00'
+                if (this.form.billDateStart) {
+                    obj.billDateStart = this.form.billDateStart.slice(0, 10) + ' 00:00:00'
                 }
-                if (this.form.accountDateTo) {
-                    obj.accountDateTo = this.form.accountDateTo.slice(0, 10) + ' 00:00:00'
+                if (this.form.billDateEnd) {
+                    obj.billDateEnd = this.form.billDateEnd.slice(0, 10) + ' 00:00:00'
                 }
                 obj.type = '3'
                 obj.branchId = this.form.branchId