diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java
index 76dcbd94..5aa5f147 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/service/impl/PoundlistServiceImpl.java
@@ -88,7 +88,7 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
         int total = 0;
         int poundlistNum = 0;
         QueryWrapper<PoundlistEntity> poundlistQueryWrapper = new QueryWrapper<>();
-        //poundlistQueryWrapper.lambda().eq(PoundlistEntity::getIsExamine, "1");
+        poundlistQueryWrapper.lambda().eq(PoundlistEntity::getIsExamine, "1");
         boolean pcPermission = true;
         boolean appPermission = true;
         boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
@@ -105,7 +105,7 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
         }
         if (!isPc && appPermission) {
             if (!userProvider.get().getIsAdministrator()) {
-                Object poundlistObj = authorizeService.getCondition(new AuthorizeConditionModel(poundlistQueryWrapper, poundlistPagination.getMenuId(), "jg_poundlist"));
+                Object poundlistObj = authorizeService.getCondition2(new AuthorizeConditionModel(poundlistQueryWrapper, poundlistPagination.getMenuId(), "jg_poundlist"));
                 if (ObjectUtil.isEmpty(poundlistObj)) {
                     return new ArrayList<>();
                 } else {
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java
index 28a6d471..4c761a44 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java
@@ -27,6 +27,6 @@ public interface PurchaseorderitemMapper extends BaseMapper<PurchaseorderitemEnt
     List<HashMap<String,Object>> getTitleInfo(@Param("ew")Wrapper<PurchaseorderitemEntity> queryWrapper);
     List<HashMap<String,Object>> getWordExcelInfo(@Param("ew")Wrapper<PurchaseorderitemEntity> queryWrapper);
     List<HashMap<String,Object>> getVehicleInfo(@Param("ew")Wrapper<PurchaseorderitemEntity> queryWrapper);
-    IPage<PurchaseorderitemEntity> queryByKeyword(@Param("page") Page<PurchaseorderitemEntity> page, @Param("purchaseorderPagination") PurchaseorderPagination purchaseorderPagination);
+    IPage<PurchaseorderitemEntity> queryByKeyword(@Param("page") Page<PurchaseorderitemEntity> page, @Param("purchaseorderPagination") PurchaseorderPagination purchaseorderPagination, @Param("ew") Wrapper<PurchaseorderitemEntity> queryWrapper);
     List<Purchaseorder_item0Entity> queryPurchaseOrderItem(String id);
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
index 35b0a155..f28ab6b5 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
@@ -855,6 +855,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
         int total = 0;
         int purchaseorderNum = 0;
         QueryWrapper<PurchaseorderitemEntity> purchaseorderQueryWrapper = new QueryWrapper<>();
+        purchaseorderQueryWrapper.lambda().eq(PurchaseorderitemEntity::getDeleteMark, "0");
         int purchaseorder_item0Num = 0;
         QueryWrapper<Purchaseorder_item0Entity> purchaseorder_item0QueryWrapper = new QueryWrapper<>();
         int purchasebackitemNum = 0;
@@ -870,7 +871,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
         boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
         if (isPc && pcPermission) {
             if (!userProvider.get().getIsAdministrator()) {
-                Object purchaseorderObj = authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper, purchaseorderPagination.getMenuId(), "jg_purchaseorder"));
+                Object purchaseorderObj = authorizeService.getCondition2(new AuthorizeConditionModel(purchaseorderQueryWrapper, purchaseorderPagination.getMenuId(), "jg_purchaseorder"));
                 if (ObjectUtil.isEmpty(purchaseorderObj)) {
                     return new ArrayList<>();
                 } else {
@@ -916,7 +917,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
         }
         if (!isPc && appPermission) {
             if (!userProvider.get().getIsAdministrator()) {
-                Object purchaseorderObj = authorizeService.getCondition(new AuthorizeConditionModel(purchaseorderQueryWrapper, purchaseorderPagination.getMenuId(), "jg_purchaseorder"));
+                Object purchaseorderObj = authorizeService.getCondition2(new AuthorizeConditionModel(purchaseorderQueryWrapper, purchaseorderPagination.getMenuId(), "jg_purchaseorder"));
                 if (ObjectUtil.isEmpty(purchaseorderObj)) {
                     return new ArrayList<>();
                 } else {
@@ -1015,7 +1016,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
             purchaseorderPagination.setDepartmentId(detpartment);
         }
 
-        IPage<PurchaseorderitemEntity> userIPage = purchaseorderitemMapper.queryByKeyword(page, purchaseorderPagination);
+        IPage<PurchaseorderitemEntity> userIPage = purchaseorderitemMapper.queryByKeyword(page, purchaseorderPagination, purchaseorderQueryWrapper);
         return purchaseorderPagination.setData(userIPage.getRecords(), userIPage.getTotal());
 
 
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/ReceiptinMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/ReceiptinMapper.java
index 002dac72..0af082eb 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/ReceiptinMapper.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/ReceiptinMapper.java
@@ -1,6 +1,7 @@
 package jnpf.receiptin.mapper;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jnpf.receiptin.entity.ReceiptinEntity;
@@ -18,5 +19,5 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface ReceiptinMapper extends BaseMapper<ReceiptinEntity> {
 
-    IPage<ReceiptinEntity> queryByKeyword(@Param("page") Page<ReceiptinEntity> page, @Param("receiptinPagination") ReceiptinPagination receiptinPagination);
+    IPage<ReceiptinEntity> queryByKeyword(@Param("page") Page<ReceiptinEntity> page, @Param("receiptinPagination") ReceiptinPagination receiptinPagination, @Param("ew") Wrapper<ReceiptinEntity> queryWrapper);
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java
index cd45d637..4b539def 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java
@@ -76,6 +76,7 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
         int total=0;
 		int receiptinNum =0;
         QueryWrapper<ReceiptinEntity> receiptinQueryWrapper=new QueryWrapper<>();
+        receiptinQueryWrapper.lambda().eq(ReceiptinEntity::getDeleteMark, "0");
 		int receiptin_item0Num =0;
         QueryWrapper<Receiptin_item0Entity> receiptin_item0QueryWrapper=new QueryWrapper<>();
     boolean pcPermission = true;
@@ -83,7 +84,7 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
     if(isPc && pcPermission){
 		if (!userProvider.get().getIsAdministrator()){
-				Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin"));
+				Object receiptinObj=authorizeService.getCondition2(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin"));
             if (ObjectUtil.isEmpty(receiptinObj)){
                 return new ArrayList<>();
             } else {
@@ -101,7 +102,7 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
     }
     if(!isPc && appPermission){
 		if (!userProvider.get().getIsAdministrator()){
-			Object receiptinObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin"));
+			Object receiptinObj=authorizeService.getCondition2(new AuthorizeConditionModel(receiptinQueryWrapper,receiptinPagination.getMenuId(),"jg_receiptin"));
             if (ObjectUtil.isEmpty(receiptinObj)){
                 return new ArrayList<>();
             } else {
@@ -163,7 +164,7 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
         if (StringUtil.isNotNull(detpartment)) {
             receiptinPagination.setDepartmentId(detpartment);
         }
-        IPage<ReceiptinEntity> userIPage = receiptinMapper.queryByKeyword(page, receiptinPagination);
+        IPage<ReceiptinEntity> userIPage = receiptinMapper.queryByKeyword(page, receiptinPagination, receiptinQueryWrapper);
         return receiptinPagination.setData(userIPage.getRecords(),userIPage.getTotal());
 			/*if(StringUtil.isNotEmpty(receiptinPagination.getDocumentno())){
             receiptinNum++;
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
index 47aa2d82..49d28844 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
@@ -46,6 +46,8 @@ import jnpf.saleback.entity.Saleback_item0Entity;
 import jnpf.saleorder.mapper.ReceiptoutsoitemMapper;
 import jnpf.vehicle.entity.VehicleEntity;
 import jnpf.vehicle.service.VehicleService;
+import jnpf.warehouse.entity.WareHouseEntity;
+import jnpf.warehouse.service.WareHouseService;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
@@ -145,6 +147,8 @@ public class SaleorderitemController {
     @Autowired
     private ReservoirareaService reservoirareaService;
     @Autowired
+    private WareHouseService wareHouseService;
+    @Autowired
     private ReceiptoutService receiptoutService;
     @Autowired
     private ArinvoicesService arinvoicesService;
@@ -216,9 +220,17 @@ public class SaleorderitemController {
                     if (receiptin_item0Entity.size()>0){
                         if (receiptin_item0Entity.get(0).getReservoirareaId() != null){
                             entity.setReservoirareaId(receiptin_item0Entity.get(0).getReservoirareaId());
+                            ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(entity.getReservoirareaId());
+                            if(reservoirareaEntity != null){
+                                entity.setReservoirareaName(reservoirareaEntity.getAreaname());
+                            }
                         }
                         if (receiptin_item0Entity.get(0).getWarehouseId() != null){
                             entity.setWarehouseId(receiptin_item0Entity.get(0).getWarehouseId());
+                            WareHouseEntity wareHouseEntity = wareHouseService.getById(entity.getWarehouseId());
+                            if(wareHouseEntity != null){
+                                entity.setWarehouseName(wareHouseEntity.getName());
+                            }
                         }
                     }
                     VehicleEntity vehicleEntity = vehicleService.getById(entity.getVehicleId());
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java
index 84530a82..e6ca0270 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java
@@ -145,6 +145,14 @@ public class Salesorder_item0Entity  {
     @TableField(exist = false)
     private String warehouseId;
 
+    /** 库区id */
+    @TableField(exist = false)
+    private String reservoirareaName;
+
+    /** 仓库id */
+    @TableField(exist = false)
+    private String warehouseName;
+
     @TableField(exist = false)
     private PoundlistEntity poundEntity;
 
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml
index 72e884f7..83213966 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml
@@ -69,7 +69,7 @@ WHERE a.delete_mark = 0 and
 		LEFT JOIN jg_natural i on a.natural_id = i.id
 		LEFT JOIN jg_purchaseorder_item0 j on a.id = j.poundlist_id
 		LEFT JOIN jg_salesorder_item0 k on a.id = k.poundlist_id
-		${ew.customSqlSegment} and a.is_examine = '1' and a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0 and e.delete_mark = 0 and f.delete_mark = 0 and g.delete_mark = 0
+		${ew.customSqlSegment} and a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0 and e.delete_mark = 0 and f.delete_mark = 0 and g.delete_mark = 0
 		<if test="poundlistPagination.keyword != null and poundlistPagination.keyword != ''">
             AND (b.ticketno LIKE CONCAT('%',#{poundlistPagination.keyword},'%') OR c.supplier_name LIKE CONCAT('%',#{poundlistPagination.keyword},'%') OR d.supplier_nm LIKE CONCAT('%',#{poundlistPagination.keyword},'%'))
         </if>
@@ -88,7 +88,6 @@ WHERE a.delete_mark = 0 and
 		<if test="poundlistPagination.isPay != null and poundlistPagination.isPay != ''">
 			AND a.is_pay = #{poundlistPagination.isPay}
 		</if>
-		/*modified by 巴卫*/
 		<!--<if test="poundlistPagination.departmentId != null and poundlistPagination.departmentId != ''">
 			AND a.department_id = #{poundlistPagination.departmentId}
 		</if>
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml
index 74065c38..a17f0f9a 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml
@@ -259,15 +259,7 @@
         from jg_purchaseorder a
         LEFT JOIN jg_supplier b on a.supplier_id = b.id
         LEFT JOIN jg_contract c on a.contract_code = c.id
-        WHERE 1=1 and a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0
-        /*添加权限*/
-        <if test="purchaseorderPagination.departmentId != null and purchaseorderPagination.departmentId != ''">
-            AND a.department_id = #{purchaseorderPagination.departmentId}
-        </if>
-        <if test="purchaseorderPagination.orgnizeId != null and purchaseorderPagination.orgnizeId != ''">
-            AND a.orgnize_id = #{purchaseorderPagination.orgnizeId}
-        </if>
-
+        ${ew.customSqlSegment} and a.delete_mark = 0 and b.delete_mark = 0 and c.delete_mark = 0
         <if test="purchaseorderPagination.keyword != null and purchaseorderPagination.keyword != ''">
             AND (c.contract_name LIKE CONCAT('%',#{purchaseorderPagination.keyword},'%') OR b.supplier_name LIKE CONCAT('%',#{purchaseorderPagination.keyword},'%'))
         </if>
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/ReceiptinMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/ReceiptinMapper.xml
index dc7d4535..11329352 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/ReceiptinMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/ReceiptinMapper.xml
@@ -6,14 +6,7 @@
         from jg_receiptin a
         LEFT JOIN jg_purchaseorder b on a.souceno = b.id
         LEFT JOIN jg_supplier d on a.supplier_id = d.id
-        where 1=1 and a.delete_mark = 0 and b.delete_mark = 0 and d.delete_mark = 0
-        /*添加权限*/
-        <if test="receiptinPagination.departmentId != null and receiptinPagination.departmentId != ''">
-            AND a.department_id = #{receiptinPagination.departmentId}
-        </if>
-        <if test="receiptinPagination.orgnizeId != null and receiptinPagination.orgnizeId != ''">
-            AND a.orgnize_id = #{receiptinPagination.orgnizeId}
-        </if>
+        ${ew.customSqlSegment} and a.delete_mark = 0 and b.delete_mark = 0 and d.delete_mark = 0
         <if test="receiptinPagination.startDate != null and receiptinPagination.endDate != null">
             AND a.creator_time &gt; #{receiptinPagination.startDate} AND a.creator_time &lt;= #{receiptinPagination.endDate}
         </if>
diff --git a/SC-web/src/views/scm/basicInformation/receiptin/ReservoirareaBox.vue b/SC-web/src/views/scm/basicInformation/receiptin/ReservoirareaBox.vue
index 18e39a6f..bed55dfd 100644
--- a/SC-web/src/views/scm/basicInformation/receiptin/ReservoirareaBox.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptin/ReservoirareaBox.vue
@@ -84,11 +84,6 @@
 				checked: '',
 			}
 		},
-		computed: {
-		  menuId() {
-		    return this.$route.meta.modelId || ''
-		  }
-		},
 		methods: {
 			rowdbClick(row){
 			  this.checked = row.id
@@ -104,7 +99,7 @@
 				this.listLoading = true
 				this.listQuery.areacode = this.areacode
 				this.listQuery.areaname = this.areaname
-				this.listQuery.menuId = this.menuId
+				this.listQuery.menuId = '380669124906343173'
 				let listQuery = this.listQuery
 				request({
 					url: `/api/example/Reservoirarea/getList`,
diff --git a/SC-web/src/views/scm/basicInformation/receiptout/Form.vue b/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
index 181f60a6..87621f34 100644
--- a/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
@@ -1,521 +1,637 @@
 <template>
-<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
-           :close-on-click-modal="false" append-to-body
-           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="1500px">
-<el-row :gutter="15" class="">
-<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-            <el-col :span="8" >
-                <el-form-item  label="单据编号"
- prop="documentNo" >
-                    <el-input    v-model="dataForm.documentNo"
- placeholder="系统自动生成"  readonly >
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
+		:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1500px">
+		<el-row :gutter="15" class="">
+			<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px"
+				label-position="right">
+				<template v-if="!loading">
+					<el-col :span="8">
+						<el-form-item label="单据编号" prop="documentNo">
+							<el-input v-model="dataForm.documentNo" placeholder="系统自动生成" readonly>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="业务类型"
- prop="type" >
-                    <el-select    v-model="dataForm.type"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' disabled>
-                            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="业务类型" prop="type">
+							<el-select v-model="dataForm.type" placeholder="请选择" clearable :style='{"width":"100%"}'
+								disabled>
+								<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName"
+									:value="item.id" :disabled="item.disabled"></el-option>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="来源单号"
- prop="sourceNo" >
-<!--                    <popupSelect    v-model="dataForm.sourceNo"
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="来源单号" prop="sourceNo">
+							<!--                    <popupSelect    v-model="dataForm.sourceNo"
  placeholder="请选择"  clearable  field="sourceNo" interfaceId="392956668264114117" :columnOptions="salesIdcolumnOptions" propsValue="id" relationField="document_no" popupType="dialog"
  popupTitle="选择数据"  popupWidth="800px" disabled
  hasPage :pageSize="20"   >
 
                 </popupSelect>-->
-                  <el-input    v-model="dataForm.sourceName"
-                               placeholder="请输入"  readonly  clearable  :style='{"width":"100%"}' disabled>
+							<el-input v-model="dataForm.sourceName" placeholder="请输入" readonly clearable
+								:style='{"width":"100%"}' disabled>
 
-                  </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="出库金额"
- prop="amount" >
-                    <el-input    v-model="dataForm.amount"
- placeholder="请输入出库金额"  readonly  clearable  :style='{"width":"100%"}' disabled>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="出库金额" prop="amount">
+							<el-input v-model="dataForm.amount" placeholder="请输入出库金额" readonly clearable
+								:style='{"width":"100%"}' disabled>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="币别"
- prop="currency" >
-                    <el-select    v-model="dataForm.currency"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' disabled>
-                            <el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="币别" prop="currency">
+							<el-select v-model="dataForm.currency" placeholder="请选择" clearable :style='{"width":"100%"}'
+								disabled>
+								<el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName"
+									:value="item.id" :disabled="item.disabled"></el-option>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="出库数量"
- prop="num" >
-                    <el-input    v-model="dataForm.num"
- placeholder="请输入出库数量"  readonly  clearable  :style='{"width":"100%"}' disabled>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="出库数量" prop="num">
+							<el-input v-model="dataForm.num" placeholder="请输入出库数量" readonly clearable
+								:style='{"width":"100%"}' disabled>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-      <el-col :span="8" >
-        <el-form-item  label="客户"
-                       prop="customerId" >
-<!--          <popupSelect    v-model="dataForm.customerId"
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item label="客户" prop="customerId">
+							<!--          <popupSelect    v-model="dataForm.customerId"
                           placeholder="请选择"  clearable  field="customerId" interfaceId="395936123471343749" :columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm" popupType="dialog"
                           popupTitle="选择数据"  popupWidth="800px" disabled
                           hasPage :pageSize="20"   >
           </popupSelect>-->
-          <el-input    v-model="dataForm.customerName"
-                       placeholder="请输入"  readonly  clearable  :style='{"width":"100%"}' disabled>
+							<el-input v-model="dataForm.customerName" placeholder="请输入" readonly clearable
+								:style='{"width":"100%"}' disabled>
 
-          </el-input>
-        </el-form-item>
-      </el-col>
-            <el-col :span="16" >
-                <el-form-item  label="备注"
- prop="remark" >
-                    <el-input    v-model="dataForm.remark"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="16">
+						<el-form-item label="备注" prop="remark">
+							<el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-<!--            <el-col :span="12" >-->
-<!--                <el-form-item  label="出库日期"-->
-<!-- prop="issueDate" >-->
-<!--                    <el-date-picker    v-model="dataForm.issueDate"-->
-<!-- placeholder="请选择出库日期"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >-->
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<!--            <el-col :span="12" >-->
+					<!--                <el-form-item  label="出库日期"-->
+					<!-- prop="issueDate" >-->
+					<!--                    <el-date-picker    v-model="dataForm.issueDate"-->
+					<!-- placeholder="请选择出库日期"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >-->
 
-<!--                </el-date-picker>-->
-<!--                </el-form-item>-->
-<!--            </el-col>-->
-<!--            <el-col :span="12" >-->
-<!--                <el-form-item  label="单据状态"-->
-<!-- prop="status" >-->
-<!--                    <el-select    v-model="dataForm.status"-->
-<!-- placeholder="请选择"  clearable  :style='{"width":"100%"}'>-->
-<!--                            <el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>-->
+					<!--                </el-date-picker>-->
+					<!--                </el-form-item>-->
+					<!--            </el-col>-->
+					<!--            <el-col :span="12" >-->
+					<!--                <el-form-item  label="单据状态"-->
+					<!-- prop="status" >-->
+					<!--                    <el-select    v-model="dataForm.status"-->
+					<!-- placeholder="请选择"  clearable  :style='{"width":"100%"}'>-->
+					<!--                            <el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>-->
 
-<!--                </el-select>-->
-<!--                </el-form-item>-->
-<!--            </el-col>-->
-            <el-col :span="24">
-                <el-tabs  v-model="activezlqlfb"  tab-position="top" class="mb-20">
-                <el-tab-pane  label="磅单明细">
-    <el-col :span="24"  >
-    <el-form-item label-width="0">
-            <div class="JNPF-common-title">
-                <h2></h2>
-            </div>
-    <el-table :data="dataForm.receiptout_item0List" size='mini'  show-summary :summary-method="getSummaries" >
-        <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="vehicleId" label="车牌号" align="center" width="130">
-                <template slot-scope="scope">
-<!--                    <popupSelect   v-model="scope.row.vehicleId"
+					<!--                </el-select>-->
+					<!--                </el-form-item>-->
+					<!--            </el-col>-->
+					<el-col :span="24">
+						<el-tabs v-model="activezlqlfb" tab-position="top" class="mb-20">
+							<el-tab-pane label="磅单明细">
+								<el-col :span="24">
+									<el-form-item label-width="0">
+										<div class="JNPF-common-title">
+											<h2></h2>
+										</div>
+										<el-table :data="dataForm.receiptout_item0List" size='mini' show-summary
+											:summary-method="getSummaries">
+											<el-table-column type="index" width="50" label="序号" align="center" />
+											<el-table-column prop="vehicleId" label="车牌号" align="center" width="130">
+												<template slot-scope="scope">
+													<!--                    <popupSelect   v-model="scope.row.vehicleId"
  placeholder="请选择"  clearable  :field="'vehicleId'+scope.$index"  interfaceId="398732963950472005" :columnOptions="receiptout_item0vehicleIdcolumnOptions" propsValue="id" relationField="ticketno" popupType="dialog"
  popupWidth="800px" disabled
  hasPage :pageSize="20"   >
                 </popupSelect>-->
-                  <el-input   v-model="scope.row.vehicleName"
-                              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                  </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="materialId" label="物料名称" align="center" width="180">
-                <template slot-scope="scope">
-<!--                    <popupSelect   v-model="scope.row.materialId"
+													<el-input v-model="scope.row.vehicleName" placeholder="请输入"
+														clearable :style='{"width":"100%"}' disabled>
+													</el-input>
+												</template>
+											</el-table-column>
+											<el-table-column prop="materialId" label="物料名称" align="center" width="180">
+												<template slot-scope="scope">
+													<!--                    <popupSelect   v-model="scope.row.materialId"
  placeholder="请选择"  clearable  :field="'materialId'+scope.$index"  interfaceId="398719564478785669" :columnOptions="receiptout_item0materialIdcolumnOptions" propsValue="id" relationField="item_name" popupType="dialog"
  popupWidth="800px" disabled
   >
                 </popupSelect>-->
-                  <el-input   v-model="scope.row.materialName"
-                              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                  </el-input>
-            </template>
-        </el-table-column>
-      <el-table-column prop="reservoirareaId" label="库区名称" align="center" width="130">
-        <template slot-scope="scope">
-          <popupSelect   v-model="scope.row.reservoirareaId"
-                         placeholder="请选择"  clearable  :field="'reservoirareaId'+scope.$index"  interfaceId="381404161809350213" :columnOptions="receiptout_item0reservoirareaIdcolumnOptions" propsValue="id" relationField="areaname" popupType="dialog"
-                         popupWidth="800px" @change="areaSelect"
-          >
-          </popupSelect>
-<!--          <el-input v-model="scope.row.reservoirareaName" placeholder="选择库区"
-                    readonly @click.native="choiceReservoirareaId(scope.$index)">
-          </el-input>-->
-        </template>
-      </el-table-column>
-      <el-table-column prop="warehouseId" label="仓库名称" align="center" width="130">
-        <template slot-scope="scope">
-          <popupSelect   v-model="scope.row.warehouseId"
-                         placeholder="请选择"  clearable  :field="'reservoirareaId'+scope.$index"  interfaceId="399117969575232581" :columnOptions="receiptout_item0reservoirareaIdcolumnOptions" propsValue="id" relationField="name" popupType="dialog"
-                         popupWidth="800px" disabled>
-          </popupSelect>
-<!--          <el-input v-model="scope.row.warehouseName" placeholder="选择仓库"
-                    readonly>
-          </el-input>-->
-        </template>
-      </el-table-column>
-      <el-table-column prop="batchNo" label="批次号" align="center" width="180">
-        <template slot-scope="scope">
-          <el-input   v-model="scope.row.batchNo"
-                      placeholder="系统自动生成"  readonly>
-          </el-input>
-        </template>
-      </el-table-column>
-      <el-table-column prop="deliveryNum" label="出库数量" align="center" width="130">
-        <template slot-scope="scope">
-          <el-input   v-model="scope.row.deliveryNum"
-                      placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-          </el-input>
-        </template>
-      </el-table-column>
-      <el-table-column prop="unit" label="计量单位" align="center" width="130">
-        <template slot-scope="scope">
-          <el-select   v-model="scope.row.unit"
-                       placeholder="请选择"  clearable  :style='{"width":"100%"}' disabled>
-            <el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
-          </el-select>
-        </template>
-      </el-table-column>
-      <el-table-column prop="price" label="单价" align="center" width="130">
-        <template slot-scope="scope">
-          <el-input   v-model="scope.row.price"
-                      placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-          </el-input>
-        </template>
-      </el-table-column>
-      <el-table-column prop="rate" label="税率" align="center" width="130">
-        <template slot-scope="scope">
-          <el-select   v-model="scope.row.rate"
-                       placeholder="请选择"  clearable  :style='{"width":"100%"}' disabled>
-            <el-option v-for="(item, index) in rateOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
-          </el-select>
-        </template>
-      </el-table-column>
-      <el-table-column prop="amount" label="金额" align="center" width="130">
-        <template slot-scope="scope">
-          <el-input   v-model="scope.row.amount"
-                      placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-          </el-input>
-        </template>
-      </el-table-column>
-      <el-table-column prop="rateAmount" label="税额" align="center" width="130">
-        <template slot-scope="scope">
-          <el-input   v-model="scope.row.rateAmount"
-                      placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-          </el-input>
-        </template>
-      </el-table-column>
-      <el-table-column prop="poundType" label="磅单类型" align="center" width="130">
-        <template slot-scope="scope">
-          <el-select   v-model="scope.row.poundType"
-                       placeholder="请选择"  clearable  :style='{"width":"100%"}' disabled>
-            <el-option v-for="(item, index) in poundTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
-          </el-select>
-        </template>
-      </el-table-column>
-<!--    <el-table-column label="操作" width="50" >-->
-<!--        <template slot-scope="scope">-->
-<!--            <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delreceiptout_item0List(scope.$index)">删除</el-button>-->
-<!--        </template>-->
-<!--    </el-table-column>-->
-    </el-table>
-<!--    <div class="table-actions" @click="addreceiptout_item0List()">-->
-<!--        <el-button type="text" icon="el-icon-plus">添加</el-button>-->
-<!--    </div>-->
-    </el-form-item>
-    </el-col>
-            </el-tab-pane >
-            </el-tabs>
-                </el-col>
-    </template>
-</el-form>
-    </el-row>
-    <span slot="footer" class="dialog-footer">
-        <el-button @click="visible = false"> 取 消</el-button>
-        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail" :disabled="submitDisabled"> 确 定</el-button>
-    </span>
-  <ReservoirareaBox v-if="formVisible" ref="form" @refreshDataList="initData" />
-    </el-dialog>
+													<el-input v-model="scope.row.materialName" placeholder="请输入"
+														clearable :style='{"width":"100%"}' disabled>
+													</el-input>
+												</template>
+											</el-table-column>
+											<el-table-column prop="reservoirareaId" width="200" label="库区">
+												<template slot-scope="scope">
+													<el-input v-model="scope.row.reservoirareaName" placeholder="选择库区"
+														readonly @click.native="choiceReservoirareaId(scope.$index)">
+													</el-input>
+												</template>
+											</el-table-column>
+											<el-table-column prop="warehouseId" width="200" label="仓库">
+												<template slot-scope="scope">
+													<el-input v-model="scope.row.warehouseName" placeholder="选择库区"
+														readonly>
+													</el-input>
+												</template>
+											</el-table-column>
+											<el-table-column prop="batchNo" label="批次号" align="center" width="180">
+												<template slot-scope="scope">
+													<el-input v-model="scope.row.batchNo" placeholder="系统自动生成" readonly>
+													</el-input>
+												</template>
+											</el-table-column>
+											<el-table-column prop="deliveryNum" label="出库数量" align="center" width="130">
+												<template slot-scope="scope">
+													<el-input v-model="scope.row.deliveryNum" placeholder="请输入"
+														clearable :style='{"width":"100%"}' disabled>
+													</el-input>
+												</template>
+											</el-table-column>
+											<el-table-column prop="unit" label="计量单位" align="center" width="130">
+												<template slot-scope="scope">
+													<el-select v-model="scope.row.unit" placeholder="请选择" clearable
+														:style='{"width":"100%"}' disabled>
+														<el-option v-for="(item, index) in unitOptions" :key="index"
+															:label="item.fullName" :value="item.id"
+															:disabled="item.disabled"></el-option>
+													</el-select>
+												</template>
+											</el-table-column>
+											<el-table-column prop="price" label="单价" align="center" width="130">
+												<template slot-scope="scope">
+													<el-input v-model="scope.row.price" placeholder="请输入" clearable
+														:style='{"width":"100%"}' disabled>
+													</el-input>
+												</template>
+											</el-table-column>
+											<el-table-column prop="rate" label="税率" align="center" width="130">
+												<template slot-scope="scope">
+													<el-select v-model="scope.row.rate" placeholder="请选择" clearable
+														:style='{"width":"100%"}' disabled>
+														<el-option v-for="(item, index) in rateOptions" :key="index"
+															:label="item.fullName" :value="item.id"
+															:disabled="item.disabled"></el-option>
+													</el-select>
+												</template>
+											</el-table-column>
+											<el-table-column prop="amount" label="金额" align="center" width="130">
+												<template slot-scope="scope">
+													<el-input v-model="scope.row.amount" placeholder="请输入" clearable
+														:style='{"width":"100%"}' disabled>
+													</el-input>
+												</template>
+											</el-table-column>
+											<el-table-column prop="rateAmount" label="税额" align="center" width="130">
+												<template slot-scope="scope">
+													<el-input v-model="scope.row.rateAmount" placeholder="请输入" clearable
+														:style='{"width":"100%"}' disabled>
+													</el-input>
+												</template>
+											</el-table-column>
+											<el-table-column prop="poundType" label="磅单类型" align="center" width="130">
+												<template slot-scope="scope">
+													<el-select v-model="scope.row.poundType" placeholder="请选择" clearable
+														:style='{"width":"100%"}' disabled>
+														<el-option v-for="(item, index) in poundTypeOptions"
+															:key="index" :label="item.fullName" :value="item.id"
+															:disabled="item.disabled"></el-option>
+													</el-select>
+												</template>
+											</el-table-column>
+											<!--    <el-table-column label="操作" width="50" >-->
+											<!--        <template slot-scope="scope">-->
+											<!--            <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delreceiptout_item0List(scope.$index)">删除</el-button>-->
+											<!--        </template>-->
+											<!--    </el-table-column>-->
+										</el-table>
+										<!--    <div class="table-actions" @click="addreceiptout_item0List()">-->
+										<!--        <el-button type="text" icon="el-icon-plus">添加</el-button>-->
+										<!--    </div>-->
+									</el-form-item>
+								</el-col>
+							</el-tab-pane>
+						</el-tabs>
+					</el-col>
+				</template>
+			</el-form>
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false"> 取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail" :disabled="submitDisabled"> 确 定
+			</el-button>
+		</span>
+		<ReservoirareaBox v-if="formVisible" ref="form" @refreshDataList="initData" />
+	</el-dialog>
 </template>
 <script>
-    import request from '@/utils/request'
-    import ReservoirareaBox from './ReservoirareaBox'
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    export default {
-        components: {
-          ReservoirareaBox
-        },
-        props: [],
-        data() {
-            return {
-                comIndex: -1,
-                formVisible: false,
-                submitDisabled: false,
-                visible: false,
-                loading: false,
-                isDetail: false,
-            dataForm: {
-                            documentNo : '',
-                            type : "0",
-                            salesId : "XS002",
-                            sourceNo: "",
-                            amount : '',
-                            currency : "0",
-                            num : '',
-                            customerId : '',
-                            remark : '',
-                            issueDate : '',
-                            status : "0",
-                            creatorTime : "",
-                            creatorUserName : "",
-                            lastModifyTime : "",
-                            lastModifyUserName : "",
-                        receiptout_item0List:[],
-            },
-                            activezlqlfb:'0',
-            rules:
-            {
-                            type: [
-                                {
-                                    required: true,
-                                    message: '请至少选择一个',
-                                    trigger: 'change'
-                                },
-                        ],
-              sourceNo: [
-                                {
-                                    required: true,
-                                    message: '请至少选择一个',
-                                    trigger: 'change'
-                                },
-                        ],
-            },
-                        typeOptions:[{"fullName":"销售出库","id":"0"},{"fullName":"购销出库","id":"1"}],
-                    salesIdcolumnOptions:[ {"label":"单据编号","value":"document_no"}, {"label":"币别","value":"currency"}, {"label":"客户名称","value":"customer_name"},],
-                        currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
-                        statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}],
+	import request from '@/utils/request'
+	import ReservoirareaBox from '../receiptin/ReservoirareaBox'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	export default {
+		components: {
+			ReservoirareaBox
+		},
+		props: [],
+		data() {
+			return {
+				comIndex: -1,
+				formVisible: false,
+				submitDisabled: false,
+				visible: false,
+				loading: false,
+				isDetail: false,
+				dataForm: {
+					documentNo: '',
+					type: "0",
+					salesId: "XS002",
+					sourceNo: "",
+					amount: '',
+					currency: "0",
+					num: '',
+					customerId: '',
+					remark: '',
+					issueDate: '',
+					status: "0",
+					creatorTime: "",
+					creatorUserName: "",
+					lastModifyTime: "",
+					lastModifyUserName: "",
+					receiptout_item0List: [],
+				},
+				activezlqlfb: '0',
+				rules: {
+					type: [{
+						required: true,
+						message: '请至少选择一个',
+						trigger: 'change'
+					}, ],
+					sourceNo: [{
+						required: true,
+						message: '请至少选择一个',
+						trigger: 'change'
+					}, ],
+				},
+				typeOptions: [{
+					"fullName": "销售出库",
+					"id": "0"
+				}, {
+					"fullName": "购销出库",
+					"id": "1"
+				}],
+				salesIdcolumnOptions: [{
+					"label": "单据编号",
+					"value": "document_no"
+				}, {
+					"label": "币别",
+					"value": "currency"
+				}, {
+					"label": "客户名称",
+					"value": "customer_name"
+				}, ],
+				currencyOptions: [{
+					"fullName": "人民币",
+					"id": "0"
+				}, {
+					"fullName": "美元",
+					"id": "1"
+				}, {
+					"fullName": "英镑",
+					"id": "2"
+				}],
+				statusOptions: [{
+					"fullName": "已保存",
+					"id": "0"
+				}, {
+					"fullName": "审批中",
+					"id": "1"
+				}, {
+					"fullName": "已审批",
+					"id": "2"
+				}],
 
-                        receiptout_item0vehicleIdcolumnOptions:[ {"label":"车辆号","value":"ticketno"}, {"label":"物料名称","value":"material_name"}, {"label":"出库数量","value":"settlement"}, {"label":"计量单位","value":"unit"}, {"label":"含税单价","value":"unit_price"}, {"label":"税率","value":"rate"}, {"label":"金额","value":"price"}, {"label":"批次号","value":"poundlist_id"}, {"label":"磅单类型","value":"pound_type"},],
-                        receiptout_item0materialIdcolumnOptions:[ {"label":"物料编码","value":"item_code"}, {"label":"物料名称","value":"item_name"}, {"label":"单位","value":"primary_unit_of_measure"}, {"label":"默认入库区","value":"in_area"}, {"label":"默认出库区","value":"out_area"},],
-                        receiptout_item0reservoirareaIdcolumnOptions:[ {"label":"库区名称","value":"areaname"}, {"label":"最高库存","value":"maximum"}, {"label":"安全库存","value":"safety"}, {"label":"最低库存","value":"minimum"}, {"label":"仓库名称","value":"name"},],
-                        unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
-                        rateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
-                        poundTypeOptions:[{"fullName":"贸易","id":"0"},{"fullName":"自加工","id":"1"},{"fullName":"委外","id":"2"},{"fullName":"倒运","id":"3"}],
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
-        },
-        mounted() {},
-        methods: {
-          initData(reservoirarea) {
-            for (let i = 0; i < this.dataForm.receiptout_item0List.length; i++) {
-              if (this.comIndex == 0) {
-                this.dataForm.receiptout_item0List.forEach((column, index) => {
-                  column.reservoirareaId = reservoirarea.id;
-                  column.warehouseId = reservoirarea.houseId;
-                  column.reservoirareaName = reservoirarea.areaname;
-                  column.warehouseName = reservoirarea.houseName;
-                });
-              } else {
-                this.dataForm.receiptout_item0List[this.comIndex].reservoirareaId = reservoirarea.id;
-                this.dataForm.receiptout_item0List[this.comIndex].warehouseId = reservoirarea.houseId;
-                this.dataForm.receiptout_item0List[this.comIndex].reservoirareaName = reservoirarea.areaname;
-                this.dataForm.receiptout_item0List[this.comIndex].warehouseName = reservoirarea.houseName;
-              }
-            }
-          },
-          choiceReservoirareaId(index) {
-            this.comIndex = index;
-            this.formVisible = true
-            this.$nextTick(() => {
-              this.$refs.form.init()
-            })
-          },
-          areaSelect(a,b){
-            for (let i = 0;i<this.dataForm.receiptout_item0List.length;i++) {
-              if (a == this.dataForm.receiptout_item0List[i].reservoirareaId) {
-                this.dataForm.receiptout_item0List[i].warehouseId = b.warehouse_id
-              }
-            }
-          },
-          getSummaries(param) {
-            const { columns, data } = param;
-            const sums = [];
-            columns.forEach((column, index) => {
-              if (index === 0) {
-                sums[index] = '合计';
-                return;
-              }
-              const values = data.map(item => Number(item[column.property]));
-              if (!values.every(value => isNaN(value)) && (index === 6 || index === 8 || index === 10  || index === 11  )) {
-                sums[index] = values.reduce((prev, curr) => {
-                  const value = Number(curr);
-                  if (!isNaN(value)) {
-                    return this.jnpf.floatAdd(prev, curr);
-                  } else {
-                    return prev;
-                  }
-                }, 0);
-              } else {
-                sums[index] = '';
-              }
-            });
-            return sums;
-          },
-				receiptout_item0Exist() {
-				let isOk = true;
-					for(let i=0;i<this.dataForm.receiptout_item0List.length;i++){
-						const e = this.dataForm.receiptout_item0List[i];
+				receiptout_item0vehicleIdcolumnOptions: [{
+					"label": "车辆号",
+					"value": "ticketno"
+				}, {
+					"label": "物料名称",
+					"value": "material_name"
+				}, {
+					"label": "出库数量",
+					"value": "settlement"
+				}, {
+					"label": "计量单位",
+					"value": "unit"
+				}, {
+					"label": "含税单价",
+					"value": "unit_price"
+				}, {
+					"label": "税率",
+					"value": "rate"
+				}, {
+					"label": "金额",
+					"value": "price"
+				}, {
+					"label": "批次号",
+					"value": "poundlist_id"
+				}, {
+					"label": "磅单类型",
+					"value": "pound_type"
+				}, ],
+				receiptout_item0materialIdcolumnOptions: [{
+					"label": "物料编码",
+					"value": "item_code"
+				}, {
+					"label": "物料名称",
+					"value": "item_name"
+				}, {
+					"label": "单位",
+					"value": "primary_unit_of_measure"
+				}, {
+					"label": "默认入库区",
+					"value": "in_area"
+				}, {
+					"label": "默认出库区",
+					"value": "out_area"
+				}, ],
+				receiptout_item0reservoirareaIdcolumnOptions: [{
+					"label": "库区名称",
+					"value": "areaname"
+				}, {
+					"label": "最高库存",
+					"value": "maximum"
+				}, {
+					"label": "安全库存",
+					"value": "safety"
+				}, {
+					"label": "最低库存",
+					"value": "minimum"
+				}, {
+					"label": "仓库名称",
+					"value": "name"
+				}, ],
+				unitOptions: [{
+					"fullName": "吨",
+					"id": "0"
+				}, {
+					"fullName": "千克",
+					"id": "1"
+				}],
+				rateOptions: [{
+					"fullName": "13",
+					"id": "0"
+				}, {
+					"fullName": "9",
+					"id": "1"
+				}, {
+					"fullName": "6",
+					"id": "2"
+				}, {
+					"fullName": "5",
+					"id": "3"
+				}, {
+					"fullName": "3",
+					"id": "4"
+				}, {
+					"fullName": "0",
+					"id": "5"
+				}],
+				poundTypeOptions: [{
+					"fullName": "贸易",
+					"id": "0"
+				}, {
+					"fullName": "自加工",
+					"id": "1"
+				}, {
+					"fullName": "委外",
+					"id": "2"
+				}, {
+					"fullName": "倒运",
+					"id": "3"
+				}],
+			}
+		},
+		computed: {},
+		watch: {},
+		created() {},
+		mounted() {},
+		methods: {
+			initData(reservoirarea) {
+				for (let i = 0; i < this.dataForm.receiptout_item0List.length; i++) {
+					if (this.comIndex == 0) {
+						this.dataForm.receiptout_item0List.forEach((column, index) => {
+							column.reservoirareaId = reservoirarea.id;
+							column.warehouseId = reservoirarea.houseId;
+							column.reservoirareaName = reservoirarea.areaname;
+							column.warehouseName = reservoirarea.houseName;
+						});
+					} else {
+						this.dataForm.receiptout_item0List[this.comIndex].reservoirareaId = reservoirarea.id;
+						this.dataForm.receiptout_item0List[this.comIndex].warehouseId = reservoirarea.houseId;
+						this.dataForm.receiptout_item0List[this.comIndex].reservoirareaName = reservoirarea.areaname;
+						this.dataForm.receiptout_item0List[this.comIndex].warehouseName = reservoirarea.houseName;
+					}
+				}
+			},
+			choiceReservoirareaId(index) {
+				this.comIndex = index;
+				this.formVisible = true
+				this.$nextTick(() => {
+					this.$refs.form.init()
+				})
+			},
+			areaSelect(a, b) {
+				for (let i = 0; i < this.dataForm.receiptout_item0List.length; i++) {
+					if (a == this.dataForm.receiptout_item0List[i].reservoirareaId) {
+						this.dataForm.receiptout_item0List[i].warehouseId = b.warehouse_id
+					}
+				}
+			},
+			getSummaries(param) {
+				const {
+					columns,
+					data
+				} = param;
+				const sums = [];
+				columns.forEach((column, index) => {
+					if (index === 0) {
+						sums[index] = '合计';
+						return;
 					}
+					const values = data.map(item => Number(item[column.property]));
+					if (!values.every(value => isNaN(value)) && (index === 6 || index === 8 || index === 10 ||
+							index === 11)) {
+						sums[index] = values.reduce((prev, curr) => {
+							const value = Number(curr);
+							if (!isNaN(value)) {
+								return this.jnpf.floatAdd(prev, curr);
+							} else {
+								return prev;
+							}
+						}, 0);
+					} else {
+						sums[index] = '';
+					}
+				});
+				return sums;
+			},
+			receiptout_item0Exist() {
+				let isOk = true;
+				for (let i = 0; i < this.dataForm.receiptout_item0List.length; i++) {
+					const e = this.dataForm.receiptout_item0List[i];
+				}
 				return isOk;
 			},
-            clearData(data){
-                for (let key in data) {
-                    if (data[key] instanceof Array) {
-                        data[key] = [];
-                    } else if (data[key] instanceof Object) {
-                        this.clearData(data[key]);
-                    } else {
-                        data[key] = "";
-                    }
-                }
-              let param = {
-                "param" : 'chuku',
-                "batchNum" : 'receiptout-num'
-              }
-              request({
-                url: '/api/collection/Collection/autoSerialNum',
-                method: 'get',
-                data: param
-              }).then(res => {
-                this.dataForm.documentNo = res.msg
-                this.loading = false
-              });
-            },
-            init(id, isDetail) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
-                this.$nextTick(() => {
-                    this.$refs['elForm'].resetFields();
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/receipout/Receiptout/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                       this.clearData(this.dataForm)
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            // 表单提交
-            dataFormSubmit() {
-                this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-                            if (!this.receiptout_item0Exist()) return
-                            this.request()
-                    }
-                })
-            },
-            request() {
-                this.submitDisabled = true;
-                var _data =this.dataList()
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/receipout/Receiptout',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.submitDisabled = false;
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    }).catch(() => {
-                      this.submitDisabled = false
-                    })
-                }else{
-                    request({
-                        url: '/api/receipout/Receiptout/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.submitDisabled = false;
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    }).catch(() => {
-                      this.submitDisabled = false
-                    })
-                }
-            },
-                addreceiptout_item0List(){
-                    let item = {
-                            vehicleId:undefined,
-                            materialId:undefined,
-                            reservoirareaId:undefined,
-                            warehouseId:undefined,
-                            deliveryNum:undefined,
-                            unit:undefined,
-                            price:undefined,
-                            rate:undefined,
-                            amount:undefined,
-                            rateAmount:undefined,
-                            batchNo:undefined,
-                            poundType:undefined,
-                }
-                    this.dataForm.receiptout_item0List.push(item)
-                },
-                delreceiptout_item0List(index) {
-                    this.dataForm.receiptout_item0List.splice(index, 1);
-                },
-            dataList(){
-                var _data = JSON.parse(JSON.stringify(this.dataForm));
-                    for(let i=0;i<_data.receiptout_item0List.length;i++){
-                        var _list = _data.receiptout_item0List[i];
-                    }
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                    for(let i=0;i<_dataAll.receiptout_item0List.length;i++){
-                        var _list = _dataAll.receiptout_item0List[i];
-                    }
-                this.dataForm = _dataAll
-            },
-        },
-    }
-
+			clearData(data) {
+				for (let key in data) {
+					if (data[key] instanceof Array) {
+						data[key] = [];
+					} else if (data[key] instanceof Object) {
+						this.clearData(data[key]);
+					} else {
+						data[key] = "";
+					}
+				}
+				let param = {
+					"param": 'chuku',
+					"batchNum": 'receiptout-num'
+				}
+				request({
+					url: '/api/collection/Collection/autoSerialNum',
+					method: 'get',
+					data: param
+				}).then(res => {
+					this.dataForm.documentNo = res.msg
+					this.loading = false
+				});
+			},
+			init(id, isDetail) {
+				this.dataForm.id = id || 0;
+				this.visible = true;
+				this.isDetail = isDetail || false;
+				this.$nextTick(() => {
+					this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						this.loading = true
+						request({
+							url: '/api/receipout/Receiptout/' + this.dataForm.id,
+							method: 'get'
+						}).then(res => {
+							this.dataInfo(res.data)
+							this.loading = false
+						});
+					} else {
+						this.clearData(this.dataForm)
+					}
+				});
+				this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+			},
+			// 表单提交
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+					if (valid) {
+						if (!this.receiptout_item0Exist()) return
+						this.request()
+					}
+				})
+			},
+			request() {
+				this.submitDisabled = true;
+				var _data = this.dataList()
+				if (!this.dataForm.id) {
+					request({
+						url: '/api/receipout/Receiptout',
+						method: 'post',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.submitDisabled = false;
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					}).catch(() => {
+						this.submitDisabled = false
+					})
+				} else {
+					request({
+						url: '/api/receipout/Receiptout/' + this.dataForm.id,
+						method: 'PUT',
+						data: _data
+					}).then((res) => {
+						this.$message({
+							message: res.msg,
+							type: 'success',
+							duration: 1000,
+							onClose: () => {
+								this.submitDisabled = false;
+								this.visible = false
+								this.$emit('refresh', true)
+							}
+						})
+					}).catch(() => {
+						this.submitDisabled = false
+					})
+				}
+			},
+			addreceiptout_item0List() {
+				let item = {
+					vehicleId: undefined,
+					materialId: undefined,
+					reservoirareaId: undefined,
+					warehouseId: undefined,
+					deliveryNum: undefined,
+					unit: undefined,
+					price: undefined,
+					rate: undefined,
+					amount: undefined,
+					rateAmount: undefined,
+					batchNo: undefined,
+					poundType: undefined,
+				}
+				this.dataForm.receiptout_item0List.push(item)
+			},
+			delreceiptout_item0List(index) {
+				this.dataForm.receiptout_item0List.splice(index, 1);
+			},
+			dataList() {
+				var _data = JSON.parse(JSON.stringify(this.dataForm));
+				for (let i = 0; i < _data.receiptout_item0List.length; i++) {
+					var _list = _data.receiptout_item0List[i];
+				}
+				return _data;
+			},
+			dataInfo(dataAll) {
+				let _dataAll = dataAll
+				for (let i = 0; i < _dataAll.receiptout_item0List.length; i++) {
+					var _list = _dataAll.receiptout_item0List[i];
+				}
+				this.dataForm = _dataAll
+			},
+		},
+	}
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/receiptout/ReservoirareaBox.vue b/SC-web/src/views/scm/basicInformation/receiptout/ReservoirareaBox.vue
deleted file mode 100644
index 18e39a6f..00000000
--- a/SC-web/src/views/scm/basicInformation/receiptout/ReservoirareaBox.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<template>
-	<el-dialog title="选择库区" :close-on-click-modal="false" :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center"
-		lock-scroll append-to-body width="1000px">
-		<el-row class="JNPF-common-search-box" :gutter="16">
-			<el-form @submit.native.prevent>
-				<el-col :span="8">
-					<el-form-item label="库区编码">
-						<el-input v-model="areacode" placeholder="请输入库区编码查询" clearable @keyup.enter.native="init()" />
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item label="库区名称">
-						<el-input v-model="areaname" placeholder="请输入库区名称查询" clearable @keyup.enter.native="init()" />
-					</el-form-item>
-				</el-col>
-				<el-col :span="8">
-					<el-form-item>
-						<el-button type="primary" icon="el-icon-search" @click="init()">{{$t('common.search')}}
-						</el-button>
-						<el-button icon="el-icon-refresh-right" @click="refresh()">{{$t('common.reset')}}
-						</el-button>
-					</el-form-item>
-				</el-col>
-			</el-form>
-			<div class="JNPF-common-search-box-right">
-				<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-					<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="init()" />
-				</el-tooltip>
-			</div>
-		</el-row>
-		<JNPF-table v-loading="listLoading" :data="list" @row-click="rowClick" @row-dblclick="rowdbClick" :border="false" :hasNO="false">
-			<el-table-column width="35">
-			  <template slot-scope="scope">
-			    <el-radio :label="scope.row.id" v-model="checkedRow.id">&nbsp;</el-radio>
-			  </template>
-			</el-table-column>
-			<el-table-column type="index" width="50" label="序号" align="center" />
-			<el-table-column prop="areacode" label="库区编码" />
-			<el-table-column prop="areaname" label="库区名称" />
-			<el-table-column prop="maximum" label="最高库存" />
-			<el-table-column prop="safety" label="安全库存" />
-			<el-table-column prop="minimum" label="最低库存" />
-			<el-table-column prop="warehouseId" label="仓库名称" />
-		</JNPF-table>
-		<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-			@pagination="refresh" />
-		<span slot="footer" class="dialog-footer">
-			<el-button @click="visible = false">{{$t('common.cancelButton')}}</el-button>
-			<el-button type="primary" @click="select()">{{$t('common.confirmButton')}}</el-button>
-		</span>
-	</el-dialog>
-</template>
-
-<script>
-	import request from '@/utils/request'
-	import {
-	  getDictionaryDataSelector
-	} from '@/api/systemData/dictionary'
-	import {
-	  getDataInterfaceRes
-	} from '@/api/systemData/dataInterface'
-	import {
-		GoodsList
-	} from '@/api/extend/order'
-	export default {
-		data() {
-			return {
-				visible: false,
-				listLoading: true,
-				areacode: '',
-				areaname: '',
-				list: [],
-				total: 0,
-				checkedRow: {},
-				listQuery: {
-					currentPage: 1,
-					pageSize: 20,
-					sort: "desc",
-					sidx: "creatorTime",
-					areacode: '',
-					areaname: '',
-				},
-				total: 0,
-				checked: '',
-			}
-		},
-		computed: {
-		  menuId() {
-		    return this.$route.meta.modelId || ''
-		  }
-		},
-		methods: {
-			rowdbClick(row){
-			  this.checked = row.id
-			  this.checkedRow = row
-			  this.select();
-			},
-			rowClick(row) {
-			  this.checked = row.id
-			  this.checkedRow = row
-			},
-			init() {
-				this.visible = true
-				this.listLoading = true
-				this.listQuery.areacode = this.areacode
-				this.listQuery.areaname = this.areaname
-				this.listQuery.menuId = this.menuId
-				let listQuery = this.listQuery
-				request({
-					url: `/api/example/Reservoirarea/getList`,
-					method: 'post',
-					data: listQuery
-				}).then(res => {
-					this.list = res.data.list
-					this.total = res.data.pagination.total
-					this.listLoading = false
-				})
-				/* GoodsList(query).then(res => {
-        this.list = res.data.list
-				this.total = res.data.pagination.total
-        this.listLoading = false
-      }) */
-			},
-			refresh() {
-				this.areacode = ''
-				this.areaname = ''
-				this.init()
-			},
-			select() {
-				if (this.checked == '') return
-				this.$emit('refreshDataList', this.checkedRow)
-				this.visible = false
-			},
-			handleSelectionChange(val) {
-				this.checked = val
-			}
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	>>>.el-dialog__body {
-		height: 70vh;
-		padding: 0 0 10px !important;
-		display: flex;
-		flex-direction: column;
-		overflow: hidden;
-
-		.JNPF-common-search-box {
-			margin-bottom: 0;
-
-			.JNPF-common-search-box-right {
-				padding: 10px 10px 0 0;
-			}
-		}
-	}
-</style>
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue
index 12caad55..a4511e70 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue
@@ -156,29 +156,20 @@
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="reservoirareaId" label="库区名称" align="center" width="130">
-                        <template slot-scope="scope">
-                          <popupSelect v-model="scope.row.reservoirareaId"
-                                       placeholder="请选择" clearable :field="'reservoirareaId'+scope.$index"
-                                       interfaceId="381404161809350213"
-                                       :columnOptions="receiptout_item0reservoirareaIdcolumnOptions" propsValue="id"
-                                       relationField="areaname" popupType="dialog"
-                                       popupWidth="800px" @change="areaSelect"
-                          >
-                          </popupSelect>
-                        </template>
-                      </el-table-column>
-                      <el-table-column prop="warehouseId" label="仓库名称" align="center" width="130">
-                        <template slot-scope="scope">
-                          <popupSelect v-model="scope.row.warehouseId"
-                                       placeholder="请选择" clearable :field="'reservoirareaId'+scope.$index"
-                                       interfaceId="399117969575232581"
-                                       :columnOptions="receiptout_item0reservoirareaIdcolumnOptions" propsValue="id"
-                                       relationField="name" popupType="dialog"
-                                       popupWidth="800px" disabled>
-                          </popupSelect>
-                        </template>
-                      </el-table-column>
+						<el-table-column prop="reservoirareaId" width="200" label="库区">
+							<template slot-scope="scope">
+								<el-input v-model="scope.row.reservoirareaName" placeholder="选择库区"
+									readonly @click.native="choiceReservoirareaId(scope.$index)">
+								</el-input>
+							</template>
+						</el-table-column>
+						<el-table-column prop="warehouseId" width="200" label="仓库">
+							<template slot-scope="scope">
+								<el-input v-model="scope.row.warehouseName" placeholder="选择库区"
+									readonly>
+								</el-input>
+							</template>
+						</el-table-column>
                       <el-table-column prop="batchNo" label="批次号" align="center" width="180">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.batchNo"
@@ -262,18 +253,22 @@
         <el-button @click="visible = false"> 取 消</el-button>
         <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail" :disabled="submitDisabled"> 确 定</el-button>
     </span>
+	<ReservoirareaBox v-if="formVisible" ref="form" @refreshDataList="initData" />
   </el-dialog>
 </template>
 <script>
   import request from '@/utils/request'
+	import ReservoirareaBox from '../receiptin/ReservoirareaBox'
   import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
   import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
 
   export default {
-    components: {},
+    components: {ReservoirareaBox},
     props: [],
     data() {
       return {
+				comIndex: -1,
+				formVisible: false,
         submitDisabled: false,
         visible: false,
         loading: false,
@@ -359,6 +354,30 @@
     mounted() {
     },
     methods: {
+	initData(reservoirarea) {
+		for (let i = 0; i < this.dataForm.receiptout_item0List.length; i++) {
+			if (this.comIndex == 0) {
+				this.dataForm.receiptout_item0List.forEach((column, index) => {
+					column.reservoirareaId = reservoirarea.id;
+					column.warehouseId = reservoirarea.houseId;
+					column.reservoirareaName = reservoirarea.areaname;
+					column.warehouseName = reservoirarea.houseName;
+				});
+			} else {
+				this.dataForm.receiptout_item0List[this.comIndex].reservoirareaId = reservoirarea.id;
+				this.dataForm.receiptout_item0List[this.comIndex].warehouseId = reservoirarea.houseId;
+				this.dataForm.receiptout_item0List[this.comIndex].reservoirareaName = reservoirarea.areaname;
+				this.dataForm.receiptout_item0List[this.comIndex].warehouseName = reservoirarea.houseName;
+			}
+		}
+	},
+	choiceReservoirareaId(index) {
+		this.comIndex = index;
+		this.formVisible = true
+		this.$nextTick(() => {
+			this.$refs.form.init()
+		})
+	},
       getSummaries(param) {
         const {columns, data} = param;
         const sums = [];
@@ -429,9 +448,7 @@
               this.dataForm.receiptout_item0List[i].rateAmount =this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.receiptout_item0List[i].amount, item.fullName),100)
             }
           })
-          debugger
           this.dataForm.receiptout_item0List[i].unit = list[0].list[i].poundEntity.unit;
-          debugger
           this.dataForm.receiptout_item0List[i].poundType = list[0].list[i].poundEntity.poundType;
         }
         this.$store.commit('generator/UPDATE_RELATION_DATA', {})
@@ -494,6 +511,8 @@
           materialId: undefined,
           reservoirareaId: undefined,
           warehouseId: undefined,
+		  reservoirareaName: undefined,
+		  warehouseName: undefined,
           deliveryNum: undefined,
           unit: undefined,
           price: undefined,