qgb-process 0.1.69 → 0.1.81

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qgb-process",
-  "version": "0.1.69",
+  "version": "0.1.81",
   "private": false,
   "description": "",
   "author": "",
@@ -9,7 +9,7 @@
     "build": "node --max_old_space_size=10096 node_modules/@vue/cli-service/bin/vue-cli-service.js build",
     "build:test": "node --max_old_space_size=10096 node_modules/@vue/cli-service/bin/vue-cli-service.js build   --mode test",
     "build:pre": "node --max_old_space_size=10096 node_modules/@vue/cli-service/bin/vue-cli-service.js build   --mode pre",
-    "lib": "node --max_old_space_size=10096 node_modules/@vue/cli-service/bin/vue-cli-service.js build --target lib --name qgb-process --dest lib packages/index.js --mode pre",
+    "lib": "node --max_old_space_size=10096 node_modules/@vue/cli-service/bin/vue-cli-service.js build --target lib --name qgb-process --dest lib packages/index.js",
     "lint": "vue-cli-service lint",
     "lint-fix": "eslint src/ --fix",
     "test:unit": "vue-cli-service test:unit",

package/src/App.vue

@@ -16,7 +16,10 @@ export default {
   computed: {},
   watch: {},
   methods: {},
-  mounted() {},
+  mounted() {
+    // window.process = process.env
+    // console.log(window)
+  },
   created() {}
 };
 </script>

package/src/api/apiMemberSelection.js

@@ -1,8 +1,10 @@
 import request from "@/http"
-const url = process.env.VUE_APP_API
-const authUrlType = process.env.VUE_APP_EMTERPRISE
-const qiguan = process.env.VUE_APP_QIGUAN
-const urls = "http://192.168.2.184:9190"
+const base = JSON.parse(localStorage.getItem("env"))
+const url = base.VUE_APP_API
+const authUrlType = base.VUE_APP_EMTERPRISE
+const qiguan = base.VUE_APP_QIGUAN
+
+
 const apiMemberSelection = {
   getOrgsData:()=>request.get( url + authUrlType + `/v1/organization/getNewOrganizationAndContacts`),
   list: () => request.get(url + authUrlType + `/v1/organization/getOrganizationAndContacts`), //  /v1/organization/getOrganization

package/src/api/apiProcess.js

@@ -7,13 +7,15 @@
 * @FilePath: \src\api\apiProcess.js
  **/
 import request from "@/http"
-const baseUrl = process.env.VUE_APP_API + "/sgb-meta-design"
-// const baseUrl = 'http://192.168.3.51:9096'
 import qs from "qs"
-const url = process.env.VUE_APP_API
-const qiguan = process.env.VUE_APP_QIGUAN
+const base = JSON.parse(localStorage.getItem("env"))
+const baseUrl = base.VUE_APP_API + "/sgb-meta-design"
+const url = base.VUE_APP_API
+const qiguan = base.VUE_APP_QIGUAN
 const appUrl = url + qiguan;
 
+console.log(baseUrl)
+
 // 保存流程
 export const saveProcess = async(params) => request.postHeaders(`${baseUrl}/v1/pc/process/addProcess`, qs.stringify(params))
 // 新的保存流程

package/src/http/index.js

@@ -24,8 +24,9 @@ const removePending = (config) => {
 }
 
 // axios 基础配置
+const base = JSON.parse(localStorage.getItem("env"))
 axios.defaults.timeout = 50000
-axios.defaults.baseURL = process.env.VUE_APP_APIUSER
+axios.defaults.baseURL = base.VUE_APP_APIUSER
 
 axios.interceptors.request.use(
   config => {

package/src/main.js

@@ -34,15 +34,6 @@ if (window.__POWERED_BY_QIANKUN__) {
   __webpack_public_path__ = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__;
 }
 
-
-// 流程图组件
-import nodeWrap from '@/views/formBuilder/workflow/nodeWrap'
-import addNode from '@/views/formBuilder/workflow/addNode'
-Vue.use(nodeWrap)
-Vue.component('nodeWrap', nodeWrap); //初始化组件
-Vue.use(addNode)
-Vue.component('addNode', addNode); //初始化组件
-
 // 自定义指令
 Vue.directive('enterNumber', {
     bind: function(el, { value = 2 }) {

package/src/views/formBuilder/components/approverSelector.vue

@@ -17,7 +17,7 @@
             <div class="approverSelectorItemCon rowDirection">
                 <el-radio-group v-model="approverMode" @change="approverModeChange">
                     <el-radio :label="1">指定成员</el-radio>
-                    <el-radio :label="2" v-if="$route.query.type | filterType">主管</el-radio>
+                    <el-radio :label="2" v-if="queryInfo.type | filterType">主管</el-radio>
                 </el-radio-group>
                 <!-- 指定成员 -->
                 <div v-if="approverMode == 1" class="selector-list">
@@ -119,7 +119,13 @@ export default {
     value: {
       type: Boolean,
       default: true
-    }
+    },
+    queryInfo:{
+      type: Object,
+      default:()=>{
+        return {}
+      }
+    },
   },
   data() {
     return {
@@ -345,9 +351,9 @@ export default {
   computed: {
     // 过滤非主管的审批模块
     filterType(type) {
-      if (this.$route.query.type == "notice") {
+      if (this.queryInfo.type == "notice") {
         return false
-      } else if (this.$route.query.type == "officialDocument") {
+      } else if (this.queryInfo.type == "officialDocument") {
         return false
       } else {
         return true

package/src/views/formBuilder/components/nodeConditionConfig.vue

@@ -171,6 +171,12 @@ export default {
     title: {
       type: String,
       default: ""
+    },
+    queryInfo:{
+      type: Object,
+      default:()=>{
+        return {}
+      }
     }
   },
   data() {
@@ -394,7 +400,7 @@ export default {
 
     // 设置条件
     async setConfig() {
-      this.applyType = this.$route.query.type;
+      this.applyType = this.queryInfo.type;
       var configDefault = {
         ele: "sponsor",
         name: "发起人",
@@ -403,7 +409,7 @@ export default {
 
       this.configList = config[this.applyType] ? await config[this.applyType](this) : [];
 
-      if (this.$route.query.type == "sealApproval" || this.$route.query.name == "用章申请" || this.$route.query.name == "用车申请" || this.$route.query.type == "carApproval") {
+      if (this.queryInfo.type == "sealApproval" || this.queryInfo.name == "用章申请" || this.queryInfo.name == "用车申请" || this.queryInfo.type == "carApproval") {
         configDefault = {};
       } else {
         this.configList.unshift(configDefault);

package/src/views/formBuilder/process-2.vue

@@ -3,11 +3,9 @@
     <el-row v-if="tools">
       <el-col :span="24" class="right-plan">
         <div class="process-heard">
-          <!-- v-if="$route.query.name" -->
-          <template>
+          <template v-if="queryName">
             <div v-if="isEdit">
-              <!-- {{ $route.query.name }} -->
-              <span class="process-title">流程</span>
+              <span class="process-title">{{queryName}}流程</span>
               <!-- <i class="el-icon-edit" @click.stop="isEdit = false; conName = name"></i> -->
             </div>
             <div v-else>
@@ -108,7 +106,7 @@ import lodash from "lodash";
 import * as api from "../../api/apiProcess";
 import * as ProcessBuilder from "../../views/formBuilder/service/ProcessBuilder";
 export default {
-  props: ["tools"],
+  props: ["queryInfo","tools","path","userInfo"],
   data() {
     return {
       approverSelectorData: {
@@ -181,10 +179,7 @@ export default {
     }
   },
   created() {
-    // this.type =
-    //   this.$route.path == "/index"
-    //     ? "customForm_" + this.$store.state.formBuilder.formDesId
-    //     : this.$route.query.type;
+    this.type = this.queryInfo.type
   },
   mounted() {
     this.jsPlumbInit();
@@ -192,9 +187,9 @@ export default {
   methods: {
     async save() {
       // const user = this.$store.state.user;
-      const user = "";
+      const user = this.userInfo;
       const flg = false;
-      if (this.$route.path == "/index") {
+      if (this.path == "/index") {
         // this.params.menuId = this.$store.state.formBuilder.menuId;
          this.params.menuId  = ""
       }
@@ -538,9 +533,9 @@ export default {
         const content = JSON.parse(res.data.data.content);
         this.data = { nodeList: content.nodeList, lineList: content.lineList };
         // todo: 
-        // this.name = this.$route.query.name
-        //   ? this.$route.query.name + "流程"
-        //   : content.name;
+        this.name = this.queryInfo.name
+          ? this.queryInfo.name + "流程"
+          : content.name;
         this.isFlg = content.switchOn != 0;
         this.processId = res.data.data._id;
         this.version = res.data.data.rootNode.version;
@@ -553,10 +548,10 @@ export default {
         if (res.data.data && res.data.data._id) {
           this.processId = res.data.data._id;
           const processList = JSON.parse(res.data.data.content);
-          // this.name = processList.name;
-          // this.name = this.$route.query.name
-          //   ? this.$route.query.name + "流程"
-          //   : processList.name;
+          this.name = processList.name;
+          this.name = this.queryInfo.name
+            ? this.queryInfo.name + "流程"
+            : processList.name;
 
           this.isFlg = processList.switchOn != 0;
           this.version = res.data.data.rootNode.version;
@@ -574,17 +569,17 @@ export default {
               const res = await api.updateProcessToNew(data);
             }, 200);
           } else {
-            // this.name = this.$route.query.name
-            //   ? this.$route.query.name + "流程"
-            //   : this.$store.state.formBuilder.name + "流程";
+            this.name = this.queryInfo.name
+              ? this.queryInfo.name + "流程"
+              : "流程";
             this.initProcess();
             const result = ProcessBuilder.treeToListLocal(this.root.lists);
             this.id = result.length + 10;
           }
         } else {
-          // this.name = this.$route.query.name
-          //   ? this.$route.query.name + "流程"
-          //   : this.$store.state.formBuilder.name + "流程";
+          this.name = this.queryInfo.name
+            ? this.queryInfo.name + "流程"
+            : "流程";
           this.initProcess();
           const result = ProcessBuilder.treeToListLocal(this.root.lists);
           this.id = result.length + 10;

package/src/views/formBuilder/process.vue

@@ -3,8 +3,7 @@
         <!-- 顶部导航栏 -->
 		<div class="fd-nav sidePadding">
 			<div class="fd-nav-left">
-        <!-- {{$route.query.name}} -->
-				<div class="fd-nav-title">流程</div>
+				<div class="fd-nav-title">{{queryInfo.name}}流程</div>
 			</div>
 			<div class="fd-nav-center"></div>
 			<div class="fd-nav-right">
@@ -42,6 +41,7 @@
 						:isTried.sync="isTried"
             :directorMaxLevel="directorMaxLevel"
             :tableId="processConfig.processId"
+            :queryInfo="queryInfo"
           />
 					<div class="end-node">
 						<div class="end-node-circle"></div>
@@ -75,15 +75,14 @@
 			</span>
 		</el-dialog>
 
-        <!-- 老数据展示弹出 -->
-        <!-- ${$route.query.name} -->
-        <el-dialog :title="`老数据参考`" :visible.sync="oldModal" width="70%" :before-close="showOldModal">
-            <OldProcess :tools="false"/>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="oldModal = false">取 消</el-button>
-                <el-button type="primary" @click="oldModal = false">确 定</el-button>
-            </span>
-        </el-dialog>
+    <!-- 老数据展示弹出 -->
+    <el-dialog :title="`${queryInfo.name}老数据参考`" :visible.sync="oldModal" width="70%" :before-close="showOldModal">
+        <OldProcess :tools="false" :path="path" :userInfo="userInfo" :queryInfo="queryInfo"/>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="oldModal = false">取 消</el-button>
+            <el-button type="primary" @click="oldModal = false">确 定</el-button>
+        </span>
+    </el-dialog>
 
 
 	</div>
@@ -92,11 +91,51 @@
 import initData from "./workflow/initData"
 import * as api from "@/api/apiProcess";
 import OldProcess from "./process-2"
+import nodeWrap from './workflow/nodeWrap'
+
 
 export default {
   name: 'Process',
   components: {
-    OldProcess
+    OldProcess,
+    nodeWrap
+  },
+  props: {
+    // 路由地址
+    path: {
+      type: String,
+      default: () => {
+        return "/index"
+      }
+    },
+    // 类型数据
+    queryInfo:{
+      type:Object,
+      default:()=>{
+        return {
+          name:"公告管理",
+          type:"notice"
+        }
+      }
+    },
+
+    // 用户信息
+    userInfo: {
+      type: Object,
+      default:()=>{
+        return {
+          "companyNo":"202008267425615", // 公司no
+          "no":"", // 用户no
+        }
+      }
+    },
+    // 对应环境接口
+    env:{
+      type:Object,
+      default:()=>{
+        return {}
+      }
+    }
   },
   data() {
     return {
@@ -118,12 +157,16 @@ export default {
       processId: null // 流程ID
     };
   },
+  mounted() {
+    window.process = this.env
+    console.log(window.process)
+  },
   created() {
     // 获取审批流程数据
     this.getProcessSet()
     // 设置类型
     // todo: 修改 this.$store.state.formBuilder.formDesId
-    // this.type = this.$route.path == "/index" ? "customForm_" + this.$store.state.formBuilder.formDesId : this.$route.query.type;
+    // this.type = this.path == "/index" ? "customForm_" + this.$store.state.formBuilder.formDesId : this.queryInfo.type;
   },
   methods: {
     // 初始化数据
@@ -139,12 +182,9 @@ export default {
         "automaticPass": !!parseInt(this.processConfig.automaticPass)
       }
     },
-
     // 获取审批流程数据
     async getProcessSet() {
-      // this.$store.state.user.companyNo
-      // this.$route.query.type
-      const param = { companyId: "", type: "" };
+      const param = { companyId: this.userInfo.companyNo, type: this.queryInfo.type };
       const result = await api.queryProcessByType(param);
       const { state, data } = result.data
       if (state == "ok" && data) {
@@ -326,11 +366,11 @@ export default {
         ...this.processConfig,
         "switchOn": this.workFlowDef.switchOn ? 1 : 0, // 审批状态
         "automaticPass": this.workFlowDef.automaticPass ? 1 : 0, // 重复审批人问题
-        "creator": "", // 用户no this.$store.state.user.no
-        "companyId": "", // 公司id this.$store.state.user.companyNo
-        "type": "", // 流程类型 this.$route.query.type
-        "processName": "", // 流程名称 ""this.$route.query.name
-        "describe": "" // 流程描述 this.$route.query.name
+        "creator": this.userInfo.no, // 用户no this.$store.state.user.no
+        "companyId": this.userInfo.companyNo, // 公司id this.$store.state.user.companyNo
+        "type": this.queryInfo.type, // 流程类型 this.$route.query.type
+        "processName": this.queryInfo.name, // 流程名称 ""this.$route.query.name
+        "describe": this.queryInfo.name // 流程描述 this.$route.query.name
       }
 
 

package/src/views/formBuilder/workflow/nodeWrap.vue

@@ -75,13 +75,13 @@
         </div>
 
         <nodeWrap v-if="nodeConfig.childNode && nodeConfig.childNode" :nodeConfig.sync="nodeConfig.childNode" :tableId="tableId"
-        :isTried.sync="isTried" :directorMaxLevel="directorMaxLevel"></nodeWrap>
+        :isTried.sync="isTried" :directorMaxLevel="directorMaxLevel" :queryInfo="queryInfo"></nodeWrap>
 
         <!-- 审批人 / 抄送人 -->
-        <ApproverSelector ref="approverSelector"/>
+        <ApproverSelector ref="approverSelector" :queryInfo="queryInfo"/>
 
         <!-- 条件设置弹出窗口 -->
-        <NodeConditionConfig  ref="conditionForm" :formData="connection" :title="title"/>
+        <NodeConditionConfig  ref="conditionForm" :formData="connection" :title="title" :queryInfo="queryInfo"/>
 
         <!-- TODO: 发起人 -->
 
@@ -91,13 +91,17 @@
 <script>
 import ApproverSelector from '../components/approverSelector.vue'
 import NodeConditionConfig from "../components/nodeConditionConfig";
+import addNode from './addNode'
+
 
 export default {
-    props: ["nodeConfig", "flowPermission", "directorMaxLevel", "isTried", "tableId"],
+    props: ["nodeConfig", "flowPermission", "directorMaxLevel", "isTried", "tableId","queryInfo"],
     components:{
         ApproverSelector,
-        NodeConditionConfig
+        NodeConditionConfig,
+        addNode
     },
+    name:"nodeWrap",
     data() {
         return {
             placeholderList: ["发起人", "审批人", "抄送人"],
@@ -139,6 +143,7 @@ export default {
             }
         }
     },
+    created(){},
     methods: {
         // 展示修改节点的输入框
         clickEvent(index) {