feat: 任务增加统计、同步增加通知

wlzboy

3 天以前 40a8157440e3b906da8f52e07d939d78c3f4c313

 ruoyi-ui/src/views/system/user/index.vue

@@ -59,14 +59,9 @@

            <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
              <el-table-column type="selection" width="50" align="center" />
              <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
              <el-table-column label="OA用户ID" align="center" key="oaUserId" prop="oaUserId" v-if="columns[1].visible" width="120">
                <template slot-scope="scope">
                  <span v-if="scope.row.oaUserId">{{ scope.row.oaUserId }}</span>
                  <span v-else style="color: #909399;">-</span>
                </template>
              </el-table-column>
              <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
              
              <!-- OA用户ID列已隐藏，只在编辑表单中显示 -->
              <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[2].visible" width="150" />
              <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
              <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[4].visible" :show-overflow-tooltip="true" />
              <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[5].visible" width="120" />
@@ -80,7 +75,7 @@
                  <span>{{ parseTime(scope.row.createTime) }}</span>
                </template>
              </el-table-column>
              <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
              <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
                <template slot-scope="scope" v-if="scope.row.userId !== 1">
                  <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']">修改</el-button>
                  <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">删除</el-button>
@@ -89,6 +84,8 @@
                    <el-dropdown-menu slot="dropdown">
                      <el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
                      <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check" v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
                      <!-- 新增：管理分公司配置入口 -->
                      <el-dropdown-item command="handleManageBranch" icon="el-icon-office-building" v-hasPermi="['system:user:edit']">管理分公司</el-dropdown-item>
                    </el-dropdown-menu>
                  </el-dropdown>
                </template>
@@ -119,7 +116,17 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="OA用户ID" prop="oaUserId">
              <el-input v-model="form.oaUserId" placeholder="OA系统的用户ID" :disabled="true" />
              <el-input v-model="form.oaUserId" placeholder="OA系统的用户ID" type="number" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="24">
            <el-form-item label="可管理分公司">
              <div>
                <el-tag v-for="bc in userBranchCompanies" :key="bc.deptId" type="info" size="small" style="margin-right:6px;margin-bottom:6px">{{ bc.deptName }}</el-tag>
                <span v-if="userBranchCompanies.length === 0" style="color:#999">暂无分公司</span>
              </div>
            </el-form-item>
          </el-col>
        </el-row>
@@ -159,6 +166,34 @@
            <el-form-item label="状态">
              <el-radio-group v-model="form.status">
                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="查看所有咨询单">
              <el-radio-group v-model="form.canViewAllConsult">
                <el-radio label="0">否</el-radio>
                <el-radio label="1">是</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="可创建任务单">
              <el-radio-group v-model="form.canCreateTask">
                <el-radio label="0">否</el-radio>
                <el-radio label="1">是</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="可管理任务单">
              <el-radio-group v-model="form.canViewAllConsult">
                <el-radio label="0">否</el-radio>
                <el-radio label="1">是</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
@@ -211,16 +246,48 @@
        <el-button @click="upload.open = false">取 消</el-button>
      </div>
    </el-dialog>

    <!-- 新增：用户管理分公司配置对话框 -->
    <el-dialog title="配置管理分公司" :visible.sync="branchDialog.open" width="520px" append-to-body>
      <el-form label-width="100px" v-loading="branchDialog.loading">
        <el-form-item label="已关联分公司">
          <div style="margin-bottom:8px;color:#666;font-size:12px;">OA自动关联（只读）：</div>
          <div>
            <el-tag v-for="bc in branchDialog.companies" :key="'oa-'+bc.deptId" type="success" size="small" style="margin-right:6px;margin-bottom:6px">{{ bc.deptName }}</el-tag>
            <span v-if="branchDialog.companies.length === 0" style="color:#999;font-size:12px">无OA自动关联</span>
          </div>
        </el-form-item>
        <el-form-item label="手动添加">
          <div style="margin-bottom:6px;color:#666;font-size:12px;">选择需要额外添加的分公司：</div>
          <el-checkbox-group v-model="branchDialog.selectedDeptIds">
            <el-checkbox
              v-for="branch in branchDialog.allBranches"
              :key="branch.deptId"
              :label="branch.deptId"
              style="display:block;margin-bottom:4px;"
            >{{ branch.deptName }}</el-checkbox>
          </el-checkbox-group>
          <div v-if="branchDialog.allBranches.length === 0" style="color:#999;font-size:12px">暂无分公司数据</div>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitBranchCompanies" :loading="branchDialog.loading">保 存</el-button>
        <el-button @click="branchDialog.open = false">关 闭</el-button>
      </div>
    </el-dialog>
  </div>
</template>

<script>
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
import { updateUserBranch } from "@/api/system/user";
import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { Splitpanes, Pane } from "splitpanes";
import "splitpanes/dist/splitpanes.css";
import request from "@/utils/request";
import { listDept, listBranchByUser, listAllBranches } from "@/api/system/dept";

export default {
  name: "User",
@@ -261,7 +328,9 @@
      // 角色选项
      roleOptions: [],
      // 表单参数
      form: {},
      form: {
        canCreateTask: "0"
      },
      defaultProps: {
        children: "children",
        label: "label"
@@ -290,10 +359,10 @@
        status: undefined,
        deptId: undefined
      },
      // 列信息
      // 列信息（OA用户ID列默认隐藏）
      columns: [
        { key: 0, label: `用户编号`, visible: true },
        { key: 1, label: `OA用户ID`, visible: true },
        { key: 1, label: `OA用户ID`, visible: false },
        { key: 2, label: `用户名称`, visible: true },
        { key: 3, label: `用户昵称`, visible: true },
        { key: 4, label: `部门`, visible: true },
@@ -313,7 +382,7 @@
        password: [
          { required: true, message: "用户密码不能为空", trigger: "blur" },
          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' },
          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\\ |", trigger: "blur" }
        ],
        email: [
          {
@@ -329,7 +398,18 @@
            trigger: "blur"
          }
        ]
      }
      },
      // 新增：分公司配置对话框数据
      branchDialog: {
        open: false,
        userId: null,
        allBranches: [],
        selectedDeptIds: [],
        companies: [],
        loading: false
      },
      // 基于 oa_order_class 计算的分公司列表（只读展示）
      userBranchCompanies: []
    };
  },
  watch: {
@@ -409,6 +489,7 @@
        userName: undefined,
        nickName: undefined,
        oaUserId: undefined,
        oaOrderClass: undefined,
        password: undefined,
        phonenumber: undefined,
        email: undefined,
@@ -416,7 +497,9 @@
        status: "0",
        remark: undefined,
        postIds: [],
        roleIds: []
        roleIds: [],
        canViewAllConsult: "0",
        canCreateTask: "0"
      };
      this.resetForm("form");
    },
@@ -448,6 +531,9 @@
        case "handleAuthRole":
          this.handleAuthRole(row);
          break;
        case "handleManageBranch":
          this.handleManageBranch(row);
          break;
        default:
          break;
      }
@@ -476,8 +562,38 @@
        this.open = true;
        this.title = "修改用户";
        this.form.password = "";
        this.loadUserBranchCompanies();
      });
    },
    // 根据 form.oaOrderClass 计算分公司列表（service/dispatch 编码匹配）
    loadUserBranchCompanies() {
      this.userBranchCompanies = [];
      const codesStr = this.form.oaOrderClass || '';
      const codes = codesStr.split(',').map(s => s.trim()).filter(s => s);
      if (codes.length === 0) {
        return;
      }
      listDept({ parentId: 100 }).then(res => {
        const all = res.data || [];
        const codeSet = new Set(codes);
        const list = [];
        const seen = new Set();
        all.forEach(d => {
          const s = d.serviceOrderClass || '';
          const dis = d.dispatchOrderClass || '';
          if ((s && codeSet.has(s)) || (dis && codeSet.has(dis))) {
            if (!seen.has(d.deptId)) {
              seen.add(d.deptId);
              list.push({ deptId: d.deptId, deptName: d.deptName });
            }
          }
        });
        this.userBranchCompanies = list;
      }).catch(() => {
        this.userBranchCompanies = [];
      });
    },

    /** 重置密码按钮操作 */
    handleResetPwd(row) {
      this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
@@ -488,7 +604,7 @@
        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
        inputValidator: (value) => {
          if (/<|>|"|'|\||\\/.test(value)) {
            return "不能包含非法字符：< > \" ' \\\ |"
            return "不能包含非法字符：< > \" ' \\\\ |"
          }
        },
      }).then(({ value }) => {
@@ -501,6 +617,57 @@
    handleAuthRole: function(row) {
      const userId = row.userId;
      this.$router.push("/system/user-auth/role/" + userId);
    },
    /** 管理分公司配置入口 */
    handleManageBranch(row) {
      const userId = row.userId;
      this.branchDialog.userId = userId;
      this.branchDialog.companies = [];
      this.branchDialog.allBranches = [];
      this.branchDialog.selectedDeptIds = [];
      this.branchDialog.loading = true;
      this.branchDialog.open = true;
      // 并行加载：当前用户OA关联分公司 + 所有分公司列表
      const p1 = listBranchByUser(userId).then(res => {
        return (res.data || []).map(d => ({ deptId: d.deptId, deptName: d.deptName }));
      });
      const p2 = listAllBranches().then(res => {
        return res.data || [];
      });
      Promise.all([p1, p2]).then(([oaCompanies, allBranches]) => {
        this.branchDialog.companies = oaCompanies;
        this.branchDialog.allBranches = allBranches;
        // 初始化已选：从 userList 中找到该用户的 oaOrderClass，匹配分公司
        const userRow = (this.userList || []).find(u => u.userId === userId);
        if (userRow && userRow.oaOrderClass) {
          const codes = userRow.oaOrderClass.split(',').map(s => s.trim()).filter(s => s);
          const codeSet = new Set(codes);
          const selected = allBranches
            .filter(d => {
              return (d.serviceOrderClass && codeSet.has(d.serviceOrderClass.trim()))
                || (d.dispatchOrderClass && codeSet.has(d.dispatchOrderClass.trim()));
            })
            .map(d => d.deptId);
          this.branchDialog.selectedDeptIds = selected;
        }
        this.branchDialog.loading = false;
      }).catch(() => {
        this.$modal.msgError('加载分公司配置失败');
        this.branchDialog.loading = false;
      });
    },
    /** 保存分公司配置 */
    submitBranchCompanies() {
      this.branchDialog.loading = true;
      updateUserBranch(this.branchDialog.userId, this.branchDialog.selectedDeptIds).then(() => {
        this.$modal.msgSuccess('分公司配置保存成功');
        this.branchDialog.loading = false;
        this.branchDialog.open = false;
        this.getList();
      }).catch(() => {
        this.$modal.msgError('保存分公司配置失败');
        this.branchDialog.loading = false;
      });
    },
    /** 提交按钮 */
    submitForm: function() {
@@ -566,4 +733,4 @@
    }
  }
};
</script>
</script>