Browse Source

对账中心新加合计

Qukatie 3 weeks ago
parent
commit
1f38de3c80

+ 320 - 237
src/views/iosBasicData/fininvoicesApplyfor/index.vue

@@ -1,57 +1,96 @@
 <template>
   <div>
     <basic-container v-show="isShow">
-      <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
-        :before-open="beforeOpen" v-model="form" ref="crud" id="out-table" :header-cell-class-name="headerClassName"
-        @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel" @search-change="searchChange"
-        @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
-        @size-change="sizeChange" @refresh-change="refreshChange" :search.sync="query"
+      <avue-crud
+        :option="option"
+        :table-loading="loading"
+        :data="data"
+        :page.sync="page"
+        :permission="permissionList"
+        :before-open="beforeOpen"
+        v-model="form"
+        ref="crud"
+        id="out-table"
+        :header-cell-class-name="headerClassName"
+        @row-update="rowUpdate"
+        @row-save="rowSave"
+        @row-del="rowDel"
+        @search-change="searchChange"
+        @search-reset="searchReset"
+        @selection-change="selectionChange"
+        @current-change="currentChange"
+        @size-change="sizeChange"
+        @refresh-change="refreshChange"
+        :search.sync="query"
         @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 320)"
-        @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 320)" @on-load="onLoad">
+        @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 320)"
+        @on-load="onLoad"
+      >
         <template slot="menuLeft">
-          <el-button type="success" size="small" icon="el-icon-plus" plain @click="newbillFun">新建发票申请
-          </el-button>
-          <el-button type="danger" size="small" icon="el-icon-delete" plain @click="handleDelete">一键删除
-          </el-button>
+          <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+            <el-tab-pane label="未开" :name="0"></el-tab-pane>
+            <el-tab-pane label="已开" :name="1"></el-tab-pane>
+          </el-tabs>
+          <el-button type="success" size="small" icon="el-icon-plus" plain @click="newbillFun">新建发票申请 </el-button>
+          <el-button type="danger" size="small" icon="el-icon-delete" plain @click="handleDelete">一键删除 </el-button>
         </template>
         <tempalte slot="feeCnNameSearch">
-          <dic-select v-model="query.feeCnName" placeholder="费用名称" key="id" label="cnName" res="records"
-            url="/blade-los/bfees/list" :filterable="true" :remote="true" dataName="cnName"></dic-select>
+          <dic-select
+            v-model="query.feeCnName"
+            placeholder="费用名称"
+            key="id"
+            label="cnName"
+            res="records"
+            url="/blade-los/bfees/list"
+            :filterable="true"
+            :remote="true"
+            dataName="cnName"
+          ></dic-select>
         </tempalte>
-        <template slot="menu" slot-scope="{row}">
-          <el-button type="text" size="small" @click="editFun(row)">编辑
-          </el-button>
+        <template slot="menu" slot-scope="{ row }">
+          <el-button type="text" size="small" @click="editFun(row)">编辑 </el-button>
           <!--:disabled="saberUserInfo.role_name.indexOf('允许修改他人业务') == -1?saberUserInfo.user_id != row.createUser:false"-->
-          <el-button type="text" size="small"
-            :disabled="row.status == 3
-              || (saberUserInfo.role_name.indexOf('admin') == -1 ? saberUserInfo.role_name.indexOf('允许修改他人业务') == -1 ? saberUserInfo.user_id != row.createUser : false : false)"
-            @click="rowDel(row)">删除
+          <el-button
+            type="text"
+            size="small"
+            :disabled="
+              row.status == 3 ||
+                (saberUserInfo.role_name.indexOf('admin') == -1
+                  ? saberUserInfo.role_name.indexOf('允许修改他人业务') == -1
+                    ? saberUserInfo.user_id != row.createUser
+                    : false
+                  : false)
+            "
+            @click="rowDel(row)"
+            >删除
           </el-button>
         </template>
         <template slot-scope="scope" slot="stlMode">
-          <span>{{ scope.row.stlMode ? '月结' : '票结' }}</span>
+          <span>{{ scope.row.stlMode ? "月结" : "票结" }}</span>
         </template>
         <template slot-scope="{ row }" slot="billNo">
-          <span class="pointerClick" @click="editFun(row)">{{ row.billNo }}
-          </span>
+          <span class="pointerClick" @click="editFun(row)">{{ row.billNo }} </span>
         </template>
         <template slot-scope="{ row }" slot="invoiceDate">
-          {{ row.invoiceDate ? row.invoiceDate.slice(0, 10) : '' }}
+          {{ row.invoiceDate ? row.invoiceDate.slice(0, 10) : "" }}
         </template>
       </avue-crud>
     </basic-container>
-    <fininvoicesDetails ref="fininvoicesDetails" :editSave="editSave" v-if="!isShow" @goBack="goBack"
-      @toAddEdit="toAddEdit" :key="datekey"  :pageIds="pageIds">
+    <fininvoicesDetails
+      ref="fininvoicesDetails"
+      :editSave="editSave"
+      v-if="!isShow"
+      @goBack="goBack"
+      @toAddEdit="toAddEdit"
+      :key="datekey"
+      :pageIds="pageIds"
+    >
     </fininvoicesDetails>
   </div>
 </template>
 
 <script>
-import {
-  fininvoicesList,
-  fininvoicesDetail,
-  fininvoicesRemove, fininvoicesSubmit
-} from "@/api/iosBasicData/fininvoices";
+import { fininvoicesList, fininvoicesDetail, fininvoicesRemove, fininvoicesSubmit } from "@/api/iosBasicData/fininvoices";
 import fininvoicesDetails from "@/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue";
 import { mapGetters } from "vuex";
 import dicSelect from "@/components/dicSelect/main";
@@ -59,6 +98,7 @@ export default {
   components: { fininvoicesDetails, dicSelect },
   data() {
     return {
+      activeName: 0,
       pageIds: [],
       datekey: Date.now(),
       // 详情页面和列表切换
@@ -75,7 +115,7 @@ export default {
       selectionList: [],
       option: {},
       optionBack: {
-        height: 'auto',
+        height: "auto",
         calcHeight: 30,
         tip: false,
         searchShow: true,
@@ -89,13 +129,13 @@ export default {
         searchIcon: true,
         searchIndex: 3,
         column: [
-        {
+          {
             label: "客户名称",
             prop: "corpCnName",
             width: "120",
             search: true,
             searchOrder: 1,
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "MB/L NO",
@@ -131,62 +171,67 @@ export default {
             label: "单据编号",
             prop: "billNo",
             search: true,
-            rules: [{
-              required: true,
-              message: "请输入单据编号",
-              trigger: "blur"
-            }],
-            overHidden: true,
+            rules: [
+              {
+                required: true,
+                message: "请输入单据编号",
+                trigger: "blur"
+              }
+            ],
+            overHidden: true
           },
           {
             label: "费用名称",
             prop: "feeCnName",
             width: "140",
             search: true,
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "发票抬头",
             prop: "invCorpCnName",
             width: "160",
             search: true,
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "合计本位币(CNY)",
             prop: "amountLoc",
             width: "120",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "单据日期",
             prop: "billDate",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "制单人",
             prop: "createUserName",
-            overHidden: true,
-          }, {
+            overHidden: true
+          },
+          {
             label: "制单日期",
             prop: "createTime",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "发票号码",
             prop: "invoiceNo",
             search: true,
-            rules: [{
-              required: true,
-              message: "请输入发票号码",
-              trigger: "blur"
-            }],
-            overHidden: true,
+            rules: [
+              {
+                required: true,
+                message: "请输入发票号码",
+                trigger: "blur"
+              }
+            ],
+            overHidden: true
           },
           {
             label: "发票日期",
             prop: "invoiceDate",
-            overHidden: true,
+            overHidden: true
           },
           // {
           //   label: "单据开始日期",
@@ -223,7 +268,7 @@ export default {
             searchRange: true,
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
-            searchDefaultTime: ["00:00:00", "23:59:59"],
+            searchDefaultTime: ["00:00:00", "23:59:59"]
           },
           // {
           //   label: "原发票号码",
@@ -235,7 +280,7 @@ export default {
             label: "税务发票号码",
             prop: "taxInvoiceNo",
             width: "150",
-            overHidden: true,
+            overHidden: true
           },
           // {
           //   label: "全电发票",
@@ -247,7 +292,7 @@ export default {
             search: true,
             prop: "invType",
             width: "160",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "对账单号",
@@ -274,57 +319,61 @@ export default {
           {
             label: "税率 %",
             prop: "taxRate",
-            rules: [{
-              required: true,
-              message: "请输入税率 %",
-              trigger: "blur"
-            }],
-            overHidden: true,
+            rules: [
+              {
+                required: true,
+                message: "请输入税率 %",
+                trigger: "blur"
+              }
+            ],
+            overHidden: true
           },
           {
             label: "结算方式",
             prop: "stlMode",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "发票币种",
             prop: "invCurCode",
-            rules: [{
-              required: true,
-              message: "请输入发票币种",
-              trigger: "blur"
-            }],
-            overHidden: true,
+            rules: [
+              {
+                required: true,
+                message: "请输入发票币种",
+                trigger: "blur"
+              }
+            ],
+            overHidden: true
           },
           {
             label: "开票单位税号",
             prop: "invCorpTaxNo",
             width: "140",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "开票单位CNY开户银行",
             prop: "invCorpAccountBankCny",
             width: "160",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "开票单位CNY银行账号",
             prop: "invCorpAccountNoCny",
             width: "160",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "开票单位USD开户银行",
             prop: "invCorpAccountBankUsd",
             width: "160",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "开票单位USD银行账号",
             prop: "invCorpAccountNoUsd",
             width: "160",
-            overHidden: true,
+            overHidden: true
           },
           // {
           //   label: "船名/航次",
@@ -335,211 +384,232 @@ export default {
           {
             label: "开船日",
             prop: "etd",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "装货港",
             prop: "pol",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "卸货港",
             prop: "pod",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "目的地",
             prop: "destination",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "箱型/箱量",
             prop: "containers",
             width: "100",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "币种",
             prop: "curCode",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "原汇率",
             prop: "exrate",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "是否转换为人民币",
             prop: "isExchangeToCny",
             width: "140",
-            dicData: [{
-              label: '否',
-              value: 0
-            }, {
-              label: '是',
-              value: 1
-            }],
-            overHidden: true,
+            dicData: [
+              {
+                label: "否",
+                value: 0
+              },
+              {
+                label: "是",
+                value: 1
+              }
+            ],
+            overHidden: true
           },
           {
             label: "业务类型",
             prop: "businessTypes",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "业务单据编号",
             prop: "businessNo",
             width: "120",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "对账单编号",
             prop: "checkNo",
             width: "120",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "订舱",
             prop: "bookingNo",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "财务开始日期",
             prop: "accountDateFrom",
             width: "100",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "财务结束日期",
             prop: "accountDateTo",
             width: "100",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "申请人",
             prop: "applicantName",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "审核人",
             prop: "approverName",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "是否代理发票",
             prop: "isAgent",
             width: "120",
-            dicData: [{
-              label: '否',
-              value: 0
-            }, {
-              label: '是',
-              value: 1
-            }],
-            overHidden: true,
+            dicData: [
+              {
+                label: "否",
+                value: 0
+              },
+              {
+                label: "是",
+                value: 1
+              }
+            ],
+            overHidden: true
           },
           {
             label: "是否DK",
             prop: "isDk",
-            dicData: [{
-              label: '否',
-              value: 0
-            }, {
-              label: '是',
-              value: 1
-            }],
-            overHidden: true,
+            dicData: [
+              {
+                label: "否",
+                value: 0
+              },
+              {
+                label: "是",
+                value: 1
+              }
+            ],
+            overHidden: true
           },
           {
             label: "是否RP",
             prop: "isRp",
-            dicData: [{
-              label: '否',
-              value: 0
-            }, {
-              label: '是',
-              value: 1
-            }],
-            overHidden: true,
+            dicData: [
+              {
+                label: "否",
+                value: 0
+              },
+              {
+                label: "是",
+                value: 1
+              }
+            ],
+            overHidden: true
           },
           {
             label: "RP名称",
             prop: "rpName",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "导出日期",
             prop: "exportDate",
             width: "100",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "导出人",
             prop: "exportName",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "是否导出船名航次",
             prop: "isExportVslvoy",
             width: "140",
-            dicData: [{
-              label: '否',
-              value: 0
-            }, {
-              label: '是',
-              value: 1
-            }],
-            overHidden: true,
+            dicData: [
+              {
+                label: "否",
+                value: 0
+              },
+              {
+                label: "是",
+                value: 1
+              }
+            ],
+            overHidden: true
           },
           {
             label: "是否导出主单号",
             prop: "isExportMblno",
             width: "140",
-            dicData: [{
-              label: '否',
-              value: 0
-            }, {
-              label: '是',
-              value: 1
-            }],
-            overHidden: true,
+            dicData: [
+              {
+                label: "否",
+                value: 0
+              },
+              {
+                label: "是",
+                value: 1
+              }
+            ],
+            overHidden: true
           },
           {
             label: "是否导出分单号",
             prop: "isExportHblno",
             width: "140",
-            dicData: [{
-              label: '否',
-              value: 0
-            }, {
-              label: '是',
-              value: 1
-            }],
-            overHidden: true,
+            dicData: [
+              {
+                label: "否",
+                value: 0
+              },
+              {
+                label: "是",
+                value: 1
+              }
+            ],
+            overHidden: true
           },
           {
             label: "发票本位币(CNY)",
             prop: "amountCny",
             width: "140",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "发票USD",
             prop: "amountUsd",
             width: "100",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "税额(CNY)",
             prop: "amountTax",
             width: "100",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "全电发票备注",
             prop: "elecRemarks",
             width: "120",
-            overHidden: true,
+            overHidden: true
           },
           // {
           //   label: "银行进账单出票人名称",
@@ -551,45 +621,45 @@ export default {
             label: "银行进账单出票银行",
             prop: "bankReceiptBankName",
             width: "160",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "银行进账单出票银行账号",
             prop: "bankReceiptAccountNo",
             width: "160",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "银行进账单票据张数",
             prop: "bankReceiptBillCount",
             width: "160",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "银行进账单是否已进账(收款)",
             prop: "bankReceiptIsIncome",
             width: "180",
-            overHidden: true,
+            overHidden: true
           },
           {
             label: "备注",
             prop: "remarks",
-            rules: [{
-              required: true,
-              message: "请输入备注",
-              trigger: "blur"
-            }],
-            overHidden: true,
-          },
+            rules: [
+              {
+                required: true,
+                message: "请输入备注",
+                trigger: "blur"
+              }
+            ],
+            overHidden: true
+          }
         ]
       },
       data: [],
-      saberUserInfo: {}, // 当前登录人个人信息
+      saberUserInfo: {} // 当前登录人个人信息
     };
   },
-  watch: {
-
-  },
+  watch: {},
   computed: {
     ...mapGetters(["permission"]),
     permissionList() {
@@ -610,46 +680,50 @@ export default {
   },
   async created() {
     // 获取当前登录人个人信息
-    this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
+    this.saberUserInfo = JSON.parse(localStorage.getItem("saber-userInfo")).content;
     this.option = await this.getColumnData(this.getColumnName(320), this.optionBack);
   },
   activated() {
     if (this.$route.query.mblno) {
       setTimeout(() => {
-        this.newbillFun()
+        this.newbillFun();
       }, 200);
     }
   },
   methods: {
+    handleClick() {
+      this.page.currentPage = 1;
+      this.onLoad(this.page, this.query);
+    },
     // 新建发票
     newbillFun() {
-      this.pageIds = []
+      this.pageIds = [];
       this.isShow = false;
-      this.editSave = false
+      this.editSave = false;
       this.$store.commit("IN_FINAPP_DETAIL");
     },
     toAddEdit() {
-      this.datekey = Date.now()
-      this.isShow = false
-      this.editSave = false
+      this.datekey = Date.now();
+      this.isShow = false;
+      this.editSave = false;
     },
     // 编辑
     editFun(row) {
-      this.pageIds = []
+      this.pageIds = [];
       this.data.forEach(item => {
-        this.pageIds.push(item.id)
-      })
-      this.isShow = false
-      this.editSave = true
+        this.pageIds.push(item.id);
+      });
+      this.isShow = false;
+      this.editSave = true;
       this.$nextTick(() => {
-        this.$refs.fininvoicesDetails.fininvoicesDetailfun(row.id)
-      })
+        this.$refs.fininvoicesDetails.fininvoicesDetailfun(row.id);
+      });
       this.$store.commit("IN_FINAPP_DETAIL");
     },
     // 详情的返回列表
     goBack() {
       // 初始化数据
-      this.pageIds = []
+      this.pageIds = [];
       // this.detailData = this.$options.data().detailData;
       if (JSON.stringify(this.$route.query) != "{}") {
         this.$router.$avueRouter.closeTag();
@@ -662,32 +736,37 @@ export default {
       this.$store.commit("OUT_FINAPP_DETAIL");
     },
 
-
     rowSave(row, done, loading) {
-      fininvoicesSubmit(row).then(() => {
-        this.onLoad(this.page);
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        done();
-      }, error => {
-        loading();
-        window.console.log(error);
-      });
+      fininvoicesSubmit(row).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        },
+        error => {
+          loading();
+          window.console.log(error);
+        }
+      );
     },
     rowUpdate(row, index, done, loading) {
-      fininvoicesSubmit(row).then(() => {
-        this.onLoad(this.page);
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        done();
-      }, error => {
-        loading();
-        console.log(error);
-      });
+      fininvoicesSubmit(row).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        },
+        error => {
+          loading();
+          console.log(error);
+        }
+      );
     },
     rowDel(row) {
       this.$confirm("确定将选择数据删除?", {
@@ -715,20 +794,20 @@ export default {
       // 判断是否可以编辑别人业务 true 就没有权限
       if (this.ModifyOthersfun()) return;
       // 已经提交请核的提示不让删除
-      let sumArr = []
-      const h = this.$createElement
+      let sumArr = [];
+      const h = this.$createElement;
       for (let item of this.selectionList) {
         if (item.status == 3) {
-          sumArr.push(h('p', `序号${item.$index + 1}的数据已经确认提交请勿删除`))
+          sumArr.push(h("p", `序号${item.$index + 1}的数据已经确认提交请勿删除`));
         }
       }
       if (sumArr.length != 0) {
-        this.$confirm('提示', {
-          message: h('div', sumArr),
+        this.$confirm("提示", {
+          message: h("div", sumArr),
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
-        })
+        });
         return;
       }
       this.$confirm("确定将选择数据删除?", {
@@ -750,24 +829,24 @@ export default {
     },
     // 判断是否可以编辑别人业务
     ModifyOthersfun() {
-      let sumArr = []
-      const h = this.$createElement
+      let sumArr = [];
+      const h = this.$createElement;
       // 判断是否有权限
-      if (this.saberUserInfo.role_name.indexOf('允许修改他人业务') != -1) return false
+      if (this.saberUserInfo.role_name.indexOf("允许修改他人业务") != -1) return false;
       // 当前登录人和选择的创建人对比是不是一个人
       for (let item of this.selectionList) {
         if (this.saberUserInfo.user_id != item.createUser) {
-          sumArr.push(h('p', `你没有"允许修改他人业务"权限,请重新选择数据`))
+          sumArr.push(h("p", `你没有"允许修改他人业务"权限,请重新选择数据`));
         }
       }
       if (sumArr.length != 0) {
-        this.$confirm('提示', {
-          message: h('div', sumArr),
+        this.$confirm("提示", {
+          message: h("div", sumArr),
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
-        }).catch(err => { })
-        return true
+        }).catch(err => {});
+        return true;
       }
     },
     beforeOpen(done, type) {
@@ -808,21 +887,26 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
       if (!this.query.dateList) {
-        this.query.invoiceDateStart = null
-        this.query.invoiceDateEnd = null
-
+        this.query.invoiceDateStart = null;
+        this.query.invoiceDateEnd = null;
       } else {
-        this.query.invoiceDateStart = this.query.dateList[0]
-        this.query.invoiceDateEnd = this.query.dateList[1]
+        this.query.invoiceDateStart = this.query.dateList[0];
+        this.query.invoiceDateEnd = this.query.dateList[1];
       }
-      fininvoicesList(page.currentPage, page.pageSize,
-        { ...Object.assign(params, this.query), type: "申请", billNoFormat: 'FPSQ', businessTypeCode: 'FPSQ' }).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
+      let obj = {
+        ...Object.assign(params, this.query),
+        type: "申请",
+        billNoFormat: "FPSQ",
+        businessTypeCode: "FPSQ",
+        billStatus: this.activeName
+      };
+      fininvoicesList(page.currentPage, page.pageSize, obj).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
     },
 
     //自定义列保存
@@ -852,17 +936,16 @@ export default {
     // 更改表格颜色
     headerClassName(tab) {
       //颜色间隔
-      let back = ""
+      let back = "";
       if (tab.columnIndex >= 0 && tab.column.level === 1) {
         if (tab.columnIndex % 2 === 0) {
-          back = "back-one"
+          back = "back-one";
         } else if (tab.columnIndex % 2 === 1) {
-          back = "back-two"
+          back = "back-two";
         }
       }
       return back;
-    },
-
+    }
   }
 };
 </script>

+ 62 - 54
src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -591,34 +591,9 @@
         </el-form>
       </el-card>
 
-      <el-card style="margin-top: 10px">
-        <el-row>
-          <el-col :span="4">
-            <div class="bottomFlex" style="color: #81B337">
-              <span>应收CNY:</span>
-              <span class="weightnum">¥{{ form.amountDr || 0 }}元</span>
-            </div>
-          </el-col>
-          <el-col :span="4">
-            <div class="bottomFlex" style="color: #6BBCD1">
-              <span>应付CNY:</span>
-              <span class="weightnum">¥{{ form.amountCr || 0 }}元</span>
-            </div>
-          </el-col>
-          <el-col :span="4">
-            <div class="bottomFlex" style="color: #81B337">
-              <span>应收USD:</span>
-              <span class="weightnum">${{ form.amountDrUsd || 0 }}元</span>
-            </div>
-          </el-col>
-          <el-col :span="4">
-            <div class="bottomFlex" style="color: #6BBCD1">
-              <span>应付USD:</span>
-              <span class="weightnum">${{ form.amountCrUsd || 0 }}元</span>
-            </div>
-          </el-col>
-        </el-row>
-      </el-card>
+      <!-- <el-card style="margin-top: 10px">
+       
+      </el-card> -->
 
       <el-card style="margin-top: 10px">
         <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -632,10 +607,26 @@
               @handleSelectionChange="addSelectionChange"
             >
               <template slot="menuLeft">
-                <div>
+                <div style="display: flex;">
                   <el-button size="small" type="success" style="margin-right: 8px" :disabled="editSave" :loading="saveLoading" @click="allCell"
                     >确认选定行
                   </el-button>
+                  <div class="bottomFlex" style="color: #81B337;margin-right: 20px;">
+                    <span>应收:</span>
+                    <span class="weightnum">¥{{ amountDSubSum || 0 }}</span>
+                  </div>
+                  <div class="bottomFlex" style="color: #81B337;margin-right: 20px;">
+                    <span></span>
+                    <span class="weightnum">${{ amountDSubUsdSum || 0 }}</span>
+                  </div>
+                  <div class="bottomFlex" style="color: #6BBCD1;margin-right: 20px;">
+                    <span>应付:</span>
+                    <span class="weightnum">¥{{ amountCSubSum || 0 }}</span>
+                  </div>
+                  <div class="bottomFlex" style="color: #6BBCD1;margin-right: 20px;">
+                    <span></span>
+                    <span class="weightnum">${{ amountCSubUsdSum || 0 }}</span>
+                  </div>
                 </div>
               </template>
             </queryfinstlbillsitems>
@@ -649,43 +640,23 @@
               @handleSelectionChange="handleSelectionChange"
             >
               <template slot="menuLeft">
-                <div>
+                <div style="display: flex;">
                   <el-button size="small" type="danger" style="margin-left: 10px" :disabled="editSave" :loading="saveLoading" @click="batchDeletefun"
                     >一键删除
                   </el-button>
                   <el-button size="small" type="primary" style="margin-left: 10px" :disabled="editSave" :loading="saveLoading" @click="editHandle"
                     >一键编辑
                   </el-button>
-                  <el-button
-                    size="small"
-                    type="primary"
-                    style="margin-right: 8px"
-                    :loading="saveLoading"
-                    @click="Confirminvoicefun('2')"
+                  <el-button size="small" type="primary" style="margin-right: 8px" :loading="saveLoading" @click="Confirminvoicefun('2')"
                     >不开发票
                   </el-button>
-                  <el-button
-                    size="small"
-                    type="warning"
-                    style="margin-right: 8px"
-                    :loading="saveLoading"
-                    @click="Notinvoicingfun('2')"
+                  <el-button size="small" type="warning" style="margin-right: 8px" :loading="saveLoading" @click="Notinvoicingfun('2')"
                     >取消不开发票
                   </el-button>
-                  <el-button
-                    size="small"
-                    type="primary"
-                    style="margin-right: 8px"
-                    :loading="saveLoading"
-                    @click="Confirminvoicefun('1')"
+                  <el-button size="small" type="primary" style="margin-right: 8px" :loading="saveLoading" @click="Confirminvoicefun('1')"
                     >确认开票
                   </el-button>
-                  <el-button
-                    size="small"
-                    type="warning"
-                    style="margin-right: 8px"
-                    :loading="saveLoading"
-                    @click="Notinvoicingfun('1')"
+                  <el-button size="small" type="warning" style="margin-right: 8px" :loading="saveLoading" @click="Notinvoicingfun('1')"
                     >撤销开票
                   </el-button>
                   <el-button
@@ -724,6 +695,22 @@
                     @click="batchRevoke"
                     >撤销对账
                   </el-button>
+                  <div class="bottomFlex" style="color: #81B337;margin-right: 20px;">
+                    <span>应收:</span>
+                    <span class="weightnum">¥{{ form.amountDr || 0 }}</span>
+                  </div>
+                  <div class="bottomFlex" style="color: #81B337;margin-right: 20px;">
+                    <span></span>
+                    <span class="weightnum">${{ form.amountDrUsd || 0 }}</span>
+                  </div>
+                  <div class="bottomFlex" style="color: #6BBCD1;margin-right: 20px;">
+                    <span>应付:</span>
+                    <span class="weightnum">¥{{ form.amountCr || 0 }}</span>
+                  </div>
+                  <div class="bottomFlex" style="color: #6BBCD1;margin-right: 20px;">
+                    <span></span>
+                    <span class="weightnum">${{ form.amountCrUsd || 0 }}</span>
+                  </div>
                 </div>
               </template>
             </finstlbillsitems>
@@ -829,6 +816,10 @@ export default {
   },
   data() {
     return {
+      amountDSubSum:0,
+      amountDSubUsdSum:0,
+      amountCSubSum:0,
+      amountCSubUsdSum:0,
       activeName: "1",
       retrievePopupsType: false, // 弹窗开启关闭
       retrievePopupsData: [], // 选择弹窗数据
@@ -1775,6 +1766,23 @@ export default {
     },
     // 确认选定行
     addSelectionChange(arr) {
+      this.amountDSubSum = 0;
+      this.amountDSubUsdSum = 0;
+      this.amountCSubSum = 0;
+      this.amountCSubUsdSum = 0;
+      if (arr.length) {
+        arr.forEach(e => {
+          console.log(e.accountDc);
+          if (e.accountDc == "D") {
+            this.amountDSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+            this.amountDSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+          }
+          if (e.accountDc == "C") {
+            this.amountCSubSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+            this.amountCSubUsdSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+          }
+        });
+      }
       this.addData = arr;
     },
     // 下面表格多选