qgb-process 0.1.98 → 0.2.3

package/src/api/apiPurchase/apiPurchase.js

@@ -7,7 +7,7 @@
 * @FilePath: \src\api\apiPurchase\apiPurchase.js
  **/
 import request from "@/http"
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const url = base.VUE_APP_APIUSER
 
 // const url = "http://localhost:8080"

package/src/api/apiPurchaseApply.js

@@ -1,5 +1,5 @@
 import request from "@/http"
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const url = base.VUE_APP_APIUSER
 const apiPurchaseApply = {
   // 采购申请列表查询

package/src/api/apiPurchasePay.js

@@ -1,5 +1,5 @@
 import request from "@/http"
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const url = base.VUE_APP_APIUSER
 const apiPurchasePay = {
   PurchaseApplySelect: (data) => request.get(url + "/v1/api/purchaseApply/findPurchaseApplySelect/" + data), // 获取采购申请单下拉框

package/src/api/apiRecruit.js

@@ -1,5 +1,5 @@
 import request from "@/http"
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const url = base.VUE_APP_TALENTS
 const api = {
   // 新增职位

package/src/api/apiRisk/index.js

@@ -1,6 +1,6 @@
 // 会员单位申请
 import request from "@/http"
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const zcUrl = base.VUE_APP_APIRECRUITMENT // 招采
 const apiRisk = {
   getRiskList: (data) => request.post(`${zcUrl}/v1/riskmanage/list`, data), // 分控列表

package/src/api/apiRoleManagement.js

@@ -1,5 +1,5 @@
 import request from "@/http"
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const url = base.VUE_APP_API
 const authUrlType = base.VUE_APP_AUTHURLTYPE
 const apiRoleManagement = {

package/src/api/apiRules/apiRules.js

@@ -1,6 +1,6 @@
 
 import request from "@/http"
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const url = base.VUE_APP_APIRECRUITMENT
 const apiRules = {
   // save: (data) => request.post(`${url}/v1/rules/bidding/save`, data),

package/src/api/apiSchedule/apiSchedule.js

@@ -1,6 +1,6 @@
 // 商品api
 import request from "@/http"
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const api = base.VUE_APP_APISCHEDULE
 const apiSchedule = {
   saveSchedule: (params) => request.post(`${api}/v1/app/v1/pc/schedule/saveSchedule`, params), // 新建日程

package/src/api/apiSealRecord.js

@@ -1,5 +1,5 @@
 import request from "@/http"
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const baseUrl =base.VUE_APP_APIUSER
 // let Url = process.env.VUE_APP_AUTHENTICATION
 // 获取申请人

package/src/api/apiSign.js

@@ -1,5 +1,5 @@
 import request from "@/http"
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const apiUrl =base.VUE_APP_MEMBERCENTER
 
 const getCode = (params) => request.get(apiUrl + "/api/user/getRegisterCode", params)

package/src/api/apiSolution/apiSolution.js

@@ -1,6 +1,6 @@
 
 import request from "@/http"
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const url = base.VUE_APP_APIRECRUITMENT
 const apiSolution = {
   save: (table, data) => request.post(`${url}/v1/customized/${table}/save`, data),

package/src/api/apiSubcontract.js

@@ -7,7 +7,7 @@
 * @FilePath: \src\api\apiSubcontract.js
  **/
 import request from "@/http"
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const url = base.VUE_APP_APIRECRUITMENT
 const apiSubcontract = {
   subcontractAdd: (data) => request.post(`${url}/v1/subpackageDesign/save`, data),

package/src/api/apiSystem/index.js

@@ -1,5 +1,5 @@
 import request from "@/http"
-const base = JSON.parse(localStorage.getItem("env"))
+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

package/src/api/apiTask.js

@@ -1,5 +1,5 @@
 import request from "@/http"
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const url = base.VUE_APP_APISCHEDULE
 const task = {
   // 申报任务|下达任务

package/src/api/apiTeam/api.js

@@ -1,3 +1,3 @@
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const api = base.VUE_APP_TEAM
 export default api

package/src/api/apiTender.js

@@ -2,7 +2,7 @@
  * 我的招标
  */
 import request from "@/http"
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const url = base.VUE_APP_APIRECRUITMENT
 const apiTender = {
   // 招标发布保存

package/src/api/apiUserEnterprise/api.js

@@ -1,3 +1,3 @@
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const api = base.VUE_APP_APIUSER
 export default api

package/src/api/apiUserEnterprise/apiUserEn.js

@@ -1,6 +1,6 @@
 import api from "./api"
 import http from "@/http/type.js"
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const api2 = base.VUE_APP_MEMBERCENTER
 const apiSelfEnterprise = {
   fetchEnterpriseList: (params) => http.get(base.VUE_APP_MEMBERCENTER + "/userJoinCompanyAudit/myComList", params), // 我的企业列表

package/src/api/apiVolunteerTeam.js

@@ -1,6 +1,6 @@
 
 import request from "@/http"
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const url = base.VUE_APP_TEAM
 const urls = base.VUE_APP_APIRECRUITMENT
 const apiVolunteerTeam = {

package/src/api/apiWorkarea.js

@@ -2,7 +2,7 @@
  * 我的项目
  */
 import request from "@/http"
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const url = base.VUE_APP_APIRECRUITMENT
 // const url = 'http://yuyue.ngrok.gcw.net:90'
 const apiWorkarea = {

package/src/api/apiXzqh.js

@@ -1,6 +1,6 @@
 
 import request from "@/http"
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const url = base.VUE_APP_APIRECRUITMENT
 const apiXzqh = {
   list: () => request.get(`${url}/v1/xzqh/list`)

package/src/api/common/api.js

@@ -1,3 +1,3 @@
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const api = base.VUE_APP_APIRECRUITMENT
 export default api

package/src/api/evection.js

@@ -1,5 +1,5 @@
 import request from "@/http"
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const baseUrl = base.VUE_APP_APIUSER
 // let baseUrl = 'http://192.168.0.152:9190'
 

package/src/api/guide.js

@@ -1,6 +1,6 @@
 
 import request from "@/http"
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const url = base.VUE_APP_APIUSER
 
 const guide = {

package/src/api/sociaManageApi.js

@@ -1,7 +1,7 @@
 import request from "@/http"
 
 // let contract = 'http://192.168.2.175:9090'
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const contract = base.VUE_APP_APIUSER
 
 const apiPact = {

package/src/formBuilder/apiBusiness.js

@@ -7,7 +7,7 @@
 * @FilePath: \src\formBuilder\apiBusiness.js
  **/
 import request from "@/http"
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const goodsUrl = base.VUE_APP_APIMATERIALS
 const MachineryUrl = base.VUE_APP_APIMACHINERY
 const EquipmentUrl = base.VUE_APP_APIEQUIPMENT

package/src/views/formBuilder/components/conditionConfig.js

@@ -12,6 +12,9 @@ import { log } from "fullcalendar";
 
 
 
+// 获取缓存中的用户数据
+const userInfo = JSON.parse(localStorage.getItem("userInfo")) || {}
+
 // 请假申请
 export const leave = async() => {
   const leaveApply = [
@@ -19,7 +22,7 @@ export const leave = async() => {
     { name: "时长(天)", variable: "duration", ele: "input" }
   ]
   // const res = await api.leaveType(store.state.user.no);
-  const res = await api.getVacationList({ member: store.state.user.no });
+  const res = await api.getVacationList({ member: userInfo.no });
   if (res.data.code == "200") {
     // if (res.data.data.length === 0) {
     //   this.$message.warning(

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

@@ -178,7 +178,7 @@ export default {
     queryInfo: {
       type: Object,
       default: () => {
-        return {}
+        return JSON.parse(localStorage.getItem("queryInfo"))
       }
     }
   },
@@ -421,7 +421,7 @@ export default {
       };
 
       this.configList = config[this.applyType] ? await config[this.applyType](this) : [];
-      console.log(this.queryInfo, "----999")
+
       if (this.queryInfo.type == "sealApproval" || this.queryInfo.name == "用章申请" || this.queryInfo.name == "用车申请" || this.queryInfo.type == "carApproval") {
         configDefault = {};
       } else {
@@ -507,7 +507,9 @@ export default {
 /deep/ .el-form-item{
     margin-bottom: 10px;
 }
-
+/deep/ .is-error{
+    margin-bottom: 20px;
+}
 /deep/ .el-form-item__label{
     text-align: left;
 }

package/src/views/formBuilder/process.vue

@@ -124,7 +124,7 @@ export default {
       default:()=>{
         return {
           "companyNo":"202008267425615", // 公司no
-          "no":"", // 用户no
+          "no":"2121212121", // 用户no
         }
       }
     },
@@ -162,6 +162,9 @@ export default {
   created() {
     // 获取审批流程数据
     this.getProcessSet()
+    // 存储用户信息
+    localStorage.setItem("userInfo",JSON.stringify(this.userInfo))
+    localStorage.setItem("queryInfo",JSON.stringify(this.queryInfo))
     // 设置类型
     this.type = this.path == "/index" ? "customForm_" + this.formBuilder.formDesId : this.queryInfo.type;
   },

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

@@ -424,7 +424,8 @@ export default {
         conditionStr(item, index) {
             var { conditionList, nodeUserList } = item;
             if (conditionList.length == 0) {
-                return (index == this.nodeConfig.conditionNodes.length - 1) && this.nodeConfig.conditionNodes[0].conditionList.length != 0 ? '其他条件进入此流程' : '请设置条件'
+                // 设置了条件判断: (index == this.nodeConfig.conditionNodes.length - 1) && this.nodeConfig.conditionNodes[0].conditionList.length != 0
+                return '请设置条件'
             } else if(item.desc){
                 return item.desc.join("；")
             }