Merge branch 'dev'

xiangpei

2025-03-02 8c9f4f20341274df1c2326a1ce7fbc59770afc65

Merge branch 'dev'

 src/components/Process/panel/formPanel.vue

@@ -1,23 +1,39 @@
<template>
  <div>
    <el-form label-width="80px" size="small" @submit.native.prevent>
      <el-form-item label="流程表单">
        <el-select v-model="bpmnFormData.formKey" clearable class="m-2" placeholder="挂载节点表单" @clear="updateElementFormKey(null)" @change="updateElementFormKey">
          <el-option
              v-for="item in formList"
              :key="item.formId"
              :label="item.formName"
              :value="item.formId"
          />
        </el-select>
      </el-form-item>
          <el-form-item label="流程表单">
            <el-select v-model="bpmnFormData.formKey" clearable class="m-2" placeholder="挂载节点表单" @clear="updateElementFormKey(null)" @change="updateElementFormKey">
              <el-option
                v-for="item in formList"
                :key="item.formId"
                :label="item.formName"
                :value="item.formId"
              />
            </el-select>
            <el-button
              style="margin-left: 10px"
              size="mini"
              type="text"
              icon="el-icon-view"
              :disabled="checkState"
              @click="handleDetail()"
            >预览
            </el-button>
          </el-form-item>

    </el-form>

    <!--表单详情-->
    <el-dialog :title="formTitle" :visible.sync="formRenderOpen" width="60%" append-to-body>
      <v-form-render :form-data="formData" ref="vFormRef"/>
    </el-dialog>

  </div>
</template>

<script>

import { listAllForm } from '@/api/flowable/form'
import { listAllForm, getForm} from '@/api/flowable/form'
import {StrUtil} from "@/utils/StrUtil";
export default {
  name: "FormPanel",
@@ -30,11 +46,21 @@
  },
  data() {
    return {
      formTitle: "",
      formOpen: false,
      formRenderOpen: false,
      formData: {},
      formList: [], // 表单数据
      bpmnFormData: {}
      bpmnFormData: {
        formKey:null
      },
    }
  },

  computed:{
    checkState(){
      return this.bpmnFormData.formKey === null || this.bpmnFormData.formKey === undefined;
    }
  },
  /** 传值监听 */
  watch: {
    id: {
@@ -59,7 +85,23 @@
    resetFlowForm() {
      this.bpmnFormData.formKey = this.modelerStore.element.businessObject.formKey;
    },
    handleDetail() {
      getForm(this.bpmnFormData.formKey).then(res =>{
        this.formRenderOpen = true;
        this.formTitle = "表单详情";
        this.$nextTick(() => {
          // 回显数据
          this.$refs.vFormRef.setFormJson(JSON.parse(res.data.formContent))
          this.$nextTick(() => {
            // 表单禁用
            this.$refs.vFormRef.disableForm();
          })
        })

      })


    },
    updateElementFormKey(val) {
      this.init()
      if (StrUtil.isBlank(val)) {

 src/views/engineering/index.vue

@@ -58,45 +58,54 @@
          v-hasPermi="['code:engineering:add']"
        >新增</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="success"
          plain
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['code:engineering:edit']"
        >修改</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="danger"
          plain
          icon="el-icon-delete"
          size="mini"
          :disabled="multiple"
          @click="deleteByIds"
          v-hasPermi="['code:engineering:remove']"
        >删除</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['code:engineering:export']"
        >导出</el-button>
      </el-col>
<!--      <el-col :span="1.5">-->
<!--        <el-button-->
<!--          type="success"-->
<!--          plain-->
<!--          icon="el-icon-edit"-->
<!--          size="mini"-->
<!--          :disabled="single"-->
<!--          @click="handleUpdate"-->
<!--          v-hasPermi="['code:engineering:edit']"-->
<!--        >修改</el-button>-->
<!--      </el-col>-->
<!--      <el-col :span="1.5">-->
<!--        <el-button-->
<!--          type="danger"-->
<!--          plain-->
<!--          icon="el-icon-delete"-->
<!--          size="mini"-->
<!--          :disabled="multiple"-->
<!--          @click="deleteByIds"-->
<!--          v-hasPermi="['code:engineering:remove']"-->
<!--        >删除</el-button>-->
<!--      </el-col>-->
<!--      <el-col :span="1.5">-->
<!--        <el-button-->
<!--          type="warning"-->
<!--          plain-->
<!--          icon="el-icon-download"-->
<!--          size="mini"-->
<!--          @click="handleExport"-->
<!--          v-hasPermi="['code:engineering:export']"-->
<!--        >导出</el-button>-->
<!--      </el-col>-->
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-table v-loading="loading" :data="engineeringList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="工程名称" align="center" prop="projectName" />
      <el-table-column label="主项目名称" align="center" prop="projectInfoName" />
    <el-table
      ref="elTable"
      v-loading="loading"
      style="margin-top: 20px"
      :data="engineeringList"
      height="100%"
      sortable="custom"
      row-key="id"
      border
      default-expand-all
      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
      :show-overflow-tooltip="true">
      <el-table-column label="项目名称" align="center" prop="projectName" />
      <el-table-column label="项目推进类型" align="center" prop="projectType">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_project_type" :value="scope.row.projectType"/>
@@ -108,21 +117,35 @@
          <dict-tag :options="dict.type.sys_project_status" :value="scope.row.status"/>
        </template>
      </el-table-column>
      <el-table-column label="主管部门" align="center" prop="departmentName">

      </el-table-column>
      <el-table-column label="业主单位" align="center" prop="unitName">
      </el-table-column>
      <el-table-column label="年份" align="center" prop="year">
        <template slot-scope="scope">
          {{ scope.row.year ? scope.row.year.split('-')[0] + '年' : '' }}
        </template>
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-plus"
            @click="handleadd(scope.row)"
          >添加子工程</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['code:engineering:edit']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="deleteById(scope.row)"
            v-hasPermi="['code:engineering:remove']"
          >删除</el-button>
        </template>
      </el-table-column>
@@ -183,6 +206,20 @@
            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="主管部门" prop="department">
          <treeselect v-model="form.department"  @input="getCompetentDepartmentInfo" noChildrenText="无匹配数据" :options="approvalList"  :normalizer="normalizer"  placeholder="请选择主管部门">
          </treeselect>
        </el-form-item>
        <el-form-item label="业主单位" prop="unit">
          <treeselect v-model="form.unit"  @input="getProjectOwnerUnit" noChildrenText="无匹配数据" :options="selectOptions" :normalizer="normalizer" placeholder="选择单位" />
        </el-form-item>
        <el-form-item label="年份" prop="year">
          <el-date-picker v-model="form.year "
                          placeholder="选择时间"
                          style="width: 100%"
                          type="date"
                          value-format="yyyy-MM-dd HH:mm:ss"/>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -195,9 +232,15 @@
<script>
import { getProjectEngineerings, getProjectEngineeringById, deleteProjectEngineeringByIds, deleteProjectEngineeringById, editProjectEngineering, addProjectEngineering } from "@/api/projectEngineering/projectEngineering";
import {list} from "@/api/projectEngineering/projectInfo";
import Treeselect from '@riophae/vue-treeselect'
import "@riophae/vue-treeselect/dist/vue-treeselect.css";

import {approvalList,listDept} from "@/api/system/dept";


export default {
  name: "Engineering",
  components: { Treeselect },
  dicts: ['sys_project_type', 'sys_project_status'],
  data() {
    return {
@@ -220,6 +263,10 @@
      title: "",
      // 是否显示弹出层
      open: false,
      //主管部门
      approvalList: [],
      //业主单位
      selectOptions: [],
      // 查询参数
      queryParams: {
        currentPage: 1,
@@ -229,6 +276,7 @@
        projectType: null,
        status: null,
      },
      addId:null,
      // 表单参数
      form: {},
      // 表单校验
@@ -238,6 +286,10 @@
        investmentAmount: [{required: true, message: '请输入投资额', trigger: 'change'}],
        projectType: [{required: true, message: '请选择流程推进类型', trigger: 'change'}],
        status: [{required: true, message: '请选择开工状态', trigger: 'change'}],
        department: [{required: true, message: '请选择主管部门', trigger: 'change'}],
        unit: [{required: true, message: '请选择项目业主单位', trigger: 'change'}],
        year: [{required: true, message: '请选择计划开工时间', trigger: 'change'}],
        parent: [{required: false, message: '请选择父工程', trigger: 'change'}],
      }
    };
  },
@@ -245,7 +297,60 @@
    this.getList();
    this.getProjectList();
  },
  mounted() {
    //初始化主管部门下拉框
    this.getApprovalList();
    //单位
    this.getDeptList();
  },
  methods: {
    getProjectOwnerUnit(unitId) {
      console.log(unitId)
      // if (deptId) {
      //   this.projectForm.unit = deptId
      // } else {
      //   this.projectForm.unit = ''
      // }
    },
    getCompetentDepartmentInfo(deptId) {
      console.log(deptId)
      // if (deptId) {
      //   if (this.projectForm.department != deptId) {
      //     this.projectForm.competentDepartmentPerson = ""
      //     this.projectForm.competentDepartmentPhone = ""
      //   }
      //   this.projectForm.department = deptId
      //   this.getCompetentDepartmentPeople(deptId)
      // } else {
      //   this.projectForm.department = ''
      //   this.deptPersonList = [];
      // }
    },
    getDeptList(){
      listDept().then(response => {
        console.log(response.data)
        this.selectOptions = this.handleTree(response.data, "deptId");
        this.selectOptions.push({deptId: '', deptName: '无', children: []})
      });
    },
    getApprovalList() {
      approvalList().then(res => {
        this.approvalList = this.handleTree(res.data, "deptId");
        this.approvalList.push({deptId: '', deptName: '无', children: []})
        console.log(this.approvalList)
      });
    },
    /** 转换部门数据结构 */
    normalizer(node) {
      if (node.children && !node.children.length) {
        delete node.children;
      }
      return {
        id: node.deptId,
        label: node.deptName,
        children: node.children
      };
    },
    getProjectList() {
      list().then(res => {
        this.projectList = res.data
@@ -256,6 +361,7 @@
      this.loading = true;
      getProjectEngineerings(this.queryParams).then(res => {
        this.engineeringList = res.data;
        console.log(this.engineeringList)
        this.total = res.total;
        this.loading = false;
      });
@@ -276,10 +382,16 @@
        status: null,
        gmtCreate: null,
        gmtUpdate: null,
        deleted: null
        deleted: null,
        department:null,
        unit:null,
        year:null,
        parent:null,
      };
      this.addId = null;
      this.resetForm("form");
    },

    /** 搜索按钮操作 */
    handleQuery() {
      this.queryParams.pageNum = 1;
@@ -295,6 +407,12 @@
      this.ids = selection.map(item => item.id)
      this.single = selection.length!==1
      this.multiple = !selection.length
    },
    handleadd(row){
      this.reset();
      this.open = true;
      this.title = "添加工程";
      this.addId = row.id;
    },
    /** 新增按钮操作 */
    handleAdd() {
@@ -316,13 +434,23 @@
    submitForm() {
      this.$refs["form"].validate(valid => {
        if (valid) {
          if (this.addId != null){
            this.form.parent = this.addId;
            addProjectEngineering(this.form).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            });
            return;
          }
          //修改
          if (this.form.id != null) {
            editProjectEngineering(this.form).then(response => {
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
          } else {//不存在addId父工程新增
            addProjectEngineering(this.form).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;

 src/views/flowable/task/form/index.vue

@@ -208,6 +208,7 @@
        this.formList = response.rows;
        this.total = response.total;
        this.loading = false;

      });
    },
    // 表单重置

 src/views/projectProcess/index.vue

@@ -467,6 +467,7 @@
      this.loading = true;
      getProjectProcess(this.queryParams).then(response => {
        this.projectInfoList = response.data;
        console.log(this.projectInfoList)
        this.total = response.total;
        this.loading = false;
      });