qgb-process 0.1.93 → 0.1.97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qgb-process",
-  "version": "0.1.93",
+  "version": "0.1.97",
   "private": false,
   "description": "",
   "author": "",

package/src/api/apiAuth.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 auth = base.VUE_APP_AUTH

package/src/api/apiAuthentication.js

@@ -2,7 +2,7 @@
 // 认证管理
 //
 import request from "@/http"
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const api = base.VUE_APP_API_APISTORE
 const apiMaterials = base.VUE_APP_APIMATERIALS
 const apiUser = base.VUE_APP_APIUSER

package/src/api/apiTender.js

@@ -104,6 +104,24 @@ const apiTender = {
     request.post(`${url}/gv1/mechanicalLabor/win`, data),
   // 定标公司列表
   getWinningCompany: (data) =>
-    request.get(`${url}/v1/NewBiddingRules/winningCompany`, data)
+    request.get(`${url}/v1/NewBiddingRules/winningCompany`, data),
+
+
+  // 招标类型
+  getTypeList: () => request.get(`${url}/ov1/mechanicalLabor/tenderTypeSelectCustom`),
+  // 招标类型  审批调用 NO为字符串
+  findTenderType: () => request.get(`${url}/ov1/mechanicalLabor/findTenderType`),
+  // 招标方式
+  getTenderMethod: () => request.get(`${url}/ov1/mechanicalLabor/getTenderBiddingMethod`),
+  // 报名方式
+  getVerticalWay: () => request.get(`${url}/ov1/mechanicalLabor/getVerticalBidWay`),
+  // 招标规则
+  getRuleSetUp: () => request.get(`${url}/ov1/mechanicalLabor/getRuleSetUp`),
+  // 招标状态
+  getTenderStatus: () => request.get(`${url}/gv1/mechanicalLabor/getTenderAddendumStatusShow`),
+  // 竞价类型  审批调用 NO为字符串
+  getBidTypeNo: () => request.get(`${url}/ov1/bid/getBidType`),
+  // 竞价规则
+  getBidRuleSetUp: () => request.get(`${url}/ov1/bid/getRuleSetUp`),
 }
 export default apiTender

package/src/api/apiUser.js

@@ -1,5 +1,5 @@
 import request from "@/http"
-const base = JSON.parse(localStorage.getItem("env"))
+const base = JSON.parse(localStorage.getItem("env")) || {}
 const api = base.VUE_APP_MEMBERCENTER
 const apiUser = {
   getUserInfo: () => request.get(api + "/api/user/getCurrentUserInfo"),

package/src/styles/workflow/workflow.css

@@ -488,7 +488,7 @@ textarea.ant-input {
 
 .fd-nav-content {
     z-index: 1;
-    overflow-x: hidden;
+    overflow-x: scroll;
     overflow-y: auto;
     background-color: #f5f5f7;
 }

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

@@ -7,6 +7,7 @@ import { req } from "@/api/apiTeam/apiUtils";
 import { getSealList } from "@/api/apiSealRecord";
 import apiSystem from "@/api/apiSystem";
 import apiment from "@/api/apiRankManagement";
+import apiTender from "@/api/apiTender";
 import { log } from "fullcalendar";
 
 
@@ -105,10 +106,10 @@ export const trip = async() => { // ok
 // 项目立项
 export const projectApproval = async() => {
   const projectAddApply = [
-    { name: "申请单位", variable: "accountSubject", ele: "checkbox", data: [] },
-    { name: "工程类型", variable: "type", ele: "checkbox", data: engineeringTypes },
+    { name: "申请单位", variable: "applyCompany", ele: "checkbox", data: [] },
+    { name: "工程类型", variable: "engineeringType", ele: "checkbox", data: engineeringTypes },
     // { name: "资金来源", variable: "fundSource", ele: "checkbox", data: capitalSourceList },
-    { name: "项目造价", variable: "price", ele: "input" },
+    { name: "项目造价", variable: "projectPrice", ele: "input" },
     {
       name: "经营类型", variable: "businessType", ele: "checkbox", data: [
         { name: "合作管理", no: "合作管理" },
@@ -480,3 +481,105 @@ export const purchaseAccept = async() => {
 export const payable = async() => {
   return []
 }
+// 招标发布
+export const issueTender = async() => {
+  const issueTenderApply = [
+    { name: "招标类型", variable: "type", ele: "checkbox", data: [] },
+    { name: "招标方式", variable: "biddingMethod", ele: "checkbox", data: [] },
+    { name: "报名方式", variable: "verticalTypeValue", ele: "checkbox", data: [] },
+    { name: "招标规则", variable: "tenderingRuleType", ele: "checkbox", data: [] },
+    { name: "概算金额", variable: "money", ele: "input" }
+  ]
+  const res = await apiTender.findTenderType();
+  issueTenderApply[0].data = res.data.result;
+  const res1 = await apiTender.getTenderMethod()
+  issueTenderApply[1].data = res1.data.result;
+  const res2 = await apiTender.getVerticalWay()
+  issueTenderApply[2].data = res2.data.result;
+  const res3 = await apiTender.getRuleSetUp()
+  issueTenderApply[3].data = res3.data.result;
+  return issueTenderApply
+}
+// 招标定标
+export const tenderBid = async() => {
+  const tenderBidApply = [
+    { name: "招标类型", variable: "type", ele: "checkbox", data: [] },
+    {
+      name: "中标单位是否为第一名", variable: "isFirst", ele: "radio", data: [{ value: "1", name: "是" }, { value: "0", name: "否" }]
+    },
+    { name: "中标总价", variable: "money", ele: "input" },
+    { name: "投标家数", variable: "bidNum", ele: "input" }
+  ]
+  const res = await apiTender.findTenderType();
+  tenderBidApply[0].data = res.data.result;
+  return tenderBidApply
+}
+// 招标废标
+export const abandonedBid = async() => {
+  const abandonedBidApply = [
+    { name: "招标类型", variable: "type", ele: "checkbox", data: [] },
+    { name: "招标状态", variable: "state", ele: "checkbox", data: [] }
+  ]
+  const res = await apiTender.findTenderType();
+  abandonedBidApply[0].data = res.data.result;
+  const res1 = await apiTender.getTenderStatus();
+  abandonedBidApply[1].data = res1.data.result;
+  return abandonedBidApply
+}
+// 招标补遗
+export const addendum = async() => {
+  const addendumApply = [
+    { name: "招标类型", variable: "tenderingType", ele: "checkbox", data: [] },
+    { name: "招标状态", variable: "tenderingState", ele: "checkbox" }
+  ]
+  const res = await apiTender.findTenderType();
+  addendumApply[0].data = res.data.result;
+  const res1 = await apiTender.getTenderStatus();
+  addendumApply[1].data = res1.data.result;
+  return addendumApply
+}
+// 竞价发布
+export const issueBiding = async() => {
+  const issueBidingApply = [
+    { name: "竞价类型", variable: "type", ele: "checkbox", data: [] },
+    { name: "竞价规则", variable: "ruleSetUp", ele: "checkbox", data: [] },
+    { name: "概算金额", variable: "budgetPrice", ele: "input" }
+  ]
+  const res = await apiTender.getBidTypeNo();
+  issueBidingApply[0].data = res.data.result;
+  const res1 = await apiTender.getBidRuleSetUp();
+  issueBidingApply[1].data = res1.data.result;
+  return issueBidingApply
+}
+// 竞价定标
+export const zcBidDetermine = async() => {
+  const zcBidDetermineApply = [
+    { name: "竞价类型", variable: "type", ele: "checkbox", data: [] },
+    {
+      name: "中标单位是否为第一名", variable: "isFirst", ele: "radio", data: [{ value: "1", name: "是" }, { value: "0", name: "否" }]
+    },
+    { name: "中标总价", variable: "money", ele: "input" },
+    { name: "竞价家数", variable: "bidNum", ele: "input" }
+  ]
+  const res = await apiTender.getBidTypeNo();
+  zcBidDetermineApply[0].data = res.data.result;
+  return zcBidDetermineApply
+}
+// 竞价废标
+export const zcBidCancel = async() => {
+  const zcBidCancelApply = [
+    { name: "竞价类型", variable: "type", ele: "checkbox", data: [] }
+  ]
+  const res = await apiTender.getBidTypeNo();
+  zcBidCancelApply[0].data = res.data.result;
+  return zcBidCancelApply
+}
+// 竞价补遗
+export const zcBidAddendum = async() => {
+  const zcBidAddendumApply = [
+    { name: "竞价类型", variable: "bidType", ele: "checkbox", data: [] }
+  ]
+  const res = await apiTender.getBidTypeNo();
+  zcBidAddendumApply[0].data = res.data.result;
+  return zcBidAddendumApply
+}

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

@@ -29,7 +29,7 @@
                     <div v-for="(item, index) in formConfig" :key="index">
                     <template v-if="item.ele == 'checkbox'">
                         <el-form-item :label="item.name + ': '">
-                        <el-checkbox-group v-if="item.variable == 'accountSubject'" v-model="form[item.variable].value" @change="(val) => handlerChange(val, item)">
+                        <el-checkbox-group v-if="item.variable == 'applyCompany'" v-model="form[item.variable].value" @change="(val) => handlerChange(val, item)">
                             <el-checkbox :label="items.id" v-for="(items, indexs) in item.data" :key="indexs">{{ items.name }}</el-checkbox>
                         </el-checkbox-group>
                         <el-checkbox-group v-else v-model="form[item.variable].value" @change="(val) => handlerChange(val, item)">
@@ -175,9 +175,9 @@ export default {
       type: String,
       default: ""
     },
-    queryInfo:{
+    queryInfo: {
       type: Object,
-      default:()=>{
+      default: () => {
         return {}
       }
     }
@@ -322,16 +322,16 @@ export default {
               const data = this.configList.filter(i => i.variable == name)[0].data;
               let descArr;
               if (data && Array.isArray(this.form[name].value)) {
-                if(this.form[name].name == '申请单位'){
-                    descArr = [];
-                    this.form[name].value.forEach(item=>{
-                        data.forEach(j=>{
-                            if(item == j.id){
-                                descArr.push(j.name)
-                            }
-                        })
+                if (this.form[name].name == "申请单位") {
+                  descArr = [];
+                  this.form[name].value.forEach(item => {
+                    data.forEach(j => {
+                      if (item == j.id) {
+                        descArr.push(j.name)
+                      }
                     })
-                  } else{
+                  })
+                } else {
                   descArr = this.form[name].value.map(item => data.filter(j => j.no == item)[0].name)
                 }
               } else if (data && !Array.isArray(this.form[name].value)) {
@@ -421,6 +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 {
@@ -519,7 +520,7 @@ export default {
 .conditionSelect /deep/ .el-dialog__header{
     padding: 15px 20px;
     border-bottom: 1px solid #eaeaea;
-    
+
 }
 
 .conditionSelect /deep/ .el-dialog__header .el-dialog__title{

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

@@ -183,7 +183,8 @@ export default {
                 // 条件配置
                 this.bPriorityLevel = priorityLevel;
                 this.conditionsConfig = JSON.parse(JSON.stringify(this.nodeConfig))
-                this.conditionConfig = this.conditionsConfig.conditionNodes[priorityLevel - 1]
+                // this.conditionConfig = this.conditionsConfig.conditionNodes[priorityLevel - 1]
+                this.conditionConfig = item
                 this.$refs.conditionForm.nodeConditionHandler() // 条件页面
                 this.fillConditionForm(this.conditionConfig) // 填充条件弹出表单参数
             }
@@ -371,8 +372,8 @@ export default {
                 // 判断修改类型，适应表单复现
                 // todo: 暂时判断输入框与发起人类型
                 if(!['input','sponsor'].includes(item.ele)){
-                    item.value = item.value.split(',')
-                    // item.value.map((items,key)=>item.value[key] = parseInt(items))
+                    // 判断是否数组 
+                    item.value = !Array.isArray(item.value) ? item.value.split(',') : item.value
                 }
                 
                 json[item.variable] = item;