出纳管理 确认去掉弹窗

src/views/iosBasicData/ComputationCenter/index.vue

@@ -72,6 +72,14 @@
             dataName="cnName"
           ></dic-select>
         </tempalte>
+        <template slot="amountSub" slot-scope="{ row }">
+          <span v-if="tabsValue == 'CHK-D' || tabsValue == 'CHK-C'">{{ tabsValue == "CHK-D" ? row.amountDr : row.amountCr }} </span>
+          <span v-else>{{ row.amountSub }} </span>
+        </template>
+        <template slot="amountSubUsd" slot-scope="{ row }">
+          <span v-if="tabsValue == 'CHK-D' || tabsValue == 'CHK-C'">{{ tabsValue == "CHK-D" ? row.amountDrUsd : row.amountCrUsd }} </span>
+          <span v-else>{{ row.amountSubUsd }} </span>
+        </template>
         <template slot="menu" slot-scope="{ row }">
           <el-button
             v-if="tabsValue == 'DCDD'"
@@ -211,7 +219,7 @@ export default {
               value: "cnName",
               res: "data.records"
             },
-            width: 140,
+            width: 140
           },
           {
             label: "MB/L NO",
@@ -308,7 +316,7 @@ export default {
             label: "结算日期",
             prop: "billDate",
             width: 140,
-            overHidden: true,
+            overHidden: true
           },
 
           {
@@ -690,8 +698,16 @@ export default {
       this.amountSubUsdSum = 0;
       if (list.length) {
         list.forEach(e => {
-          this.amountSubSum += Number(e.amountSub);
-          this.amountSubUsdSum += Number(e.amountSubUsd);
+          if (this.tabsValue == "CHK-D") {
+            this.amountSubSum += Number(e.amountDr);
+            this.amountSubUsdSum += Number(e.amountDrUsd);
+          } else if (this.tabsValue == "CHK-C") {
+            this.amountSubSum += Number(e.amountCr);
+            this.amountSubUsdSum += Number(e.amountCrUsd);
+          } else {
+            this.amountSubSum += Number(e.amountSub);
+            this.amountSubUsdSum += Number(e.amountSubUsd);
+          }
         });
       }
       this.selectionList = list;
@@ -820,7 +836,7 @@ export default {
           businessType: "FFSQ",
           cashierStatus: 2,
           status: 3,
-          billStatus: 0,
+          billStatus: 0
         });
       } else if (this.tabsValue == "DCDD") {
         // 调用 销项发票业务数据
@@ -838,7 +854,7 @@ export default {
           cashierStatus: 2,
           status: 3,
           billStatus: 0,
-          srcType:'对账'
+          srcType: "对账"
         });
       } else if (this.tabsValue == "GZXZ") {
         // 调用 销项发票业务数据

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

@@ -291,7 +291,7 @@ export default {
   },
   methods: {
     viewCashier(row) {
-      this.cashierData = []
+      this.cashierData = [];
       cashierList({ pid: row.id }).then(res => {
         this.cashierData = res.data.data.records;
       });
@@ -311,41 +311,35 @@ export default {
             return this.$message.error("请选择未出纳的数据");
           }
         }
-        this.$confirm("是否确认出纳?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          let obj = {
-            applyCashierList: this.selectionList
-          };
-          const loading = this.$loading({
-            lock: true,
-            text: "加载中",
-            spinner: "el-icon-loading",
-            background: "rgba(255,255,255,0.7)"
-          });
-          // 对账和付费申请
-          if (!this.form.type) {
-            confirmCashier(obj)
-              .then(res => {
-                this.openDialog(this.form);
-              })
-              .finally(() => {
-                loading.close();
-              });
-          }
-          // 发票申请
-          if (this.form.type == "销项") {
-            confirmCashier2(obj)
-              .then(res => {
-                this.openDialog(this.form);
-              })
-              .finally(() => {
-                loading.close();
-              });
-          }
+        let obj = {
+          applyCashierList: this.selectionList
+        };
+        const loading = this.$loading({
+          lock: true,
+          text: "加载中",
+          spinner: "el-icon-loading",
+          background: "rgba(255,255,255,0.7)"
         });
+        // 对账和付费申请
+        if (!this.form.type) {
+          confirmCashier(obj)
+            .then(res => {
+              this.openDialog(this.form);
+            })
+            .finally(() => {
+              loading.close();
+            });
+        }
+        // 发票申请
+        if (this.form.type == "销项") {
+          confirmCashier2(obj)
+            .then(res => {
+              this.openDialog(this.form);
+            })
+            .finally(() => {
+              loading.close();
+            });
+        }
       }
       if (name == "撤销出纳") {
         for (let item of this.selectionList) {
@@ -353,7 +347,7 @@ export default {
             return this.$message.error("请选择已出纳的数据");
           }
         }
-        this.$confirm("是否撤销出纳?", "提示", {
+        this.$confirm("是否撤销?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

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

@@ -86,6 +86,44 @@ export default {
   },
   data() {
     return {
+      rlaData: [],
+      rlaOption: {
+        header: false,
+        menu: false,
+        align: "center",
+        column: [
+          {
+            label: "来源单号",
+            prop: "srcNo",
+            width: "200",
+            overHidden: true
+          },
+          {
+            label: "来源类型",
+            prop: "srcType",
+            width: "80",
+            overHidden: true
+          },
+          {
+            label: "签收金额",
+            prop: "signedAmount",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "签收人",
+            prop: "consigneeName",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "签收时间",
+            prop: "signingTime",
+            width: "120",
+            overHidden: true
+          }
+        ]
+      },
       curCodeData: [], // 本次币种
       option: {},
       optionBack: {

src/views/iosBasicData/writeOff/assembly/finstlbillsitems.vue

@@ -12,8 +12,8 @@
       :page.sync="page"
       @size-change="sizeChange"
       @current-change="currentChange"
-      @resetColumn="resetColumn('crud', 'option', 'optionBack', 455)"
-      @saveColumn="saveColumn('crud', 'option', 'optionBack', 455)"
+      @resetColumn="resetColumn('crud', 'option', 'optionBack', 484)"
+      @saveColumn="saveColumn('crud', 'option', 'optionBack', 484)"
     >
       <template slot="menuLeft">
         <slot name="menuLeft"></slot>
@@ -24,10 +24,10 @@
           v-model="row.currentStlAmountRMB"
           @change="armbChange(row)"
           :controls="false"
-          placeholder="请输入 本次签收CNY"
+          placeholder="请输入 本次CNY"
           size="mini"
           style="width: 100%;"
-          :disabled="row.currentStlCurCode != 'CNY'|| (row.currentStlAmountRMB == 0 && row.currentStlAmountUSD == 0)"
+          :disabled="row.currentStlCurCode != 'CNY' || (row.currentStlAmountRMB == 0 && row.currentStlAmountUSD == 0)"
         ></el-input-number>
         <span v-else>{{ row.currentStlAmountRMB }}</span>
       </tempalte>
@@ -37,10 +37,10 @@
           v-model="row.currentStlAmountUSD"
           @change="ausdChange(row)"
           :controls="false"
-          placeholder="请输入 本次签收USD"
+          placeholder="请输入 本次USD"
           size="mini"
           style="width: 100%;"
-          :disabled="row.currentStlCurCode != 'USD'|| (row.currentStlAmountRMB == 0 && row.currentStlAmountUSD == 0)"
+          :disabled="row.currentStlCurCode != 'USD' || (row.currentStlAmountRMB == 0 && row.currentStlAmountUSD == 0)"
         ></el-input-number>
         <span v-else>{{ row.currentStlAmountUSD }}</span>
       </tempalte>
@@ -52,6 +52,18 @@
         <span v-if="row.dc == 'D'">{{ row.stlAmountDrUSD }}</span>
         <span v-if="row.dc == 'C'">{{ row.stlAmountCrUSD }}</span>
       </template>
+      <template slot="reconciliationAmount" slot-scope="{ row }">
+        <el-popover trigger="click">
+          <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
+          <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewRLA(row)">{{ row.reconciliationAmount }}</span>
+        </el-popover>
+      </template>
+      <template slot="reconciliationAmountUsd" slot-scope="{ row }">
+        <el-popover trigger="click">
+          <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
+          <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewRLA(row)">{{ row.reconciliationAmountUsd }}</span>
+        </el-popover>
+      </template>
       <template slot="remarkss" slot-scope="{ row }">
         <el-input style="width: 100%;" v-model="row.remarkss" v-if="brfalse" size="mini" autocomplete="off" clearable placeholder="请输入 备注">
         </el-input>
@@ -66,7 +78,7 @@ import { getWorkDicts } from "@/api/system/dictbiz";
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import costDetails from "../assembly/costDetails.vue";
 import { getRateList } from "@/api/iosBasicData/rateManagement";
-import { feecenterSelectByAccNoList } from "@/api/iosBasicData/finstlbills";
+import { feecenterSelectByAccNoList, getListAll } from "@/api/iosBasicData/finstlbills";
 
 export default {
   components: { SearchQuery, costDetails },
@@ -94,6 +106,44 @@ export default {
   },
   data() {
     return {
+      rlaData: [],
+      rlaOption: {
+        header: false,
+        menu: false,
+        align: "center",
+        column: [
+          {
+            label: "来源单号",
+            prop: "srcNo",
+            width: "200",
+            overHidden: true
+          },
+          {
+            label: "来源类型",
+            prop: "srcType",
+            width: "80",
+            overHidden: true
+          },
+          {
+            label: "签收金额",
+            prop: "signedAmount",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "签收人",
+            prop: "consigneeName",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "签收时间",
+            prop: "signingTime",
+            width: "120",
+            overHidden: true
+          }
+        ]
+      },
       ifInvoiceData: [], // 是否数据
       invoicelosDara: [], // 发票
       curCodeData: [], // 币种
@@ -139,18 +189,30 @@ export default {
             overHidden: true
           },
           {
-            label: "本次签收CNY",
+            label: "本次CNY",
             prop: "currentStlAmountRMB",
             width: 100,
             overHidden: true
           },
           {
-            label: "本次签收USD",
+            label: "本次USD",
             prop: "currentStlAmountUSD",
             width: 100,
             overHidden: true
           },
           {
+            label: "已签收CNY",
+            prop: "reconciliationAmount",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "已签收USD",
+            prop: "reconciliationAmountUsd",
+            width: 100,
+            overHidden: true
+          },
+          {
             label: "币种",
             prop: "currentStlCurCode",
             width: 60,
@@ -319,18 +381,6 @@ export default {
             overHidden: true
           },
           {
-            label: "已签收CNY",
-            prop: "reconciliationAmount",
-            width: 100,
-            overHidden: true
-          },
-          {
-            label: "已签收USD",
-            prop: "reconciliationAmountUsd",
-            width: 100,
-            overHidden: true
-          },
-          {
             label: "已结算CNY",
             prop: "stlAmountDr",
             width: 90,
@@ -372,11 +422,17 @@ export default {
     };
   },
   async created() {
-    this.option = await this.getColumnData(this.getColumnName(455), this.optionBack);
+    this.option = await this.getColumnData(this.getColumnName(484), this.optionBack);
     this.isSignforWorkDicts();
     this.invoicelosWorkDictsfun();
   },
   methods: {
+    viewRLA(row) {
+      this.rlaData = [];
+      getListAll({ billId: row.accBillId }).then(res => {
+        this.rlaData = res.data.data;
+      });
+    },
     sizeChange(val) {
       this.page.currentPage = 1;
       this.page.pageSize = val;

src/views/iosBasicData/writeOff/assembly/finstlbillsitems2.vue

@@ -12,8 +12,8 @@
       :page.sync="page"
       @size-change="sizeChange"
       @current-change="currentChange"
-      @resetColumn="resetColumn('crud', 'option', 'optionBack', 479)"
-      @saveColumn="saveColumn('crud', 'option', 'optionBack', 479)"
+      @resetColumn="resetColumn('crud', 'option', 'optionBack', 484)"
+      @saveColumn="saveColumn('crud', 'option', 'optionBack', 484)"
     >
       <template slot="menuLeft">
         <slot name="menuLeft"></slot>
@@ -24,7 +24,7 @@
           v-model="row.currentStlAmountRMB"
           @change="armbChange(row)"
           :controls="false"
-          placeholder="请输入 本次签收CNY"
+          placeholder="请输入 本次CNY"
           size="mini"
           style="width: 100%;"
           :disabled="row.currentStlCurCode != 'CNY' || row.isSignfor == 1 || form.advancePaymentRecordList.length"
@@ -37,7 +37,7 @@
           v-model="row.currentStlAmountUSD"
           @change="ausdChange(row)"
           :controls="false"
-          placeholder="请输入 本次签收USD"
+          placeholder="请输入 本次USD"
           size="mini"
           style="width: 100%;"
           :disabled="row.currentStlCurCode != 'USD' || row.isSignfor == 1 || form.advancePaymentRecordList.length"
@@ -52,6 +52,18 @@
         <span v-if="row.dc == 'D'">{{ row.stlAmountDrUSD }}</span>
         <span v-if="row.dc == 'C'">{{ row.stlAmountCrUSD }}</span>
       </template>
+      <template slot="reconciliationAmount" slot-scope="{ row }">
+        <el-popover trigger="click">
+          <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
+          <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewRLA(row)">{{ row.reconciliationAmount }}</span>
+        </el-popover>
+      </template>
+      <template slot="reconciliationAmountUsd" slot-scope="{ row }">
+        <el-popover trigger="click">
+          <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
+          <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewRLA(row)">{{ row.reconciliationAmountUsd }}</span>
+        </el-popover>
+      </template>
       <template slot="remarkss" slot-scope="{ row }">
         <el-input style="width: 100%;" v-model="row.remarkss" v-if="brfalse" size="mini" autocomplete="off" clearable placeholder="请输入 备注">
         </el-input>
@@ -66,7 +78,7 @@ import { getWorkDicts } from "@/api/system/dictbiz";
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import costDetails from "../assembly/costDetails.vue";
 import { getRateList } from "@/api/iosBasicData/rateManagement";
-import { feecenterSelectByAccNoList } from "@/api/iosBasicData/finstlbills";
+import { feecenterSelectByAccNoList, getListAll } from "@/api/iosBasicData/finstlbills";
 
 export default {
   components: { SearchQuery, costDetails },
@@ -94,6 +106,44 @@ export default {
   },
   data() {
     return {
+      rlaData: [],
+      rlaOption: {
+        header: false,
+        menu: false,
+        align: "center",
+        column: [
+          {
+            label: "来源单号",
+            prop: "srcNo",
+            width: "200",
+            overHidden: true
+          },
+          {
+            label: "来源类型",
+            prop: "srcType",
+            width: "80",
+            overHidden: true
+          },
+          {
+            label: "签收金额",
+            prop: "signedAmount",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "签收人",
+            prop: "consigneeName",
+            width: "100",
+            overHidden: true
+          },
+          {
+            label: "签收时间",
+            prop: "signingTime",
+            width: "120",
+            overHidden: true
+          }
+        ]
+      },
       ifInvoiceData: [], // 是否数据
       invoicelosDara: [], // 发票
       curCodeData: [], // 币种
@@ -173,18 +223,30 @@ export default {
             overHidden: true
           },
           {
-            label: "本次签收CNY",
+            label: "本次CNY",
             prop: "currentStlAmountRMB",
             width: 100,
             overHidden: true
           },
           {
-            label: "本次签收USD",
+            label: "本次USD",
             prop: "currentStlAmountUSD",
             width: 100,
             overHidden: true
           },
           {
+            label: "已签收CNY",
+            prop: "reconciliationAmount",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "已签收USD",
+            prop: "reconciliationAmountUsd",
+            width: 100,
+            overHidden: true
+          },
+          {
             label: "币种",
             prop: "currentStlCurCode",
             width: 60,
@@ -319,18 +381,6 @@ export default {
             overHidden: true
           },
           {
-            label: "已签收CNY",
-            prop: "reconciliationAmount",
-            width: 100,
-            overHidden: true
-          },
-          {
-            label: "已签收USD",
-            prop: "reconciliationAmountUsd",
-            width: 100,
-            overHidden: true
-          },
-          {
             label: "已结算CNY",
             prop: "stlAmountDr",
             width: 90,
@@ -372,12 +422,18 @@ export default {
     };
   },
   async created() {
-    this.option = await this.getColumnData(this.getColumnName(479), this.optionBack);
+    this.option = await this.getColumnData(this.getColumnName(484), this.optionBack);
 
     this.isSignforWorkDicts();
     this.invoicelosWorkDictsfun();
   },
   methods: {
+    viewRLA(row) {
+      this.rlaData = [];
+      getListAll({ billId: row.accBillId }).then(res => {
+        this.rlaData = res.data.data;
+      });
+    },
     sizeChange(val) {
       this.page.currentPage = 1;
       this.page.pageSize = val;