qgb-process 0.1.90 → 0.1.91

package/package.json

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

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

@@ -106,13 +106,13 @@ export const trip = async() => { // ok
 export const projectApproval = async() => {
   const projectAddApply = [
     { name: "申请单位", variable: "accountSubject", ele: "checkbox", data: [] },
-    { name: "工程类型", variable: "type", ele: "checkbox", data: [] },
+    { name: "工程类型", variable: "type", ele: "checkbox", data: engineeringTypes },
     { name: "资金来源", variable: "fundSource", ele: "checkbox", data: capitalSourceList },
     { name: "项目造价", variable: "price", ele: "input" },
     {
       name: "经营类型", variable: "businessType", ele: "checkbox", data: [
-        { name: "合作管理", no: "1" },
-        { name: "组织经营", no: "2" }
+        { name: "合作管理", no: "合作管理" },
+        { name: "组织经营", no: "组织经营" }
       ]
     }
   ]
@@ -120,11 +120,27 @@ export const projectApproval = async() => {
   const res = await getApplyCompanyList();
   projectAddApply[0].data = [...res.data.data];
   // 工程类型
-  const { data } = await req.get("/sysTeamCategory/findCategoryListTree");
-  projectAddApply[1].data = data.data;
+  // const { data } = await req.get("/sysTeamCategory/findCategoryListTree");
+  // projectAddApply[1].data = data.data;
   return projectAddApply
 }
 
+const engineeringTypes = [
+    { name: "房建工程",no:"房建工程" },
+    { name: "水利工程",no:"水利工程"  },
+    { name: "市政工程",no:"市政工程"  },
+    { name: "冶炼工程",no:"冶炼工程"  },
+    { name: "矿山工程",no:"矿山工程"  },
+    { name: "化工石油工程",no:"化工石油工程"  },
+    { name: "电力工程",no:"电力工程"  },
+    { name: "农林工程",no:"农林工程"  },
+    { name: "铁路工程",no:"铁路工程"  },
+    { name: "公路工程",no:"公路工程"  },
+    { name: "港口与航道工程",no:"港口与航道工程"  },
+    { name: "航天航空工程",no:"航天航空工程"  },
+    { name: "通信工程" ,no:"通信工程" },
+    { name: "机电安装工程",no:"机电安装工程"  }
+]
 const capitalSourceList = [
   {
     name: "国拨资金",
@@ -304,7 +320,7 @@ export const officialDocument = async() => {
     const documentObject = [
         {
           name: "公文类型",
-          variable: "type",
+          variable: "documentType",
           ele: "checkbox",
           data: []
         }

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

@@ -29,8 +29,11 @@
                     <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-model="form[item.variable].value" @change="(val) => handlerChange(val, item)">
-                            <el-checkbox :label="items.no" v-for="(items, indexs) in item.data" :key="indexs">{{ items.name }}</el-checkbox>
+                        <el-checkbox-group v-if="item.variable == 'accountSubject'" 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 }}321</el-checkbox>
+                        </el-checkbox-group>
+                        <el-checkbox-group v-else v-model="form[item.variable].value" @change="(val) => handlerChange(val, item)">
+                            <el-checkbox :label="items.no+''" v-for="(items, indexs) in item.data" :key="indexs">{{ items.name }}123</el-checkbox>
                         </el-checkbox-group>
                         </el-form-item>
                     </template>
@@ -319,7 +322,18 @@ export default {
               const data = this.configList.filter(i => i.variable == name)[0].data;
               let descArr;
               if (data && Array.isArray(this.form[name].value)) {
-                descArr = this.form[name].value.map(item => data.filter(j => j.no == item)[0].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{
+                  descArr = this.form[name].value.map(item => data.filter(j => j.no == item)[0].name)
+                }
               } else if (data && !Array.isArray(this.form[name].value)) {
                 const satff = data.filter(j => j.value == this.form[name].value)[0].name;
                 descArr = [satff];

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

@@ -372,7 +372,7 @@ 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.map((items,key)=>item.value[key] = parseInt(items))
                 }
                 
                 json[item.variable] = item;