Merge remote-tracking branch 'origin/dev' into dev

src/views/activiti/applyHome.vue

@@ -41,7 +41,7 @@
       :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
       width="80%"
     >
-      <component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent"
+      <component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent" :hieg = "lcModa.hieg"
                  :processData="lcModa.processData" :isNew = "lcModa.isNew" :pictureId="lcModa.pictureId" :procInstId="lcModa.procInstId"
                  @afterSubmit="afterSub" @close="lcModa.visible=false,lcModa.disabled = false">
       </component>
@@ -96,6 +96,7 @@
         addApplyLoading: false,
         lcModa: {
           title:'',
+          hieg:true,
           disabled:false,
           visible:false,
           formComponent : null,
@@ -169,6 +170,7 @@
         this.lcModa.formComponent = this.getFormComponent(v.routeName).component;
         this.lcModa.title = '发起流程：'+v.name;
         this.lcModa.isNew = true;
+        this.lcModa.hieg = true;
         this.lcModa.pictureId=v.id;
         this.lcModa.procInstId='';
         this.lcModa.processData = v;

src/views/activiti/applyList.vue

@@ -154,7 +154,7 @@
     </a-drawer>
     <!--流程表单-->
     <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%">
-      <component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent"
+      <component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent" :hieg ="lcModa.hieg"
                  :processData="lcModa.processData" :isNew = "lcModa.isNew" :procInstId="lcModa.procInstId" :pictureId="lcModa.pictureId"
                  @afterSubmit="afterSub" @close="lcModa.visible=false,lcModa.disabled = false"></component>
     </a-modal>
@@ -348,6 +348,7 @@
           visible:false,
           formComponent : null,
           isNew : false,
+          hieg: false,
           procInstId:'',
           pictureId:'',
         },
@@ -503,6 +504,7 @@
 
         isView = isView||false;
         this.lcModa.disabled = isView;
+        this.lcModa.hieg = isView;
         this.lcModa.title = '修改流程业务信息：'+r.title;
         if (isView) this.lcModa.title = '查看流程业务信息：'+r.title;
         this.lcModa.formComponent = this.getFormComponent(r.routeName).component;
@@ -581,5 +583,5 @@
   }
 </script>
 <style scoped>
-  @import '~@assets/less/common.less'
+  @import '~@assets/less/common.less';
 </style>

src/views/activiti/form/ProcessUdgetPlan.vue

@@ -3,7 +3,7 @@
 
     <a-tabs style="text-align: center">
       <a-tab-pane tab="流程正文" key="1" forceRender>
-        <process-udget-plan-form :isNew="isNew" :processData="processData" :disabled="disabled" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask"/>
+        <process-udget-plan-form :isNew="isNew" :processData="processData" :disabled="disabled" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask" :hieg="hieg"/>
       </a-tab-pane>
 
         <a-tab-pane tab="流程节点图" key="2" forceRender>
@@ -50,6 +50,11 @@
         type: Boolean,
         default: false,
         required: false
+      },
+      hieg: {
+        type: Boolean,
+        default: true,
+        required: true
       }
     },
     // props: {

src/views/activiti/form/ProcessUdgetPlanForm.vue

@@ -251,7 +251,7 @@
         materialPrice:0,
         materialAmount:0,
         describes:'',
-        hieg:true,
+        // hieg:true,
         historyBigId:[],
         isHistoryBigId:false,
         bigIdMerchandiseNews:[],
@@ -541,6 +541,12 @@
         type: Boolean,
         default: false,
         required: false
+      },
+      //表单禁用
+      hieg: {
+        type: Boolean,
+        default: true,
+        required: true
       }
     },
     computed: {