删除多余文件

zhiyong.zhou

2024-03-04 88063d681ca4d692c31a162ef5bf8b9bd41e5d11

删除多余文件

 src/assets/flowDesign.scss

File was deleted

 src/assets/flowDesignVertical.scss

File was deleted

 src/views/admin/FormProcessDesign.vue

@@ -35,6 +35,7 @@
<script>
import LayoutHeader from './LayoutHeader'
import {createFlow, getFlowDetail} from '@/api/design'

import ProcessDesign from '@/views/admin/layout/ProcessDesign'

export default {
@@ -109,13 +110,13 @@
        const tempJson = data.find(f =>
            f.index_no === index
        )
        console.log("tempJson",tempJson);
        //解析子审批节点
        parent.children = {
          "id": tempJson.id,
          "parentId": parentId,
          "name": "审批人",
          "type": "APPROVAL",
          "children":{},//必须要 不然选中的值无法传递
          "props":
              {
                "assignedType": "ASSIGN_USER",
@@ -145,7 +146,6 @@
      //获取流程详情
      getFlowDetail(param).then(rsp => {
        let form = rsp.data.data;
        console.log("getFlowDetail-form", form)
        form.logo = ""
        form.formItems = []
        form.process =this.convertToTreeData(form.steps, {
@@ -162,7 +162,7 @@
        form.templateName = form.name
        form.groupId = null;

        console.log("输出转换后的form,",form)

        this.$store.commit('loadForm', form)
      }).catch(err => {
        this.$message.error(err)
@@ -203,7 +203,6 @@
      })
    },
    validateDesign() {
      console.log('000')
      this.validVisible = true
      this.validStep = 0
      this.showValiding()
@@ -287,10 +286,9 @@
    },
    //审批流树形结构转换为json
    dataTree(data, index, parentId) {
      let result = [];
      let names = [];
      let ruleCode = [];
      console.log("data》》》",data)
      let result = [];//存放结果
      let names = [];//存放审批人
      let ruleCode = [];//架构组
      data.props.assignedUser.forEach(org => names.push(org.name));
      let ids = []
      data.props.assignedUser.forEach(org => ids.push(org.id));
@@ -317,7 +315,6 @@
            rule_code: ruleCode.length > 0 ? String(ruleCode).replaceAll(',', '、') : null
          }
      ) // 只取当前节点的信息，不包括 children
      console.log("result>>>",result)
      //如果下面还有子项 继续往下读数据
      if (data.children!==undefined&&Object.keys(data.children).length !== 0) {
        let getChildren = this.dataTree(data.children, index + 1, parentId)
@@ -326,7 +323,6 @@

      return result
    },

    doPublish() {
      this.$confirm('确认发布后流程立即生效，是否继续?', '提示', {
        confirmButtonText: '发布',
@@ -334,17 +330,14 @@
        type: 'warning'
      }).then(() => {
        let processNew = JSON.parse(JSON.stringify(this.setup.process));
        console.log("processNew", processNew)
        //判断条件分支
        this.conditionRecursion(processNew);
        let data = {};
        data.name = this.form.name;
        data.id = processNew.id||''
        var i = 1;
        let i = 1;
        //转数据结构
        data.steps = this.dataTree(processNew.children, i, processNew.id);
        let template = {data}
        console.log("新数组结构-template", template);
        createFlow(template).then(rsp => {
          this.$message.success("创建流程成功")
          this.$router.push("/formsPanel")

 src/views/admin/FormsPanel.vue

@@ -62,9 +62,7 @@
    getGroups() {
      let template = {"dataname": "sys_state_approve"}
      getEntitySet(template).then(rsp => {
        console.log("getEntitySet", rsp.data.data)
        this.groups = rsp.data.data.entityset
        console.log("this.groups", this.groups)
      }).catch(err => this.$message.error('获取审批流程异常'))
    },
    newProcess(groupId) {
@@ -78,7 +76,6 @@


    viewGroup(item, group) {
      console.log("viewGroup",item)
      this.$router.push(
          {
            path: "/workspace/process/instance/tabs",
@@ -92,7 +89,6 @@


    editFrom(item, group) {
      console.log("item",item)
      this.$router.push("/admin/design?code=" + item.id);
    },


 src/views/admin/LayoutHeader.vue

@@ -80,7 +80,6 @@
      this.$emit('input', path)
    },
    handleSelect(key, keyPath) {
      console.log(key, keyPath);
    },
    listener() {
      window.onunload = this.closeBefore()

 src/views/admin/layout/ProcessDesign.vue

@@ -45,7 +45,6 @@
  },
  computed:{
    selectedNode(){
      console.log("ProcessDesign-selectedNode")
      return this.$store.state.selectedNode
    }
  },
@@ -58,7 +57,6 @@
      return this.$refs["process-tree"].validateProcess()
    },
    nodeSelected(node){
      console.log('配置节点aaa', node)
      this.showConfig = true
    }
  },

 src/views/admin/layout/ProcessDiagramViewer.vue

@@ -44,7 +44,6 @@
  },
  computed:{
    selectedNode(){
      console.log("ProcessDiagramViewer-selectedNode",this.$store.state)
      return this.$store.state.selectedNode
    }
  },
@@ -56,13 +55,11 @@
  },
  methods: {
    test(){
      console.log("test")
    },
    validate(){
      return this.$refs["process-tree"].validateProcess()
    },
    nodeSelected(node){
      console.log('配置节点bbb', node)
      this.showConfig = true
    }
  },

 src/views/admin/layout/process/ProcessTree.vue

@@ -14,7 +14,6 @@
import Subprocess from '@/views/common/process/nodes/SubprocessNode.vue'

import DefaultProps from "./DefaultNodeProps"

export default {
  name: "ProcessTree",
  components: {Node, Root, Approval, Task, Cc, Trigger, Concurrent, Condition, Inclusive, Delay, Empty, Subprocess},
@@ -40,6 +39,7 @@
    ]))
    return h('div', {class:{'_root': true}, ref:'_root'}, processTrees)
  },

  methods: {
    getDomTree(h, node) {
      this.toMapping(node);
@@ -88,6 +88,7 @@
    //解码渲染的时候插入dom到同级
    decodeAppendDom(h, node, dom, props = {}){
      props.config = node
      console.log("decodeAppendDom",props)
      dom.unshift(h(node.type.toLowerCase(), {
        props: props,
        ref: node.id,
@@ -106,7 +107,6 @@
    //id映射到map，用来向上遍历
    toMapping(node){
      if (node && node.id){
        //console.log("node=> " + node.id + " name:" + node.name + " type:" + node.type)
        this.nodeMap.set(node.id, node)
      }
    },
@@ -170,23 +170,22 @@
      return node.type === 'CONCURRENTS'
    },
    getRandomId(){
      console.log("tree生成节点id")
      return ' ';
      //return `HighDatas_${new Date().getTime().toString().substring(5)}${Math.round(Math.random()*9000+1000)}`
    },
    //选中一个节点
    selectNode(node){
      this.$store.commit('selectedNode', node)
      this.$store.commit('selectedNode', node);
      this.$emit('selectedNode', node)
    },
    //处理节点插入逻辑
    insertNode(type, parentNode){
      console.log("insertNode-parentNode",parentNode)

      this.$refs['_root'].click()
      let afterNode = parentNode.children
      console.log("afterNode",afterNode)
      //插入新节点
      parentNode.children = {

        id: this.getRandomId(),
        parentId: parentNode.id,
        props: {},
@@ -194,6 +193,7 @@

      }
      switch (type){

        case 'APPROVAL': this.insertApprovalNode(parentNode, afterNode); break;
        case 'SUBPROCESS' : this.insertApprovalNode(parentNode, afterNode); break;
        case 'TASK': this.insertTaskNode(parentNode); break;
@@ -216,15 +216,16 @@
          afterNode.parentId = parentNode.children.id
        }
        this.$set(parentNode.children, 'children', Object)
        console.log("parentNode.children",parentNode.children)

      }
      this.$forceUpdate()
    },
    insertApprovalNode(parentNode){
      this.$set(parentNode.children, "name", "审批人")
      console.log("tree-DefaultProps.APPROVAL_PROPS)",DefaultProps.APPROVAL_PROPS)

      this.$set(parentNode.children, "props", this.$deepCopy(DefaultProps.APPROVAL_PROPS))
      console.log("parentNode.children",parentNode.children)


    },
    insertTaskNode(parentNode){
      this.$set(parentNode.children, "name", "办理人")
@@ -258,6 +259,7 @@
          name: "条件1",
          children:{}
        },{

          id: this.getRandomId(),
          parentId: parentNode.children.id,
          type: "CONDITION",
@@ -339,7 +341,7 @@
    },
    //删除当前节点
    delNode(node){
      console.log("ProcessTree删除节点", node)

      //获取该节点的父节点
      let parentNode = this.nodeMap.get(node.parentId)
      if (parentNode){

 src/views/admin/layout/process/ProcessTreeViewer.vue

@@ -188,7 +188,6 @@
    },
    //选中一个节点
    selectNode(node){
      console.log("ProcessTreeViewer-emit-selectNode")
      this.$store.commit('selectedNode', node)
      this.$emit('selectedNode', node)
    },
@@ -348,7 +347,6 @@
    },
    //删除当前节点
    delNode(node){
      console.log("删除节点", node)
      //获取该节点的父节点
      let parentNode = this.nodeMap.get(node.parentId)
      if (parentNode){

 src/views/common/InsertButton.vue

@@ -5,38 +5,38 @@
        <i class="el-icon-s-check" style="color:rgb(255, 148, 62);"></i>
        <span>审批人</span>
      </div>
      <div @click="addTaskNode">
        <i class="el-icon-s-check" style="color:rgb(230, 176, 57);"></i>
        <span>办理人</span>
      </div>
      <div @click="addCcNode">
        <i class="el-icon-s-promotion" style="color:rgb(50, 150, 250);"></i>
        <span>抄送人</span>
      </div>
      <div @click="addConditionsNode">
        <i class="el-icon-share" style="color:rgb(21, 188, 131);"></i>
        <span>条件分支</span>
      </div>
      <div @click="addConcurrentsNode">
        <i class="el-icon-s-operation" style="color:#718dff;"></i>
        <span>并行分支</span>
      </div>
      <div @click="addInclusivesNode">
        <i class="el-icon-s-operation" style="color:#718dff;"></i>
        <span>包容分支</span>
      </div>
      <div @click="addDelayNode">
        <i class="el-icon-time" style="color:#f25643;"></i>
        <span>延迟等待</span>
      </div>
      <div @click="addTriggerNode">
        <i class="el-icon-set-up" style="color:#15BC83;"></i>
        <span>触发器</span>
      </div>
      <div @click="addSubprocessNode">
        <i class="el-icon-set-up" style="color:#15BC93;"></i>
        <span>子流程</span>
      </div>
<!--      <div @click="addTaskNode">-->
<!--        <i class="el-icon-s-check" style="color:rgb(230, 176, 57);"></i>-->
<!--        <span>办理人</span>-->
<!--      </div>-->
<!--      <div @click="addCcNode">-->
<!--        <i class="el-icon-s-promotion" style="color:rgb(50, 150, 250);"></i>-->
<!--        <span>抄送人</span>-->
<!--      </div>-->
<!--      <div @click="addConditionsNode">-->
<!--        <i class="el-icon-share" style="color:rgb(21, 188, 131);"></i>-->
<!--        <span>条件分支</span>-->
<!--      </div>-->
<!--      <div @click="addConcurrentsNode">-->
<!--        <i class="el-icon-s-operation" style="color:#718dff;"></i>-->
<!--        <span>并行分支</span>-->
<!--      </div>-->
<!--      <div @click="addInclusivesNode">-->
<!--        <i class="el-icon-s-operation" style="color:#718dff;"></i>-->
<!--        <span>包容分支</span>-->
<!--      </div>-->
<!--      <div @click="addDelayNode">-->
<!--        <i class="el-icon-time" style="color:#f25643;"></i>-->
<!--        <span>延迟等待</span>-->
<!--      </div>-->
<!--      <div @click="addTriggerNode">-->
<!--        <i class="el-icon-set-up" style="color:#15BC83;"></i>-->
<!--        <span>触发器</span>-->
<!--      </div>-->
<!--      <div @click="addSubprocessNode">-->
<!--        <i class="el-icon-set-up" style="color:#15BC93;"></i>-->
<!--        <span>子流程</span>-->
<!--      </div>-->
    </div>
    <el-button icon="el-icon-plus" slot="reference" type="primary" size="small" circle></el-button>
  </el-popover>

 src/views/common/process/config/ApprovalNodeConfig.vue

@@ -118,11 +118,9 @@
      return this.$store.state.selectedNode
    },
    nodeProps() {
      console.log("this.$store.state.selectedNode.props",this.$store.state.selectedNode.props)
      return this.$store.state.selectedNode.props
    },
    select() {
      console.log("this.config--select", this.config)
      return this.config.assignedUser
    },

@@ -160,13 +158,10 @@
      this.selectedNode.props.groups.splice(index, 1)
    },
    addConditionGroup() {
      console.log("this.config", this.config)
      this.config.groups.push({
      })
    },
    selected(select, type) {
      debugger
      console.log("this.config.props",this.config)
      this.nodeProps.assignedUser = []
      if (type === 'group') {
        this.nodeProps.staffGroup = {}
@@ -185,9 +180,7 @@
            }
        )
      }
      console.log("输出选中select", this.nodeProps)
      this.orgPickerSelected.length = 0
      this.$forceUpdate()

    },
    removeOrgItem(index) {
      this.select.splice(index, 1)

 src/views/common/process/config/ConditionGroupItemConfig.vue

@@ -234,7 +234,6 @@
      }
    },
    selected(select) {
      console.log(select)
      this.users.length = 0
      select.forEach(u => this.users.push(u))
    },
@@ -246,8 +245,6 @@
      group.conditions.splice(index, 1)
    },
    conditionChange(index, group) {
      console.log("index",index);
      console.log("group",group);
      //判断新增的
      group.cids.forEach(cid => {
        if (0 > group.conditions.findIndex(cd => cd.id === cid)){

 src/views/common/process/config/ConditionNodeConfig.vue

@@ -62,7 +62,6 @@
    //条件节点
    prioritySortList() {
      let node = this.$store.state.nodeMap.get(this.selectedNode.parentId)
      console.log(this.selectedNode.id, node)
      if (node) {
        return node.branchs || []
      }
@@ -91,7 +90,6 @@
      this.showOrgSelect = true
    },
    selected(select) {
      console.log(select)
      this.showOrgSelect = false
      select.forEach(val => this.select.push(val))
    },

 src/views/common/process/config/InclusiveGroupItemConfig.vue

@@ -179,7 +179,6 @@
      }
    },
    selected(select) {
      console.log(select)
      this.users.length = 0
      select.forEach(u => this.users.push(u))
    },
@@ -196,7 +195,6 @@
        if (0 > group.conditions.findIndex(cd => cd.id === cid)){
          //新增条件
          let condition = {...this.conditionList[index]}
          console.log(condition, this.conditionList, index)
          condition.compare = '';
          condition.value = []
          group.conditions.push(condition)

 src/views/common/process/config/InclusiveNodeConfig.vue

@@ -62,7 +62,6 @@
    //条件节点
    prioritySortList() {
      let node = this.$store.state.nodeMap.get(this.selectedNode.parentId)
      console.log(this.selectedNode.id, node)
      if (node) {
        return node.branchs || []
      }

 src/views/common/process/config/NodeConfig.vue

@@ -1,14 +1,6 @@
<template>
  <div>
    <el-tabs v-model="active" v-if="name && formConfig.length > 0">
      <el-tab-pane :label="name" name="properties">
        <component :is="(selectNode.type||'').toLowerCase()" :config="selectNode.props"/>
      </el-tab-pane>
      <el-tab-pane label="表单权限设置" name="permissions">
        <form-authority-config/>
      </el-tab-pane>
    </el-tabs>
    <component :is="(selectNode.type||'').toLowerCase()" v-else :config="selectNode.props"/>
    <component :is="(selectNode.type||'').toLowerCase()"  :config="selectNode.props"/>
  </div>
</template>

@@ -45,7 +37,6 @@
  },
  computed: {
    selectNode() {
      console.log("selectNode",this.$store.state)
      return this.$store.state.selectedNode
    },
    formConfig() {

 src/views/common/process/config/RootNodeConfig.vue

@@ -29,7 +29,6 @@
  },
  computed:{
    select(){
      console.log("this.config.assignedUser-select",this.config.assignedUser)
      return this.config.assignedUser
    }
  },

 src/views/common/process/config/TaskNodeConfig.vue

@@ -242,7 +242,6 @@
      this.$refs.orgPicker.show()
    },
    selected(select) {
      console.log(select)
      this.orgPickerSelected.length = 0
      select.forEach(val => this.orgPickerSelected.push(val))
    },

 src/views/common/process/nodes/ApprovalNode.vue

@@ -34,16 +34,13 @@
    },
    content(){
      const config = this.config.props
      console.log("content:config.assignedUser",config)
      let texts = []
      config.assignedUser.forEach(org => texts.push(org.name))
      return String(texts).replaceAll(',', '、')||"aaa"
      return String(texts).replaceAll(',', '、')
    },

  },
  created() {
    console.log("加载ApprovalNode.vue")
    this.content
  },
  methods: {
    getFormItemById(id){
@@ -95,11 +92,11 @@
      return true;
    },
    validate_FORM_USER(err){
     if (this.config.props.formUser === ''){
       this.errorInfo = '请指定表单中的人员组件'
       err.push(`${this.config.name} 审批人为表单中人员，但未指定`)
       return false
     }
      if (this.config.props.formUser === ''){
        this.errorInfo = '请指定表单中的人员组件'
        err.push(`${this.config.name} 审批人为表单中人员，但未指定`)
        return false
      }
      return true;
    },
    validate_REFUSE(err){

 src/views/common/process/nodes/ConditionNode.vue

@@ -137,9 +137,6 @@
    },
    //校验数据配置的合法性
    validate(err) {
      console.log('condition children', this.config.children)
      console.log('this.level', this.level)
      console.log('this.size', this.size)
      if (!(this.level == this.size && this.size != 0) && !this.config.children?.id) {
        this.showError = true
        this.errorInfo = '条件分支后不能为空'

 src/views/common/process/nodes/InclusiveNode.vue

@@ -132,7 +132,6 @@
    },
    //校验数据配置的合法性
    validate(err) {
      console.log('inclusive children', this.config.children)
      if (!(this.level == this.size && this.size != 0) && !this.config.children?.id) {
        this.showError = true
        this.errorInfo = '条件分支后不能为空'

 src/views/common/process/nodes/SubprocessNode.vue

@@ -33,7 +33,6 @@
    },
    content(){
      const config = this.config.props
      console.log("role,config.assignedUser",config.assignedUser)
      switch (config.assignedType){
        case "ASSIGN_USER":
          if (config.assignedUser.length > 0){

 src/views/common/process/viewNodes/ApprovalNode.vue

@@ -34,7 +34,6 @@
    },
    content(){
      const config = this.config.props
      console.log("content:config.assignedUser",config)
      let texts = []
      config.assignedUser.forEach(org => texts.push(org.name))
      return String(texts).replaceAll(',', '、')
@@ -53,7 +52,6 @@
    // }
  },
  created() {
    console.log("加载ApprovalNode.vue")
  },
  methods: {
    getFormItemById(id){

 src/views/common/process/viewNodes/ConditionNode.vue

@@ -117,7 +117,6 @@
          let  items = subCondition.value.map(function (item) {
            return item.label
          })
          console.log("subCondition",String(items))
          return `${subCondition.title}为[${String(items).replaceAll(',', '、')}]中之一`
        case 'B':
          return `${subCondition.value[0]} < ${subCondition.title} < ${subCondition.value[1]}`
@@ -137,9 +136,7 @@
    },
    //校验数据配置的合法性
    validate(err) {
      console.log('condition children', this.config.children)
      console.log('this.level', this.level)
      console.log('this.size', this.size)

      if (!(this.level == this.size && this.size != 0) && !this.config.children?.id) {
        this.showError = true
        this.errorInfo = '条件分支后不能为空'

 src/views/common/process/viewNodes/InclusiveNode.vue

@@ -132,7 +132,6 @@
    },
    //校验数据配置的合法性
    validate(err) {
      console.log('inclusive children', this.config.children)
      if (!(this.level == this.size && this.size != 0) && !this.config.children?.id) {
        this.showError = true
        this.errorInfo = '条件分支后不能为空'

 src/views/common/process/viewNodes/SubprocessNode.vue

@@ -33,7 +33,6 @@
    },
    content(){
      const config = this.config.props
      console.log("role,config.assignedUser",config.assignedUser)
      switch (config.assignedType){
        case "ASSIGN_USER":
          if (config.assignedUser.length > 0){

 src/views/workspace/process/ProcessInstanceTabs.vue

@@ -27,7 +27,6 @@
      const tempJson = data.find(f =>
          f.index_no === index
      )
      console.log("tempJson",tempJson);
      this.$store.state.noTakeList .push(tempJson.id)
      parent.children = {
        "id": tempJson.id,
@@ -62,7 +61,6 @@
      let param = {"id": this.processInstanceId}
      getWorkSetpsByBusinessId(param).then(rsp => {
        let workSetps=rsp.data.data
        console.log("workSetps", workSetps)
        if(workSetps.length>0){
          let index=-1;
          let resultProcess;
@@ -73,23 +71,18 @@
          }else{
            //否则就取遍历查询 审批节点不为空 index_no最大的
            workSetps.forEach(item => {
              console.log("indexno",item.index_no)
              if (item.index_no > index && item.end_time!==null) {
                index = item.index_no;
                resultProcess = item;
              }
            })
          }

          console.log("resultProcess", resultProcess)
          this.$store.state.runningList .push(resultProcess.approve_step_id)
          param.id=resultProcess.approve_id
          this.getFlowDetail(param)
        }else{
          this.$message.error("未查询到审批流数据!")
        }

        console.log("workSetps", workSetps)
      }).catch(err => {
        this.$message.error(err)
      })
@@ -98,23 +91,7 @@
    },
    getFlowDetail(param){
      getFlowDetail(param).then(rsp => {

        let form = rsp.data.data;
        console.log("getFlowDetail-form", form)
        form.logo = ""
        form.settings = {
          "commiter": [],
          "admin": [],
          "sign": false,
          "notify": {
            "types": [
              "APP"
            ],
            " title": "消息通知标题"
          }
        }
        form.formItems = []

        form.process =this.convertToTreeData(form.steps, {
          "id": form.id, "parentId": null,
          "type": "ROOT",
@@ -127,15 +104,7 @@

        form.name=this.$Utils.decode(form.name);
        form.templateName = form.name
        form.groupId = null;
        form.icon = "{\"icon\":\"el-icon-eleme\",\"background\":\"#1e90ff\"}";
        form.notify = "";
        form.remark = "备注说明";
        form.isStop = false
        form.processDefinitionId = null
        this.$store.state.design = form;
        console.log("this.$store.state.design",this.$store.state.design)
        console.log("输出转换后的form,",form)
        this.$store.commit('loadForm', form)
      }).catch(err => {
        this.$message.error(err)