流程推进关闭优化、项目码显示临时调整、流程推进分页当前页字段调整
4个文件已修改
29 ■■■■■ 已修改文件
src/views/flowable/task/myProcess/detail/index.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flowable/task/myProcess/send/index.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/projectEngineering/projectLibrary/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/projectProcess/index.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flowable/task/myProcess/detail/index.vue
@@ -192,6 +192,8 @@
    },
    /** 返回页面 */
    goBack() {
      // 关闭当前标签页
      this.$store.dispatch("tagsView/delView", this.$route);
      this.$router.push({
        path: '/projectFlow/detail',
        query: {
src/views/flowable/task/myProcess/send/index.vue
@@ -83,10 +83,10 @@
          </el-alert>
          <el-form-item label="用户类型" prop="peopleType">
            <el-select v-model="delegationForm.peopleType" @change="peopleTypeChange" placeholder="请选择用户类型">
              <el-option label="指定人员" value="FIX_USER"></el-option>
              <el-option label="候选用户" value="USER"></el-option>
              <el-option label="指定人员" disabled value="FIX_USER"></el-option>
              <el-option label="候选用户" disabled value="USER"></el-option>
              <el-option label="候选部门" value="DEPT"></el-option>
              <el-option label="候选角色" value="ROLE"></el-option>
              <el-option label="候选角色" disabled  value="ROLE"></el-option>
            </el-select>
          </el-form-item>
          <el-form-item v-if="delegationForm.peopleType === 'DEPT'" label="候选部门" prop="targetId">
@@ -201,6 +201,7 @@
      }).then(() => {
        taskDelegation(this.delegationForm).then(res => {
          this.$message.success("已发起转办申请")
          this.goBack()
        })
      }).catch(() => {
        this.$message({
@@ -304,6 +305,9 @@
    },
    /** 返回页面 */
    goBack() {
      // 关闭当前标签页
      this.$store.dispatch("tagsView/delView", this.$route);
      // 跳转路由
      this.$router.push({
        path: '/projectFlow/detail',
        query: {
src/views/projectEngineering/projectLibrary/index.vue
@@ -217,7 +217,7 @@
              <dict-tag :options="dict.type.sys_project_status" :value="scope.row.projectStatus"/>
            </template>
            <!-- projectColorCode插槽 -->
            <template v-if="item.slotName === 'coding'">
            <template v-if="item.slotName === 'projectColorCode'">
              <dict-tag :options="dict.type.sys_project_code" :value="scope.row.coding"/>
            </template>
            <!-- projectType插槽 -->
src/views/projectProcess/index.vue
@@ -206,8 +206,13 @@
              <dict-tag :options="dict.type.sys_project_status" :value="scope.row.projectStatus"/>
            </template>
            <!-- projectColorCode插槽 -->
            <template v-if="item.slotName === 'projectColorCode'">
              <dict-tag :options="dict.type.sys_project_code" :value="scope.row.projectColorCode"/>
            <template v-if="item.slotName === 'projectColorCode' || item.slotName === 'coding'">
              <div v-if="scope.row.projectColorCode">
                <dict-tag :options="dict.type.sys_project_code" :value="scope.row.projectColorCode"/>
              </div>
              <div v-else>
                <dict-tag :options="dict.type.sys_project_code" :value="scope.row.coding"/>
              </div>
            </template>
            <!-- projectType插槽 -->
            <template v-if="item.slotName === 'projectType'">
@@ -259,7 +264,7 @@
    <pagination
      v-show="total>0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :page.sync="queryParams.currentPage"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />
@@ -341,7 +346,7 @@
      timeRange: [],
      // 查询参数
      queryParams: {
        pageNum: 1,
        currentPage: 1,
        pageSize: 10,
        projectName: null,
        projectCode: null,
@@ -535,7 +540,7 @@
    },
    /** 搜索按钮操作 */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.queryParams.currentPage = 1;
      this.getList();
    },
    /** 重置按钮操作 */