diff --git a/src/views/activiti/ProcessModelList.vue b/src/views/activiti/ProcessModelList.vue
index ea94c31..129d008 100644
--- a/src/views/activiti/ProcessModelList.vue
+++ b/src/views/activiti/ProcessModelList.vue
@@ -339,7 +339,7 @@
             dataIndex: '',
             scopedSlots: { customRender: 'make' },
             align:"center",
-            fixed:'right'
+            // fixed:'right'
           }
         ],
         viewImage:false,
diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
index 0df8065..f457366 100644
--- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
@@ -9,7 +9,7 @@
               <a-input v-decorator="['id']" placeholder="" style="width: 100%"/>
             </a-form-item>
           </a-col>
-          <a-col :span="8">
+          <a-col :span="8" v-show="false">
             <a-form-item label="planType" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input v-decorator="['planType']" placeholder="" style="width: 100%"/>
             </a-form-item>
@@ -346,8 +346,8 @@
           processUdgetPlanId: { rules: [{ required: true, message: '关联预算流程不能为空!' }] },
           targetLibrary: { rules: [{ required: this.isTargetLibrary, message: '入库目标库不能为空!' }] },
           warehousingBatch: { rules: [{ required: true, message: '入库总批次不能为空!' }] },
-          ifDirect: { rules: [{ required: true, message: '是否属于直达物资不能为空!' }] },
-          ifInspection: { rules: [{ required: true, message: '是否需要送检不能为空!' }] }
+          // ifDirect: { rules: [{ required: true, message: '是否属于直达物资不能为空!' }] },
+          // ifInspection: { rules: [{ required: true, message: '是否需要送检不能为空!' }] }
         }
       }
     },
@@ -761,14 +761,20 @@
         //   }
         // })
         let res = val[0]
-        if (res.planType==1){
-          this.isIfDirect=true
-          //isIfInspection
+        if (res.materialType!=6){
+          if (res.planType==1){
+            this.isIfDirect=true
+            //isIfInspection
+          }else {
+            this.isIfDirect=false
+          }
         }else {
           this.isIfDirect=false
         }
         let param = {}
         param.planType = res.planType
+        console.log("res+++++++++++++")
+        console.log(res)
         this.data = param
         let fieldval = pick(this.data, 'planType')
         this.$nextTick(() => {