From 35c200b690a46c6589f57868d11588c1ec32e245 Mon Sep 17 00:00:00 2001
From: vayne <vayne0702@163.com>
Date: Fri, 15 Mar 2024 18:09:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProductWarehouseServiceImpl.java     |    5 +-
 .../controller/BusinessOrderController.java   |   20 +
 .../src/views/scm/inventorysnapshot/form.vue  | 1178 +++++++++--------
 .../scm/purchaseCenter/purchaseOrder/form.vue |  659 ++++-----
 4 files changed, 845 insertions(+), 1017 deletions(-)

diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ProductWarehouseServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ProductWarehouseServiceImpl.java
index 88a6712d..101b0ecb 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ProductWarehouseServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ProductWarehouseServiceImpl.java
@@ -30,6 +30,9 @@ import jnpf.util.*;
 import java.util.*;
 import jnpf.base.UserInfo;
 import jnpf.permission.entity.UserEntity;
+
+import javax.annotation.Resource;
+
 /**
  *
  * productWarehouse
@@ -52,7 +55,7 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
     private ProductUnitService productUnitService;
     @Autowired
     private ProductWarehouseService productWarehouseService;
-    @Autowired
+    @Resource
     private ProductWarehouseMapper productWarehouseMapper;
     @Override
     public List<ProductWarehouseEntity> getList(ProductWarehousePagination productWarehousePagination){
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java
index c4723c8f..959bfc3d 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java
@@ -756,4 +756,24 @@ public class BusinessOrderController {
         }
         return ActionResult.success(list);
     }
+
+    /**
+     * 列表
+     *
+     * @return
+     */
+    @Operation(summary = "根据合同查询商品列表")
+    @GetMapping("/getPurchaseContractList")
+    public ActionResult productList()throws IOException{
+        List<ContractLEntity> list= businessOrderService.queryPurchaseContractInfo();
+        for (ContractLEntity entity : list){
+            List<ProductByContractModel> productByContractModelList =  businessOrderService.queryProductByContractInfo(entity.getId());
+            entity.setProductByContractModelList(productByContractModelList);
+            QueryWrapper<SubjectbasicEntity> subjectQueryWrapper = new QueryWrapper<>();
+            subjectQueryWrapper.lambda().eq(SubjectbasicEntity::getId,entity.getFirstSupplyId());
+            List<SubjectbasicEntity> subjectbasicEntityList = subjectbasicService.list(subjectQueryWrapper);
+            entity.setSubjectbasicEntityList(subjectbasicEntityList);
+        }
+        return ActionResult.success(list);
+    }
 }
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/inventorysnapshot/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/inventorysnapshot/form.vue
index 0fc39ee7..f84cfbb7 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/inventorysnapshot/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/inventorysnapshot/form.vue
@@ -1,232 +1,234 @@
-
-
-
-    <template>
-            <transition name="el-zoom-in-center">
-            <div class="JNPF-preview-main">
-                <div class="JNPF-common-page-header">
-                    <el-page-header @back="goBack"
-                                    :content="!dataForm.id ? '新建':'编辑'"/>
-                    <div class="options">
-                            <el-dropdown class="dropdown" placement="bottom">
-                                <el-button style="width:70px">
-                                    更 多<i class="el-icon-arrow-down el-icon--right"></i>
-                                </el-button>
-                                <el-dropdown-menu slot="dropdown">
-                                        <template v-if="dataForm.id">
-                                            <el-dropdown-item @click.native="prev" :disabled='prevDis'>
-                                                {{'上一条'}}
-                                            </el-dropdown-item>
-                                            <el-dropdown-item @click.native="next" :disabled='nextDis'>
-                                                {{'下一条'}}
-                                            </el-dropdown-item>
-                                        </template>
-                                    <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
-                                                      :loading="continueBtnLoading" :disabled='btnLoading'>
-                                        {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
-                                </el-dropdown-menu>
-                            </el-dropdown>
-                        <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'> 保 存</el-button>
-                        <el-button @click="goBack"> 取 消</el-button>
-                    </div>
+<template>
+    <transition name="el-zoom-in-center">
+        <div class="JNPF-preview-main">
+            <div class="JNPF-common-page-header">
+                <el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
+                <div class="options">
+                    <el-dropdown class="dropdown" placement="bottom">
+                        <el-button style="width:70px">
+                            更 多<i class="el-icon-arrow-down el-icon--right"></i>
+                        </el-button>
+                        <el-dropdown-menu slot="dropdown">
+                            <template v-if="dataForm.id">
+                                <el-dropdown-item @click.native="prev" :disabled='prevDis'>
+                                    {{ '上一条' }}
+                                </el-dropdown-item>
+                                <el-dropdown-item @click.native="next" :disabled='nextDis'>
+                                    {{ '下一条' }}
+                                </el-dropdown-item>
+                            </template>
+                            <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
+                                :loading="continueBtnLoading" :disabled='btnLoading'>
+                                {{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-dropdown-item>
+                        </el-dropdown-menu>
+                    </el-dropdown>
+                    <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
+                        :disabled='continueBtnLoading'> 保
+                        存</el-button>
+                    <el-button @click="goBack"> 取 消</el-button>
                 </div>
-            <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
-    <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-        <!-- 具体表单 -->
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="商品编码"   prop="code" >
-        <JnpfInput   v-model="dataForm.code" @change="changeData('code',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="商品名称"   prop="name" >
-        <JnpfInput   v-model="dataForm.name" @change="changeData('name',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="商品规格"   prop="spec" >
-        <JnpfInput   v-model="dataForm.spec" @change="changeData('spec',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="商品图片"   prop="photo" >
-        <JnpfUploadImg   v-model="dataForm.photo" @change="changeData('photo',-1)" 
- :fileSize="10" sizeUnit="MB"  :limit="9"  pathType="defaultPath"  :isAccount="0" >
-    </JnpfUploadImg>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="商品类型"   prop="productTypeId" >
-        <JnpfRadio   v-model="dataForm.productTypeId" @change="changeData('productTypeId',-1)" 
- optionType="default"  direction="horizontal"  size="small"  :options="productTypeIdOptions" :props="productTypeIdProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="商品品牌id"   prop="brandId" >
-        <JnpfPopupSelect   v-model="dataForm.brandId" @change="changeData('brandId',-1)" 
- :rowIndex="null"  :formData="dataForm"  :templateJson="interfaceRes.brandId"  placeholder="请选择"  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="24" >
-        <jnpf-form-tip-item
- label="库存单位"   prop="inventoryUnitId" >
-        <JnpfSelect   v-model="dataForm.inventoryUnitId" @change="changeData('inventoryUnitId',-1)" 
- placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="inventoryUnitIdOptions" :props="inventoryUnitIdProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="批次号"   prop="batchNumber" >
-        <JnpfInput   v-model="dataForm.batchNumber" @change="changeData('batchNumber',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="期初库存"   prop="inventoryNumberStart" >
-        <JnpfInput   v-model="dataForm.inventoryNumberStart" @change="changeData('inventoryNumberStart',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="期末库存"   prop="inventoryNumberEnd" >
-        <JnpfInput   v-model="dataForm.inventoryNumberEnd" @change="changeData('inventoryNumberEnd',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="采购数量"   prop="purchaseNumber" >
-        <JnpfInput   v-model="dataForm.purchaseNumber" @change="changeData('purchaseNumber',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="仓库"   prop="warehouseId" >
-        <JnpfPopupSelect   v-model="dataForm.warehouseId" @change="changeData('warehouseId',-1)" 
- :rowIndex="null"  :formData="dataForm"  :templateJson="interfaceRes.warehouseId"  placeholder="请选择"  propsValue="id"  popupWidth="800px"  popupTitle="选择数据"  popupType="dialog"  relationField='name'  field='warehouseId'  interfaceId="529617754022498181"  :pageSize="20"  :columnOptions="warehouseIdcolumnOptions"  clearable  :style='{"width":"100%"}'>
-    </JnpfPopupSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="货区"   prop="storageAreaId" >
-        <JnpfPopupSelect   v-model="dataForm.storageAreaId" @change="changeData('storageAreaId',-1)" 
- :rowIndex="null"  :formData="dataForm"  :templateJson="interfaceRes.storageAreaId"  placeholder="请选择"  propsValue="id"  popupWidth="800px"  popupTitle="选择数据"  popupType="dialog"  relationField='fullName'  field='storageAreaId'  interfaceId="529624294691458949"  :pageSize="20"  :columnOptions="storageAreaIdcolumnOptions"  clearable  :style='{"width":"100%"}'>
-    </JnpfPopupSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="采购入库数量"   prop="purchaseWarehousingNumber" >
-        <JnpfInput   v-model="dataForm.purchaseWarehousingNumber" @change="changeData('purchaseWarehousingNumber',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="销售数量"   prop="saleNumber" >
-        <JnpfInput   v-model="dataForm.saleNumber" @change="changeData('saleNumber',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="销售出库数量"   prop="saleOutboundNumber" >
-        <JnpfInput   v-model="dataForm.saleOutboundNumber" @change="changeData('saleOutboundNumber',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="调拨入库数量"   prop="alloteWarehousingNumber" >
-        <JnpfInput   v-model="dataForm.alloteWarehousingNumber" @change="changeData('alloteWarehousingNumber',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="调拨出库数量"   prop="alloteOutboundNumber" >
-        <JnpfInput   v-model="dataForm.alloteOutboundNumber" @change="changeData('alloteOutboundNumber',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
+            </div>
+            <el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
+                <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
+                    label-position="right">
+                    <template v-if="!loading">
+                        <!-- 具体表单 -->
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="商品编码" prop="code">
+                                <JnpfInput v-model="dataForm.code" @change="changeData('code', -1)" placeholder="请输入"
+                                    clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="商品名称" prop="name">
+                                <JnpfInput v-model="dataForm.name" @change="changeData('name', -1)" placeholder="请输入"
+                                    clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="商品规格" prop="spec">
+                                <JnpfInput v-model="dataForm.spec" @change="changeData('spec', -1)" placeholder="请输入"
+                                    clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="商品图片" prop="photo">
+                                <JnpfUploadImg v-model="dataForm.photo" @change="changeData('photo', -1)" :fileSize="10"
+                                    sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
+                                </JnpfUploadImg>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="商品类型" prop="productTypeId">
+                                <JnpfRadio v-model="dataForm.productTypeId" @change="changeData('productTypeId', -1)"
+                                    optionType="default" direction="horizontal" size="small"
+                                    :options="productTypeIdOptions" :props="productTypeIdProps">
+                                </JnpfRadio>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="商品品牌id" prop="brandId">
+                                <JnpfPopupSelect v-model="dataForm.brandId" @change="changeData('brandId', -1)"
+                                    :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.brandId"
+                                    placeholder="请选择" 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="24">
+                            <jnpf-form-tip-item label="库存单位" prop="inventoryUnitId">
+                                <JnpfSelect v-model="dataForm.inventoryUnitId"
+                                    @change="changeData('inventoryUnitId', -1)" placeholder="请选择" clearable
+                                    :style='{ "width": "100%" }' :options="inventoryUnitIdOptions"
+                                    :props="inventoryUnitIdProps">
+                                </JnpfSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="批次号" prop="batchNumber">
+                                <JnpfInput v-model="dataForm.batchNumber" @change="changeData('batchNumber', -1)"
+                                    placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="期初库存" prop="inventoryNumberStart">
+                                <JnpfInput v-model="dataForm.inventoryNumberStart"
+                                    @change="changeData('inventoryNumberStart', -1)" placeholder="请输入" clearable
+                                    :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="期末库存" prop="inventoryNumberEnd">
+                                <JnpfInput v-model="dataForm.inventoryNumberEnd"
+                                    @change="changeData('inventoryNumberEnd', -1)" placeholder="请输入" clearable
+                                    :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="采购数量" prop="purchaseNumber">
+                                <JnpfInput v-model="dataForm.purchaseNumber" @change="changeData('purchaseNumber', -1)"
+                                    placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="仓库" prop="warehouseId">
+                                <JnpfPopupSelect v-model="dataForm.warehouseId" @change="changeData('warehouseId', -1)"
+                                    :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.warehouseId"
+                                    placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据"
+                                    popupType="dialog" relationField='name' field='warehouseId'
+                                    interfaceId="529617754022498181" :pageSize="20"
+                                    :columnOptions="warehouseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+                                </JnpfPopupSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="货区" prop="storageAreaId">
+                                <JnpfPopupSelect v-model="dataForm.storageAreaId"
+                                    @change="changeData('storageAreaId', -1)" :rowIndex="null" :formData="dataForm"
+                                    :templateJson="interfaceRes.storageAreaId" placeholder="请选择" propsValue="id"
+                                    popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='fullName'
+                                    field='storageAreaId' interfaceId="529624294691458949" :pageSize="20"
+                                    :columnOptions="storageAreaIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+                                </JnpfPopupSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="采购入库数量" prop="purchaseWarehousingNumber">
+                                <JnpfInput v-model="dataForm.purchaseWarehousingNumber"
+                                    @change="changeData('purchaseWarehousingNumber', -1)" placeholder="请输入" clearable
+                                    :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="销售数量" prop="saleNumber">
+                                <JnpfInput v-model="dataForm.saleNumber" @change="changeData('saleNumber', -1)"
+                                    placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="销售出库数量" prop="saleOutboundNumber">
+                                <JnpfInput v-model="dataForm.saleOutboundNumber"
+                                    @change="changeData('saleOutboundNumber', -1)" placeholder="请输入" clearable
+                                    :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="调拨入库数量" prop="alloteWarehousingNumber">
+                                <JnpfInput v-model="dataForm.alloteWarehousingNumber"
+                                    @change="changeData('alloteWarehousingNumber', -1)" placeholder="请输入" clearable
+                                    :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="调拨出库数量" prop="alloteOutboundNumber">
+                                <JnpfInput v-model="dataForm.alloteOutboundNumber"
+                                    @change="changeData('alloteOutboundNumber', -1)" placeholder="请输入" clearable
+                                    :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
 
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="快照时间"   prop="snapshotDate" >
-        <JnpfDatePicker   v-model="dataForm.snapshotDate" @change="changeData('snapshotDate',-1)" 
- :startTime="dateTime(false,1,1,'','')"  :endTime="dateTime(false,1,1,'','')"  placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd" >
-    </JnpfDatePicker>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="快照类型"   prop="snapshotType" >
-        <JnpfRadio   v-model="dataForm.snapshotType" @change="changeData('snapshotType',-1)" 
- optionType="default"  direction="horizontal"  size="small"  :options="snapshotTypeOptions" :props="snapshotTypeProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="其他数量"   prop="otherNumber" >
-        <JnpfInput   v-model="dataForm.otherNumber" @change="changeData('otherNumber',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <!-- 表单结束 -->
-    </template>
-    </el-form>
-    <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
-                  ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
-    </el-row>
-    </div>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="快照时间" prop="snapshotDate">
+                                <JnpfDatePicker v-model="dataForm.snapshotDate" @change="changeData('snapshotDate', -1)"
+                                    :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
+                                    placeholder="请选择" clearable :style='{ "width": "100%" }' type="date"
+                                    format="yyyy-MM-dd">
+                                </JnpfDatePicker>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="快照类型" prop="snapshotType">
+                                <JnpfRadio v-model="dataForm.snapshotType" @change="changeData('snapshotType', -1)"
+                                    optionType="default" direction="horizontal" size="small"
+                                    :options="snapshotTypeOptions" :props="snapshotTypeProps">
+                                </JnpfRadio>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="其他数量" prop="otherNumber">
+                                <JnpfInput v-model="dataForm.otherNumber" @change="changeData('otherNumber', -1)"
+                                    placeholder="请输入" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <!-- 表单结束 -->
+                    </template>
+                </el-form>
+                <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
+                    @select="addForSelect" @close="selectDialogVisible = false" />
+            </el-row>
+        </div>
     </transition>
-    </template>
+</template>
 
 
 <script>
-    import request from '@/utils/request'
-    import {mapGetters} from "vuex";
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    import { getDefaultCurrentValueUserId } from '@/api/permission/user'
-    import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
-    import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { },
-        props: [],
-        data() {
+import request from '@/utils/request'
+import { mapGetters } from "vuex";
+import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import { getDefaultCurrentValueUserId } from '@/api/permission/user'
+import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
+import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+    components: {},
+    props: [],
+    data() {
         return {
             dataFormSubmitType: 0,
             continueBtnLoading: false,
@@ -238,409 +240,409 @@
             loading: false,
             btnLoading: false,
             formRef: 'formRef',
-            setting:{},
+            setting: {},
             eventType: '',
-            userBoxVisible:false,
+            userBoxVisible: false,
             selectDialogVisible: false,
-            currTableConf:{},
-            dataValueAll:{},
-            addTableConf:{
+            currTableConf: {},
+            dataValueAll: {},
+            addTableConf: {
             },
             //可选范围默认值
-            ableAll:{
+            ableAll: {
             },
-        tableRows:{
-        },
-            Vmodel:"",
-            currVmodel:"",
+            tableRows: {
+            },
+            Vmodel: "",
+            currVmodel: "",
             dataForm: {
-                                code : undefined,
-                                name : undefined,
-                                spec : undefined,
-                                    photo : [],
-                                    productTypeId : undefined,
-                                    brandId : undefined,
-                                    inventoryUnitId : undefined,
-                                batchNumber : undefined,
-                                inventoryNumberStart : undefined,
-                                inventoryNumberEnd : undefined,
-                                purchaseNumber : undefined,
-                                    warehouseId : undefined,
-                                    storageAreaId : undefined,
-                                purchaseWarehousingNumber : undefined,
-                                saleNumber : undefined,
-                                saleOutboundNumber : undefined,
-                                alloteWarehousingNumber : undefined,
-                                alloteOutboundNumber : undefined,
-                                snapshotDate : undefined,
-                                snapshotType : undefined,
-                                otherNumber : undefined,
-                    version: 0,
+                code: undefined,
+                name: undefined,
+                spec: undefined,
+                photo: [],
+                productTypeId: undefined,
+                brandId: undefined,
+                inventoryUnitId: undefined,
+                batchNumber: undefined,
+                inventoryNumberStart: undefined,
+                inventoryNumberEnd: undefined,
+                purchaseNumber: undefined,
+                warehouseId: undefined,
+                storageAreaId: undefined,
+                purchaseWarehousingNumber: undefined,
+                saleNumber: undefined,
+                saleOutboundNumber: undefined,
+                alloteWarehousingNumber: undefined,
+                alloteOutboundNumber: undefined,
+                snapshotDate: undefined,
+                snapshotType: undefined,
+                otherNumber: undefined,
+                version: 0,
             },
             tableRequiredData: {},
             dataRule:
             {
             },
-                    productTypeIdOptions:[],
-                            productTypeIdProps:{"label":"fullName","value":"enCode"  },
-                    brandIdcolumnOptions:[ {"label":"品牌","value":"brand_name"},],
-                    inventoryUnitIdOptions:[],
-                            inventoryUnitIdProps:{"label":"unit_name","value":"id"  },
-                    warehouseIdcolumnOptions:[ {"label":"仓库编号","value":"code"}, {"label":"仓库名称","value":"name"}, {"label":"仓库简称","value":"simple_name"},],
-                    storageAreaIdcolumnOptions:[ {"label":"货区编码","value":"code"}, {"label":"货区名称","value":"name"},],
-                            snapshotTypeOptions:[{"fullName":"日","id":"1"},{"fullName":"月","id":"2"}],
-                            snapshotTypeProps:{"label":"fullName","value":"id"  },
-            childIndex:-1,
-                    isEdit:false,
-                    interfaceRes: {
-                        code:[] ,
-                        name:[] ,
-                        spec:[] ,
-                        photo:[] ,
-                        productTypeId:[] ,
-                        brandId:[] ,
-                        inventoryUnitId:[] ,
-                        batchNumber:[] ,
-                        inventoryNumberStart:[] ,
-                        inventoryNumberEnd:[] ,
-                        purchaseNumber:[] ,
-                        warehouseId:[] ,
-                        storageAreaId:[{"dataType":"varchar","defaultValue":"","field":"warehouseId","fieldName":"","id":"Y4nIRy1","jnpfKey":"popupSelect","relationField":"warehouseId","required":"0"}] ,
-                        purchaseWarehousingNumber:[] ,
-                        saleNumber:[] ,
-                        saleOutboundNumber:[] ,
-                        alloteWarehousingNumber:[] ,
-                        alloteOutboundNumber:[] ,
-                        snapshotDate:[] ,
-                        snapshotType:[] ,
-                        otherNumber:[] ,
+            productTypeIdOptions: [],
+            productTypeIdProps: { "label": "fullName", "value": "enCode" },
+            brandIdcolumnOptions: [{ "label": "品牌", "value": "brand_name" },],
+            inventoryUnitIdOptions: [],
+            inventoryUnitIdProps: { "label": "unit_name", "value": "id" },
+            warehouseIdcolumnOptions: [{ "label": "仓库编号", "value": "code" }, { "label": "仓库名称", "value": "name" }, { "label": "仓库简称", "value": "simple_name" },],
+            storageAreaIdcolumnOptions: [{ "label": "货区编码", "value": "code" }, { "label": "货区名称", "value": "name" },],
+            snapshotTypeOptions: [{ "fullName": "日", "id": "1" }, { "fullName": "月", "id": "2" }],
+            snapshotTypeProps: { "label": "fullName", "value": "id" },
+            childIndex: -1,
+            isEdit: false,
+            interfaceRes: {
+                code: [],
+                name: [],
+                spec: [],
+                photo: [],
+                productTypeId: [],
+                brandId: [],
+                inventoryUnitId: [],
+                batchNumber: [],
+                inventoryNumberStart: [],
+                inventoryNumberEnd: [],
+                purchaseNumber: [],
+                warehouseId: [],
+                storageAreaId: [{ "dataType": "varchar", "defaultValue": "", "field": "warehouseId", "fieldName": "", "id": "Y4nIRy1", "jnpfKey": "popupSelect", "relationField": "warehouseId", "required": "0" }],
+                purchaseWarehousingNumber: [],
+                saleNumber: [],
+                saleOutboundNumber: [],
+                alloteWarehousingNumber: [],
+                alloteOutboundNumber: [],
+                snapshotDate: [],
+                snapshotType: [],
+                otherNumber: [],
             },
         }
+    },
+    computed: {
+        ...mapGetters(['userInfo'])
+    },
+    watch: {},
+    created() {
+        this.dataAll()
+        this.initDefaultData()
+        this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+    },
+    mounted() { },
+    methods: {
+        prev() {
+            this.index--
+            if (this.index === 0) {
+                this.prevDis = true
+            }
+            this.nextDis = false
+            for (let index = 0; index < this.allList.length; index++) {
+                const element = this.allList[index];
+                if (this.index == index) {
+                    this.getInfo(element.id)
+                }
+            }
         },
-        computed: {
-            ...mapGetters(['userInfo'])
+        next() {
+            this.index++
+            if (this.index === this.allList.length - 1) {
+                this.nextDis = true
+            }
+            this.prevDis = false
+            for (let index = 0; index < this.allList.length; index++) {
+                const element = this.allList[index];
+                if (this.index == index) {
+                    this.getInfo(element.id)
+                }
+            }
         },
-        watch: {},
-        created() {
-            this.dataAll()
-            this.initDefaultData()
-            this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+        getInfo(id) {
+            request({
+                url: '/api/scm/InventorySnapshot/' + id,
+                method: 'get'
+            }).then(res => {
+                this.dataInfo(res.data)
+            });
         },
-        mounted() {},
-        methods: {
-            prev() {
-                this.index--
-                if (this.index === 0) {
-                    this.prevDis = true
-                }
-                this.nextDis = false
-                for (let index = 0; index < this.allList.length; index++) {
-                    const element = this.allList[index];
-                    if (this.index == index) {
-                        this.getInfo(element.id)
-                    }
-                }
-            },
-            next() {
-                this.index++
-                if (this.index === this.allList.length - 1) {
-                    this.nextDis = true
-                }
-                this.prevDis = false
-                for (let index = 0; index < this.allList.length; index++) {
-                    const element = this.allList[index];
-                    if (this.index == index) {
-                        this.getInfo(element.id)
-                    }
-                }
-            },
-            getInfo(id) {
-                request({
-                    url: '/api/scm/InventorySnapshot/'+ id,
-                    method: 'get'
-                }).then(res => {
-                    this.dataInfo(res.data)
-                });
-            },
-            goBack() {
-                this.visible = false
-                this.$emit('refreshDataList', true)
-            },
-            changeData(model, index) {
-                this.isEdit = false
-                this.childIndex = index
-                let modelAll = model.split("-");
-                let faceMode = "";
-                for (let i = 0; i < modelAll.length; i++) {
-                    faceMode += modelAll[i];
-                }
-                for (let key in this.interfaceRes) {
-                    if (key != faceMode) {
-                        let faceReList = this.interfaceRes[key]
-                        for (let i = 0; i < faceReList.length; i++) {
-                            if (faceReList[i].relationField == model) {
-                                let options = 'get' + key + 'Options';
-                                if(this[options]){
-                                    this[options]()
-                                }
-                                this.changeData(key, index)
+        goBack() {
+            this.visible = false
+            this.$emit('refreshDataList', true)
+        },
+        changeData(model, index) {
+            this.isEdit = false
+            this.childIndex = index
+            let modelAll = model.split("-");
+            let faceMode = "";
+            for (let i = 0; i < modelAll.length; i++) {
+                faceMode += modelAll[i];
+            }
+            for (let key in this.interfaceRes) {
+                if (key != faceMode) {
+                    let faceReList = this.interfaceRes[key]
+                    for (let i = 0; i < faceReList.length; i++) {
+                        if (faceReList[i].relationField == model) {
+                            let options = 'get' + key + 'Options';
+                            if (this[options]) {
+                                this[options]()
                             }
+                            this.changeData(key, index)
                         }
                     }
                 }
-            },
-            changeDataFormData(type, data, model,index,defaultValue) {
-                if(!this.isEdit) {
-                    if (type == 2) {
-                        for (let i = 0; i < this.dataForm[data].length; i++) {
-                            if (index == -1) {
-                                this.dataForm[data][i][model] = defaultValue
-                            } else if (index == i) {
-                                this.dataForm[data][i][model] = defaultValue
-                            }
+            }
+        },
+        changeDataFormData(type, data, model, index, defaultValue) {
+            if (!this.isEdit) {
+                if (type == 2) {
+                    for (let i = 0; i < this.dataForm[data].length; i++) {
+                        if (index == -1) {
+                            this.dataForm[data][i][model] = defaultValue
+                        } else if (index == i) {
+                            this.dataForm[data][i][model] = defaultValue
                         }
-                    } else {
-                        this.dataForm[data] = defaultValue
                     }
+                } else {
+                    this.dataForm[data] = defaultValue
                 }
-            },
-            dataAll(){
-                        this.getproductTypeIdOptions();
-                        this.getinventoryUnitIdOptions();
-            },
-                    getproductTypeIdOptions() {
-                    getDictionaryDataSelector('521699870097015173').then(res => {
-                        this.productTypeIdOptions = res.data.list
-                    })
-                },
-                    getinventoryUnitIdOptions() {
-                    const index = this.childIndex
-                    let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.inventoryUnitId))
-                    for (let i = 0; i < templateJsonList.length; i++) {
-                        let json = templateJsonList[i];
-                        if(json.relationField){
-                            let relationFieldAll = json.relationField.split("-");
-                            let val = json.defaultValue;
-                            if(relationFieldAll.length>1 && index>-1){
-                                val = this.dataForm[relationFieldAll[0]+'List']&&this.dataForm[relationFieldAll[0]+'List'].length?this.dataForm[relationFieldAll[0]+'List'][index][relationFieldAll[1]]:''
-                            }else {
-                                val = this.dataForm[relationFieldAll]
-                            }
-                            json.defaultValue = val
-                        }
-                    }
-                    let template ={
-                        paramList:templateJsonList
-                    }
-                    getDataInterfaceRes('529938341609623877',template).then(res => {
-                        let data = res.data
-                        this.inventoryUnitIdOptions = data
-                        this.changeDataFormData(1,'inventoryUnitId','inventoryUnitId',index,'')
-                    })
-                },
-                goBack() {
-                this.$emit('refresh')
-            },
-            clearData(){
-                this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
-            },
-            init(id,isDetail,allList) {
-                this.prevDis = false
-                this.nextDis = false
-                this.allList = allList || []
-                if (allList.length) {
-                    this.index = this.allList.findIndex(item => item.id === id)
-                    if (this.index == 0) {
-                        this.prevDis = true
-                    }
-                    if (this.index == this.allList.length - 1) {
-                        this.nextDis = true
+            }
+        },
+        dataAll() {
+            this.getproductTypeIdOptions();
+            this.getinventoryUnitIdOptions();
+        },
+        getproductTypeIdOptions() {
+            getDictionaryDataSelector('521699870097015173').then(res => {
+                this.productTypeIdOptions = res.data.list
+            })
+        },
+        getinventoryUnitIdOptions() {
+            const index = this.childIndex
+            let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.inventoryUnitId))
+            for (let i = 0; i < templateJsonList.length; i++) {
+                let json = templateJsonList[i];
+                if (json.relationField) {
+                    let relationFieldAll = json.relationField.split("-");
+                    let val = json.defaultValue;
+                    if (relationFieldAll.length > 1 && index > -1) {
+                        val = this.dataForm[relationFieldAll[0] + 'List'] && this.dataForm[relationFieldAll[0] + 'List'].length ? this.dataForm[relationFieldAll[0] + 'List'][index][relationFieldAll[1]] : ''
+                    } else {
+                        val = this.dataForm[relationFieldAll]
                     }
-                } else {
+                    json.defaultValue = val
+                }
+            }
+            let template = {
+                paramList: templateJsonList
+            }
+            getDataInterfaceRes('529938341609623877', template).then(res => {
+                let data = res.data
+                this.inventoryUnitIdOptions = data
+                this.changeDataFormData(1, 'inventoryUnitId', 'inventoryUnitId', index, '')
+            })
+        },
+        goBack() {
+            this.$emit('refresh')
+        },
+        clearData() {
+            this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+        },
+        init(id, isDetail, allList) {
+            this.prevDis = false
+            this.nextDis = false
+            this.allList = allList || []
+            if (allList.length) {
+                this.index = this.allList.findIndex(item => item.id === id)
+                if (this.index == 0) {
                     this.prevDis = true
+                }
+                if (this.index == this.allList.length - 1) {
                     this.nextDis = true
                 }
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/scm/InventorySnapshot/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                        this.clearData()
-                        this.initDefaultData()
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            //初始化默认数据
-            initDefaultData() {
-
-            },
-            // 表单提交
-            dataFormSubmit(type) {
-                this.dataFormSubmitType = type ? type : 0
-                this.$refs['formRef'].validate((valid) => {
-                    if (valid) {
-                        this.request()
-                    }
-                })
-            },
-            request() {
-                let _data =this.dataList()
-                if (this.dataFormSubmitType == 2) {
-                    this.continueBtnLoading = true
+            } else {
+                this.prevDis = true
+                this.nextDis = true
+            }
+            this.dataForm.id = id || 0;
+            this.visible = true;
+            this.$nextTick(() => {
+                if (this.dataForm.id) {
+                    this.loading = true
+                    request({
+                        url: '/api/scm/InventorySnapshot/' + this.dataForm.id,
+                        method: 'get'
+                    }).then(res => {
+                        this.dataInfo(res.data)
+                        this.loading = false
+                    });
                 } else {
-                    this.btnLoading = true
+                    this.clearData()
+                    this.initDefaultData()
                 }
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/scm/InventorySnapshot',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                if (this.dataFormSubmitType == 2) {
-                                    this.$nextTick(() => {
-                                        this.clearData()
-                                        this.initDefaultData()
-                                    })
-                                    this.continueBtnLoading = false
-                                    return
-                                }
-                                this.visible = false
-                                this.btnLoading = false
-                                this.$emit('refresh', true)
+            });
+            this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+        },
+        //初始化默认数据
+        initDefaultData() {
+
+        },
+        // 表单提交
+        dataFormSubmit(type) {
+            this.dataFormSubmitType = type ? type : 0
+            this.$refs['formRef'].validate((valid) => {
+                if (valid) {
+                    this.request()
+                }
+            })
+        },
+        request() {
+            let _data = this.dataList()
+            if (this.dataFormSubmitType == 2) {
+                this.continueBtnLoading = true
+            } else {
+                this.btnLoading = true
+            }
+            if (!this.dataForm.id) {
+                request({
+                    url: '/api/scm/InventorySnapshot',
+                    method: 'post',
+                    data: _data
+                }).then((res) => {
+                    this.$message({
+                        message: res.msg,
+                        type: 'success',
+                        duration: 1000,
+                        onClose: () => {
+                            if (this.dataFormSubmitType == 2) {
+                                this.$nextTick(() => {
+                                    this.clearData()
+                                    this.initDefaultData()
+                                })
+                                this.continueBtnLoading = false
+                                return
                             }
-                        })
-                    }).catch(()=>{
-                        this.btnLoading = false
-                        this.continueBtnLoading = false
+                            this.visible = false
+                            this.btnLoading = false
+                            this.$emit('refresh', true)
+                        }
                     })
-                }else{
-                    request({
-                        url: '/api/scm/InventorySnapshot/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
-                                this.visible = false
-                                this.btnLoading = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    }).catch(()=>{
-                        this.btnLoading = false
-                        this.continueBtnLoading = false
+                }).catch(() => {
+                    this.btnLoading = false
+                    this.continueBtnLoading = false
+                })
+            } else {
+                request({
+                    url: '/api/scm/InventorySnapshot/' + this.dataForm.id,
+                    method: 'PUT',
+                    data: _data
+                }).then((res) => {
+                    this.$message({
+                        message: res.msg,
+                        type: 'success',
+                        duration: 1000,
+                        onClose: () => {
+                            if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
+                            this.visible = false
+                            this.btnLoading = false
+                            this.$emit('refresh', true)
+                        }
                     })
-                }
-            },
-            openSelectDialog(key) {
-                this.currTableConf=this.addTableConf[key]
-                this.currVmodel=key
-                this.selectDialogVisible = true
-                this.$nextTick(() => {
-                    this.$refs.selectDialog.init()
+                }).catch(() => {
+                    this.btnLoading = false
+                    this.continueBtnLoading = false
                 })
-            },
-            addForSelect(data) {
-                for (let i = 0; i < data.length; i++) {
-                    let t = data[i]
-                    if(this['get'+this.currVmodel]){
-                        this['get'+this.currVmodel](t)
-                    }
+            }
+        },
+        openSelectDialog(key) {
+            this.currTableConf = this.addTableConf[key]
+            this.currVmodel = key
+            this.selectDialogVisible = true
+            this.$nextTick(() => {
+                this.$refs.selectDialog.init()
+            })
+        },
+        addForSelect(data) {
+            for (let i = 0; i < data.length; i++) {
+                let t = data[i]
+                if (this['get' + this.currVmodel]) {
+                    this['get' + this.currVmodel](t)
                 }
-            },
-            dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
-                let timeDataValue = null;
-                let timeValue = Number(timeValueData)
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = new Date().getTime()
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getBeforeData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
-                        }
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getLaterData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
-                        }
+            }
+        },
+        dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+            let timeDataValue = null;
+            let timeValue = Number(timeValueData)
+            if (timeRule) {
+                if (timeType == 1) {
+                    timeDataValue = timeValue
+                } else if (timeType == 2) {
+                    timeDataValue = dataValue
+                } else if (timeType == 3) {
+                    timeDataValue = new Date().getTime()
+                } else if (timeType == 4) {
+                    let previousDate = '';
+                    if (timeTarget == 1 || timeTarget == 2) {
+                        previousDate = getDateDay(timeTarget, timeType, timeValue)
+                        timeDataValue = new Date(previousDate).getTime()
+                    } else if (timeTarget == 3) {
+                        previousDate = getBeforeData(timeValue)
+                        timeDataValue = new Date(previousDate).getTime()
+                    } else {
+                        timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+                    }
+                } else if (timeType == 5) {
+                    let previousDate = '';
+                    if (timeTarget == 1 || timeTarget == 2) {
+                        previousDate = getDateDay(timeTarget, timeType, timeValue)
+                        timeDataValue = new Date(previousDate).getTime()
+                    } else if (timeTarget == 3) {
+                        previousDate = getLaterData(timeValue)
+                        timeDataValue = new Date(previousDate).getTime()
+                    } else {
+                        timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
                     }
                 }
-                return timeDataValue;
-            },
-            time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
-                let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
-                let timeDataValue = null
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue || '00:00:00'
-                        if (timeDataValue.split(':').length == 3) {
-                            timeDataValue = timeDataValue
-                        } else {
-                            timeDataValue = timeDataValue + ':00'
-                        }
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = this.jnpf.toDate(new Date(), format)
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        previousDate = getBeforeTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        previousDate = getLaterTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
+            }
+            return timeDataValue;
+        },
+        time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
+            let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+            let timeDataValue = null
+            if (timeRule) {
+                if (timeType == 1) {
+                    timeDataValue = timeValue || '00:00:00'
+                    if (timeDataValue.split(':').length == 3) {
+                        timeDataValue = timeDataValue
+                    } else {
+                        timeDataValue = timeDataValue + ':00'
                     }
+                } else if (timeType == 2) {
+                    timeDataValue = dataValue
+                } else if (timeType == 3) {
+                    timeDataValue = this.jnpf.toDate(new Date(), format)
+                } else if (timeType == 4) {
+                    let previousDate = '';
+                    previousDate = getBeforeTime(timeTarget, timeValue)
+                    timeDataValue = this.jnpf.toDate(previousDate, format)
+                } else if (timeType == 5) {
+                    let previousDate = '';
+                    previousDate = getLaterTime(timeTarget, timeValue)
+                    timeDataValue = this.jnpf.toDate(previousDate, format)
                 }
-                return timeDataValue;
-            },
-            dataList(){
-                var _data = this.dataForm;
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-                this.isEdit = true
-                this.dataAll()
-                this.childIndex=-1
-            },
+            }
+            return timeDataValue;
+        },
+        dataList() {
+            var _data = this.dataForm;
+            return _data;
+        },
+        dataInfo(dataAll) {
+            let _dataAll = dataAll
+            this.dataForm = _dataAll
+            this.isEdit = true
+            this.dataAll()
+            this.childIndex = -1
         },
-    }
+    },
+}
 
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue
index 9661dd2e..35736c02 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue
@@ -584,433 +584,214 @@
               </JnpfGroupTitle>
             </jnpf-form-tip-item>
           </el-col>
-          <template v-if="dataForm.orderType == 1">
-            <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
-              <jnpf-form-tip-item label-width="0">
-                <div class="JNPF-common-title">
-                  <h2></h2>
-                </div>
-                <el-table :data="dataForm.businessOrderProductRelationalList" size='mini'>
-                  <el-table-column type="index" width="50" label="序号" align="center" />
-                  <el-table-column label="商品名称" v-if="judgeShow('businessorderproductrelational-productId')"
-                    prop="productId">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-productId')">*</span>商品名称
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfPopupSelect v-model="scope.row.productId" @change="productInfo" :rowIndex="scope.$index"
-                        :formData="dataForm" :templateJson="interfaceRes.businessorderproductrelationalproductId"
-                        placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                        relationField='name' :field="'productId' + scope.$index" interfaceId="530009896687501829"
-                        :pageSize="20" :columnOptions="businessorderproductrelationalproductIdcolumnOptions2" clearable
-                        :style='{ "width": "100%" }'>
-                      </JnpfPopupSelect>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="规格" v-if="judgeShow('businessorderproductrelational-spec')" prop="spec">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-spec')">*</span>规格
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.spec"
-                        @change="changeData('businessorderproductrelational-spec', scope.$index)" placeholder="请输入"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-spec')"
-                        clearable :style='{ "width": "100%" }'>
-                      </JnpfInput>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="库存单位" v-if="judgeShow('businessorderproductrelational-inventoryUnitId')"
-                    prop="inventoryUnitId">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-inventoryUnitId')">*</span>库存单位
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.inventoryUnitId"
-                        @change="changeData('businessorderproductrelational-inventoryUnitId', scope.$index)"
-                        placeholder="请输入"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-inventoryUnitId')"
-                        clearable :style='{ "width": "100%" }'>
-                      </JnpfInput>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="实物库存" v-if="judgeShow('businessorderproductrelational-realBound')"
-                    prop="realBound">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-realBound')">*</span>实物库存
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.realBound"
-                        @change="changeData('businessorderproductrelational-realBound', scope.$index)" placeholder="请输入"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-realBound')"
-                        clearable :style='{ "width": "100%" }'>
-                      </JnpfInput>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="可用库存" v-if="judgeShow('businessorderproductrelational-useBound')"
-                    prop="useBound">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-useBound')">*</span>可用库存
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.useBound"
-                        @change="changeData('businessorderproductrelational-useBound', scope.$index)" placeholder="请输入"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-useBound')"
-                        clearable :style='{ "width": "100%" }'>
-                      </JnpfInput>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="采购单位" v-if="judgeShow('businessorderproductrelational-salesMainUnitId')"
-                    prop="salesMainUnitId">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-salesMainUnitId')">*</span>采购单位
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfSelect v-model="scope.row.salesMainUnitId"
-                        @change="changeData('businessorderproductrelational-salesMainUnitId', scope.$index)"
-                        placeholder="请选择"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-salesMainUnitId')"
-                        clearable :style='{ "width": "100%" }'
-                        :options="businessorderproductrelationalsalesMainUnitIdOptions"
-                        :props="businessorderproductrelationalsalesMainUnitIdProps">
-                      </JnpfSelect>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="业务数量" v-if="judgeShow('businessorderproductrelational-businessNum')"
-                    prop="businessNum">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-businessNum')">*</span>业务数量
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.businessNum"
-                        @change="changeData('businessorderproductrelational-businessNum', scope.$index)"
-                        placeholder="请输入"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-businessNum')"
-                        clearable :style='{ "width": "100%" }'>
-                      </JnpfInput>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="业务单价" v-if="judgeShow('businessorderproductrelational-businessPrice')"
-                    prop="businessPrice">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-businessPrice')">*</span>业务单价
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.businessPrice"
-                        @change="changeData('businessorderproductrelational-businessPrice', scope.$index)"
-                        placeholder="请输入"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-businessPrice')"
-                        clearable :style='{ "width": "100%" }'>
-                      </JnpfInput>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="税率" v-if="judgeShow('businessorderproductrelational-tax')" prop="tax">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-tax')">*</span>税率
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.tax"
-                        @change="changeData('businessorderproductrelational-tax', scope.$index)" placeholder="请输入"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-tax')"
-                        clearable :style='{ "width": "100%" }'>
-                      </JnpfInput>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="含税小计" v-if="judgeShow('businessorderproductrelational-taxCount')"
-                    prop="taxCount">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-taxCount')">*</span>含税小计
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.taxCount"
-                        @change="changeData('businessorderproductrelational-taxCount', scope.$index)" placeholder="请输入"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-taxCount')"
-                        clearable :style='{ "width": "100%" }'>
-                      </JnpfInput>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="不含税单价" v-if="judgeShow('businessorderproductrelational-notTaxPrice')"
-                    prop="notTaxPrice">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-notTaxPrice')">*</span>不含税单价
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.notTaxPrice"
-                        @change="changeData('businessorderproductrelational-notTaxPrice', scope.$index)"
-                        placeholder="请输入"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-notTaxPrice')"
-                        clearable :style='{ "width": "100%" }'>
-                      </JnpfInput>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="不含税小计" v-if="judgeShow('businessorderproductrelational-notTaxCount')"
-                    prop="notTaxCount">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-notTaxCount')">*</span>不含税小计
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.notTaxCount"
-                        @change="changeData('businessorderproductrelational-notTaxCount', scope.$index)"
-                        placeholder="请输入"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-notTaxCount')"
-                        clearable :style='{ "width": "100%" }'>
-                      </JnpfInput>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="上一次采购单价" v-if="judgeShow('businessorderproductrelational-lastSalePrice')"
-                    prop="lastSalePrice">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-lastSalePrice')">*</span>上一次采购单价
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.lastSalePrice"
-                        @change="changeData('businessorderproductrelational-lastSalePrice', scope.$index)"
-                        placeholder="请输入"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-lastSalePrice')"
-                        clearable :style='{ "width": "100%" }'>
-                      </JnpfInput>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="操作" width="50" v-if="!judgeWrite('businessorderproductrelationalList')">
-                    <template slot-scope="scope">
-                      <el-button size="mini" type="text" class="JNPF-table-delBtn"
-                        @click="delbusinessorderproductrelationalList(scope.$index)">删除</el-button>
-                    </template>
-                  </el-table-column>
-                </el-table>
-                <div class="table-actions" @click="addbusinessorderproductrelationalList()"
-                  v-if="!judgeWrite('businessorderproductrelationalList')">
-                  <el-button type="text" icon="el-icon-plus">添加</el-button>
-                </div>
-              </jnpf-form-tip-item>
-            </el-col>
-          </template>
-          <template v-if="dataForm.orderType == 3">
-            <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
-              <jnpf-form-tip-item label-width="0">
-                <div class="JNPF-common-title">
-                  <h2></h2>
-                </div>
-                <el-table :data="dataForm.businessOrderProductRelationalList" size='mini'>
-                  <el-table-column type="index" width="50" label="序号" align="center" />
-                  <el-table-column label="商品名称" v-if="judgeShow('businessorderproductrelational-productId')"
-                    prop="productId">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-productId')">*</span>商品名称
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfPopupSelect v-model="scope.row.productId" @change="productInfo2" :rowIndex="scope.$index"
-                        :formData="dataForm" :templateJson="interfaceRes.businessorderproductrelationalproductId"
-                        placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                        relationField='commodity_name' :field="'productId' + scope.$index"
-                        interfaceId="523160915206474309" :pageSize="20"
-                        :columnOptions="businessorderproductrelationalproductIdcolumnOptions" clearable
-                        :style='{ "width": "100%" }'>
-                      </JnpfPopupSelect>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="规格" v-if="judgeShow('businessorderproductrelational-spec')" prop="spec">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-spec')">*</span>规格
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.spec"
-                        @change="changeData('businessorderproductrelational-spec', scope.$index)" placeholder="请输入"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-spec')"
-                        clearable :style='{ "width": "100%" }'>
-                      </JnpfInput>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="库存单位" v-if="judgeShow('businessorderproductrelational-inventoryUnitId')"
-                    prop="inventoryUnitId">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-inventoryUnitId')">*</span>库存单位
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.inventoryUnitId"
-                        @change="changeData('businessorderproductrelational-inventoryUnitId', scope.$index)"
-                        placeholder="请输入"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-inventoryUnitId')"
-                        clearable :style='{ "width": "100%" }'>
-                      </JnpfInput>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="实物库存" v-if="judgeShow('businessorderproductrelational-realBound')"
-                    prop="realBound">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-realBound')">*</span>实物库存
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.realBound"
-                        @change="changeData('businessorderproductrelational-realBound', scope.$index)" placeholder="请输入"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-realBound')"
-                        clearable :style='{ "width": "100%" }'>
-                      </JnpfInput>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="可用库存" v-if="judgeShow('businessorderproductrelational-useBound')"
-                    prop="useBound">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-useBound')">*</span>可用库存
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.useBound"
-                        @change="changeData('businessorderproductrelational-useBound', scope.$index)" placeholder="请输入"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-useBound')"
-                        clearable :style='{ "width": "100%" }'>
-                      </JnpfInput>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="采购单位" v-if="judgeShow('businessorderproductrelational-salesMainUnitId')"
-                    prop="salesMainUnitId">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-salesMainUnitId')">*</span>采购单位
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfSelect v-model="scope.row.salesMainUnitId"
-                        @change="changeData('businessorderproductrelational-salesMainUnitId', scope.$index)"
-                        placeholder="请选择"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-salesMainUnitId')"
-                        clearable :style='{ "width": "100%" }'
-                        :options="businessorderproductrelationalsalesMainUnitIdOptions"
-                        :props="businessorderproductrelationalsalesMainUnitIdProps">
-                      </JnpfSelect>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="业务数量" v-if="judgeShow('businessorderproductrelational-businessNum')"
-                    prop="businessNum">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-businessNum')">*</span>业务数量
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.businessNum"
-                        @change="changeData('businessorderproductrelational-businessNum', scope.$index)"
-                        placeholder="请输入"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-businessNum')"
-                        clearable :style='{ "width": "100%" }'>
-                      </JnpfInput>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="业务单价" v-if="judgeShow('businessorderproductrelational-businessPrice')"
-                    prop="businessPrice">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-businessPrice')">*</span>业务单价
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.businessPrice"
-                        @change="changeData('businessorderproductrelational-businessPrice', scope.$index)"
-                        placeholder="请输入"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-businessPrice')"
-                        clearable :style='{ "width": "100%" }'>
-                      </JnpfInput>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="税率" v-if="judgeShow('businessorderproductrelational-tax')" prop="tax">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-tax')">*</span>税率
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.tax"
-                        @change="changeData('businessorderproductrelational-tax', scope.$index)" placeholder="请输入"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-tax')"
-                        clearable :style='{ "width": "100%" }'>
-                      </JnpfInput>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="含税小计" v-if="judgeShow('businessorderproductrelational-taxCount')"
-                    prop="taxCount">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-taxCount')">*</span>含税小计
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.taxCount"
-                        @change="changeData('businessorderproductrelational-taxCount', scope.$index)" placeholder="请输入"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-taxCount')"
-                        clearable :style='{ "width": "100%" }'>
-                      </JnpfInput>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="不含税单价" v-if="judgeShow('businessorderproductrelational-notTaxPrice')"
-                    prop="notTaxPrice">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-notTaxPrice')">*</span>不含税单价
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.notTaxPrice"
-                        @change="changeData('businessorderproductrelational-notTaxPrice', scope.$index)"
-                        placeholder="请输入"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-notTaxPrice')"
-                        clearable :style='{ "width": "100%" }'>
-                      </JnpfInput>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="不含税小计" v-if="judgeShow('businessorderproductrelational-notTaxCount')"
-                    prop="notTaxCount">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-notTaxCount')">*</span>不含税小计
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.notTaxCount"
-                        @change="changeData('businessorderproductrelational-notTaxCount', scope.$index)"
-                        placeholder="请输入"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-notTaxCount')"
-                        clearable :style='{ "width": "100%" }'>
-                      </JnpfInput>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="上一次采购单价" v-if="judgeShow('businessorderproductrelational-lastSalePrice')"
-                    prop="lastSalePrice">
-                    <template slot="header">
-                      <span class="required-sign"
-                        v-if="judgeRequired('businessorderproductrelationalList-lastSalePrice')">*</span>上一次采购单价
-                    </template>
-                    <template slot-scope="scope">
-                      <JnpfInput v-model="scope.row.lastSalePrice"
-                        @change="changeData('businessorderproductrelational-lastSalePrice', scope.$index)"
-                        placeholder="请输入"
-                        :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-lastSalePrice')"
-                        clearable :style='{ "width": "100%" }'>
-                      </JnpfInput>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="操作" width="50" v-if="!judgeWrite('businessorderproductrelationalList')">
-                    <template slot-scope="scope">
-                      <el-button size="mini" type="text" class="JNPF-table-delBtn"
-                        @click="delbusinessorderproductrelationalList(scope.$index)">删除</el-button>
-                    </template>
-                  </el-table-column>
-                </el-table>
-                <div class="table-actions" @click="addbusinessorderproductrelationalList()"
-                  v-if="!judgeWrite('businessorderproductrelationalList')">
-                  <el-button type="text" icon="el-icon-plus">添加</el-button>
-                </div>
-              </jnpf-form-tip-item>
-            </el-col>
-          </template>
+          <el-col :span="24" v-if="judgeShow('-${html.relationField}')">
+            <jnpf-form-tip-item label-width="0">
+              <div class="JNPF-common-title">
+                <h2></h2>
+              </div>
+              <el-table :data="dataForm.businessOrderProductRelationalList" size='mini'>
+                <el-table-column type="index" width="50" label="序号" align="center" />
+                <el-table-column label="商品名称" v-if="judgeShow('businessorderproductrelational-productId')"
+                  prop="productId">
+                  <template slot="header">
+                    <span class="required-sign"
+                      v-if="judgeRequired('businessorderproductrelationalList-productId')">*</span>商品名称
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfPopupSelect v-model="scope.row.productId" @change="productInfo" :rowIndex="scope.$index"
+                      :formData="dataForm" :templateJson="interfaceRes.businessorderproductrelationalproductId"
+                      placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                      relationField='name' :field="'productId' + scope.$index" interfaceId="530009896687501829"
+                      :pageSize="20" :columnOptions="businessorderproductrelationalproductIdcolumnOptions2" clearable
+                      :style='{ "width": "100%" }'>
+                    </JnpfPopupSelect>
+                  </template>
+                </el-table-column>
+                <el-table-column label="规格" v-if="judgeShow('businessorderproductrelational-spec')" prop="spec">
+                  <template slot="header">
+                    <span class="required-sign"
+                      v-if="judgeRequired('businessorderproductrelationalList-spec')">*</span>规格
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfInput v-model="scope.row.spec"
+                      @change="changeData('businessorderproductrelational-spec', scope.$index)" placeholder="请输入"
+                      :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-spec')"
+                      clearable :style='{ "width": "100%" }'>
+                    </JnpfInput>
+                  </template>
+                </el-table-column>
+                <el-table-column label="库存单位" v-if="judgeShow('businessorderproductrelational-inventoryUnitId')"
+                  prop="inventoryUnitId">
+                  <template slot="header">
+                    <span class="required-sign"
+                      v-if="judgeRequired('businessorderproductrelationalList-inventoryUnitId')">*</span>库存单位
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfInput v-model="scope.row.inventoryUnitId"
+                      @change="changeData('businessorderproductrelational-inventoryUnitId', scope.$index)"
+                      placeholder="请输入"
+                      :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-inventoryUnitId')"
+                      clearable :style='{ "width": "100%" }'>
+                    </JnpfInput>
+                  </template>
+                </el-table-column>
+                <el-table-column label="实物库存" v-if="judgeShow('businessorderproductrelational-realBound')"
+                  prop="realBound">
+                  <template slot="header">
+                    <span class="required-sign"
+                      v-if="judgeRequired('businessorderproductrelationalList-realBound')">*</span>实物库存
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfInput v-model="scope.row.realBound"
+                      @change="changeData('businessorderproductrelational-realBound', scope.$index)" placeholder="请输入"
+                      :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-realBound')"
+                      clearable :style='{ "width": "100%" }'>
+                    </JnpfInput>
+                  </template>
+                </el-table-column>
+                <el-table-column label="可用库存" v-if="judgeShow('businessorderproductrelational-useBound')"
+                  prop="useBound">
+                  <template slot="header">
+                    <span class="required-sign"
+                      v-if="judgeRequired('businessorderproductrelationalList-useBound')">*</span>可用库存
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfInput v-model="scope.row.useBound"
+                      @change="changeData('businessorderproductrelational-useBound', scope.$index)" placeholder="请输入"
+                      :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-useBound')"
+                      clearable :style='{ "width": "100%" }'>
+                    </JnpfInput>
+                  </template>
+                </el-table-column>
+                <el-table-column label="采购单位" v-if="judgeShow('businessorderproductrelational-salesMainUnitId')"
+                  prop="salesMainUnitId">
+                  <template slot="header">
+                    <span class="required-sign"
+                      v-if="judgeRequired('businessorderproductrelationalList-salesMainUnitId')">*</span>采购单位
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfSelect v-model="scope.row.salesMainUnitId"
+                      @change="changeData('businessorderproductrelational-salesMainUnitId', scope.$index)"
+                      placeholder="请选择"
+                      :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-salesMainUnitId')"
+                      clearable :style='{ "width": "100%" }'
+                      :options="businessorderproductrelationalsalesMainUnitIdOptions"
+                      :props="businessorderproductrelationalsalesMainUnitIdProps">
+                    </JnpfSelect>
+                  </template>
+                </el-table-column>
+                <el-table-column label="业务数量" v-if="judgeShow('businessorderproductrelational-businessNum')"
+                  prop="businessNum">
+                  <template slot="header">
+                    <span class="required-sign"
+                      v-if="judgeRequired('businessorderproductrelationalList-businessNum')">*</span>业务数量
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfInput v-model="scope.row.businessNum"
+                      @change="changeData('businessorderproductrelational-businessNum', scope.$index)" placeholder="请输入"
+                      :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-businessNum')"
+                      clearable :style='{ "width": "100%" }'>
+                    </JnpfInput>
+                  </template>
+                </el-table-column>
+                <el-table-column label="业务单价" v-if="judgeShow('businessorderproductrelational-businessPrice')"
+                  prop="businessPrice">
+                  <template slot="header">
+                    <span class="required-sign"
+                      v-if="judgeRequired('businessorderproductrelationalList-businessPrice')">*</span>业务单价
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfInput v-model="scope.row.businessPrice"
+                      @change="changeData('businessorderproductrelational-businessPrice', scope.$index)"
+                      placeholder="请输入"
+                      :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-businessPrice')"
+                      clearable :style='{ "width": "100%" }'>
+                    </JnpfInput>
+                  </template>
+                </el-table-column>
+                <el-table-column label="税率" v-if="judgeShow('businessorderproductrelational-tax')" prop="tax">
+                  <template slot="header">
+                    <span class="required-sign"
+                      v-if="judgeRequired('businessorderproductrelationalList-tax')">*</span>税率
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfInput v-model="scope.row.tax"
+                      @change="changeData('businessorderproductrelational-tax', scope.$index)" placeholder="请输入"
+                      :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-tax')"
+                      clearable :style='{ "width": "100%" }'>
+                    </JnpfInput>
+                  </template>
+                </el-table-column>
+                <el-table-column label="含税小计" v-if="judgeShow('businessorderproductrelational-taxCount')"
+                  prop="taxCount">
+                  <template slot="header">
+                    <span class="required-sign"
+                      v-if="judgeRequired('businessorderproductrelationalList-taxCount')">*</span>含税小计
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfInput v-model="scope.row.taxCount"
+                      @change="changeData('businessorderproductrelational-taxCount', scope.$index)" placeholder="请输入"
+                      :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-taxCount')"
+                      clearable :style='{ "width": "100%" }'>
+                    </JnpfInput>
+                  </template>
+                </el-table-column>
+                <el-table-column label="不含税单价" v-if="judgeShow('businessorderproductrelational-notTaxPrice')"
+                  prop="notTaxPrice">
+                  <template slot="header">
+                    <span class="required-sign"
+                      v-if="judgeRequired('businessorderproductrelationalList-notTaxPrice')">*</span>不含税单价
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfInput v-model="scope.row.notTaxPrice"
+                      @change="changeData('businessorderproductrelational-notTaxPrice', scope.$index)" placeholder="请输入"
+                      :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-notTaxPrice')"
+                      clearable :style='{ "width": "100%" }'>
+                    </JnpfInput>
+                  </template>
+                </el-table-column>
+                <el-table-column label="不含税小计" v-if="judgeShow('businessorderproductrelational-notTaxCount')"
+                  prop="notTaxCount">
+                  <template slot="header">
+                    <span class="required-sign"
+                      v-if="judgeRequired('businessorderproductrelationalList-notTaxCount')">*</span>不含税小计
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfInput v-model="scope.row.notTaxCount"
+                      @change="changeData('businessorderproductrelational-notTaxCount', scope.$index)" placeholder="请输入"
+                      :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-notTaxCount')"
+                      clearable :style='{ "width": "100%" }'>
+                    </JnpfInput>
+                  </template>
+                </el-table-column>
+                <el-table-column label="上一次采购单价" v-if="judgeShow('businessorderproductrelational-lastSalePrice')"
+                  prop="lastSalePrice">
+                  <template slot="header">
+                    <span class="required-sign"
+                      v-if="judgeRequired('businessorderproductrelationalList-lastSalePrice')">*</span>上一次采购单价
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfInput v-model="scope.row.lastSalePrice"
+                      @change="changeData('businessorderproductrelational-lastSalePrice', scope.$index)"
+                      placeholder="请输入"
+                      :disabled="judgeWrite('businessorderproductrelationalList') || judgeWrite('businessorderproductrelationalList-lastSalePrice')"
+                      clearable :style='{ "width": "100%" }'>
+                    </JnpfInput>
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作" width="50" v-if="!judgeWrite('businessorderproductrelationalList')">
+                  <template slot-scope="scope">
+                    <el-button size="mini" type="text" class="JNPF-table-delBtn"
+                      @click="delbusinessorderproductrelationalList(scope.$index)">删除</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <div class="table-actions" @click="choiceProduct(dataForm.contractId)"
+                v-if="!judgeWrite('businessorderproductrelationalList')">
+                <el-button type="text" icon="el-icon-plus">添加</el-button>
+              </div>
+            </jnpf-form-tip-item>
+          </el-col>
           <!-- <el-col :span="24" v-if="judgeShow('status')">
             <jnpf-form-tip-item label="状态" v-if="judgeShow('status')" prop="status">
               <JnpfSelect v-model="dataForm.status" @change="changeData('status',-1)"
@@ -1026,6 +807,7 @@
       </el-form>
     </el-row>
     <UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
+    <BomProductGoodsBox v-if="BomgoodsBoxVisible" ref="BomGoodsBox" @refreshDataList="initProductList" />
   </div>
 </template>
 
@@ -1040,12 +822,14 @@ import { getDefaultCurrentValueUserId } from '@/api/permission/user'
 import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
 import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
 import { thousandsFormat } from "@/components/Generator/utils/index"
+import BomProductGoodsBox from '@/views/scm/publicPopup/BomProductGoodsBox'
 export default {
   mixins: [comMixin],
-  components: {},
+  components: { BomProductGoodsBox },
   props: [],
   data() {
     return {
+      BomgoodsBoxVisible: false,
       dataFormSubmitType: 0,
       continueBtnLoading: false,
       index: 0,
@@ -1401,6 +1185,25 @@ export default {
     this.initPurchaseData();
   },
   methods: {
+    choiceProduct(val) {
+      if (!val) {
+        this.$message({
+          type: 'error',
+          message: '请先关联合同',
+          duration: 1500,
+        })
+        return
+      }
+      this.BomgoodsBoxVisible = true
+      let excludeIdList = [];
+      for (let i = 0; i < this.dataForm.businessOrderProductRelationalList.length; i++) {
+        excludeIdList.push(this.dataForm.businessOrderProductRelationalList[i].productId);
+      }
+      debugger
+      this.$nextTick(() => {
+        this.$refs.BomGoodsBox.init(excludeIdList, val)
+      })
+    },
     productInfo(val, val2) {
       this.dataForm.businessOrderProductRelationalList.push(val2)
       this.dataForm.businessOrderProductRelationalList.splice(-2, 1)