Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

hb_client/src/components/customForm/index.vue

@@ -687,11 +687,13 @@
         that.field = []; //检查项目
         let submit = isSubmit=='1'?false:true;
         that.formData.forEach((item) => {
-          let field_value = 0;
+          let field_value = null;
           if(item.field_type==='int'){
             field_value = parseInt(that.checkForm[item.field_key])
           }else if(item.field_type==='float'){
             field_value = parseFloat(that.checkForm[item.field_key])
+          }else{
+            field_value = that.checkForm[item.field_key];
           }
           that.field.push({
             id: item.id,

hb_client/src/views/workflow/index.vue

@@ -428,20 +428,20 @@ export default {
       // 检查json
       checkJson(){
         if (this.hasJsonFlag == false){
-          alert("限制表达式json验证失败")
+          // alert("限制表达式json验证失败")
           return false
         } else {
-          alert("限制表达式json验证成功")
+          // alert("限制表达式json验证成功")
           return true
         }
       },
        // 检查json
       checkJson2(){
         if (this.hasJsonFlag1 == false){
-          alert("展现表单字段json验证失败")
+          // alert("展现表单字段json验证失败")
           return false
         } else {
-          alert("展现表单字段json1验证成功")
+          // alert("展现表单字段json1验证成功")
           return true
         }
       },

hb_client/src/views/workflow/state.vue

@@ -184,15 +184,20 @@
             <el-col :span="1" style="height: 1px;"></el-col>
             <el-col :span="8">
               <el-select style="width: 100%" v-model="item.value" placeholder="请选择状态">
-                <el-option label="只读" value="1"></el-option>
+                <el-option
-                <el-option label="必填" value="2"></el-option>
+                  v-for="item in state_fields"
-                <el-option label="可选" value="3"></el-option>
+                  :label="item.label"
-                <el-option label="隐藏" value="4"></el-option>
+                  :value="item.value"
+                  :key="item.value"
+                ></el-option>
               </el-select>
             </el-col>
             <el-col :span="2" style="text-align: center" v-if="$index!==0">
-              <i class="el-icon-remove-outline" @click.prevent="removeStatusChange($index)"
+              <i
-                 style="color: red;font-size: 16px;"></i>
+                class="el-icon-remove-outline"
+                style="color: red;font-size: 16px;"
+                @click.prevent="removeStatusChange($index)"
+              ></i>
             </el-col>
           </el-row>
         </el-form-item>
@@ -292,6 +297,21 @@
           value: 9,
           label: '代码获取'
         }],
+        state_fields:[
+          {
+            value: 1,
+            label: '只读'
+          },{
+            value: 2,
+            label: '必填'
+          },{
+            value: 3,
+            label: '可选'
+          },{
+            value: 4,
+            label: '隐藏'
+          },
+        ],
         display_form_str: [],
         limit_expression: [],
         dialogVisible: false,
@@ -316,8 +336,8 @@
     methods: {
 
       checkPermission(value){
-        debugger;
+       /* debugger;
-        console.log(checkPermission(value))
+        console.log(checkPermission(value))*/
         checkPermission(value);
       },
 

hb_client/src/views/workflow/ticketHandle.vue

@@ -132,7 +132,6 @@
               <el-button v-if="ticketDetail.in_add_node" class="filter-item" type="primary" @click="handleClick('3')">加签处理</el-button>
               <el-button v-for="item in operationBtn" :key="item.id" class="filter-item" type="primary" @click="operationSubmit(item.id)">{{item.name}}</el-button>
             </div>
-
           </div>
         </el-card>
         <el-card style="margin-left: 10px">
@@ -316,6 +315,24 @@
                     let dat = that.flowSteps.filter((item)=>{
                       return item.id==state;
                     })
+                    debugger;
+                    let state_fields = dat[0].state_fields;
+                    if(state_fields!=={}){
+                      for (let labe in state_fields) {
+                        for(let j = 0;j<that.ticketDetail.ticket_data_.length;j++){
+                          if(that.ticketDetail.ticket_data_[j].field_key===labe){
+                            debugger;
+                            console.log(labe)
+                            console.log(state_fields[labe])
+                            if(state_fields[labe]!==4){
+                              that.ticketDetail.ticket_data_[j].is_hidden = false
+                            }else{
+                              that.ticketDetail.ticket_data_[j].is_hidden = true
+                            }
+                          }
+                        }
+                      }
+                    }
                     that.sort = dat[0].sort;
                     that.actives = that.flowSteps.indexOf(dat[0]);
                     if( that.flowSteps.length-that.actives >1){}else{
@@ -333,6 +350,7 @@
                     getWfStateList(workflow).then((response) => {
                       if (response.data) {
                         let nodes = response.data;
+
                         // 添加节点
                         nodes.forEach((item) => {
                           if(item.sort==that.sort){
@@ -455,8 +473,6 @@
           }
         })
       });
-
-
     },
     activated(){
     },
@@ -516,7 +532,6 @@
           .style('left', `${d3.event.pageX + 15}px`)
           .style('top', `${d3.event.pageY-10}px`)
       },
-
       // tooltip隐藏
       tipHidden() {
         this.tooltip
@@ -606,9 +621,6 @@
           }
         })
       },
-      addNode(){
-
-      },
     }
   }
 </script>