Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

src/http/moudules/task.js

@@ -777,4 +777,11 @@ export const isVisibledataMatching = () => {
     method: "get",
   })
 }
+//结算表批量删除
+export const SettlementDeletes = () => {
+  return axios({
+    url: "/InsReceivable/deleteSettlement",
+    method: "post",
+  })
+}
 

src/views/FinancialManagement/ExpenseManagement/ExpenseManagement.vue

@@ -720,25 +720,25 @@ export default {
         {
           prop: "collectionMessage",
           label: "收账方",
-          minWidth: 80,
+          minWidth: 160,
           sortable: false,
         },
         {
           prop: "applyAmount",
           label: "金额",
-          minWidth: 150,
+          minWidth: 100,
           sortable: false,
         },
         {
           prop: "applyTime",
           label: "转账日期",
-          minWidth: 150,
+          minWidth: 100,
           sortable: false,
         },
         {
           prop: "transferFlagName",
           label: "转账状态",
-          minWidth: 150,
+          minWidth: 80,
           sortable: false,
         },
       ],

src/views/FinancialManagement/ExpenseManagement/ExpenseMessage.vue

@@ -10,12 +10,21 @@
       @click="addAmount"
       >新增科目</el-button
     >
+    <el-button
+      class="operation"
+      type="primary"
+      plain
+      size="medium"
+      @click="setexpandAll"
+      >全部展开/折叠</el-button
+    >
 
     <!-- 表格 -->
     <el-table
-    class="expendtable"
+      v-if="refTable"
+      class="expendtable"
       :stripe="true"
-      default-expand-all
+      :default-expand-all="expandStatus"
       :header-cell-style="{
         background: '#F2F7FC',
         fontWeight: '900',
@@ -27,7 +36,7 @@
       border
       :tree-props="{ children: 'child', hasChildren: 'hasChildren' }"
     >
-      <el-table-column prop="category" align="center" label="类目">
+      <el-table-column prop="category" align="left" width="300" label="类目">
       </el-table-column>
       <el-table-column prop="remark" align="center" label="备注">
       </el-table-column>
@@ -106,19 +115,19 @@
   <script>
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
-import CommonUtil from "@/utils/comutil.js";
 
 export default {
   name: "ExpenseMessage",
   components: { KtCommonTable, KtButton },
   created() {
-    // this.business();
   },
   mounted() {
     this.findPage();
   },
   data() {
     return {
+      refTable:true,//表格重新渲染
+      expandStatus: false, //是否全部展开
       title: "新增明细",
       tableData: [], //表格数据
       button3Name: "删除",
@@ -148,6 +157,13 @@ export default {
     },
   },
   methods: {
+    setexpandAll() {
+      this.expandStatus = !this.expandStatus;
+      this.refTable = false;
+      this.$nextTick(() => {
+        this.refTable = true;
+      });
+    },
     //删除
     handleDelete(index, row) {
       let id = row.expensesId;
@@ -346,7 +362,7 @@ export default {
 .frame >>> .el-date-editor {
   width: 100%;
 }
-.expendtable >>> .el-table__body-wrapper{
+.expendtable >>> .el-table__body-wrapper {
   overflow-y: auto;
   height: 600px;
 }

src/views/FinancialManagement/ReconciliationSystem/ReceivablePayableCollection/SettlementSource.vue

@@ -167,7 +167,7 @@
         :operationWidth="150"
         :showOperation="true"
         permsDelete="sys:user:delete"
-        :showBatchDelete="false"
+        :showBatchDelete="true"
         :showBatchSettled="true"
         :showBatchPrint="true"
         permsButton1="sys:user:edit"
@@ -180,6 +180,7 @@
         settledName="批量修改"
         @handleSettled="handleTableSettled"
         @handlePrint="handlePrint"
+        @handleDelete="handleDelete"
         button1Name="修改"
         button1Background="#E6A23C"
         @handleButton1="sourceUpdate"
@@ -487,6 +488,35 @@ export default {
       });
       this.dialogUpdateVisible = true;
     },
+    handleDelete(ids) {
+      this.$confirm("此操作将永久删除, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$api.task.SettlementDeletes(ids).then((res) => {
+            if (res.code == "200") {
+              this.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+              this.findPage();
+            } else {
+              this.$message({
+                type: "error",
+                message: res.msg,
+              });
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
     BulkUpdate() {
       let params = {
         ids: this.batchSizeList,