修改bug

src/views/iosBasicData/financialManagement/finstlbills/components/pickedData.vue

@@ -92,22 +92,22 @@
           >撤销开票</el-button
         >
         -->
-        <el-tag type="danger" style="margin-right: 2px; color: #f56c6c">应收(CNY):{{ amountDSubSum |formatNumber }}</el-tag>
-        <el-tag type="danger" style="margin-right: 2px; color: #f56c6c">应收(USD):{{ amountDSubUsdSum |formatNumber }}</el-tag>
-        <el-tag type="danger" style="margin-right: 2px; color: #000000">应付(CNY):{{ amountCSubSum |formatNumber }}</el-tag>
-        <el-tag type="danger" style="margin-right: 2px; color: #000000; margin-right: 50px">应付(USD):{{ amountCSubUsdSum |formatNumber }}</el-tag>
-        <el-tag type="success" style="margin-right: 2px; color: #f56c6c">应收(CNY):{{ amountDSubSum2 |formatNumber }}</el-tag>
-        <el-tag type="success" style="margin-right: 2px; color: #f56c6c">应收(USD):{{ amountDSubUsdSum2 |formatNumber }}</el-tag>
-        <el-tag type="success" style="margin-right: 2px; color: #000000">应付(CNY):{{ amountCSubSum2 |formatNumber }}</el-tag>
-        <el-tag type="success" style="margin-right: 2px; color: #000000">应付(USD):{{ amountCSubUsdSum2 |formatNumber }}</el-tag>
+        <el-tag type="danger" style="margin-right: 2px; color: #f56c6c">应收(CNY):{{ amountDSubSum | formatNumber }}</el-tag>
+        <el-tag type="danger" style="margin-right: 2px; color: #f56c6c">应收(USD):{{ amountDSubUsdSum | formatNumber }}</el-tag>
+        <el-tag type="danger" style="margin-right: 2px; color: #000000">应付(CNY):{{ amountCSubSum | formatNumber }}</el-tag>
+        <el-tag type="danger" style="margin-right: 2px; color: #000000; margin-right: 50px">应付(USD):{{ amountCSubUsdSum | formatNumber }}</el-tag>
+        <el-tag type="success" style="margin-right: 2px; color: #f56c6c">应收(CNY):{{ amountDSubSum2 | formatNumber }}</el-tag>
+        <el-tag type="success" style="margin-right: 2px; color: #f56c6c">应收(USD):{{ amountDSubUsdSum2 | formatNumber }}</el-tag>
+        <el-tag type="success" style="margin-right: 2px; color: #000000">应付(CNY):{{ amountCSubSum2 | formatNumber }}</el-tag>
+        <el-tag type="success" style="margin-right: 2px; color: #000000">应付(USD):{{ amountCSubUsdSum2 | formatNumber }}</el-tag>
       </template>
       <template slot="page">
-        <el-tag style="margin-right: 2px; color: #f56c6c">应收(CNY):{{ form.amountDr |formatNumber}}</el-tag>
-        <el-tag style="margin-right: 2px; color: #f56c6c">应收(USD):{{ form.amountDrUsd |formatNumber }}</el-tag>
-        <el-tag style="margin-right: 2px; color: #f56c6c">应收合计(CNY):{{ form.amountDrLoc |formatNumber }}</el-tag>
-        <el-tag style="margin-right: 2px; color: #000000">应付(CNY):{{ form.amountCr |formatNumber }}</el-tag>
-        <el-tag style="margin-right: 2px; color: #000000">应付(USD):{{ form.amountCrUsd |formatNumber }}</el-tag>
-        <el-tag style="margin-right: 2px; color: #000000">应付合计(CNY):{{ form.amountCrLoc |formatNumber }}</el-tag>
+        <el-tag style="margin-right: 2px; color: #f56c6c">应收(CNY):{{ form.amountDr | formatNumber }}</el-tag>
+        <el-tag style="margin-right: 2px; color: #f56c6c">应收(USD):{{ form.amountDrUsd | formatNumber }}</el-tag>
+        <el-tag style="margin-right: 2px; color: #f56c6c">应收合计(CNY):{{ form.amountDrLoc | formatNumber }}</el-tag>
+        <el-tag style="margin-right: 2px; color: #000000">应付(CNY):{{ form.amountCr | formatNumber }}</el-tag>
+        <el-tag style="margin-right: 2px; color: #000000">应付(USD):{{ form.amountCrUsd | formatNumber }}</el-tag>
+        <el-tag style="margin-right: 2px; color: #000000">应付合计(CNY):{{ form.amountCrLoc | formatNumber }}</el-tag>
       </template>
       <template slot="customSelected" slot-scope="{ row }">
         <el-checkbox v-model="row.customSelected" @change="customSelection(row)"> </el-checkbox>
@@ -579,7 +579,7 @@ export default {
   },
   filters: {
     formatNumber(value) {
-      return Number(value?value:0).toFixed(2);
+      return Number(value ? value : 0).toFixed(2);
     },
   },
   methods: {
@@ -850,6 +850,11 @@ export default {
           if (item.isChecked == 1) {
             return this.$message.error("请选择未对账的数据");
           }
+          if (item.currentStlCurCode == "CNY") {
+            item.currentStlAmount = item.currentStlAmountRMB;
+          } else {
+            item.currentStlAmount = item.currentStlAmountUSD;
+          }
         }
         let obj = {
           ...this.form,
@@ -940,6 +945,11 @@ export default {
           if (item.isSignfor == 1) {
             return this.$message.error("请选择未签收的数据");
           }
+          if (item.currentStlCurCode == "CNY") {
+            item.currentStlAmount = item.currentStlAmountRMB;
+          } else {
+            item.currentStlAmount = item.currentStlAmountUSD;
+          }
         }
         let obj = {
           ...this.form,

src/views/iosBasicData/financialManagement/finstlbills/detailsPage.vue

@@ -868,7 +868,7 @@ export default {
         if (this.form.finStlBillsItemsList.length == 0) {
           return this.$message.error("选定数据不能为空");
         }
-        if (this.form.dc == "C") {
+        if (this.form.operatingType == '付费申请') {
           getListAllDetail({ srcId: this.form.id }).then((res) => {
             if (
               Number(this.form.amountDr) != Number(this.form.actualAmountDr) ||
@@ -894,7 +894,7 @@ export default {
             }
           });
         }
-        if (this.form.dc == "D") {
+        if (this.form.operatingType != '付费申请') {
           this.$confirm("确定进行确认完成操作?", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",