货代 2024-1-15

src/router/views/index.js

@@ -2751,6 +2751,20 @@ export default [{
     }]
   },
   {
+    path: '/iosBasicData/amends/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/iosBasicData/amends/index',
+      name: '海运出口AMENO',
+      meta: {
+        i18n: '/iosBasicData/amends/index',
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/amends/index.vue')
+    }]
+  },
+  {
     path: '/billM/billingCenter/index',
     component: Layout,
     hidden: true,

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -73,8 +73,8 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="4">
-                                <el-form-item label="业务开始日期" prop="accountDateFrom">
-                                    <el-date-picker v-model="form.accountDateFrom" clearable
+                                <el-form-item label="业务开始" prop="businessDateStart">
+                                    <el-date-picker v-model="form.businessDateStart" clearable
                                                     style="width: 100%;"
                                                     type="date" size="small"
                                                     :disabled="editSave"
@@ -85,8 +85,8 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="4">
-                                <el-form-item label="业务结束日期" prop="accountDateTo">
-                                    <el-date-picker v-model="form.accountDateTo" clearable
+                                <el-form-item label="业务结束" prop="businessDateEnd">
+                                    <el-date-picker v-model="form.businessDateEnd" clearable
                                                     style="width: 100%;"
                                                     type="date" size="small"
                                                     :disabled="editSave"
@@ -618,8 +618,11 @@ export default {
                 this.form.businessTypeCode = 'STL'
                 this.form.businessType = 'STL' // 结算单
                 this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
-                this.form.accountDateFrom = this.form.accountDateFrom?this.form.accountDateFrom.slice(0,10) + ' 00:00:00':null // 财务开始日期
-                this.form.accountDateTo = this.form.accountDateTo?this.form.accountDateTo.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                this.form.businessDateStart = this.form.businessDateStart?this.form.businessDateStart.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                this.form.businessDateEnd = this.form.businessDateEnd?this.form.businessDateEnd.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                this.form.billDate = this.form.billDate?this.form.billDate.slice(0,10) + ' 00:00:00':null
+                this.form.auditDateTo = this.form.auditDateTo?this.form.auditDateTo.slice(0,10) + ' 00:00:00':null
+
                 this.form.settlementType = this.settlementType
                 this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
                     if (item.currentStlCurCode == 'CNY') {
@@ -753,8 +756,8 @@ export default {
             obj.voyageNo = this.form.voyageNo // 航次
             obj.signforDateList = this.form.signforDateList // 签收日期
             obj.auditStatus = '0'
-            obj.billDateStart = this.form.accountDateFrom // 业务开始日期
-            obj.billDateEnd = this.form.accountDateTo // 业务开始日期
+            obj.businessDateStart = this.form.businessDateStart // 业务开始日期
+            obj.businessDateEnd = this.form.businessDateEnd // 业务开始日期
             // 判断是否有对账单号
             if (this.form.checkNo) {
                 obj.corpId = this.form.corpId // 结算单位
@@ -897,9 +900,11 @@ export default {
             }).then(()=>{
                 this.pageLoading = true
                 this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
-                this.form.accountDateFrom = this.form.accountDateFrom?this.form.accountDateFrom.slice(0,10) + ' 00:00:00':null // 财务开始日期
-                this.form.accountDateTo = this.form.accountDateTo?this.form.accountDateTo.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                this.form.businessDateStart = this.form.businessDateStart?this.form.businessDateStart.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                this.form.businessDateEnd = this.form.businessDateEnd?this.form.businessDateEnd.slice(0,10) + ' 00:00:00':null // 财务开始日期
                 this.form.billDate = this.form.billDate?this.form.billDate.slice(0,10) + ' 00:00:00':null
+                this.form.auditDateTo = this.form.auditDateTo?this.form.auditDateTo.slice(0,10) + ' 00:00:00':null
+
                 this.form.url = '/iosBasicData/ComputationCenter/index',
                 this.form.pageStatus = "this.$store.getters.SettlementCenterF"
                 this.form.pageLabel = "结算中心(F)"
@@ -921,9 +926,11 @@ export default {
             }).then(()=>{
                 this.pageLoading = true
                 this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
-                this.form.accountDateFrom = this.form.accountDateFrom?this.form.accountDateFrom.slice(0,10) + ' 00:00:00':null // 财务开始日期
-                this.form.accountDateTo = this.form.accountDateTo?this.form.accountDateTo.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                this.form.businessDateStart = this.form.businessDateStart?this.form.businessDateStart.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                this.form.businessDateEnd = this.form.businessDateEnd?this.form.businessDateEnd.slice(0,10) + ' 00:00:00':null // 财务开始日期
                 this.form.billDate = this.form.billDate?this.form.billDate.slice(0,10) + ' 00:00:00':null
+                this.form.auditDateTo = this.form.auditDateTo?this.form.auditDateTo.slice(0,10) + ' 00:00:00':null
+
                 finstlbillsRevokeSettlement(this.form).then(res=>{
                     this.pageLoading = false
                     this.$message.success('操作成功');

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -99,8 +99,8 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="4">
-                                <el-form-item label="财务开始日期" prop="accountDateFrom">
-                                    <el-date-picker v-model="form.accountDateFrom" clearable
+                                <el-form-item label="业务开始" prop="businessDateStart">
+                                    <el-date-picker v-model="form.businessDateStart" clearable
                                                     style="width: 100%;"
                                                     type="date" size="small"
                                                     :disabled="editSave"
@@ -111,8 +111,8 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="4">
-                                <el-form-item label="财务结束日期" prop="accountDateTo">
-                                    <el-date-picker v-model="form.accountDateTo" clearable
+                                <el-form-item label="业务结束" prop="businessDateEnd">
+                                    <el-date-picker v-model="form.businessDateEnd" clearable
                                                     style="width: 100%;"
                                                     type="date" size="small"
                                                     :disabled="editSave"
@@ -699,8 +699,8 @@
                     if(this.form.estimatedTime) {
                         this.form.estimatedTime = this.form.estimatedTime + ' 00:00:00'
                     }
-                    this.form.accountDateFrom = this.form.accountDateFrom?this.form.accountDateFrom.slice(0,10) + ' 00:00:00':null // 财务开始日期
-                    this.form.accountDateTo = this.form.accountDateTo?this.form.accountDateTo.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                    this.form.businessDateStart = this.form.businessDateStart?this.form.businessDateStart.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                    this.form.businessDateEnd = this.form.businessDateEnd?this.form.businessDateEnd.slice(0,10) + ' 00:00:00':null // 财务开始日期
                     this.form.billDate = this.form.billDate?this.form.billDate.slice(0,10) + ' 00:00:00':null
                     this.saveLoading = true // 加载动画
                     this.form.billNoFormat = 'FFSQ'
@@ -789,8 +789,8 @@
                 obj.receivableAdvance = this.form.receivableAdvance // 预收帐款
                 obj.voyageNo = this.form.voyageNo // 航次
                 obj.auditStatus = '0'
-                obj.billDateStart = this.form.accountDateFrom // 财务开始日期
-                obj.billDateEnd = this.form.accountDateTo // 财务开始日期
+                obj.businessDateStart = this.form.businessDateStart // 财务开始日期
+                obj.businessDateEnd = this.form.businessDateEnd // 财务结束日期
                 // 判断是否有对账单号
                 if (this.form.checkNo) {
                     obj.corpId = this.form.corpId // 结算单位
@@ -911,8 +911,8 @@
                 }).then(()=>{
                     this.pageLoading = true
                     this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
-                    this.form.accountDateFrom = this.form.accountDateFrom?this.form.accountDateFrom.slice(0,10) + ' 00:00:00':null // 财务开始日期
-                    this.form.accountDateTo = this.form.accountDateTo?this.form.accountDateTo.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                    this.form.businessDateStart = this.form.businessDateStart?this.form.businessDateStart.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                    this.form.businessDateEnd = this.form.businessDateEnd?this.form.businessDateEnd.slice(0,10) + ' 00:00:00':null // 财务开始日期
                     this.form.estimatedTime = this.form.estimatedTime?this.form.estimatedTime.slice(0,10) + ' 00:00:00':null
                     this.form.billDate = this.form.billDate?this.form.billDate.slice(0,10) + ' 00:00:00':null
                     this.form.url = '/iosBasicData/PaymentApplication/index',
@@ -936,8 +936,8 @@
                 }).then(()=>{
                     this.pageLoading = true
                     this.form.businessTypes = this.form.businessTypes?this.form.businessTypes.join(','):'' // 业务类型
-                    this.form.accountDateFrom = this.form.accountDateFrom?this.form.accountDateFrom.slice(0,10) + ' 00:00:00':null // 财务开始日期
-                    this.form.accountDateTo = this.form.accountDateTo?this.form.accountDateTo.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                    this.form.businessDateStart = this.form.businessDateStart?this.form.businessDateStart.slice(0,10) + ' 00:00:00':null // 财务开始日期
+                    this.form.businessDateEnd = this.form.businessDateEnd?this.form.businessDateEnd.slice(0,10) + ' 00:00:00':null // 财务开始日期
                     this.form.estimatedTime = this.form.estimatedTime?this.form.estimatedTime.slice(0,10) + ' 00:00:00':null
                     this.form.billDate = this.form.billDate?this.form.billDate.slice(0,10) + ' 00:00:00':null
                     revokeSettlementApprove(this.form).then(res=>{

src/views/iosBasicData/PaymentApplication/index.vue

@@ -212,7 +212,7 @@
             },
             {
                 label: "业务开始日期",
-                prop: "businessDateStart",
+                prop: "billDateStart",
                 width: "140",
                 overHidden:true,
                 search:true,
@@ -224,7 +224,7 @@
             },
             {
                 label: "业务结束日期",
-                prop: "businessDateEnd",
+                prop: "billDateEnd",
                 width: "140",
                 overHidden:true,
                 search:true,

src/views/iosBasicData/amends/amendsDetails.vue

@@ -290,7 +290,8 @@
                     bookingNo:this.form.bookingNo?this.form.bookingNo:null
                 }).then(res=>{
                     console.log(res,292)
-
+                    this.form = res.data.data
+                    this.form.origBillNo = res.data.data.billNo
                 })
             },
             //返回列表