cloud-web-corejs 1.0.54-dev.747 → 1.0.54-dev.750

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.747",
+  "version": "1.0.54-dev.750",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",
@@ -184,7 +184,7 @@
     "src/permission.js",
     "src/index.js",
     "src/public-path.js",
-    "src/microRouter",
+    "src/microRouter",
     "src/App.vue"
   ],
   "publishConfig": {

package/src/store/config/index.js

@@ -458,7 +458,7 @@ modules = {
         type: 0,
         children: [],
       },
-      /* {
+      {
         id: 6657,
         createDate: "2024-05-28 16:20:15",
         modifyDate: "2025-01-02 10:20:52",
@@ -480,7 +480,7 @@ modules = {
         grade: 2,
         type: 0,
         children: [],
-      }, */
+      },
       {
         id: 6949,
         createDate: "2024-06-13 14:29:01",
@@ -617,28 +617,28 @@ modules = {
         grade: 2,
         type: 0,
       },
-      {
-        id: 10002,
-        createDate: "2022-05-31 09:39:47",
-        modifyDate: "2024-08-19 10:50:08",
-        createBy: "admin",
-        modifyBy: "admin",
-        orders: 1,
-        parent: 60,
-        menuName: "数据源",
-        menuEnName: null,
-        menuCode: "extend_datasource:list",
-        sn: null,
-        menuImg: null,
-        url: "@base/views/user/extend_datasource/list",
-        route: "/user/extend_datasource/list",
-        enabled: true,
-        treePath: ",12,60,",
-        treePathName: ",",
-        hasChild: true,
-        grade: 2,
-        type: 0,
-      },
+      // {
+      //   id: 10002,
+      //   createDate: "2022-05-31 09:39:47",
+      //   modifyDate: "2024-08-19 10:50:08",
+      //   createBy: "admin",
+      //   modifyBy: "admin",
+      //   orders: 1,
+      //   parent: 60,
+      //   menuName: "数据源",
+      //   menuEnName: null,
+      //   menuCode: "extend_datasource:list",
+      //   sn: null,
+      //   menuImg: null,
+      //   url: "@base/views/user/extend_datasource/list",
+      //   route: "/user/extend_datasource/list",
+      //   enabled: true,
+      //   treePath: ",12,60,",
+      //   treePathName: ",",
+      //   hasChild: true,
+      //   grade: 2,
+      //   type: 0,
+      // },
       {
         id: 10003,
         createDate: "2022-05-31 09:39:47",

package/src/views/user/wf/wf_manage/list.vue

@@ -49,7 +49,10 @@
                 <div class="clearfix screen-btns">
                   <div class="fl">
                     <base-table-export
-                      :option="{ title: $t1('流程待办导出'), targetRef: 'table-m1' }"
+                      :option="{
+                        title: $t1('流程待办导出'),
+                        targetRef: 'table-m1',
+                      }"
                       :parent-target="_self"
                     />
                   </div>
@@ -84,15 +87,26 @@
                 >
                   <vxe-form-item :title="$t1('待办类型') + ':'">
                     <template v-slot>
-                      <el-input v-model="checkNodeData.label" size="small" disabled />
+                      <el-input
+                        v-model="checkNodeData.label"
+                        size="small"
+                        disabled
+                      />
                     </template>
                   </vxe-form-item>
                   <vxe-form-item :title="$t1('流程主题') + ':'" field="name">
                     <template v-slot>
-                      <el-input v-model="formData.name" size="small" clearable />
+                      <el-input
+                        v-model="formData.name"
+                        size="small"
+                        clearable
+                      />
                     </template>
                   </vxe-form-item>
-                  <vxe-form-item :title="$t1('单据类型') + ':'" field="objTypeName">
+                  <vxe-form-item
+                    :title="$t1('单据类型') + ':'"
+                    field="objTypeName"
+                  >
                     <template v-slot>
                       <el-input
                         class="search-input"
@@ -116,15 +130,31 @@
                   <vxe-form-item :title="$t1('流程状态') + ':'" field="stat">
                     <template v-slot>
                       <el-select v-model="formData.stat" clearable>
-                        <el-option :value="1" :label="$t1('审核中')"></el-option>
-                        <el-option :value="2" :label="$t1('已完成')"></el-option>
-                        <el-option :value="3" :label="$t1('已驳回')"></el-option>
+                        <el-option
+                          :value="1"
+                          :label="$t1('审核中')"
+                        ></el-option>
+                        <el-option
+                          :value="2"
+                          :label="$t1('已完成')"
+                        ></el-option>
+                        <el-option
+                          :value="3"
+                          :label="$t1('已驳回')"
+                        ></el-option>
                       </el-select>
                     </template>
                   </vxe-form-item>
-                  <vxe-form-item :title="$t1('启动人') + ':'" field="starterName">
+                  <vxe-form-item
+                    :title="$t1('启动人') + ':'"
+                    field="starterName"
+                  >
                     <template v-slot>
-                      <el-input v-model="formData.starterName" size="small" clearable />
+                      <el-input
+                        v-model="formData.starterName"
+                        size="small"
+                        clearable
+                      />
                     </template>
                   </vxe-form-item>
                   <vxe-form-item title="启动时间:">
@@ -136,7 +166,9 @@
                         size="small"
                         clearable
                         value-format="yyyy-MM-dd HH:mm:ss"
-                        :picker-options="$baseStartPickerOptions(formData.endTime)"
+                        :picker-options="
+                          $baseStartPickerOptions(formData.endTime)
+                        "
                       ></el-date-picker>
                       <span>-</span>
                       <el-date-picker
@@ -147,7 +179,9 @@
                         clearable
                         value-format="yyyy-MM-dd HH:mm:ss"
                         default-time="23:59:59"
-                        :picker-options="$baseEndPickerOptions(formData.startTime)"
+                        :picker-options="
+                          $baseEndPickerOptions(formData.startTime)
+                        "
                       ></el-date-picker>
                     </template>
                   </vxe-form-item>
@@ -169,9 +203,19 @@
               <div class="clearfix screen-btns">
                 <div class="fl">
                   <base-table-export
-                    :option="{ title: $t1('流程待办导出'), targetRef: 'table-m2' }"
+                    :option="{
+                      title: $t1('流程待办导出'),
+                      targetRef: 'table-m2',
+                    }"
                     :parent-target="_self"
                   />
+                  <el-button
+                    type="primary"
+                    class="button-sty"
+                    icon="el-icon-check"
+                    @click="openCurrentTaskUserDialog"
+                    >{{ $t1("处理当前任务用户") }}
+                  </el-button>
                 </div>
                 <div class="fr">
                   <vxe-button
@@ -207,7 +251,10 @@
                     <el-input v-model="formData2.name" size="small" clearable />
                   </template>
                 </vxe-form-item>
-                <vxe-form-item :title="$t1('单据类型') + ':'" field="objTypeName">
+                <vxe-form-item
+                  :title="$t1('单据类型') + ':'"
+                  field="objTypeName"
+                >
                   <template v-slot>
                     <el-input
                       class="search-input"
@@ -237,9 +284,24 @@
                     </el-select>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item :title="$t1('当前任务用户') + ':'" field="candidateNames">
+                <vxe-form-item
+                  :title="$t1('当前任务用户') + ':'"
+                  field="candidateNames"
+                >
+                  <template v-slot>
+                    <el-input
+                      v-model="formData2.candidateNames"
+                      size="small"
+                      clearable
+                    />
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item :title="$t1('禁用用户流程') + ':'">
                   <template v-slot>
-                    <el-input v-model="formData2.candidateNames" size="small" clearable />
+                    <el-select v-model="formData2.filterDisabledUser" clearable>
+                      <el-option :value="1" :label="$t1('是')"></el-option>
+                      <el-option :value="0" :label="$t1('否')"></el-option>
+                    </el-select>
                   </template>
                 </vxe-form-item>
               </vxe-form>
@@ -262,15 +324,102 @@
       @confirm="confirmInsertWfObjConfig2"
       :multi="false"
     ></wfObjConfigDialog>
+    <el-dialog
+      :title="$t1('处理当前任务用户')"
+      :append-to-body="true"
+      :modal-append-to-body="true"
+      :close-on-click-modal="false"
+      :visible.sync="showCurrentTaskUserDialog"
+      :modal="false"
+      custom-class="dialog-style list-dialog pd_0"
+      width="300px"
+      @close="closeCurrentTaskUserDialog"
+      v-el-drag-dialog
+      v-el-dialog-center
+    >
+      <div class="cont" style="padding: 16px 20px">
+        <el-form
+          ref="currentTaskUserForm"
+          :model="currentTaskUserForm"
+          label-width="100px"
+        >
+          <el-form-item :label="$t1('删除用户')">
+            <el-input
+              class="search-input"
+              v-model="currentTaskUserForm.delUserNames"
+              clearable
+              @clear="clearDelUsers"
+              v-el-readonly
+            >
+              <i
+                slot="suffix"
+                class="el-input__icon el-icon-search"
+                @click="openDelUserDialog"
+              ></i>
+            </el-input>
+          </el-form-item>
+          <el-form-item :label="$t1('新增用户')">
+            <el-input
+              class="search-input"
+              v-model="currentTaskUserForm.addUserNames"
+              clearable
+              @clear="clearAddUsers"
+              v-el-readonly
+            >
+              <i
+                slot="suffix"
+                class="el-input__icon el-icon-search"
+                @click="openAddUserDialog"
+              ></i>
+            </el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          plain
+          class="button-sty"
+          @click="closeCurrentTaskUserDialog"
+        >
+          <i class="el-icon-close el-icon"></i>
+          {{ $t1("取 消") }}
+        </el-button>
+        <el-button
+          type="primary"
+          class="button-sty"
+          @click="confirmCurrentTaskUser"
+        >
+          <i class="el-icon-check el-icon"></i>
+          {{ $t1("确 定") }}
+        </el-button>
+      </span>
+    </el-dialog>
+    <userDialog
+      v-if="showDelUserDialog"
+      :visiable.sync="showDelUserDialog"
+      @confirm="confirmDelUsers"
+      :multi="true"
+      :param="{ enabled: null }"
+      :rows="currentTaskUserForm.delUserRows"
+    />
+    <userDialog
+      v-if="showAddUserDialog"
+      :visiable.sync="showAddUserDialog"
+      @confirm="confirmAddUsers"
+      :multi="true"
+      :rows="currentTaskUserForm.addUserRows"
+    />
   </div>
 </template>
 <script>
 import { treeScollx } from "@base/utils/global.js";
 import wfObjConfigDialog from "../../../../views/user/wf/wf_obj_config/dialog.vue";
+import userDialog from "@base/views/user/user/dialog";
 
 export default {
   name: "wf_manage:list",
-  components: { wfObjConfigDialog },
+  components: { wfObjConfigDialog, userDialog },
   created() {},
   async mounted() {
     treeScollx({ target: this, type: "default" });
@@ -301,11 +450,26 @@ export default {
       param: {},
       wfContent: null,
       showWfContent: false,
+
+      showCurrentTaskUserDialog: false,
+      showDelUserDialog: false,
+      showAddUserDialog: false,
+      currentTaskUserUuids: [],
+      currentTaskUserForm: {
+        delUserIds: [],
+        delUserNames: "",
+        delUserRows: [],
+        addUserIds: [],
+        addUserNames: "",
+        addUserRows: [],
+      },
     };
   },
   computed: {
     type() {
-      return this.checkNode && this.checkNode.data ? this.checkNode.data.type : "";
+      return this.checkNode && this.checkNode.data
+        ? this.checkNode.data.type
+        : "";
     },
     checkNodeData() {
       return this.checkNode && this.checkNode.data ? this.checkNode.data : {};
@@ -500,11 +664,14 @@ export default {
       this.$openEditView("showWfContent");
     },
     guid() {
-      return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
-        var r = (Math.random() * 16) | 0,
-          v = c == "x" ? r : (r & 0x3) | 0x8;
-        return v.toString(16);
-      });
+      return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(
+        /[xy]/g,
+        function (c) {
+          var r = (Math.random() * 16) | 0,
+            v = c == "x" ? r : (r & 0x3) | 0x8;
+          return v.toString(16);
+        }
+      );
     },
     clearNodeClick() {
       /* this.formData.saleOrgId = '';
@@ -797,6 +964,95 @@ export default {
         this.$set(this.formData2, "objTypeCode", row.objTypeCode);
       }
     },
+    openCurrentTaskUserDialog() {
+      let checkRows = this.$refs["table-m2"].getCheckboxRecords(true) || [];
+      if (!checkRows.length) {
+        this.$baseAlert(this.$t1("请勾选需要处理的数据"));
+        return;
+      }
+      this.currentTaskUserUuids = checkRows.map((row) => row.uuid);
+      this.currentTaskUserForm = {
+        delUserIds: [],
+        delUserNames: "",
+        delUserRows: [],
+        addUserIds: [],
+        addUserNames: "",
+        addUserRows: [],
+      };
+      this.showCurrentTaskUserDialog = true;
+    },
+    closeCurrentTaskUserDialog() {
+      this.showCurrentTaskUserDialog = false;
+    },
+    openDelUserDialog() {
+      this.showDelUserDialog = true;
+    },
+    openAddUserDialog() {
+      this.showAddUserDialog = true;
+    },
+    clearDelUsers() {
+      this.currentTaskUserForm.delUserIds = [];
+      this.currentTaskUserForm.delUserNames = "";
+      this.currentTaskUserForm.delUserRows = [];
+    },
+    clearAddUsers() {
+      this.currentTaskUserForm.addUserIds = [];
+      this.currentTaskUserForm.addUserNames = "";
+      this.currentTaskUserForm.addUserRows = [];
+    },
+    confirmDelUsers(rows) {
+      if (!rows || !rows.length) {
+        this.clearDelUsers();
+        return;
+      }
+      this.currentTaskUserForm.delUserIds = rows.map((row) => row.id);
+      this.currentTaskUserForm.delUserRows = rows;
+      this.currentTaskUserForm.delUserNames = rows
+        .map((row) => row.nickName)
+        .join(",");
+    },
+    confirmAddUsers(rows) {
+      if (!rows || !rows.length) {
+        this.clearAddUsers();
+        return;
+      }
+      this.currentTaskUserForm.addUserIds = rows.map((row) => row.id);
+      this.currentTaskUserForm.addUserRows = rows;
+      this.currentTaskUserForm.addUserNames = rows
+        .map((row) => row.nickName)
+        .join(",");
+    },
+    confirmCurrentTaskUser() {
+      let delUserIds = this.currentTaskUserForm.delUserIds || [];
+      let addUserIds = this.currentTaskUserForm.addUserIds || [];
+      if (!delUserIds.length) {
+        this.$message.error(this.$t1("请选择删除用户"));
+        return;
+      }
+      this.$baseConfirm(this.$t1("您确定要处理当前任务用户吗？")).then(() => {
+        this.$http({
+          url: USER_PREFIX + "/wf_info/updateCurrentTaskUsers",
+          method: "post",
+          data: {
+            uuid: this.currentTaskUserUuids,
+            delUserIds: delUserIds,
+            addUserIds: addUserIds,
+          },
+          isLoading: true,
+          success: (res) => {
+            this.$message({
+              message: res.content || this.$t1("操作成功"),
+              type: "success",
+              duration: 500,
+              onClose: () => {
+                this.closeCurrentTaskUserDialog();
+                this.searchEvent2();
+              },
+            });
+          },
+        });
+      });
+    },
   },
 };
 </script>