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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.402",
+  "version": "1.0.54-dev.404",
   "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: 128px !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: 128px !important"
       >
         <el-option
           :label="$t2('审核中', 'components.wf.wfStatus1')"
@@ -33,7 +35,26 @@
           :value="3"
         ></el-option>
       </el-select>
-      <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: 128px !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: 128px !important"
+      ></el-input>
       <span class="button-sty">
         <el-date-picker
           v-model="formData.startStartTime"
@@ -43,6 +64,7 @@
           clearable
           value-format="yyyy-MM-dd"
           :picker-options="$baseStartPickerOptions(formData.endStartTime)"
+          style="width: 128px !important"
         ></el-date-picker>
         <span>-</span>
         <el-date-picker
@@ -53,6 +75,7 @@
           clearable
           value-format="yyyy-MM-dd"
           :picker-options="$baseEndPickerOptions(formData.startStartTime)"
+          style="width: 128px !important"
         ></el-date-picker>
       </span>
       <span class="button-sty">
@@ -64,6 +87,7 @@
           clearable
           value-format="yyyy-MM-dd"
           :picker-options="$baseStartPickerOptions(formData.endEndTime)"
+          style="width: 128px !important"
         ></el-date-picker>
         <span>-</span>
         <el-date-picker
@@ -74,8 +98,18 @@
           clearable
           value-format="yyyy-MM-dd"
           :picker-options="$baseEndPickerOptions(formData.startEndTime)"
+          style="width: 128px !important"
         ></el-date-picker>
       </span>
+      <el-button
+        type="primary"
+        plain
+        class="button-sty"
+        @click="resetEvent"
+        icon="el-icon-brush"
+      >
+        {{ $t1("重置") }}
+      </el-button>
       <el-button
         type="warning"
         size="small"
@@ -124,7 +158,29 @@
             <span>流程详情列表</span>
           </div>
           <div style="height: 100%">
-            <vxe-grid ref="table-m1" v-bind="vxeOption" :data="tableData"> </vxe-grid>
+            <vxe-grid ref="table-m1" v-bind="vxeOption" :data="tableData">
+              <template #form>
+                <div class="clearfix screen-btns">
+                  <div class="fl">
+                    <base-table-export
+                      :option="{
+                        title: $t1('流程处理耗用时间查询'),
+                        targetRef: 'table-m1',
+                      }"
+                      :parent-target="_self"
+                    />
+                  </div>
+                  <div class="fr">
+                    <!-- <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
+                                plain>{{ $t1('重置') }}
+                    </vxe-button>
+                    <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
+                      {{ $t1('搜索') }}
+                    </vxe-button> -->
+                  </div>
+                </div>
+              </template>
+            </vxe-grid>
           </div>
         </el-card>
       </el-col>
@@ -169,14 +225,23 @@
         </el-card>
       </el-col>
     </el-row>
+    <wfContentDialog
+      v-if="showWfDialog"
+      :visible.sync="showWfDialog"
+      :option.sync="wfContentOption"
+    ></wfContentDialog>
   </div>
 </template>
 
 <script>
 import scriptHttpMixin from "@base/components/xform/mixins/scriptHttp";
+import wfContentDialog from "@base/views/user/wf/wf_manage/wfContentDialog";
 export default {
   name: "wf_report:index",
   mixins: [scriptHttpMixin],
+  components: {
+    wfContentDialog,
+  },
   data() {
     return {
       vxeOption: {},
@@ -224,16 +289,33 @@ export default {
         dateRange: 3,
         stat: null,
       },
+      objTypeList: [],
+
+      showWfDialog: false,
+      wfContentOption: {},
     };
   },
   mounted() {
+    this.initObjTypeList();
     this.initTableList();
     this.loadWfSummaryCount();
   },
   methods: {
+    openWfDialog(row) {
+      this.wfContentOption = {
+        objId: row.obj_id,
+        url: row.url,
+        objTypeCode: row.obj_type_code,
+      };
+      this.showWfDialog = true;
+    },
     searchEvent() {
       this.$refs["table-m1"].commitProxy("reload");
     },
+    resetEvent() {
+      this.formData = {};
+      this.$refs["table-m1"].commitProxy("reload");
+    },
     initTableList() {
       let that = this;
       let formCode = this.$route.query.formCode;
@@ -327,8 +409,10 @@ export default {
               },
             },
           },
+          { field: "approver_num", title: "审批总人数", width: 180 },
+          { field: "node_num", title: "审批节点数量", width: 180 },
           {
-            width: 47,
+            width: 90,
             fixed: "right",
             title: "",
             sortable: false,
@@ -352,6 +436,23 @@ export default {
                       <i class="iconfont icon-dianji" />
                     </el-tooltip>
                   </a>,
+                  <a
+                    href="javascript:void(0);"
+                    class="a-link"
+                    onclick={() => {
+                      this.openWfDialog(row);
+                    }}
+                  >
+                    <el-tooltip
+                      enterable={false}
+                      effect="dark"
+                      content={this.$t1("查看")}
+                      placement="top"
+                      popper-class="tooltip-skin"
+                    >
+                      <i class="el-icon-edit" />
+                    </el-tooltip>
+                  </a>,
                 ];
               },
             },
@@ -402,6 +503,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>
@@ -413,7 +526,7 @@ export default {
 }
 .filter-btns {
   .f-btn {
-    margin-right: 10px;
+    margin-right: 25px;
   }
 }
 .sum-statistics {