cloud-web-corejs 1.0.54-dev.402 → 1.0.54-dev.403

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.402",
+  "version": "1.0.54-dev.403",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/table/vxeFilter/mixin.js

@@ -57,12 +57,18 @@ modules = {
             $table,
             column,
           });
+          let sortValue = cellValue
+          let sortField = column.params?.sortField;
+          if(sortField){
+            sortValue = row[sortField]??null;
+          }
           if (lsm[cellValue]) {
             lsm[cellValue].count = lsm[cellValue].count + 1;
           } else {
             lsm[cellValue] = {
               checked: !option.data.hasFilter || vals.includes(cellValue),
               value: cellValue,
+              sortValue: sortValue,
               count: 1,
             };
           }
@@ -70,7 +76,7 @@ modules = {
         for (let key in lsm) {
           colValList.push(lsm[key]);
         }
-        colValList = this.sortByField(colValList, "value");
+        colValList = this.sortByField(colValList, "sortValue");
 
         const columnsArr = [];
 
@@ -194,43 +200,17 @@ modules = {
           this.resetFilterEvent();
           return;
         }
-
         data.vals = vals;
         option.data.hasFilter = true;
         $panel.changeOption(evnt, true, option);
         $panel.confirmFilter();
-
-        let checkStrictly =
-          $table.$options.propsData?.checkboxConfig?.checkStrictly;
-        // $table.setAllCheckboxRow(false);
-        this.clearTableCheckboxRow($table);
-      },
-      clearTableCheckboxRow($table) {
-        let originOption = $table.$xegrid?.originOption;
-        if (originOption) {
-          let target = originOption.vue;
-          if (
-            target.defaultTableRefName === originOption.tableRef &&
-            target._clearChecked
-          ) {
-            target._clearChecked();
-          } else {
-            $table.clearCheckboxRow();
-          }
-          originOption.onFilter && originOption.onFilter();
-        } else {
-          $table.clearCheckboxRow();
-        }
+        $table.setAllCheckboxRow(false);
       },
       resetFilterEvent() {
         const { $panel, $table } = this.params;
-        let checkStrictly =
-          $table.$options.propsData?.checkboxConfig?.checkStrictly;
         this.option.data.hasFilter = false;
         $panel.resetFilter();
-        // $table.setAllCheckboxRow(false);
-
-        this.clearTableCheckboxRow($table);
+        $table.setAllCheckboxRow(false);
       },
     },
   },

package/src/views/user/wf/wfReport/index.vue

@@ -6,6 +6,7 @@
         v-model="formData.dateRange"
         @change="handleSelectChange"
         clearable
+        style="width: 146px !important"
       >
         <el-option :label="$t1('本日')" :value="1"></el-option>
         <el-option :label="$t1('本周')" :value="2"></el-option>
@@ -19,6 +20,7 @@
         clearable
         @clear="formData.stat = null"
         @change="handleSelectChange"
+        style="width: 146px !important"
       >
         <el-option
           :label="$t2('审核中', 'components.wf.wfStatus1')"
@@ -33,7 +35,27 @@
           :value="3"
         ></el-option>
       </el-select>
-      <el-input v-model="formData.objTypeName" placeholder="流程类型"></el-input>
+      <!-- <el-input v-model="formData.objTypeName" placeholder="流程类型"></el-input> -->
+      <el-select
+        class="f-btn"
+        v-model="formData.objTypeCode"
+        :placeholder="$t1('流程类型')"
+        clearable
+        @change="handleSelectChange"
+        style="width: 146px !important"
+      >
+        <el-option
+          v-for="(item, index) in objTypeList"
+          :key="index"
+          :label="item.objTypeName"
+          :value="item.objTypeCode"
+        ></el-option>
+      </el-select>
+      <el-input
+        v-model="formData.name"
+        placeholder="流程主题"
+        style="width: 146px !important"
+      ></el-input>
       <span class="button-sty">
         <el-date-picker
           v-model="formData.startStartTime"
@@ -43,6 +65,7 @@
           clearable
           value-format="yyyy-MM-dd"
           :picker-options="$baseStartPickerOptions(formData.endStartTime)"
+          style="width: 146px !important"
         ></el-date-picker>
         <span>-</span>
         <el-date-picker
@@ -53,6 +76,7 @@
           clearable
           value-format="yyyy-MM-dd"
           :picker-options="$baseEndPickerOptions(formData.startStartTime)"
+          style="width: 146px !important"
         ></el-date-picker>
       </span>
       <span class="button-sty">
@@ -64,6 +88,7 @@
           clearable
           value-format="yyyy-MM-dd"
           :picker-options="$baseStartPickerOptions(formData.endEndTime)"
+          style="width: 146px !important"
         ></el-date-picker>
         <span>-</span>
         <el-date-picker
@@ -74,6 +99,7 @@
           clearable
           value-format="yyyy-MM-dd"
           :picker-options="$baseEndPickerOptions(formData.startEndTime)"
+          style="width: 146px !important"
         ></el-date-picker>
       </span>
       <el-button
@@ -224,9 +250,11 @@ export default {
         dateRange: 3,
         stat: null,
       },
+      objTypeList: [],
     };
   },
   mounted() {
+    this.initObjTypeList();
     this.initTableList();
     this.loadWfSummaryCount();
   },
@@ -327,6 +355,8 @@ export default {
               },
             },
           },
+          { field: "approver_num", title: "审批总人数", width: 180 },
+          { field: "node_num", title: "审批节点数量", width: 180 },
           {
             width: 47,
             fixed: "right",
@@ -402,6 +432,18 @@ export default {
       this.searchEvent();
       this.clearWfSummaryNode();
     },
+    initObjTypeList() {
+      this.$http({
+        url: `/${this.serviceName}/wf_info/listGroupPage`,
+        method: "post",
+        data: {
+          type: 0,
+        },
+        success: (res) => {
+          this.objTypeList = res?.objx?.records || [];
+        },
+      });
+    },
   },
 };
 </script>