Merge remote-tracking branch 'origin/master'

xiangpei

2025-02-12 52e0f3c21a732d078d221a384b080bdcdceca2fc

Merge remote-tracking branch 'origin/master'

 src/api/projectProcess/projectProcess.js

@@ -87,3 +87,13 @@
    data: data
  })
}

// 督办
export function taskSupervise(data) {
  return request({
    url: '/project-process/detail/task/supervise',
    method: 'post',
    data: data
  })
}


 src/views/projectEngineering/projectLibrary/index.vue

@@ -251,7 +251,7 @@
        <template slot-scope="scope">
          <el-tooltip class="item" effect="dark" content="审核" placement="top">
            <el-button
              v-if="scope.row.auditRole"
              v-if="scope.row.auditRole && $route.query.projectCategory==='6'"
              size="medium"
              type="text"
              icon="el-icon-circle-check"

 src/views/projectProcess/detail/index.vue

@@ -103,6 +103,7 @@
            <template slot-scope="scope">
              <el-button v-if="scope.row.taskStatus !== '未开始'" @click="goToProcessDetail(scope.row)" type="text" size="small">查看</el-button>
              <el-button v-if="showHandle(scope.row)" @click="goToDo(scope.row)" type="text" size="small">办理</el-button>
              <el-button @click="openSupervise(scope.row)" type="text" size="small">督办</el-button>
            </template>
          </el-table-column>
        </el-table>
@@ -187,7 +188,17 @@
        </div>
      </div>
    </el-dialog>

    <el-dialog :visible.sync="superviseShow" width="1000px"  title="督办" append-to-body>
      <el-form ref="superviseForm" :model="superviseForm" :rules="superviseRules" label-width="80px">
        <el-form-item label="督办内容" prop="content">
          <el-input type="textarea" v-model="superviseForm.content"></el-input>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button @click="superviseShow = false">取 消</el-button>
        <el-button type="primary" @click="submitSupervise">确 定</el-button>
      </div>
    </el-dialog>
  </div>
</template>

@@ -195,11 +206,12 @@
import {
  getProjectProcessDetail,
  getProjectProcessDetailTaskList,
  getTaskIsAuditing
  getTaskIsAuditing, taskSupervise
} from "@/api/projectProcess/projectProcess";
import {flowXmlAndNode} from "@/api/flowable/definition";
import BpmnViewer from '@/components/Process/viewer';
import {flowRecord} from "@/api/flowable/finished";
import {editProject} from "@/api/projectEngineering/projectInfo";

export default {
  name: "Detail",
@@ -216,11 +228,21 @@
      processImgShow: false, // 流程图显示
      imgLoading: false, // 流程图加载
      loading: false,
      superviseShow: false,
      tableLoading: false,
      detailData: {},
      taskList: [],
      total: 0,
      selectTabId: 2,
      superviseForm: {
        taskId: null,
        projectId: null,
        processInsId: null,
        receiverIds: null,
        receiverType: null,
        superviseType: null,
        content: '',
      },
      queryParams: {
        taskName: '',
        taskType: 'todo',
@@ -231,6 +253,9 @@
        processInsId: null,
        deployId: null,
        processName: '' // 流程名称
      },
      superviseRules: {
        content: [{required: true, message: '督办内容不能为空', trigger: 'blur'}]
      }
    }
  },
@@ -252,6 +277,32 @@
    this.getProjectProcessInfo()
  },
  methods: {
    submitSupervise() {
      this.$refs["superviseForm"].validate(valid => {
        if (valid) {
          taskSupervise(this.superviseForm).then((res) => {
            this.superviseShow = false;
            this.$message.success("操作成功");
          })
        }
      });
    },
    openSupervise(row){
      this.superviseForm.content ='';
      this.superviseForm.taskId = row.taskId;
      this.superviseForm.projectId = this.$route.query.projectId;
      this.superviseForm.processInsId = row.taskId;
      this.superviseForm.superviseType = "SUPERVISE";
      this.superviseForm.receiverType = row.handlerType;
      if (row.handlerType === 'USER') {
        this.superviseForm.receiverIds = row.handlerId;
      } else if (row.handlerType === 'DEPT') {
        this.superviseForm.receiverIds = row.handlerUnitId;
      } else if (row.handlerType === 'ROLE') {
        this.superviseForm.receiverIds = row.handlerUnitId;
      }
      this.superviseShow = true
    },
    setIcon(val) {
      if (val) {
        return "el-icon-check";