修改禅道问题

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

@@ -20,12 +20,12 @@
         <template slot="applyCashierAmount" slot-scope="{ row }">
           <el-popover width="700" trigger="click">
             <avue-crud :data="cashierData" :option="cashierOption"></avue-crud>
-            <span style="color: #409EFF;cursor: pointer" slot="reference" @click="viewCashier(row)">{{ row.applyCashierAmount }}</span>
+            <span style="color: #409eff; cursor: pointer" slot="reference" @click="viewCashier(row)">{{ row.applyCashierAmount }}</span>
           </el-popover>
         </template>
         <template slot="thisAmount" slot-scope="{ row }">
           <el-input-number
-            style="width: 100%;"
+            style="width: 100%"
             v-model="row.thisAmount"
             label="请输入本次金额"
             size="small"
@@ -73,70 +73,70 @@ export default {
             dicData: [
               {
                 label: "收",
-                value: "D"
+                value: "D",
               },
               {
                 label: "付",
-                value: "C"
-              }
+                value: "C",
+              },
             ],
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "币别",
             prop: "curCode",
             width: "60",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "汇率",
             prop: "exrate",
             width: "80",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "金额",
             prop: "amount",
             width: "100",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "转汇后金额",
             prop: "amountLoc",
             width: "100",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "税率(%)",
             prop: "taxRate",
             width: "80",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "净额",
             prop: "amountNet",
             width: "100",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "税额",
             prop: "amountTax",
             width: "80",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "创建人",
             prop: "createUserName",
             width: "100",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "创建时间",
             prop: "createTime",
             width: "100",
-            overHidden: true
-          }
-        ]
+            overHidden: true,
+          },
+        ],
       },
       selectionList: [],
       form: {},
@@ -144,12 +144,12 @@ export default {
       options: [
         {
           value: 0,
-          label: "不含税"
+          label: "不含税",
         },
         {
           value: 1,
-          label: "含税"
-        }
+          label: "含税",
+        },
       ],
       dialogVisible: false,
       loading: false,
@@ -173,7 +173,7 @@ export default {
             label: "状态",
             prop: "status",
             width: "60",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "收/付",
@@ -183,107 +183,107 @@ export default {
             dicData: [
               {
                 label: "收",
-                value: "D"
+                value: "D",
               },
               {
                 label: "付",
-                value: "C"
-              }
+                value: "C",
+              },
             ],
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "币别",
             prop: "curCode",
             width: "60",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "汇率",
             prop: "exrate",
             width: "80",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "金额",
             prop: "amount",
             width: "100",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "已确认金额",
             prop: "applyCashierAmount",
             width: "100",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "剩余金额",
             prop: "remainingCashierAmount",
             width: "100",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "本次金额",
             prop: "thisAmount",
             width: "100",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "转汇后金额",
             prop: "amountLoc",
             width: "100",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "税率(%)",
             prop: "taxRate",
             width: "80",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "净额",
             prop: "amountNet",
             width: "100",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "税额",
             prop: "amountTax",
             width: "80",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "经办人",
             prop: "cashierName",
             width: "100",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "经办时间",
             prop: "cashierTime",
             width: "100",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "创建人",
             prop: "createUserName",
             width: "100",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "创建时间",
             prop: "createTime",
             width: "100",
-            overHidden: true
+            overHidden: true,
           },
           {
             label: "备注",
             prop: "remarks",
             width: 120,
-            overHidden: true
-          }
-        ]
-      }
+            overHidden: true,
+          },
+        ],
+      },
     };
   },
   async created() {
@@ -292,7 +292,7 @@ export default {
   methods: {
     viewCashier(row) {
       this.cashierData = [];
-      cashierList({ pid: row.id }).then(res => {
+      cashierList({ pid: row.id }).then((res) => {
         this.cashierData = res.data.data.records;
       });
     },
@@ -308,22 +308,22 @@ export default {
       if (name == "确认出纳") {
         for (let item of this.selectionList) {
           if (item.status == 1) {
-            return this.$message.error("请选择"+(this.form.dc == "D" ? "未收款" : "未支付")+"的数据");
+            return this.$message.error("请选择" + (this.form.dc == "D" ? "未收款" : "未支付") + "的数据");
           }
         }
         let obj = {
-          applyCashierList: this.selectionList
+          applyCashierList: this.selectionList,
         };
         const loading = this.$loading({
           lock: true,
           text: "加载中",
           spinner: "el-icon-loading",
-          background: "rgba(255,255,255,0.7)"
+          background: "rgba(255,255,255,0.7)",
         });
         // 对账和付费申请
         if (!this.form.type) {
           confirmCashier(obj)
-            .then(res => {
+            .then((res) => {
               this.openDialog(this.form);
             })
             .finally(() => {
@@ -333,7 +333,7 @@ export default {
         // 发票申请
         if (this.form.type == "销项") {
           confirmCashier2(obj)
-            .then(res => {
+            .then((res) => {
               this.openDialog(this.form);
             })
             .finally(() => {
@@ -344,27 +344,27 @@ export default {
       if (name == "撤销出纳") {
         for (let item of this.selectionList) {
           if (item.status == 0) {
-            return this.$message.error("请选择"+(this.form.dc == "D" ? "已收款" : "已支付")+"数据");
+            return this.$message.error("请选择" + (this.form.dc == "D" ? "已收款" : "已支付") + "数据");
           }
         }
         this.$confirm("是否撤销?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
+          type: "warning",
         }).then(() => {
           let obj = {
-            applyCashierList: this.selectionList
+            applyCashierList: this.selectionList,
           };
           const loading = this.$loading({
             lock: true,
             text: "加载中",
             spinner: "el-icon-loading",
-            background: "rgba(255,255,255,0.7)"
+            background: "rgba(255,255,255,0.7)",
           });
           // 对账和付费申请
           if (!this.form.type) {
             revokeConfirmCashier(obj)
-              .then(res => {
+              .then((res) => {
                 this.openDialog(this.form);
               })
               .finally(() => {
@@ -374,7 +374,7 @@ export default {
           // 发票申请
           if (this.form.type == "销项") {
             revokeConfirmCashier2(obj)
-              .then(res => {
+              .then((res) => {
                 this.openDialog(this.form);
               })
               .finally(() => {
@@ -386,14 +386,19 @@ export default {
     },
     openDialog(row) {
       this.dialogVisible = true;
-      this.selectionList =[]
+      this.selectionList = [];
       this.form = row;
       let obj = {
-        srcIds: row.id
+        srcIds: row.id,
       };
       this.loading = true;
       getListAll(obj)
-        .then(res => {
+        .then((res) => {
+          res.data.data.forEach((item) => {
+            item.amountLoc = Number(Number(item.thisAmount ? item.thisAmount : 0) * Number(item.exrate ? item.exrate : 0)).toFixed(2);
+            item.amountTax = Number(Number(item.amountLoc ? item.amountLoc : 0) * Number(item.taxRate ? item.taxRate / 100 : 0)).toFixed(2);
+            item.amountNet = Number(Number(item.amountLoc ? item.amountLoc : 0) - Number(item.amountTax ? item.amountTax : 0)).toFixed(2);
+          });
           this.data = res.data.data;
         })
         .finally(() => {
@@ -437,8 +442,8 @@ export default {
         }
       }
       return back;
-    }
-  }
+    },
+  },
 };
 </script>
 

src/views/iosBasicData/cashier/indexC.vue

@@ -213,7 +213,10 @@ export default {
             label: "结算日期",
             prop: "billDate",
             overHidden: true,
-            width: "150"
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
+            width: 100
           },
 
           {

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

@@ -169,6 +169,9 @@ export default {
             label: "结算日期",
             prop: "billDate",
             search: true,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
             width: 120,
             overHidden: true,
           },

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

@@ -525,7 +525,7 @@ export default {
           },
           {
             label: "备注",
-            prop: "remarkss",
+            prop: "remarks",
             width: 100,
             cell: true,
             overHidden: true,
@@ -578,6 +578,13 @@ export default {
     document.removeEventListener("keyup", this.handleKeyUp);
   },
   methods: {
+    resetTotal() {
+      this.customselectList = [];
+      this.amountDSubSum2 = 0;
+      this.amountDSubUsdSum2 = 0;
+      this.amountCSubSum2 = 0;
+      this.amountCSubUsdSum2 = 0;
+    },
     handleKeyDown(e) {
       if (e.key === "Shift" || e.keyCode === 16) {
         this.isShiftPressed = true;

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

@@ -407,7 +407,7 @@ export default {
           },
           {
             label: "备注",
-            prop: "remarkss",
+            prop: "remarks",
             width: 100,
             cell: true,
             overHidden: true,

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

@@ -27,18 +27,18 @@
           size="small"
           type="danger"
           plain
-          :disabled="editButton||form.status == 3"
+          :disabled="editButton || form.status == 3"
           @click="allClick('撤销操作')"
           >撤销操作
         </el-button>
         <el-dropdown v-if="form.operatingStatus == 0" trigger="click" @command="moreClick">
-          <el-button type="success" size="small" style="margin: 0 8px" :disabled="editButton||form.status == 3"
+          <el-button type="success" size="small" style="margin: 0 8px" :disabled="editButton || form.status == 3"
             >更多操作<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="付费申请">付费申请</el-dropdown-item>
-            <el-dropdown-item command="收付相抵">收付相抵</el-dropdown-item>
-            <el-dropdown-item command="挂账销账">挂账销账</el-dropdown-item>
+            <el-dropdown-item v-if="!roleName.includes('财务')" command="收付相抵">收付相抵</el-dropdown-item>
+            <el-dropdown-item v-if="!roleName.includes('财务')" command="挂账销账">挂账销账</el-dropdown-item>
             <el-dropdown-item command="发票申请">发票申请</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
@@ -198,6 +198,7 @@ import {
   revokeFinInvoicesApprove,
   agreementListAll,
   finstlbillslistAccBillByCorp,
+  settlementApprove,
 } from "@/api/iosBasicData/finstlbills";
 import { confirmWriteOff, revokeWriteOff } from "@/api/iosBasicData/writeOff.js";
 import { getListAllDetail } from "@/api/iosBasicData/cashier.js";
@@ -233,7 +234,7 @@ export default {
           {
             label: "对账单号",
             prop: "billNo",
-            placeholder:"系统生成对账单号",
+            placeholder: "系统生成对账单号",
             disabled: true,
           },
           {
@@ -694,6 +695,7 @@ export default {
           return this.$message.error("费用明细没有付费数据");
         }
         this.$refs.cashier.openDialog(this.form, this.form.finStlBillsItemsList, "auto");
+
         // const loading = this.$loading({
         //   lock: true,
         //   text: "加载中",
@@ -845,7 +847,7 @@ export default {
           ...this.$options.data().form,
           id: this.form.id,
           version: this.form.version,
-          tenantId:this.form.tenantId,
+          tenantId: this.form.tenantId,
           branchId: this.form.branchId,
           createUser: this.form.createUser,
           createUserName: this.form.createUserName,
@@ -853,7 +855,7 @@ export default {
           updateUser: this.form.updateUser,
           updateUserName: this.form.updateUserName,
           updateTime: this.form.updateTime,
-          billNo:this.form.billNo
+          billNo: this.form.billNo,
         };
         await this.$refs.avueForm.resetForm();
         await this.$refs.avueForm2.resetForm();
@@ -1223,6 +1225,7 @@ export default {
           }
           setTimeout(() => {
             this.$refs.pickedData.refreshData();
+            this.$refs.pickedData.resetTotal();
           }, 100);
         })
         .finally(() => {

src/views/iosBasicData/fininvoicesOutput/index.vue

@@ -238,6 +238,10 @@ export default {
           {
             label: "单据日期",
             prop: "billDate",
+            width:100,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
             overHidden: true
           },
           // {
@@ -433,6 +437,10 @@ export default {
           {
             label: "单据日期",
             prop: "billDate",
+            width:100,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
             overHidden: true
           },
           {