diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue
index 838c76ac..ef82b494 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue
@@ -34,12 +34,13 @@
 
           <el-col :span="24" v-if="judgeShow('type')">
             <jnpf-form-tip-item label="单据类型" v-if="judgeShow('type')" prop="type">
-              <JnpfRadio v-model="dataForm.type" @change="changeData('type', -1)"
+              <JnpfRadio v-model="dataForm.type" @change="changeData('type',-1)"
                 :disabled="judgeWrite('type')" optionType="button" direction="horizontal"
                 size="medium" :options="typeOptions" :props="typeProps">
               </JnpfRadio>
             </jnpf-form-tip-item>
           </el-col>
+
           <!-- <el-col :span="24">
             <jnpf-form-tip-item>
               <JnpfGroupTitle content="基础信息" contentPosition="left">
@@ -161,7 +162,7 @@
                 hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
                 relationField='name' field='productId' interfaceId="549582756464582469"
                 :pageSize="20" :columnOptions="productIdcolumnOptions" clearable
-                :style='{"width":"100%"}'>
+                :disabled="judgeWrite('warehouseId')" :style='{"width":"100%"}'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -314,7 +315,8 @@
                   <template slot-scope="scope">
                     <el-input v-model="scope.row.planNum" placeholder="请输入"
                       @input="planNum(scope.row.planNum,scope.$index)" clearable
-                      @clear="clearables(scope.$index)" :style='{ "width": "100%" }'>
+                      @clear="clearables(scope.$index)" :style='{ "width": "100%" }'
+                      :disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-planNum')">
                     </el-input>
                   </template>
                 </el-table-column>
@@ -366,6 +368,7 @@
                       :templateJson="interfaceRes.workorderproductcargoId" placeholder="请选择" hasPage
                       propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
                       relationField='cargo_name' :field="'cargoId' + scope.$index"
+                      :disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-cargoId')"
                       interfaceId="530700536261903749" :pageSize="20"
                       :columnOptions="workorderproductcargoIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
@@ -431,7 +434,7 @@
               <el-table :data="dataForm.workOrderPrimaryList" size='mini' border="">
                 <el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
                 <el-table-column label="商品名称" v-if="judgeShow('workorderprimary-productId')"
-                  align="center" fixed="left" prop="productId">
+                  width="200px" align="center" fixed="left" prop="productId">
 
                   <template slot="header">
                     <span class="required-sign"
@@ -442,6 +445,7 @@
                     <JnpfPopupSelect v-model="scope.row.productId" @change="changePrimaryList"
                       :rowIndex="scope.$index" :formData="dataForm"
                       :templateJson="interfaceRes.workorderprimaryproductId" placeholder="请选择"
+                      :disabled="judgeWrite('workorderprimaryList')||judgeWrite('workorderprimaryList-productId')"
                       hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
                       popupType="dialog" relationField='name' :field="'productId' + scope.$index"
                       interfaceId="519505017699307077" :pageSize="20"
@@ -514,13 +518,11 @@
 
                 <el-table-column label="理论发料量(计算前)" v-if="judgeShow('workorderprimary-theoryNum')"
                   align="center" prop="theoryNum" width="300px">
-
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired(' workorderprimaryList-theoryNum')">*</span>理论发料量(计算前)
                   </template>
                   <template slot-scope="scope">
-
                     <JnpfInput v-model="scope.row.theoryNum" disabled
                       @change="changeData('workorderprimary-theoryNum', scope.$index)"
                       placeholder="请输入" clearable :style='{ "width": "100%" }'>
@@ -567,6 +569,7 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.realityNum"
                       @change="changeData('workorderprimary-realityNum', scope.$index)"
+                      :disabled="judgeWrite('workorderprimaryList') || judgeWrite('workorderprimaryList-realityNum')"
                       placeholder="请输入1" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
@@ -581,6 +584,7 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.returnNum"
                       @change="changeData('workorderprimary-returnNum', scope.$index)"
+                      :disabled="judgeWrite('workorderprimaryList')||judgeWrite('workorderprimaryList-returnNum')"
                       placeholder="请输入" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
@@ -595,6 +599,7 @@
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.reportlossNum"
                       @change="changeData('workorderprimary-reportlossNum', scope.$index)"
+                      :disabled="judgeWrite('workorderprimaryList')||judgeWrite('workorderprimaryList-reportlossNum')"
                       placeholder="请输入" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
@@ -602,12 +607,10 @@
 
                 <el-table-column label="货区名称" v-if="judgeShow('workorderprimary-cargoId')"
                   align="center" prop="cargoId">
-
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('workorderprimaryList-cargoId')">*</span>货区名称
                   </template>
-
                   <template slot-scope="scope">
                     <JnpfPopupSelect v-model="scope.row.cargoId"
                       @change="changeData('workorderprimary-cargoId', scope.$index)"
@@ -615,6 +618,7 @@
                       :templateJson="interfaceRes.workorderprimarycargoId" placeholder="请选择" hasPage
                       propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
                       relationField='cargo_name' :field="'cargoId' + scope.$index"
+                      :disabled="judgeWrite('workorderprimaryList')||judgeWrite('workorderprimaryList-cargoId')"
                       interfaceId="530700536261903749" :pageSize="20"
                       :columnOptions="workorderprimarycargoIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
@@ -635,6 +639,7 @@
                       :templateJson="interfaceRes.workorderprimarybatchNumber" placeholder="请选择"
                       hasPage propsValue="batchNumber" popupWidth="800px" popupTitle="选择数据"
                       popupType="dialog" relationField='batchNumber'
+                      :disabled="judgeWrite('workorderprimaryList')||judgeWrite('workorderprimaryList-batchNumber')"
                       :field="'batchNumber'+scope.$index" interfaceId="550272582679552965"
                       :pageSize="20" :columnOptions="workorderprimarybatchNumbercolumnOptions"
                       clearable :style='{"width":"100%"}'>
@@ -1178,6 +1183,15 @@ export default {
           isOk = false
           break
         }
+        if (!e.cargoId) {
+          this.$message({
+            message: '货区名称不能为空',
+            type: 'error',
+            duration: 1000
+          });
+          isOk = false
+          break
+        }
         if (!e.batchNumber) {
           this.$message({
             message: '批次号选择不能为空',
@@ -1187,6 +1201,7 @@ export default {
           isOk = false
           break
         }
+
       }
       return isOk;
     },