付费申请 指示 完结 不允许新增

src/views/iosBasicData/PaymentApplication/assembly/cashierItem.vue

@@ -16,7 +16,8 @@
         @on-load="onLoad"
       >
         <template slot="indexHeader" slot-scope="{ row }">
-          <el-button type="primary" size="small" icon="el-icon-plus" circle @click="addRow"></el-button>
+          <el-button type="primary" size="small" icon="el-icon-plus" circle @click="addRow" 
+            :disabled="form.cashierStatus == 2"></el-button>
         </template>
         <template slot="index" slot-scope="{ row, index }">
           <span>{{ index + 1 }}</span>

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -639,6 +639,7 @@ import checkSchedule from "@/components/checkH/checkSchedule.vue";
 import dicSelect from "@/components/dicSelect/main";
 import cashierItem from "./assembly/cashierItem.vue";
 import { getListAllDetail } from "@/api/iosBasicData/cashier.js";
+import { dateFormat} from "@/util/date";
 export default {
   components: {
     checkSchedule,
@@ -735,7 +736,8 @@ export default {
         dc: "C",
         mblno: null,
         corpCnName: null,
-        corpId: null
+        corpId: null,
+        estimatedTime:dateFormat(new Date(), "yyyy-MM-dd"),
       },
       addData: [],
       handleSelectionData: [], // 表格选择的数据
@@ -1465,6 +1467,7 @@ export default {
       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.auditDateTo = this.form.auditDateTo ? this.form.auditDateTo.slice(0, 10) + " 00:00:00" : null;
       (this.form.url = "/iosBasicData/PaymentApplication/index"), (this.form.pageStatus = "this.$store.getters.paidapplication");
       this.form.pageLabel = "付费申请(F)";
 
@@ -1495,6 +1498,7 @@ export default {
           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.auditDateTo = this.form.auditDateTo ? this.form.auditDateTo.slice(0, 10) + " 00:00:00" : null;
           revokeSettlementApprove(this.form)
             .then(res => {
               this.$message.success("操作成功");

src/views/iosBasicData/PaymentApplication/index.vue

@@ -28,7 +28,8 @@
         @expand-change="expandChange"
       >
         <template slot="expand" slot-scope="{ row }">
-          <finstlbillsitems :tableData="row.finStlBillsItemsList || []" :brfalse="false"></finstlbillsitems>
+          <!-- <finstlbillsitems :tableData="row.finStlBillsItemsList || []" :brfalse="false"></finstlbillsitems> -->
+          <avue-crud :data="row.finStlBillsItemsList" :option="itemOption" :cell-style="cellStyle" class="itemTable"></avue-crud>
         </template>
         <tempalte slot="feeCnNameSearch">
           <dic-select
@@ -103,6 +104,255 @@ export default {
   components: { finstlbillsitems, finstlbillsDetails, reports, dicSelect },
   data() {
     return {
+      itemOption: {
+        height: "auto",
+        header: false,
+        index: true,
+        menu: false,
+        align: "center",
+        column: [
+          {
+            label: "原业务编号",
+            prop: "billNo",
+            width: 120,
+            overHidden: true
+          },
+          {
+            label: "发票号",
+            prop: "invoiceNo",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "结算单位",
+            prop: "corpCnName",
+            width: 120,
+            overHidden: true
+          },
+          {
+            label: "MB/L NO",
+            prop: "mblno",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "本次签收CNY",
+            prop: "currentStlAmountRMB",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "本次签收USD",
+            prop: "currentStlAmountUSD",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "币种",
+            prop: "currentStlCurCode",
+            width: 60,
+            overHidden: true
+          },
+          {
+            label: "汇率",
+            prop: "currentStlExrate",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "对账",
+            prop: "isChecked",
+            width: 60,
+            overHidden: true,
+            type: "select",
+            dicData: [
+              {
+                label: "否",
+                value: 0
+              },
+              {
+                label: "是",
+                value: 1
+              }
+            ]
+          },
+          {
+            label: "签收",
+            prop: "isSignfor",
+            width: 60,
+            overHidden: true,
+            type: "select",
+            dicData: [
+              {
+                label: "否",
+                value: 0
+              },
+              {
+                label: "是",
+                value: 1
+              }
+            ]
+          },
+          {
+            label: "发票状态",
+            prop: "isInvoice",
+            width: 80,
+            type: "select",
+            dicData: [
+              {
+                label: "待开发票",
+                value: 1
+              },
+              {
+                label: "确认开票",
+                value: 2
+              },
+              {
+                label: "不开发票",
+                value: 3
+              }
+            ],
+            overHidden: true
+          },
+          {
+            label: "ETD",
+            prop: "etd",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "账单编号",
+            prop: "accBillNo",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "签收人",
+            prop: "signforName",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "签收日期",
+            prop: "signforDate",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "操作人",
+            prop: "operatorName",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "BOOKINGNO",
+            prop: "bookingNo",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "HB/L NO",
+            prop: "hblno",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "船名",
+            prop: "vesselCnName",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "航次",
+            prop: "voyageNo",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "发票CNY",
+            prop: "currentInvoiceAmountRMB",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "发票USD",
+            prop: "currentInvoiceAmountUSD",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "箱量",
+            prop: "quantityCntrTypesDescr",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "收付",
+            prop: "dc",
+            width: 60,
+            type: "select",
+            dicData: [
+              {
+                label: "收",
+                value: "D"
+              },
+              {
+                label: "付",
+                value: "C"
+              }
+            ],
+            overHidden: true
+          },
+          {
+            label: "账单CNY",
+            prop: "unsettledAmountRMB",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "账单USD",
+            prop: "unsettledAmountUSD",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "已签收CNY",
+            prop: "reconciliationAmount",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "已签收USD",
+            prop: "reconciliationAmountUsd",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "已结算CNY",
+            prop: "stlAmountDr",
+            width: 90,
+            overHidden: true
+          },
+          {
+            label: "已结算USD",
+            prop: "stlAmountDrUSD",
+            width: 90,
+            overHidden: true
+          },
+          {
+            label: "业务员",
+            prop: "srcCnName",
+            width: 80,
+            overHidden: true
+          },
+          {
+            label: "备注",
+            prop: "remarkss",
+            width: 120,
+            overHidden: true
+          }
+        ]
+      },
       activeName: 0,
       pageIds: [],
       datekey: Date.now(),
@@ -474,8 +724,8 @@ export default {
     // 展开行
     expandChange(row, expendList) {
       finstlbillsitemsList(1, 20, { pid: row.id }).then(res => {
-        row.finStlBillsItemsList = res.data.data.records.map(item => {
-          if (item.currentStlCurCode == "CNY") {
+        this.data[row.$index].finStlBillsItemsList = res.data.data.records.map(item => {
+          if (item.curCode == "CNY") {
             // 发票
             this.$set(item, "currentInvoiceAmountRMB", item.currentInvoiceAmount);
             // 应结算金额
@@ -682,6 +932,9 @@ export default {
       };
       this.loading = true;
       finstlbillsList(page.currentPage, page.pageSize, obj).then(res => {
+        res.data.data.records.forEach(item => {
+          item.finStlBillsItemsList = [];
+        });
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records.map(item => {

src/views/iosBasicData/cashier/components/cashierItem.vue

@@ -308,7 +308,7 @@ export default {
       if (name == "确认出纳") {
         for (let item of this.selectionList) {
           if (item.status == 1) {
-            return this.$message.error("请选择未出纳的数据");
+            return this.$message.error("请选择"+(this.form.dc == "D" ? "未收款" : "未支付")+"的数据");
           }
         }
         let obj = {
@@ -344,7 +344,7 @@ export default {
       if (name == "撤销出纳") {
         for (let item of this.selectionList) {
           if (item.status == 0) {
-            return this.$message.error("请选择已出纳的数据");
+            return this.$message.error("请选择"+(this.form.dc == "D" ? "已收款" : "已支付")+"数据");
           }
         }
         this.$confirm("是否撤销?", "提示", {

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -764,7 +764,7 @@
                     <el-button style="margin-left: 10px" :disabled="statusType" size="small" type="primary" @click="invoiceMatchingfun()"
                       >匹配金额</el-button
                     >
-                    <span style="font-size: 18px;font-weight: 600;margin-left: 50px;">
+                    <span style="font-size: 18px;font-weight: 600;margin-left: 10px;">
                       <span style="color: #67C23A;margin-right: 10px;"> CNY:￥{{ amountSubSum }}元 </span>
                       <span style="color: #E6A23C;"> USD:${{ amountSubUsdSum }}元 </span>
                     </span>

src/views/iosBasicData/finstlbills/assembly/cashierItem.vue

@@ -277,6 +277,7 @@ export default {
     },
     //生成指示
     async processData(row, list, dataList) {
+      this.loading=true
       let amountDr = 0;
       let amountDrUsd = 0;
       let amountCr = 0;
@@ -375,6 +376,7 @@ export default {
         const res = await submitList(this.data);
         this.data = res.data.data;
       }
+      this.loading=false
     },
     rowEdit(row) {
       if (row.$cellEdit) {

src/views/iosBasicData/finstlbills/index.vue

@@ -471,29 +471,30 @@ export default {
             },
             overHidden: true
           },
-          {
-            label: "是否签收",
-            prop: "isSignfor",
-            dicData: [],
-            props: {
-              label: "dictValue",
-              value: "dictKey"
-            },
-            overHidden: true
-          },
-          {
-            label: "是否对账",
-            prop: "isChecked",
-            dicData: [],
-            props: {
-              label: "dictValue",
-              value: "dictKey"
-            },
-            overHidden: true
-          },
+          // {
+          //   label: "是否签收",
+          //   prop: "isSignfor",
+          //   dicData: [],
+          //   props: {
+          //     label: "dictValue",
+          //     value: "dictKey"
+          //   },
+          //   overHidden: true
+          // },
+          // {
+          //   label: "是否对账",
+          //   prop: "isChecked",
+          //   dicData: [],
+          //   props: {
+          //     label: "dictValue",
+          //     value: "dictKey"
+          //   },
+          //   overHidden: true
+          // },
           {
             label: "是否生成对账",
             prop: "billStatus",
+            width:100,
             dicData: [],
             props: {
               label: "dictValue",
@@ -501,27 +502,27 @@ export default {
             },
             overHidden: true
           },
-          {
-            label: "是否销账",
-            prop: "isCleared",
-            dicData: [],
-            props: {
-              label: "dictValue",
-              value: "dictKey"
-            },
-            overHidden: true
-          },
-          {
-            label: "是否开发票",
-            prop: "isInvoice",
-            dicData: [],
-            props: {
-              label: "dictValue",
-              value: "dictKey"
-            },
-            width: "140",
-            overHidden: true
-          },
+          // {
+          //   label: "是否销账",
+          //   prop: "isCleared",
+          //   dicData: [],
+          //   props: {
+          //     label: "dictValue",
+          //     value: "dictKey"
+          //   },
+          //   overHidden: true
+          // },
+          // {
+          //   label: "是否开发票",
+          //   prop: "isInvoice",
+          //   dicData: [],
+          //   props: {
+          //     label: "dictValue",
+          //     value: "dictKey"
+          //   },
+          //   width: "140",
+          //   overHidden: true
+          // },
           {
             label: "是否含税价计算",
             prop: "isTax",