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

src/views/activiti/form/ProcessMaterialsDelivery.vue

@@ -12,7 +12,7 @@
           <a-tab-pane tab="审批历史" key="3" forceRender>
             <historic-detail :pictureId="pictureId" :procInstId="procInstId"/>
           </a-tab-pane>
-          <a-tab-pane tab="制式表格" key="4" >
+          <a-tab-pane tab="制式表格" key="4" v-if="this.isIfShow">
             <ProcessMaterialsDeliveryStatement :isTable="isTable" :materWared="this.$route.query.item" :procInstId="this.$route.query.procInstId"/>
           </a-tab-pane>
         </a-tabs>
@@ -32,7 +32,8 @@
       return {
         delivery: 1,
         onlineDisabled:true,
-        noDisabled:true
+        noDisabled:true,
+        isIfShow:false
       }
     },
     props: {
@@ -80,6 +81,17 @@
       if (user.orgType==3){
         this.delivery = 2
       }
+      if(this.itemId){
+        this.getAction('/hy/processMaterialsDelivery/queryById', {
+          id: this.itemId
+        }).then((res) => {
+          if (res.success) {
+            if (res.result.materialType==1){
+              this.isIfShow=true
+            }
+          }
+        })
+      }
       console.log(this.itemId,"this.itemId")
       this.$route.query.item=this.itemId
       this.$route.query.procInstId=this.procInstId