修改结算中心传值

src/views/iosBasicData/ComputationCenter/index.vue

@@ -7,7 +7,7 @@
           <el-tab-pane label="对账付款" name="CHK-C"> </el-tab-pane>
           <el-tab-pane label="付费结算" name="FFSQ"> </el-tab-pane>
           <el-tab-pane label="销项发票" name="XXFP"> </el-tab-pane>
-          <el-tab-pane label="其他结算" name="QTJS"> </el-tab-pane>
+          <el-tab-pane label="其他结算" name="GZXZ"> </el-tab-pane>
           <el-tab-pane label="收付相抵" name="DCDD">
             <span slot="label">收付相抵</span>
           </el-tab-pane>
@@ -43,7 +43,7 @@
       >
         <template slot="menuLeft">
           <el-button
-            v-if="tabsValue == 'CHK-D' || tabsValue == 'CHK-C' || tabsValue == 'FFSQ' || tabsValue == 'XXFP' || tabsValue == 'DCDD'"
+            v-if="tabsValue == 'CHK-D' || tabsValue == 'CHK-C' || tabsValue == 'FFSQ' || tabsValue == 'XXFP' || tabsValue == 'DCDD'|| tabsValue == 'GZXZ'"
             type="primary"
             size="small"
             plain
@@ -86,7 +86,7 @@
             >驳回
           </el-button>
           <el-button
-            v-if="tabsValue == 'CHK-D' || tabsValue == 'CHK-C' || tabsValue == 'FFSQ'|| tabsValue == 'XXFP' || tabsValue == 'DCDD'"
+            v-if="tabsValue == 'CHK-D' || tabsValue == 'CHK-C' || tabsValue == 'FFSQ'|| tabsValue == 'XXFP' || tabsValue == 'DCDD'|| tabsValue == 'GZXZ'"
             type="text"
             size="small"
             :disabled="
@@ -506,7 +506,7 @@ export default {
       this.isShow = false;
       // this.editSave = true
       this.$nextTick(() => {
-        this.$refs.settlementDetailsRef.generateFinStlBillsfun(row.id, this.tabsValue == "CHK-D"||this.tabsValue == "XXFP" ? "D" : "C", this.tabsValue);
+        this.$refs.settlementDetailsRef.generateFinStlBillsfun(row.id, this.tabsValue == "CHK-D"||this.tabsValue == "XXFP"||this.tabsValue == "GZXZ" ? "D" : "C", this.tabsValue);
       });
     },
     // 添加
@@ -558,7 +558,14 @@ export default {
             id: row.id
           }
         });
-      } else {
+      } else if (this.tabsValue == "GZXZ") {
+        this.$router.push({
+          path: `/iosBasicData/writeOff/index`,
+          query: {
+            id: row.id
+          }
+        });
+      }else {
         this.pageIds = [];
         this.data.forEach(item => {
           this.pageIds.push(item.id);
@@ -787,6 +794,7 @@ export default {
         res = await finstlbillsList(page.currentPage, page.pageSize, {
           ...Object.assign(params, this.query),
           businessType: "FFSQ",
+          cashierStatus: 2,
           status: 3,
           billStatus: 0
         });
@@ -803,6 +811,15 @@ export default {
         res = await fininvoicesList(page.currentPage, page.pageSize, {
           ...Object.assign(params, this.query),
           type: "销项",
+          cashierStatus: 2,
+          status: 3,
+          billStatus: 0
+        });
+      } else if (this.tabsValue == "GZXZ") {
+        // 调用 销项发票业务数据
+        res = await finstlbillsList(page.currentPage, page.pageSize, {
+          ...Object.assign(params, this.query),
+           businessType: "GZXZ",
           status: 3,
           billStatus: 0
         });

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -1246,17 +1246,23 @@ export default {
       this.generateStatus = true;
       this.pageLoading = true;
       this.settlementType = dc;
-      if (type == "CHK") {
-        typeName = "对账中心";
+      if (type == "CHK-D") {
+        typeName = "收费结算";
+      }
+      if (type == "CHK-C") {
+        typeName = "对账付款";
       }
       if (type == "FFSQ") {
-        typeName = "付费申请";
+        typeName = "付费结算";
       }
       if (type == "DCDD") {
         typeName = "收付相抵";
       }
       if (type == "XXFP") {
-        typeName = "销项";
+        typeName = "销项发票";
+      }
+      if (type == "GZXZ") {
+        typeName = "其他结算";
       }
       generateFinStlBills({
         billId: id,

src/views/iosBasicData/cashier/index.vue

@@ -34,11 +34,13 @@
         @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 324)"
       >
         <template slot="menu" slot-scope="{ row }">
-          <el-button type="text" size="small" @click="allClick('出纳', row)">{{ row.dc=="D"?'收款':'支付' }}</el-button>
+          <el-button type="text" size="small" @click="allClick('出纳', row)">{{ row.dc == "D" ? "收款" : "支付" }}</el-button>
         </template>
         <template slot="menuLeft">
           <span style="font-size: 24px;font-weight: 600;">
-            <el-button type="primary" size="small" @click="allClick('合并')" :disabled="selectionList.length == 0">合并{{tabsValue=='对账收费'||tabsValue=='发票申请'?'收费':'支付'  }}</el-button>
+            <el-button type="primary" size="small" @click="allClick('合并')" :disabled="selectionList.length == 0"
+              >合并{{ tabsValue == "对账收费" || tabsValue == "发票申请" ? "收费" : "支付" }}</el-button
+            >
             <span style="color: #67C23A;margin-right: 10px;"> CNY:￥{{ amountSubSum.toFixed(2) }}元 </span>
             <span style="color: #E6A23C;"> USD:${{ amountSubUsdSum.toFixed(2) }}元 </span>
           </span>
@@ -71,9 +73,9 @@ import { getBcorpslistByType } from "@/api/iosBasicData/bcorps";
 import { bbusinesstypeList } from "@/api/iosBasicData/bbusinesstype";
 import { fininvoicesList } from "@/api/iosBasicData/fininvoices";
 import dicSelect from "@/components/dicSelect/main";
-import cashierItem from './components/cashierItem.vue'
+import cashierItem from "./components/cashierItem.vue";
 export default {
-  components: { dicSelect,cashierItem },
+  components: { dicSelect, cashierItem },
   data() {
     return {
       pageIds: [],
@@ -380,17 +382,20 @@ export default {
   methods: {
     allClick(name, row) {
       if (name == "出纳") {
-        this.$refs.cashier.openDialog(row)
+        this.$refs.cashier.openDialog(row);
       }
-      if(name=='合并'){
-        let ids=[]
-        this.selectionList.forEach(item=>{
-          ids.push(item.id)
-        })
-        let obj={
-          id:ids.join(',')
+      if (name == "合并") {
+        let ids = [];
+        for (let item of this.selectionList) {
+          if (this.selectionList[0].corpId != item.corpId) {
+            return this.$message.error("请选择相同的往来单位");
+          }
+          ids.push(item.id);
         }
-           this.$refs.cashier.openDialog(obj)
+        let obj = {
+          id: ids.join(",")
+        };
+        this.$refs.cashier.openDialog(obj);
       }
     },
     // 获取业务类型

src/views/iosBasicData/writeOff/index.vue

@@ -725,7 +725,7 @@ export default {
       const h = this.$createElement;
       for (let item of this.selectionList) {
         if (item.billStatus == 1) {
-          sumArr.push(h("p", `序号${item.$index + 1}的数据已经确认对账请勿删除`));
+          sumArr.push(h("p", `序号${item.$index + 1}的数据已经确认销账请勿删除`));
         }
       }
       if (sumArr.length != 0) {