diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/productWarehouse/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/productWarehouse/form.vue
index 5e5d92d8..c4ed3eb1 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/productWarehouse/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/productWarehouse/form.vue
@@ -1,7 +1,3 @@
-
-
-
-
 <template>
     <div :style="{ margin: '0 auto', width: '100%' }">
         <el-row :gutter="15" class="">
@@ -57,8 +53,9 @@
                     </el-col>
                     <el-col :span="8" v-if="judgeShow('shortName')">
                         <jnpf-form-tip-item label="商品简称" v-if="judgeShow('shortName')" prop="shortName">
-                            <JnpfInput v-model="dataForm.shortName" @change="changeData('shortName', -1)" placeholder="请输入"
-                                :disabled="judgeWrite('shortName')" clearable :style='{ "width": "100%" }'>
+                            <JnpfInput v-model="dataForm.shortName" @change="changeData('shortName', -1)"
+                                placeholder="请输入" :disabled="judgeWrite('shortName')" clearable
+                                :style='{ "width": "100%" }'>
                             </JnpfInput>
                         </jnpf-form-tip-item>
                     </el-col>
@@ -73,27 +70,28 @@
                         <jnpf-form-tip-item label="存货类型" v-if="judgeShow('inventoryType')" prop="inventoryType">
                             <JnpfSelect v-model="dataForm.inventoryType" @change="changeData('inventoryType', -1)"
                                 placeholder="请选择" :disabled="judgeWrite('inventoryType')" clearable
-                                :style='{ "width": "100%" }' :options="inventoryTypeOptions" :props="inventoryTypeProps">
+                                :style='{ "width": "100%" }' :options="inventoryTypeOptions"
+                                :props="inventoryTypeProps">
                             </JnpfSelect>
                         </jnpf-form-tip-item>
                     </el-col>
                     <el-col :span="8" v-if="judgeShow('brandId')">
                         <jnpf-form-tip-item label="品牌" v-if="judgeShow('brandId')" prop="brandId">
-                            <JnpfPopupSelect v-model="dataForm.brandId" @change="changeData('brandId', -1)" :rowIndex="null"
-                                :formData="dataForm" :templateJson="interfaceRes.brandId" placeholder="请选择"
-                                :disabled="judgeWrite('brandId')" hasPage propsValue="id" popupWidth="800px"
-                                popupTitle="选择数据" popupType="dialog" relationField='brand_name' field='brandId'
-                                interfaceId="518049412669244677" :pageSize="20" :columnOptions="brandIdcolumnOptions"
-                                clearable :style='{ "width": "100%" }'>
+                            <JnpfPopupSelect v-model="dataForm.brandId" @change="changeData('brandId', -1)"
+                                :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.brandId"
+                                placeholder="请选择" :disabled="judgeWrite('brandId')" hasPage propsValue="id"
+                                popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='brand_name'
+                                field='brandId' interfaceId="518049412669244677" :pageSize="20"
+                                :columnOptions="brandIdcolumnOptions" clearable :style='{ "width": "100%" }'>
                             </JnpfPopupSelect>
                         </jnpf-form-tip-item>
                     </el-col>
                     <el-col :span="8" v-if="judgeShow('productCategoryId')">
                         <jnpf-form-tip-item label="商品分类" v-if="judgeShow('productCategoryId')" prop="productCategoryId">
-                            <JnpfSelect v-model="dataForm.productCategoryId" @change="changeData('productCategoryId', -1)"
-                                placeholder="请选择" :disabled="judgeWrite('productCategoryId')" clearable
-                                :style='{ "width": "100%" }' :options="productCategoryIdOptions"
-                                :props="productCategoryIdProps">
+                            <JnpfSelect v-model="dataForm.productCategoryId"
+                                @change="changeData('productCategoryId', -1)" placeholder="请选择"
+                                :disabled="judgeWrite('productCategoryId')" clearable :style='{ "width": "100%" }'
+                                :options="productCategoryIdOptions" :props="productCategoryIdProps">
                             </JnpfSelect>
                         </jnpf-form-tip-item>
                     </el-col>
@@ -155,11 +153,12 @@
                     </el-col>
                     <el-col :span="8" v-if="judgeShow('firstSupplierId')">
                         <jnpf-form-tip-item label="首选供应商" v-if="judgeShow('firstSupplierId')" prop="firstSupplierId">
-                            <JnpfPopupSelect v-model="dataForm.firstSupplierId" @change="changeData('firstSupplierId', -1)"
-                                :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.firstSupplierId"
-                                placeholder="请选择" :disabled="judgeWrite('firstSupplierId')" propsValue="id"
-                                popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
-                                field='firstSupplierId' interfaceId="530001731111617029" :pageSize="20"
+                            <JnpfPopupSelect v-model="dataForm.firstSupplierId"
+                                @change="changeData('firstSupplierId', -1)" :rowIndex="null" :formData="dataForm"
+                                :templateJson="interfaceRes.firstSupplierId" placeholder="请选择"
+                                :disabled="judgeWrite('firstSupplierId')" propsValue="id" popupWidth="800px"
+                                popupTitle="选择数据" popupType="dialog" relationField='name' field='firstSupplierId'
+                                interfaceId="530001731111617029" :pageSize="20"
                                 :columnOptions="firstSupplierIdcolumnOptions" clearable :style='{ "width": "100%" }'>
                             </JnpfPopupSelect>
                         </jnpf-form-tip-item>
@@ -265,7 +264,8 @@
                                     </template>
                                 </el-table-column>
                             </el-table>
-                            <div class="table-actions" @click="addproductunitList()" v-if="!judgeWrite('productunitList')">
+                            <div class="table-actions" @click="addproductunitList()"
+                                v-if="!judgeWrite('productunitList')">
                                 <el-button type="text" icon="el-icon-plus">添加</el-button>
                             </div>
                         </jnpf-form-tip-item>
@@ -336,8 +336,8 @@
                         <jnpf-form-tip-item label="停售时间 " v-if="judgeShow('salesEnd')" prop="salesEnd">
                             <JnpfDatePicker v-model="dataForm.salesEnd" @change="changeData('salesEnd', -1)"
                                 :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
-                                placeholder="请选择" :disabled="judgeWrite('salesEnd')" clearable :style='{ "width": "100%" }'
-                                type="date" format="yyyy-MM-dd">
+                                placeholder="请选择" :disabled="judgeWrite('salesEnd')" clearable
+                                :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
                             </JnpfDatePicker>
                         </jnpf-form-tip-item>
                     </el-col>
@@ -358,10 +358,11 @@
                         </jnpf-form-tip-item>
                     </el-col>
                     <el-col :span="12" v-if="judgeShow('availableInventory')">
-                        <jnpf-form-tip-item label="可售库存" v-if="judgeShow('availableInventory')" prop="availableInventory">
-                            <JnpfInput v-model="dataForm.availableInventory" @change="changeData('availableInventory', -1)"
-                                placeholder="请输入" :disabled="judgeWrite('availableInventory')" clearable
-                                :style='{ "width": "100%" }'>
+                        <jnpf-form-tip-item label="可售库存" v-if="judgeShow('availableInventory')"
+                            prop="availableInventory">
+                            <JnpfInput v-model="dataForm.availableInventory"
+                                @change="changeData('availableInventory', -1)" placeholder="请输入"
+                                :disabled="judgeWrite('availableInventory')" clearable :style='{ "width": "100%" }'>
                             </JnpfInput>
                         </jnpf-form-tip-item>
                     </el-col>
@@ -374,10 +375,11 @@
                         </jnpf-form-tip-item>
                     </el-col>
                     <el-col :span="12" v-if="judgeShow('inventoryDayUpper')">
-                        <jnpf-form-tip-item label="库存天数上限" v-if="judgeShow('inventoryDayUpper')" prop="inventoryDayUpper">
-                            <JnpfInput v-model="dataForm.inventoryDayUpper" @change="changeData('inventoryDayUpper', -1)"
-                                placeholder="请输入" :disabled="judgeWrite('inventoryDayUpper')" clearable
-                                :style='{ "width": "100%" }'>
+                        <jnpf-form-tip-item label="库存天数上限" v-if="judgeShow('inventoryDayUpper')"
+                            prop="inventoryDayUpper">
+                            <JnpfInput v-model="dataForm.inventoryDayUpper"
+                                @change="changeData('inventoryDayUpper', -1)" placeholder="请输入"
+                                :disabled="judgeWrite('inventoryDayUpper')" clearable :style='{ "width": "100%" }'>
                             </JnpfInput>
                         </jnpf-form-tip-item>
                     </el-col>
@@ -406,12 +408,13 @@
                         </jnpf-form-tip-item>
                     </el-col>
                     <el-col :span="24" v-if="judgeShow('jnpf_jg_product_business_jnpf_businessLineId')">
-                        <jnpf-form-tip-item label="适配业务范围" v-if="judgeShow('jnpf_jg_product_business_jnpf_businessLineId')"
+                        <jnpf-form-tip-item label="适配业务范围"
+                            v-if="judgeShow('jnpf_jg_product_business_jnpf_businessLineId')"
                             prop="jnpf_jg_product_business_jnpf_businessLineId">
                             <JnpfCheckbox v-model="dataForm.jnpf_jg_product_business_jnpf_businessLineId"
                                 @change="changeData('jnpf_jg_product_business_jnpf_businessLineId', -1)"
-                                :disabled="judgeWrite('jnpf_jg_product_business_jnpf_businessLineId')" optionType="default"
-                                direction="horizontal" size="small"
+                                :disabled="judgeWrite('jnpf_jg_product_business_jnpf_businessLineId')"
+                                optionType="default" direction="horizontal" size="small"
                                 :options="jnpf_jg_product_business_jnpf_businessLineIdOptions"
                                 :props="jnpf_jg_product_business_jnpf_businessLineIdProps">
                             </JnpfCheckbox>
@@ -491,7 +494,7 @@ export default {
                 inventoryType: undefined,
                 brandId: "520546789800018053",
                 productCategoryId: undefined,
-                area: [],
+                area: ["354094489370697", "354094489370698", "354094489403463"],
                 dangerousFlag: "0",
                 importedFlag: "0",
                 processedFlag: "0",