修改禅道4031问题

src/views/iosBasicData/advancePayment/index.vue

@@ -260,38 +260,38 @@ export default {
             valueFormat: "yyyy-MM-dd 00:00:00",
             overHidden: true,
           },
-          {
-            label: "创建人",
-            prop: "createUserName",
-            display: false,
-            overHidden: true,
-          },
-          {
-            label: "创建部门",
-            prop: "createDeptName",
-            display: false,
-            overHidden: true,
-          },
-          {
-            label: "创建时间",
-            prop: "createTime",
-            width: 160,
-            display: false,
-            overHidden: true,
-          },
-          {
-            label: "修改人",
-            prop: "updateUserName",
-            display: false,
-            overHidden: true,
-          },
-          {
-            label: "修改时间",
-            prop: "updateTime",
-            width: 160,
-            display: false,
-            overHidden: true,
-          },
+          // {
+          //   label: "创建人",
+          //   prop: "createUserName",
+          //   display: false,
+          //   overHidden: true,
+          // },
+          // {
+          //   label: "创建部门",
+          //   prop: "createDeptName",
+          //   display: false,
+          //   overHidden: true,
+          // },
+          // {
+          //   label: "创建时间",
+          //   prop: "createTime",
+          //   width: 160,
+          //   display: false,
+          //   overHidden: true,
+          // },
+          // {
+          //   label: "修改人",
+          //   prop: "updateUserName",
+          //   display: false,
+          //   overHidden: true,
+          // },
+          // {
+          //   label: "修改时间",
+          //   prop: "updateTime",
+          //   width: 160,
+          //   display: false,
+          //   overHidden: true,
+          // },
           {
             label: "备注",
             prop: "remarks",

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

@@ -18,8 +18,8 @@
       @saveColumn="saveColumn('crud', 'option', 'optionBack', 491)"
     >
       <template slot="menuLeft">
-        <el-tag type="danger" style="margin-right: 2px">人民币合计:{{ amountSubSum || 0 }}</el-tag>
-        <el-tag type="success" style="margin-right: 2px; color: #000000">美元合计:{{ amountSubUsdSum || 0 }}</el-tag>
+        <el-tag type="danger" style="margin-right: 2px">人民币合计:{{ amountSubSum | formatNumber }}</el-tag>
+        <el-tag type="success" style="margin-right: 2px; color: #000000">美元合计:{{ amountSubUsdSum | formatNumber }}</el-tag>
       </template>
       <template slot="reconciliationAmount" slot-scope="{ row }">
         <el-popover trigger="click" v-if="Number(row.reconciliationAmount)">
@@ -146,42 +146,42 @@ export default {
                 value: 9,
               },
             ],
-            sortable:true,
+            sortable: true,
             overHidden: true,
           },
           {
             label: "账单编号",
             prop: "accBillNo",
             width: 120,
-            sortable:true,
+            sortable: true,
             overHidden: true,
           },
           {
             label: "业务编号",
             prop: "billNo",
             width: 120,
-            sortable:true,
+            sortable: true,
             overHidden: true,
           },
           {
             label: "费用名称",
             prop: "feeCnName",
             width: 80,
-            sortable:true,
+            sortable: true,
             overHidden: true,
           },
           {
             label: "结算单位",
             prop: "corpCnName",
             width: 140,
-            sortable:true,
+            sortable: true,
             overHidden: true,
           },
           {
             label: "主单号",
             prop: "mblno",
             width: 100,
-            sortable:true,
+            sortable: true,
             overHidden: true,
           },
           {
@@ -360,6 +360,11 @@ export default {
       default: false,
     },
   },
+  filters: {
+    formatNumber(value) {
+      return Number(value ? value : 0).toFixed(2);
+    },
+  },
   async created() {
     this.roleName = localStorage.getItem("roleName").split(",");
     this.option = await this.getColumnData(this.getColumnName(491), this.optionBack);

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

@@ -13,7 +13,7 @@
         <el-button size="small" type="danger" plain :disabled="editButton" v-if="form.isCleared == 1" @click="allClick('撤销结算')"
           >撤销结算
         </el-button>
-        <el-button size="small" type="success" plain :disabled="editButton" v-if="form.id" @click="allClick('确认结算')">确认结算 </el-button>
+        <el-button size="small" type="success" plain :disabled="editButton" v-if="form.id&&form.status ==0" @click="allClick('确认结算')">确认结算 </el-button>
         <el-button class="el-button--small-yh" type="primary" size="small" v-if="editButton" @click="inEdit">编 辑 </el-button>
         <el-button v-else class="el-button--small-yh" type="primary" size="small" :disabled="editButton || form.status == 3" @click="submit"
           >保 存

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 || 0 }}</el-tag>
-        <el-tag type="danger" style="margin-right: 2px; color: #f56c6c">应收(USD):{{ amountDSubUsdSum || 0 }}</el-tag>
-        <el-tag type="danger" style="margin-right: 2px; color: #000000">应付(CNY):{{ amountCSubSum || 0 }}</el-tag>
-        <el-tag type="danger" style="margin-right: 2px; color: #000000; margin-right: 50px">应付(USD):{{ amountCSubUsdSum || 0 }}</el-tag>
-        <el-tag type="success" style="margin-right: 2px; color: #f56c6c">应收(CNY):{{ amountDSubSum2 || 0 }}</el-tag>
-        <el-tag type="success" style="margin-right: 2px; color: #f56c6c">应收(USD):{{ amountDSubUsdSum2 || 0 }}</el-tag>
-        <el-tag type="success" style="margin-right: 2px; color: #000000">应付(CNY):{{ amountCSubSum2 || 0 }}</el-tag>
-        <el-tag type="success" style="margin-right: 2px; color: #000000">应付(USD):{{ amountCSubUsdSum2 || 0 }}</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 || 0 }}</el-tag>
-        <el-tag style="margin-right: 2px; color: #f56c6c">应收(USD):{{ form.amountDrUsd || 0 }}</el-tag>
-        <el-tag style="margin-right: 2px; color: #f56c6c">应收合计(CNY):{{ form.amountDrLoc || 0 }}</el-tag>
-        <el-tag style="margin-right: 2px; color: #000000">应付(CNY):{{ form.amountCr || 0 }}</el-tag>
-        <el-tag style="margin-right: 2px; color: #000000">应付(USD):{{ form.amountCrUsd || 0 }}</el-tag>
-        <el-tag style="margin-right: 2px; color: #000000">应付合计(CNY):{{ form.amountCrLoc || 0 }}</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>
@@ -577,6 +577,11 @@ export default {
     document.removeEventListener("keydown", this.handleKeyDown);
     document.removeEventListener("keyup", this.handleKeyUp);
   },
+  filters: {
+    formatNumber(value) {
+      return Number(value?value:0).toFixed(2);
+    },
+  },
   methods: {
     resetTotal() {
       this.customselectList = [];

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

@@ -19,14 +19,14 @@
       <template slot="menuLeft">
         <el-button size="small" type="text" :disabled="disabled" @click="allClick('确认选定行')" style="color: #409eff">确认选定行</el-button>
         <el-button type="text" size="small" :disabled="pageData.length == 0" style="color: #409eff" @click="allClick('一键编辑')">一键编辑</el-button>
-        <el-tag type="danger" style="margin-right: 2px; color: #f56c6c">应收(CNY):{{ amountDSubSum || 0 }}</el-tag>
-        <el-tag type="danger" style="margin-right: 2px; color: #f56c6c">应收(USD):{{ amountDSubUsdSum || 0 }}</el-tag>
-        <el-tag type="danger" style="margin-right: 2px; color: #000000">应付(CNY):{{ amountCSubSum || 0 }}</el-tag>
-        <el-tag type="danger" style="margin-right: 2px; color: #000000; margin-right: 50px">应付(USD):{{ amountCSubUsdSum || 0 }}</el-tag>
-        <el-tag type="success" style="margin-right: 2px; color: #f56c6c">应收(CNY):{{ amountDSubSum2 || 0 }}</el-tag>
-        <el-tag type="success" style="margin-right: 2px; color: #f56c6c">应收(USD):{{ amountDSubUsdSum2 || 0 }}</el-tag>
-        <el-tag type="success" style="margin-right: 2px; color: #000000">应付(CNY):{{ amountCSubSum2 || 0 }}</el-tag>
-        <el-tag type="success" style="margin-right: 2px; color: #000000">应付(USD):{{ amountCSubUsdSum2 || 0 }}</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="customSelected" slot-scope="{ row }">
         <el-checkbox v-model="row.customSelected" @change="customSelection(row)"> </el-checkbox>
@@ -84,14 +84,14 @@
         </el-popover>
         <span v-else>{{ row.stlAmountDr }}</span>
       </template>
-      <template slot="stlAmountDrUSD" slot-scope="{ row }">
-        <el-popover trigger="click" v-if="Number(row.stlAmountDrUSD)">
+      <template slot="stlAmountDrUsd" slot-scope="{ row }">
+        <el-popover trigger="click" v-if="Number(row.stlAmountDrUsd)">
           <avue-crud :data="rlaData" :option="rlaOption"></avue-crud>
           <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewRLA(row, '结算中心')">
-            {{ row.stlAmountDrUSD }}
+            {{ row.stlAmountDrUsd }}
           </span>
         </el-popover>
-        <span v-else>{{ row.stlAmountDrUSD }}</span>
+        <span v-else>{{ row.stlAmountDrUsd }}</span>
       </template>
       <template slot-scope="{ row, index }" slot="menu">
         <el-button type="text" size="small" @click="rowCell(row, index)"> {{ row.$cellEdit ? "保存" : "编辑" }} </el-button>
@@ -401,7 +401,7 @@ export default {
           },
           {
             label: "已结算USD",
-            prop: "stlAmountDrUSD",
+            prop: "stlAmountDrUsd",
             width: 80,
             overHidden: true,
           },
@@ -462,6 +462,11 @@ export default {
     document.removeEventListener("keydown", this.handleKeyDown);
     document.removeEventListener("keyup", this.handleKeyUp);
   },
+  filters: {
+    formatNumber(value) {
+      return Number(value ? value : 0).toFixed(2);
+    },
+  },
   methods: {
     handleKeyDown(e) {
       if (e.key === "Shift" || e.keyCode === 16) {
@@ -628,7 +633,7 @@ export default {
           billNoFormat: "HYDZ",
           businessTypeCode: "HYDZ",
           businessType: "CHK",
-          finStlBillsItemsList:[...this.form.finStlBillsItemsList, ...this.selectionList] ,
+          finStlBillsItemsList: [...this.form.finStlBillsItemsList, ...this.selectionList],
         };
         const loading = this.$loading({
           lock: true,

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

@@ -159,7 +159,7 @@ export default {
                 value: 1,
               },
             ],
-            sortable:true,
+            sortable: true,
             overHidden: true,
           },
           {
@@ -177,21 +177,21 @@ export default {
                 value: "C",
               },
             ],
-            sortable:true,
+            sortable: true,
             overHidden: true,
           },
           {
             label: "账单编号",
             prop: "accBillNo",
             width: 120,
-            sortable:true,
+            sortable: true,
             overHidden: true,
           },
           {
             label: "主单号",
             prop: "mblno",
             width: 100,
-            sortable:true,
+            sortable: true,
             overHidden: true,
           },
           {
@@ -308,7 +308,7 @@ export default {
         currentPage: 1,
         total: 0,
         pageSize: 200,
-        pageSizes: [20, 50, 100, 200, 500,'ALL'],
+        pageSizes: [20, 50, 100, 200, 500, "ALL"],
       },
       pageData: [],
     };
@@ -328,7 +328,7 @@ export default {
     },
     sizeChange(val) {
       this.page.currentPage = 1;
-      this.page.pageSize = val?val:this.tableData.length;
+      this.page.pageSize = val ? val : this.tableData.length;
       this.getList();
     },
     currentChange(val) {
@@ -342,11 +342,9 @@ export default {
       this.pageData = this.tableData.slice(start, end);
     },
     refreshData() {
-      if (this.tableData.length) {
-        this.page.currentPage = 1;
-        this.pageData = [];
-        this.getList();
-      }
+      this.page.currentPage = 1;
+      this.pageData = [];
+      this.getList();
     },
     armbChange(row) {
       if (Number(row.amount - row.reconciliationAmount) > 0) {

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -1505,6 +1505,9 @@ export default {
           for (let index in this.tableData) {
             if (item.accBillNo == this.tableData[index].accBillNo) {
               this.tableData.splice(Number(index), 1);
+              setTimeout(() => {
+                this.$refs.pickedData.refreshData();
+              }, 100);
             }
           }
         });