oa多选 ht出差报销确认

.env.development

@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # base api
-#VUE_APP_BASE_API='http://192.167.20.118:8080/'
+#VUE_APP_BASE_API='http://192.167.20.118:8080'
 VUE_APP_BASE_API='https://cz-hjjc-test.115.langye.net'
 VUE_APP_UPLOAD_API='https://cz-hjjc-test.115.langye.net/api/upload-file'
 VUE_APP_PREVIEW=//view.langye.net/preview/onlinePreview

src/views/away/component/MultiExamine.vue

@@ -15,7 +15,6 @@
                   待审批
                 </el-tag>
               </div>
-
             </template>
           </el-table-column>
         </template>
@@ -49,7 +48,7 @@
             width: 54,
             reserveSelection: true,
             fixed: "left",
-            selectable: row => row.oa_ht_away_links ? false : true,
+            selectable: row => row.canSelect
           },
           {
             prop: 'name',
@@ -136,12 +135,22 @@
             name: xingming_details,
             children: [],
             parent: null, // 添加父级字段
-            isSelect: false // 添加选中状态字段
+            isSelect: false ,// 添加选中状态字段
+            canSelect:true,
           };
-          const innerData = originalData[xingming_details];
+          const innerData = originalData[xingming_details];
+          let count=0
           innerData.map(item => {
-            item.isSelect = false
+            item.isSelect = false
-          })
+            item.canSelect = item.oa_ht_away_links?false:true
+            if(item.oa_ht_away_links){
+              count++
+            }
+          })
+          // 如果所有的都已完成了，则父级选择框不可选
+          if(count==innerData.length){
+            person.canSelect = false
+          }
           person.children.push(...innerData)
           // const source = {
           //   id: Math.random(),
@@ -167,8 +176,10 @@
 
       },
       splite(data, flag) {
-        data.forEach((row) => {
+        data.forEach((row) => {
-          this.$refs.awayTable.toggleRowSelection(row, flag)
+          if(row.canSelect){
+            this.$refs.awayTable.toggleRowSelection(row, flag)
+          }
           if (row.children) {
             this.splite(row.children, flag)
           }
@@ -198,10 +209,12 @@
       },
       selectChildren(parent) {
         if (parent.children) {
-          parent.children.forEach((child) => {
+          parent.children.forEach((child) => {
-            this.$refs.awayTable.toggleRowSelection(child, true); // 选中当前子级
+            if(child.canSelect){
-            // child.isSelect = true; // 更新子级的 isSelect 状态
+              this.$refs.awayTable.toggleRowSelection(child, true); // 选中当前子级
-            this.$set(child, 'isSelect', true)
+              // child.isSelect = true; // 更新子级的 isSelect 状态
+              this.$set(child, 'isSelect', true)
+            }
             this.selectChildren(child); // 递归选中子级的子级
           });
         }
@@ -209,14 +222,18 @@
       deselectChildren(parent, isSelect) {
         console.log("isSelect", isSelect, parent)
         if (parent.children) {
-          parent.children.forEach((child, index) => {
+          parent.children.forEach((child, index) => {
-            this.$refs.awayTable.toggleRowSelection(child, isSelect); // 取消选择当前子级
+            if(child.canSelect){
-            this.$set(child, 'isSelect', isSelect)
+              this.$refs.awayTable.toggleRowSelection(child, isSelect); // 取消选择当前子级
+              this.$set(child, 'isSelect', isSelect)
+            }
             this.deselectChildren(child, isSelect); // 递归取消选择子级的子级
           });
-        } else {
+        } else {
-          this.$refs.awayTable.toggleRowSelection(parent, isSelect);
+          if(parent.canSelect){
-          this.$set(parent, 'isSelect', isSelect)
+            this.$refs.awayTable.toggleRowSelection(parent, isSelect);
+            this.$set(parent, 'isSelect', isSelect)
+          }
           console.log("parent", parent)
         }
       },
@@ -241,7 +258,7 @@
       async confirm() {
         console.log("this.$refs['awayTable'].getSelection()", this.$refs['awayTable'].getSelection());
         let flowsList = this.$refs['awayTable'].getSelection();
-
+        // return
         let flow_id = [];
         let chuchai_pay_id = [];
         let chuchai_pay_details = [];

src/views/finance/components/examineRegistration.vue

@@ -658,7 +658,14 @@ import {listdeptNoAuth} from "@/api/system/department";
           total += Number(item.act_money)
         })
         console.log("total",total,this.contract?.money)
-        return ((total / Number(this.contract?.money??0)) * 100).toFixed(2) || 0
+        if(this.contract){
+          if(Number(this.contract.money)>0){
+            return ((total / Number(this.contract.money)) * 100).toFixed(2)
+          }else{
+            return 0
+          }
+        }
+
       },
 
       async getRegistration(id) {

src/views/statisticalReport/budgetProgress.vue

@@ -49,7 +49,7 @@
     </xy-table>
 
     <div style="display: flex;justify-content: flex-end;">
-      <Page :total="total" show-elevator @on-change="pageChange" />
+      <Page :total="total" :page-size="select.pageSize" show-elevator @on-change="pageChange" />
     </div>
 
     <!--    查看-->
@@ -85,10 +85,12 @@ import { getToken } from '@/utils/auth'
         types: [], //预算类型
         departments: [],
         select: {
+          pageSize:15,
           pageIndex: 1,
           year: '',
           type: '',
-          department: ''
+          department: '',
+          // sort_name:'id',
         },
         rateTotal: '0%',
         moneyTotal: 0,
@@ -530,12 +532,13 @@ import { getToken } from '@/utils/auth'
 
       async getPlanProgress() {
         const res = await getProgress({
-          page_size: 10,
+          page_size: this.select.pageSize,
           page: this.select.pageIndex,
           year: this.select.year,
           type: this.select.type,
           plan_department_id: this.select.department,
-          top_pid: 1
+          top_pid: 1,
+          // sort_name:this.select.sort_name
         })
         for (var m of res.list.data) {
           m.pid_info_name = m.pid_info?.name