zhiyong.zhou
2024-03-04 e3107c621b3c6d01b8b200e0acd10323075913b6
删除多余文件
10个文件已删除
10个文件已修改
1 文件已重命名
1690 ■■■■■ 已修改文件
src/api/org.js 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/common/OrgPicker.vue 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/common/Tip.vue 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/common/flowDialog.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/config/application/index.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/config/tools.js 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main.js 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/router/index.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/Index.vue 118 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/admin/FormProcessDesign.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/admin/LayoutHeader.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/admin/layout/FormDesign.vue 533 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/admin/layout/ProcessDesign.vue 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/admin/layout/form/FormDesignRender.vue 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/common/process/config/ApprovalNodeConfig.vue 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/common/process/nodes/ApprovalNode.vue 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/workspace/InitiateProcess.vue 93 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/workspace/SponsorProcess.vue 590 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/workspace/form.js 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/workspace/index.vue 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/workspace/process/ProcessInstanceTabs.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/org.js
File was deleted
src/components/common/OrgPicker.vue
@@ -1,5 +1,5 @@
<template>
  <w-dialog :border="false" closeFree width="600px" @ok="selectOk" :title="title" v-model="visible">
  <flow-dialog :border="false" closeFree width="600px" @ok="selectOk" :title="title" v-model="visible">
    <div class="picker">
      <div class="candidate" v-loading="loading">
        <div class="role-header" >
@@ -36,11 +36,10 @@
        </div>
      </div>
    </div>
  </w-dialog>
  </flow-dialog>
</template>
<script>
import {getOrgTree, getUserByName} from '@/api/org'
import {getEntitySet} from "@/api/design";
export default {
@@ -143,19 +142,7 @@
      }
      return '**'
    },
    searchUser() {
      let userName = this.search.trim()
      this.searchUsers = []
      this.loading = true
      getUserByName({userName: userName}).then(rsp => {
        this.loading = false
        this.searchUsers = rsp.data
        this.selectToLeft()
      }).catch(err => {
        this.loading = false
        this.$message.error("接口异常")
      })
    },
    selectToLeft() {
      let nodes = this.search.trim() === '' ? this.nodes : this.searchUsers;
      nodes.forEach(node => {
src/components/common/Tip.vue
File was deleted
src/components/common/flowDialog.vue
File was renamed from src/components/common/WDialog.vue
@@ -28,9 +28,9 @@
<script>
export default {
  name: "WDialog",
  name: "flowDialog",
  install(Vue) {
    Vue.component("WDialog", this);
    Vue.component("flowDialog", this);
  },
  components: {},
  props: {
src/config/application/index.js
@@ -4,5 +4,5 @@
import uat from './application-uat';
export default {
    ...dev,
    ...local,
};
src/config/tools.js
File was deleted
src/main.js
@@ -13,14 +13,13 @@
import "@/assets/iconfont/iconfont.css"
import Ellipsis from '@/components/common/Ellipsis'
import WDialog from '@/components/common/WDialog'
import Tip from '@/components/common/Tip'
import flowDialog from '@/components/common/flowDialog.vue'
import Utils from '@/utils/utils.js'
Vue.use(ElementUI);
Vue.use(Ellipsis);
Vue.use(WDialog);
Vue.use(Tip);
Vue.use(flowDialog);
Vue.use(vueEsign)
Vue.config.productionTip = false
Vue.prototype.$Utils = Utils
src/router/index.js
@@ -16,14 +16,6 @@
      redirect: "/formsPanel",
    },
    {
      path: "/index",
      name: "index",
      component: () => import("@/views/Index.vue"),
      meta: { title: "OA工作流", viewport: viewport },
    },
    {
      path: "/formsPanel",
      name: "formsPanel",
      component: () => import("@/views/admin/FormsPanel.vue"),
src/views/Index.vue
File was deleted
src/views/admin/FormProcessDesign.vue
@@ -6,7 +6,7 @@
    <div class="layout-body">
      <process-design ref="processDesign" v-show="activeSelect === 'processDesign'"/>
    </div>
    <w-dialog :showFooter="false" v-model="validVisible" title="设置项检查">
    <flow-dialog :showFooter="false" v-model="validVisible" title="设置项检查">
      <el-result :icon="validIcon" :title="errTitle" :subTitle="validResult.desc">
        <i slot="icon" style="font-size: 30px" v-if="!validResult.finished" class="el-icon-loading"></i>
        <div slot="subTitle" class="err-info" v-if="validResult.errs.length > 0">
@@ -27,7 +27,7 @@
          </el-form>
        </template>
      </el-result>
    </w-dialog>
    </flow-dialog>
  </el-container>
</template>
@@ -35,7 +35,6 @@
<script>
import LayoutHeader from './LayoutHeader'
import {createFlow, getFlowDetail} from '@/api/design'
import ProcessDesign from '@/views/admin/layout/ProcessDesign'
export default {
src/views/admin/LayoutHeader.vue
@@ -5,7 +5,6 @@
               @select="handleSelect">
        <el-menu-item index="processDesign" @click="to('processDesign')">审批流程
        </el-menu-item>
<!--        <el-menu-item index="proSetting" @click="to('proSetting')">扩展设置</el-menu-item>-->
      </el-menu>
      <div class="publish">
src/views/admin/layout/FormDesign.vue
File was deleted
src/views/admin/layout/ProcessDesign.vue
@@ -1,14 +1,10 @@
<template>
  <el-main>
<!--    <div class="switchStyle">-->
<!--      <el-button  size="small" @click="switchCss" >切换</el-button>-->
<!--    </div>-->
    <div class="scale">
      <el-button icon="el-icon-plus" size="small" @click="scale += 10" :disabled="scale >= 150" circle></el-button>
      <span>{{ scale }}%</span>
      <el-button icon="el-icon-minus" size="small" @click="scale -= 10" :disabled="scale <= 40" circle></el-button>
<!--      <el-button @click="validate">校验流程</el-button>-->
    </div>
    <div class="design" :style="'transform: scale('+ scale / 100 +');'">
      <process-tree ref="process-tree" @selectedNode="nodeSelected"/>
@@ -57,21 +53,7 @@
  },
  methods: {
    // switchCss(){
    //
    //   console.log(this.$cssSrc)
    //   console.log(this.$isVertical)
    //
    //   if(this.$isVertical){
    //     this.$cssSrc=require('@/assets/flowDesign.scss')
    //     this.$isVertical=false;
    //   }else{
    //     this.$cssSrc=require('@/assets/flowDesignVertical.scss')
    //     this.$isVertical=true;
    //   }
    //   this.$forceUpdate()
    //
    // },
    validate(){
      return this.$refs["process-tree"].validateProcess()
    },
src/views/admin/layout/form/FormDesignRender.vue
File was deleted
src/views/common/process/config/ApprovalNodeConfig.vue
@@ -66,16 +66,13 @@
        </div>
      </el-form-item>
    </el-form>
    <org-picker :title="pickerTitle" multiple :type="orgPickerType" ref="orgPicker" :selected="orgPickerSelected"
                @ok="selected"/>
  </div>
</template>
<script>
import OrgPicker from "@/components/common/OrgPicker";
//import OrgPicker from "@/components/common/OrgPicker";
import {getDict, getEntitySet} from "@/api/design";
export default {
  name: "ApprovalNodeConfig",
  components: {OrgPicker},
  props: {
    config: {
      type: Object,
@@ -88,7 +85,6 @@
    return {
      showOrgSelect: false,
      orgPickerSelected: [],
      orgPickerType: 'user',
      groupNames: ['1', '2', '3', '4', '6', 'F', 'G', 'H', 'I', 'J'],
      approvalGroups: [
      ],
@@ -131,16 +127,7 @@
      return this.config.assignedUser
    },
    pickerTitle() {
      switch (this.orgPickerType) {
        case 'user':
          return '请选择人员';
        case 'role':
          return '请选择系统角色';
        default:
          return null;
      }
    },
  },
  mounted() {
    this.getApprovalGroup();
src/views/common/process/nodes/ApprovalNode.vue
@@ -40,17 +40,7 @@
      return String(texts).replaceAll(',', '、')
    },
    // flowText(){
    //   const config = this.config
    //   console.log("flowText-config",config);
    //
    //   // return config.approvalArr.filter(ite=>ite.node_id===config.id)[0].approval_time;
    //   if(config.approvalArr!==undefined){
    //     return "发起时间:"+config.approvalArr.filter(ite=>ite.node_id===config.id)[0].approval_time;
    //   }
    //
    //   return ''
    // }
  },
  created() {
    console.log("加载ApprovalNode.vue")
src/views/workspace/InitiateProcess.vue
File was deleted
src/views/workspace/SponsorProcess.vue
File was deleted
src/views/workspace/form.js
File was deleted
src/views/workspace/index.vue
File was deleted
src/views/workspace/process/ProcessInstanceTabs.vue
@@ -1,8 +1,6 @@
<template>
  <div class="process-view">
    <div class="process-view__tabs" v-loading="loading">
    <process-diagram-viewer />
    </div>
@@ -25,7 +23,6 @@
      processInfo: "",
    };
  },
  methods: {
    convertToTreeData(data, parent,index,parentId) {
      const tempJson = data.find(f =>