From 2c9769325e2ca32f1775135b0a1d2e5e87ff47d4 Mon Sep 17 00:00:00 2001
From: jiyufei <67400194@qq.com>
Date: Wed, 17 Jul 2024 10:40:13 +0800
Subject: [PATCH] =?UTF-8?q?feat(contract):=E5=90=88=E5=90=8C=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=89=8D=E5=90=8E=E7=AB=AF=E4=BB=A3=E7=A0=81=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/EnterpriseMerchantsService.java   |  20 +-
 .../service/impl/ContractServiceImpl.java     |  53 +-
 .../impl/EnterpriseMerchantsServiceImpl.java  | 459 +++++----
 .../src/views/scm/contract/change.vue         | 935 ++++++++++++++++++
 .../jnpf-web/src/views/scm/contract/index.vue | 167 ++--
 5 files changed, 1326 insertions(+), 308 deletions(-)
 create mode 100644 jnpf-java-boot/jnpf-web/src/views/scm/contract/change.vue

diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/EnterpriseMerchantsService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/EnterpriseMerchantsService.java
index 29dcf49..77361c8 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/EnterpriseMerchantsService.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/EnterpriseMerchantsService.java
@@ -2,7 +2,9 @@ package jnpf.service;
 
 import jnpf.model.enterprisemerchants.*;
 import jnpf.entity.*;
+
 import java.util.*;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
@@ -16,7 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 public interface EnterpriseMerchantsService extends IService<EnterpriseMerchantsEntity> {
     List<EnterpriseMerchantsEntity> getList(EnterpriseMerchantsPagination enterpriseMerchantsPagination);
 
-    List<EnterpriseMerchantsEntity> getTypeList(EnterpriseMerchantsPagination enterpriseMerchantsPagination,String dataType);
+    List<EnterpriseMerchantsEntity> getTypeList(EnterpriseMerchantsPagination enterpriseMerchantsPagination, String dataType);
 
     EnterpriseMerchantsEntity getInfo(String id);
 
@@ -28,8 +30,16 @@ public interface EnterpriseMerchantsService extends IService<EnterpriseMerchants
 
     //子表方法
     //副表数据方法
-	String checkForm(EnterpriseMerchantsForm form,int i);
-
-    void saveOrUpdate(EnterpriseMerchantsForm enterpriseMerchantsForm,String id, boolean isSave) throws Exception;
-
+    String checkForm(EnterpriseMerchantsForm form, int i);
+
+    void saveOrUpdate(EnterpriseMerchantsForm enterpriseMerchantsForm, String id, boolean isSave) throws Exception;
+
+    /**
+     * 更新商户状态
+     *
+     * @param contractStatus 变更状态
+     * @param contractName   商户主键id
+     * @param parkId         园区id
+     */
+    void updateStatus(String contractStatus, String contractName, String parkId);
 }
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ContractServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ContractServiceImpl.java
index 101830a..12a61f6 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ContractServiceImpl.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ContractServiceImpl.java
@@ -17,6 +17,7 @@ import jnpf.model.QueryModel;
 import jnpf.model.contract.*;
 import jnpf.permission.entity.UserEntity;
 import jnpf.service.ContractService;
+import jnpf.service.EnterpriseMerchantsService;
 import jnpf.service.SpacecontractService;
 import jnpf.util.*;
 import lombok.extern.slf4j.Slf4j;
@@ -25,10 +26,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.lang.reflect.Field;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -51,6 +54,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, ContractEnt
     @Autowired
     private SpacecontractService spacecontractService;
 
+    @Resource
+    private EnterpriseMerchantsService enterpriseMerchantsService;
+
     @Override
     public List<ContractEntity> getList(ContractPagination contractPagination) {
         return getTypeList(contractPagination, contractPagination.getDataType());
@@ -387,6 +393,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, ContractEnt
 
     @Override
     public void create(ContractEntity entity) {
+        entity.setCreateBy(userProvider.get().getUserId());
         this.save(entity);
     }
 
@@ -541,17 +548,32 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, ContractEnt
         LambdaQueryWrapper<ContractEntity> eq = new LambdaQueryWrapper<>(ContractEntity.class)
                 .eq(ContractEntity::getId, request.getId());
         ContractEntity contract = this.getOne(eq);
-        if (!"10".equals(contract.getContractStatus()) || !"21".equals(contract.getContractStatus())) {
-            return "该合同处于已确认状态，不允许再次确认";
-        }
-        //todo 查询空间判断
+        if ("10".equals(contract.getContractStatus()) || "21".equals(contract.getContractStatus())) {
+            //todo 查询空间判断 如果空间状态存在不是待租状态 就提示
+
+
+            contract.setContractStatus(request.getContractStatus());
+            contract.setApproveDate(DateUtil.getNowDate());
+            contract.setApprovedBy(userProvider.get().getUserId());
+            String remarks;
+            if (StringUtils.isBlank(request.getApproveRemarks()) && "20".equals(contract.getContractStatus())) {
+                remarks = "同意";
+            } else if (StringUtils.isBlank(request.getApproveRemarks()) && "10".equals(contract.getContractStatus())) {
+                remarks = "驳回";
+            } else {
+                remarks = request.getApproveRemarks();
+            }
+            contract.setApproveRemarks(remarks);
+            boolean result = this.updateById(contract);
+            if (result) {
+                //todo 需要处理空间逻辑
 
-        //todo 需要处理别的逻辑
-        contract.setContractStatus(request.getContractStatus());
-        contract.setApproveDate(DateUtil.getNowDate());
-        contract.setApprovedBy(userProvider.get().getUserId());
-        contract.setApproveRemarks(StringUtils.isNoneBlank(request.getApproveRemarks()) ? request.getApproveRemarks() : "同意");
-        return "合同确认成功";
+                //异步处理商户信息
+                CompletableFuture.runAsync(() -> enterpriseMerchantsService.updateStatus(request.getContractStatus(), contract.getContractName(), contract.getParkId()));
+            }
+            return "合同确认成功";
+        }
+        return "该合同处于已确认状态，不允许再次确认";
     }
 
     @Override
@@ -562,11 +584,18 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, ContractEnt
         ContractEntity contract = this.getOne(eq);
         if (!"20".equals(contract.getContractStatus())) {
             return "该合同没有确认，不允许结束！";
+        } else if ("30".equals(contract.getContractStatus())) {
+            return "该合同已结案！";
         }
-        //todo 需要处理别的逻辑
         contract.setContractStatus(request.getContractStatus());
         contract.setRemarks(StringUtils.isNoneBlank(request.getApproveRemarks()) ? request.getApproveRemarks() : "同意");
-        this.updateById(contract);
+        boolean result = this.updateById(contract);
+        if (result) {
+            //todo 需要处理空间逻辑
+
+            //异步处理商户信息
+            CompletableFuture.runAsync(() -> enterpriseMerchantsService.updateStatus(request.getContractStatus(), contract.getContractName(), null));
+        }
         return "合同结束成功";
     }
 }
diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/EnterpriseMerchantsServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/EnterpriseMerchantsServiceImpl.java
index dedd411..a286172 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/EnterpriseMerchantsServiceImpl.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/EnterpriseMerchantsServiceImpl.java
@@ -5,19 +5,28 @@ import jnpf.mapper.EnterpriseMerchantsMapper;
 import jnpf.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jnpf.model.enterprisemerchants.*;
+
 import java.math.BigDecimal;
+
 import cn.hutool.core.util.ObjectUtil;
 import jnpf.permission.model.authorize.AuthorizeConditionModel;
 import jnpf.util.GeneraterSwapUtil;
 import jnpf.database.model.superQuery.SuperQueryJsonModel;
 import jnpf.database.model.superQuery.ConditionJsonModel;
 import jnpf.database.model.superQuery.SuperQueryConditionModel;
+
 import java.lang.reflect.Field;
+
 import com.baomidou.mybatisplus.annotation.TableField;
+
 import java.util.regex.Pattern;
+
 import jnpf.model.QueryModel;
+
 import java.util.stream.Collectors;
+
 import jnpf.base.model.ColumnDataModel;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import jnpf.database.model.superQuery.SuperJsonModel;
@@ -25,13 +34,17 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 import java.text.SimpleDateFormat;
+
 import jnpf.util.*;
+
 import java.util.*;
+
 import jnpf.base.UserInfo;
 import jnpf.permission.entity.UserEntity;
+
 /**
- *
  * EnterpriseMerchants
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@@ -39,7 +52,8 @@ import jnpf.permission.entity.UserEntity;
  * 日期： 2024-07-15
  */
 @Service
-public class EnterpriseMerchantsServiceImpl extends ServiceImpl<EnterpriseMerchantsMapper, EnterpriseMerchantsEntity> implements EnterpriseMerchantsService{
+@Slf4j
+public class EnterpriseMerchantsServiceImpl extends ServiceImpl<EnterpriseMerchantsMapper, EnterpriseMerchantsEntity> implements EnterpriseMerchantsService {
     @Autowired
     private GeneraterSwapUtil generaterSwapUtil;
 
@@ -47,343 +61,372 @@ public class EnterpriseMerchantsServiceImpl extends ServiceImpl<EnterpriseMercha
     private UserProvider userProvider;
 
     @Override
-    public List<EnterpriseMerchantsEntity> getList(EnterpriseMerchantsPagination enterpriseMerchantsPagination){
-        return getTypeList(enterpriseMerchantsPagination,enterpriseMerchantsPagination.getDataType());
+    public List<EnterpriseMerchantsEntity> getList(EnterpriseMerchantsPagination enterpriseMerchantsPagination) {
+        return getTypeList(enterpriseMerchantsPagination, enterpriseMerchantsPagination.getDataType());
     }
-    /** 列表查询 */
+
+    /**
+     * 列表查询
+     */
     @Override
-    public List<EnterpriseMerchantsEntity> getTypeList(EnterpriseMerchantsPagination enterpriseMerchantsPagination,String dataType){
-        String userId=userProvider.get().getUserId();
-        List<String> AllIdList =new ArrayList();
-        List<List<String>> intersectionList =new ArrayList<>();
+    public List<EnterpriseMerchantsEntity> getTypeList(EnterpriseMerchantsPagination enterpriseMerchantsPagination, String dataType) {
+        String userId = userProvider.get().getUserId();
+        List<String> AllIdList = new ArrayList();
+        List<List<String>> intersectionList = new ArrayList<>();
         boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
         String columnData = !isPc ? EnterpriseMerchantsConstant.getAppColumnData() : EnterpriseMerchantsConstant.getColumnData();
         ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
         String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
 
-        int total=0;
-        int enterpriseMerchantsNum =0;
-        QueryWrapper<EnterpriseMerchantsEntity> enterpriseMerchantsQueryWrapper=new QueryWrapper<>();
+        int total = 0;
+        int enterpriseMerchantsNum = 0;
+        QueryWrapper<EnterpriseMerchantsEntity> enterpriseMerchantsQueryWrapper = new QueryWrapper<>();
         List<String> allSuperIDlist = new ArrayList<>();
-        String superOp ="";
-        if (ObjectUtil.isNotEmpty(enterpriseMerchantsPagination.getSuperQueryJson())){
+        String superOp = "";
+        if (ObjectUtil.isNotEmpty(enterpriseMerchantsPagination.getSuperQueryJson())) {
             List<String> allSuperList = new ArrayList<>();
-            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            List<List<String>> intersectionSuperList = new ArrayList<>();
             String queryJson = enterpriseMerchantsPagination.getSuperQueryJson();
             SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
             int superNum = 0;
             QueryWrapper<EnterpriseMerchantsEntity> enterpriseMerchantsSuperWrapper = new QueryWrapper<>();
-            enterpriseMerchantsSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(enterpriseMerchantsSuperWrapper,EnterpriseMerchantsEntity.class,queryJson,"0"));
+            enterpriseMerchantsSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(enterpriseMerchantsSuperWrapper, EnterpriseMerchantsEntity.class, queryJson, "0"));
             int enterpriseMerchantsNum1 = enterpriseMerchantsSuperWrapper.getExpression().getNormal().size();
-            if (enterpriseMerchantsNum1>0){
-                List<String> enterpriseMerchantsList =this.list(enterpriseMerchantsSuperWrapper).stream().map(EnterpriseMerchantsEntity::getId).collect(Collectors.toList());
+            if (enterpriseMerchantsNum1 > 0) {
+                List<String> enterpriseMerchantsList = this.list(enterpriseMerchantsSuperWrapper).stream().map(EnterpriseMerchantsEntity::getId).collect(Collectors.toList());
                 allSuperList.addAll(enterpriseMerchantsList);
                 intersectionSuperList.add(enterpriseMerchantsList);
                 superNum++;
             }
             superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
             //and or
-            if(superOp.equalsIgnoreCase("and")){
+            if (superOp.equalsIgnoreCase("and")) {
                 allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
-            }else{
+            } else {
                 allSuperIDlist = allSuperList;
             }
         }
         List<String> allRuleIDlist = new ArrayList<>();
-        String ruleOp ="";
-        if (ObjectUtil.isNotEmpty(ruleJson)){
+        String ruleOp = "";
+        if (ObjectUtil.isNotEmpty(ruleJson)) {
             List<String> allRuleList = new ArrayList<>();
-            List<List<String>> intersectionRuleList  = new ArrayList<>();
+            List<List<String>> intersectionRuleList = new ArrayList<>();
             SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
             int ruleNum = 0;
             QueryWrapper<EnterpriseMerchantsEntity> enterpriseMerchantsSuperWrapper = new QueryWrapper<>();
-            enterpriseMerchantsSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(enterpriseMerchantsSuperWrapper,EnterpriseMerchantsEntity.class,ruleJson,"0"));
+            enterpriseMerchantsSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(enterpriseMerchantsSuperWrapper, EnterpriseMerchantsEntity.class, ruleJson, "0"));
             int enterpriseMerchantsNum1 = enterpriseMerchantsSuperWrapper.getExpression().getNormal().size();
-            if (enterpriseMerchantsNum1>0){
-                List<String> enterpriseMerchantsList =this.list(enterpriseMerchantsSuperWrapper).stream().map(EnterpriseMerchantsEntity::getId).collect(Collectors.toList());
+            if (enterpriseMerchantsNum1 > 0) {
+                List<String> enterpriseMerchantsList = this.list(enterpriseMerchantsSuperWrapper).stream().map(EnterpriseMerchantsEntity::getId).collect(Collectors.toList());
                 allRuleList.addAll(enterpriseMerchantsList);
                 intersectionRuleList.add(enterpriseMerchantsList);
                 ruleNum++;
             }
             ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
             //and or
-            if(ruleOp.equalsIgnoreCase("and")){
+            if (ruleOp.equalsIgnoreCase("and")) {
                 allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
-            }else{
+            } else {
                 allRuleIDlist = allRuleList;
             }
         }
-    boolean pcPermission = false;
-    boolean appPermission = false;
-    if(isPc && pcPermission){
-    if (!userProvider.get().getIsAdministrator()){
-        Object enterpriseMerchantsObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(enterpriseMerchantsQueryWrapper,EnterpriseMerchantsEntity.class,enterpriseMerchantsPagination.getMenuId(),"0"));
-        if (ObjectUtil.isEmpty(enterpriseMerchantsObj)){
-        return new ArrayList<>();
-        } else {
-        enterpriseMerchantsQueryWrapper = (QueryWrapper<EnterpriseMerchantsEntity>)enterpriseMerchantsObj;
-        if( enterpriseMerchantsQueryWrapper.getExpression().getNormal().size()>0){
-        enterpriseMerchantsNum++;
-        }
-        }
-    }
-    }
-    if(!isPc && appPermission){
-    if (!userProvider.get().getIsAdministrator()){
-        Object enterpriseMerchantsObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(enterpriseMerchantsQueryWrapper,EnterpriseMerchantsEntity.class,enterpriseMerchantsPagination.getMenuId(),"0"));
-        if (ObjectUtil.isEmpty(enterpriseMerchantsObj)){
-        return new ArrayList<>();
-        } else {
-        enterpriseMerchantsQueryWrapper = (QueryWrapper<EnterpriseMerchantsEntity>)enterpriseMerchantsObj;
-        if( enterpriseMerchantsQueryWrapper.getExpression().getNormal().size()>0){
-        enterpriseMerchantsNum++;
-        }
+        boolean pcPermission = false;
+        boolean appPermission = false;
+        if (isPc && pcPermission) {
+            if (!userProvider.get().getIsAdministrator()) {
+                Object enterpriseMerchantsObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(enterpriseMerchantsQueryWrapper, EnterpriseMerchantsEntity.class, enterpriseMerchantsPagination.getMenuId(), "0"));
+                if (ObjectUtil.isEmpty(enterpriseMerchantsObj)) {
+                    return new ArrayList<>();
+                } else {
+                    enterpriseMerchantsQueryWrapper = (QueryWrapper<EnterpriseMerchantsEntity>) enterpriseMerchantsObj;
+                    if (enterpriseMerchantsQueryWrapper.getExpression().getNormal().size() > 0) {
+                        enterpriseMerchantsNum++;
+                    }
+                }
+            }
         }
+        if (!isPc && appPermission) {
+            if (!userProvider.get().getIsAdministrator()) {
+                Object enterpriseMerchantsObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(enterpriseMerchantsQueryWrapper, EnterpriseMerchantsEntity.class, enterpriseMerchantsPagination.getMenuId(), "0"));
+                if (ObjectUtil.isEmpty(enterpriseMerchantsObj)) {
+                    return new ArrayList<>();
+                } else {
+                    enterpriseMerchantsQueryWrapper = (QueryWrapper<EnterpriseMerchantsEntity>) enterpriseMerchantsObj;
+                    if (enterpriseMerchantsQueryWrapper.getExpression().getNormal().size() > 0) {
+                        enterpriseMerchantsNum++;
+                    }
+                }
 
 
-    }
-    }
-        if(isPc){
-            if(ObjectUtil.isNotEmpty(enterpriseMerchantsPagination.getCmpNo())){
-            enterpriseMerchantsNum++;
+            }
+        }
+        if (isPc) {
+            if (ObjectUtil.isNotEmpty(enterpriseMerchantsPagination.getCmpNo())) {
+                enterpriseMerchantsNum++;
 
                 String value = enterpriseMerchantsPagination.getCmpNo() instanceof List ?
-                    JsonUtil.getObjectToString(enterpriseMerchantsPagination.getCmpNo()) :
-                    String.valueOf(enterpriseMerchantsPagination.getCmpNo());
-                enterpriseMerchantsQueryWrapper.lambda().like(EnterpriseMerchantsEntity::getCmpNo,value);
+                        JsonUtil.getObjectToString(enterpriseMerchantsPagination.getCmpNo()) :
+                        String.valueOf(enterpriseMerchantsPagination.getCmpNo());
+                enterpriseMerchantsQueryWrapper.lambda().like(EnterpriseMerchantsEntity::getCmpNo, value);
 
             }
 
-            if(ObjectUtil.isNotEmpty(enterpriseMerchantsPagination.getCmpNm())){
-            enterpriseMerchantsNum++;
+            if (ObjectUtil.isNotEmpty(enterpriseMerchantsPagination.getCmpNm())) {
+                enterpriseMerchantsNum++;
 
                 String value = enterpriseMerchantsPagination.getCmpNm() instanceof List ?
-                    JsonUtil.getObjectToString(enterpriseMerchantsPagination.getCmpNm()) :
-                    String.valueOf(enterpriseMerchantsPagination.getCmpNm());
-                enterpriseMerchantsQueryWrapper.lambda().like(EnterpriseMerchantsEntity::getCmpNm,value);
+                        JsonUtil.getObjectToString(enterpriseMerchantsPagination.getCmpNm()) :
+                        String.valueOf(enterpriseMerchantsPagination.getCmpNm());
+                enterpriseMerchantsQueryWrapper.lambda().like(EnterpriseMerchantsEntity::getCmpNm, value);
 
             }
 
-            if(ObjectUtil.isNotEmpty(enterpriseMerchantsPagination.getCompType())){
-            enterpriseMerchantsNum++;
+            if (ObjectUtil.isNotEmpty(enterpriseMerchantsPagination.getCompType())) {
+                enterpriseMerchantsNum++;
 
-        List<String> idList = new ArrayList<>();
-        try {
-        String[][] compType = JsonUtil.getJsonToBean(enterpriseMerchantsPagination.getCompType(),String[][].class);
-        for(int i=0;i<compType.length;i++){
-        if(compType[i].length>0){
-        idList.add(JsonUtil.getObjectToString(Arrays.asList(compType[i])));
-        }
-        }
-        }catch (Exception e1){
-        try {
-        List<String> compType = JsonUtil.getJsonToList(enterpriseMerchantsPagination.getCompType(),String.class);
-        if(compType.size()>0){
-            idList.addAll(compType);
-        }
-        }catch (Exception e2){
-        idList.add(String.valueOf(enterpriseMerchantsPagination.getCompType()));
-        }
-        }
-        enterpriseMerchantsQueryWrapper.lambda().and(t->{
-        idList.forEach(tt->{
-        t.like(EnterpriseMerchantsEntity::getCompType, tt).or();
-        });
-        });
+                List<String> idList = new ArrayList<>();
+                try {
+                    String[][] compType = JsonUtil.getJsonToBean(enterpriseMerchantsPagination.getCompType(), String[][].class);
+                    for (int i = 0; i < compType.length; i++) {
+                        if (compType[i].length > 0) {
+                            idList.add(JsonUtil.getObjectToString(Arrays.asList(compType[i])));
+                        }
+                    }
+                } catch (Exception e1) {
+                    try {
+                        List<String> compType = JsonUtil.getJsonToList(enterpriseMerchantsPagination.getCompType(), String.class);
+                        if (compType.size() > 0) {
+                            idList.addAll(compType);
+                        }
+                    } catch (Exception e2) {
+                        idList.add(String.valueOf(enterpriseMerchantsPagination.getCompType()));
+                    }
+                }
+                enterpriseMerchantsQueryWrapper.lambda().and(t -> {
+                    idList.forEach(tt -> {
+                        t.like(EnterpriseMerchantsEntity::getCompType, tt).or();
+                    });
+                });
 
             }
 
-            if(ObjectUtil.isNotEmpty(enterpriseMerchantsPagination.getCompanyStatus())){
-            enterpriseMerchantsNum++;
+            if (ObjectUtil.isNotEmpty(enterpriseMerchantsPagination.getCompanyStatus())) {
+                enterpriseMerchantsNum++;
 
-        List<String> idList = new ArrayList<>();
-        try {
-        String[][] companyStatus = JsonUtil.getJsonToBean(enterpriseMerchantsPagination.getCompanyStatus(),String[][].class);
-        for(int i=0;i<companyStatus.length;i++){
-        if(companyStatus[i].length>0){
-        idList.add(JsonUtil.getObjectToString(Arrays.asList(companyStatus[i])));
-        }
-        }
-        }catch (Exception e1){
-        try {
-        List<String> companyStatus = JsonUtil.getJsonToList(enterpriseMerchantsPagination.getCompanyStatus(),String.class);
-        if(companyStatus.size()>0){
-            idList.addAll(companyStatus);
-        }
-        }catch (Exception e2){
-        idList.add(String.valueOf(enterpriseMerchantsPagination.getCompanyStatus()));
-        }
-        }
-        enterpriseMerchantsQueryWrapper.lambda().and(t->{
-        idList.forEach(tt->{
-        t.like(EnterpriseMerchantsEntity::getCompanyStatus, tt).or();
-        });
-        });
+                List<String> idList = new ArrayList<>();
+                try {
+                    String[][] companyStatus = JsonUtil.getJsonToBean(enterpriseMerchantsPagination.getCompanyStatus(), String[][].class);
+                    for (int i = 0; i < companyStatus.length; i++) {
+                        if (companyStatus[i].length > 0) {
+                            idList.add(JsonUtil.getObjectToString(Arrays.asList(companyStatus[i])));
+                        }
+                    }
+                } catch (Exception e1) {
+                    try {
+                        List<String> companyStatus = JsonUtil.getJsonToList(enterpriseMerchantsPagination.getCompanyStatus(), String.class);
+                        if (companyStatus.size() > 0) {
+                            idList.addAll(companyStatus);
+                        }
+                    } catch (Exception e2) {
+                        idList.add(String.valueOf(enterpriseMerchantsPagination.getCompanyStatus()));
+                    }
+                }
+                enterpriseMerchantsQueryWrapper.lambda().and(t -> {
+                    idList.forEach(tt -> {
+                        t.like(EnterpriseMerchantsEntity::getCompanyStatus, tt).or();
+                    });
+                });
 
             }
 
         }
         List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
-        if (total>0){
-            if (intersection.size()==0){
+        if (total > 0) {
+            if (intersection.size() == 0) {
                 intersection.add("jnpfNullList");
             }
             enterpriseMerchantsQueryWrapper.lambda().in(EnterpriseMerchantsEntity::getId, intersection);
         }
-    //是否有高级查询
-        if (StringUtil.isNotEmpty(superOp)){
-            if (allSuperIDlist.size()==0){
+        //是否有高级查询
+        if (StringUtil.isNotEmpty(superOp)) {
+            if (allSuperIDlist.size() == 0) {
                 allSuperIDlist.add("jnpfNullList");
             }
             List<String> finalAllSuperIDlist = allSuperIDlist;
-            enterpriseMerchantsQueryWrapper.lambda().and(t->t.in(EnterpriseMerchantsEntity::getId, finalAllSuperIDlist));
+            enterpriseMerchantsQueryWrapper.lambda().and(t -> t.in(EnterpriseMerchantsEntity::getId, finalAllSuperIDlist));
         }
-    //是否有数据过滤查询
-        if (StringUtil.isNotEmpty(ruleOp)){
-            if (allRuleIDlist.size()==0){
+        //是否有数据过滤查询
+        if (StringUtil.isNotEmpty(ruleOp)) {
+            if (allRuleIDlist.size() == 0) {
                 allRuleIDlist.add("jnpfNullList");
             }
             List<String> finalAllRuleIDlist = allRuleIDlist;
-            enterpriseMerchantsQueryWrapper.lambda().and(t->t.in(EnterpriseMerchantsEntity::getId, finalAllRuleIDlist));
+            enterpriseMerchantsQueryWrapper.lambda().and(t -> t.in(EnterpriseMerchantsEntity::getId, finalAllRuleIDlist));
         }
         //假删除标志
         enterpriseMerchantsQueryWrapper.lambda().isNull(EnterpriseMerchantsEntity::getDeleteMark);
 
         //排序
-        if(StringUtil.isEmpty(enterpriseMerchantsPagination.getSidx())){
+        if (StringUtil.isEmpty(enterpriseMerchantsPagination.getSidx())) {
             enterpriseMerchantsQueryWrapper.lambda().orderByDesc(EnterpriseMerchantsEntity::getId);
-        }else{
+        } else {
             try {
                 String sidx = enterpriseMerchantsPagination.getSidx();
-                String[] strs= sidx.split("_name");
+                String[] strs = sidx.split("_name");
                 EnterpriseMerchantsEntity enterpriseMerchantsEntity = new EnterpriseMerchantsEntity();
                 Field declaredField = enterpriseMerchantsEntity.getClass().getDeclaredField(strs[0]);
                 declaredField.setAccessible(true);
                 String value = declaredField.getAnnotation(TableField.class).value();
-                enterpriseMerchantsQueryWrapper="asc".equals(enterpriseMerchantsPagination.getSort().toLowerCase())?enterpriseMerchantsQueryWrapper.orderByAsc(value):enterpriseMerchantsQueryWrapper.orderByDesc(value);
+                enterpriseMerchantsQueryWrapper = "asc".equals(enterpriseMerchantsPagination.getSort().toLowerCase()) ? enterpriseMerchantsQueryWrapper.orderByAsc(value) : enterpriseMerchantsQueryWrapper.orderByDesc(value);
             } catch (NoSuchFieldException e) {
                 e.printStackTrace();
             }
         }
 
-        if("0".equals(dataType)){
-            if((total>0 && AllIdList.size()>0) || total==0){
-                Page<EnterpriseMerchantsEntity> page=new Page<>(enterpriseMerchantsPagination.getCurrentPage(), enterpriseMerchantsPagination.getPageSize());
-                IPage<EnterpriseMerchantsEntity> userIPage=this.page(page, enterpriseMerchantsQueryWrapper);
-                return enterpriseMerchantsPagination.setData(userIPage.getRecords(),userIPage.getTotal());
-            }else{
+        if ("0".equals(dataType)) {
+            if ((total > 0 && AllIdList.size() > 0) || total == 0) {
+                Page<EnterpriseMerchantsEntity> page = new Page<>(enterpriseMerchantsPagination.getCurrentPage(), enterpriseMerchantsPagination.getPageSize());
+                IPage<EnterpriseMerchantsEntity> userIPage = this.page(page, enterpriseMerchantsQueryWrapper);
+                return enterpriseMerchantsPagination.setData(userIPage.getRecords(), userIPage.getTotal());
+            } else {
                 List<EnterpriseMerchantsEntity> list = new ArrayList();
                 return enterpriseMerchantsPagination.setData(list, list.size());
             }
-        }else{
+        } else {
             return this.list(enterpriseMerchantsQueryWrapper);
         }
     }
+
     @Override
-    public EnterpriseMerchantsEntity getInfo(String id){
-        QueryWrapper<EnterpriseMerchantsEntity> queryWrapper=new QueryWrapper<>();
-        queryWrapper.lambda().eq(EnterpriseMerchantsEntity::getId,id);
+    public EnterpriseMerchantsEntity getInfo(String id) {
+        QueryWrapper<EnterpriseMerchantsEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(EnterpriseMerchantsEntity::getId, id);
         return this.getOne(queryWrapper);
     }
+
     @Override
-    public void create(EnterpriseMerchantsEntity entity){
+    public void create(EnterpriseMerchantsEntity entity) {
         this.save(entity);
     }
+
     @Override
-    public boolean update(String id, EnterpriseMerchantsEntity entity){
+    public boolean update(String id, EnterpriseMerchantsEntity entity) {
         return this.updateById(entity);
     }
+
     @Override
-    public void delete(EnterpriseMerchantsEntity entity){
-        if(entity!=null){
+    public void delete(EnterpriseMerchantsEntity entity) {
+        if (entity != null) {
             this.removeById(entity.getId());
         }
     }
-    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+
+    /**
+     * 验证表单唯一字段，正则，非空 i-0新增-1修改
+     */
     @Override
-    public String checkForm(EnterpriseMerchantsForm form,int i) {
-        boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
-        String id="";
+    public String checkForm(EnterpriseMerchantsForm form, int i) {
+        boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
+        String id = "";
         String countRecover = "";
-        if (isUp){
+        if (isUp) {
             id = form.getId();
         }
         //主表字段验证
-                if(StringUtil.isEmpty(form.getCmpNo())){
-                    return "公司编码不能为空";
-                }
-                if(StringUtil.isEmpty(form.getCmpNm())){
-                    return "公司名称不能为空";
-                }
-                if(StringUtil.isEmpty(form.getUserNm())){
-                    return "联系人不能为空";
-                }
-                if(StringUtil.isEmpty(form.getContactNumber())){
-                    return "联系电话不能为空";
-                }
-    if(StringUtil.isNotEmpty(form.getContactNumber())){
-        if(!Pattern.compile("^1[3456789]\\d{9}$|^0\\d{2,3}-?\\d{7,8}$").matcher(String.valueOf(form.getContactNumber())).matches()){
-        return "请输入正确的联系方式";
+        if (StringUtil.isEmpty(form.getCmpNo())) {
+            return "公司编码不能为空";
         }
-    }
-                if(StringUtil.isEmpty(form.getMailbox())){
-                    return "邮箱不能为空";
-                }
-    if(StringUtil.isNotEmpty(form.getMailbox())){
-        if(!Pattern.compile("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$").matcher(String.valueOf(form.getMailbox())).matches()){
-        return "请输入正确的邮箱";
+        if (StringUtil.isEmpty(form.getCmpNm())) {
+            return "公司名称不能为空";
         }
-    }
-                if(StringUtil.isEmpty(form.getRegisteredAddress())){
-                    return "注册地址不能为空";
-                }
-                if(StringUtil.isEmpty(form.getUnifiedSocialCreditCode())){
-                    return "统一社会信用代码不能为空";
-                }
-                if(StringUtil.isEmpty(form.getLgPersonNm())){
-                    return "法定代表人不能为空";
-                }
-                if(StringUtil.isEmpty(form.getCompanyRegistrationNumber())){
-                    return "公司注册号不能为空";
-                }
-                if(StringUtil.isEmpty(form.getOfficeAddress())){
-                    return "办公地址不能为空";
-                }
-                if(StringUtil.isEmpty(form.getRegisteredCapital())){
-                    return "注册资本不能为空";
-                }
-    if(StringUtil.isNotEmpty(form.getRegisteredCapital())){
-        if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getRegisteredCapital())).matches()){
-        return "请输入正确的金额";
+        if (StringUtil.isEmpty(form.getUserNm())) {
+            return "联系人不能为空";
+        }
+        if (StringUtil.isEmpty(form.getContactNumber())) {
+            return "联系电话不能为空";
+        }
+        if (StringUtil.isNotEmpty(form.getContactNumber())) {
+            if (!Pattern.compile("^1[3456789]\\d{9}$|^0\\d{2,3}-?\\d{7,8}$").matcher(String.valueOf(form.getContactNumber())).matches()) {
+                return "请输入正确的联系方式";
+            }
+        }
+        if (StringUtil.isEmpty(form.getMailbox())) {
+            return "邮箱不能为空";
+        }
+        if (StringUtil.isNotEmpty(form.getMailbox())) {
+            if (!Pattern.compile("^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$").matcher(String.valueOf(form.getMailbox())).matches()) {
+                return "请输入正确的邮箱";
+            }
+        }
+        if (StringUtil.isEmpty(form.getRegisteredAddress())) {
+            return "注册地址不能为空";
+        }
+        if (StringUtil.isEmpty(form.getUnifiedSocialCreditCode())) {
+            return "统一社会信用代码不能为空";
+        }
+        if (StringUtil.isEmpty(form.getLgPersonNm())) {
+            return "法定代表人不能为空";
+        }
+        if (StringUtil.isEmpty(form.getCompanyRegistrationNumber())) {
+            return "公司注册号不能为空";
+        }
+        if (StringUtil.isEmpty(form.getOfficeAddress())) {
+            return "办公地址不能为空";
+        }
+        if (StringUtil.isEmpty(form.getRegisteredCapital())) {
+            return "注册资本不能为空";
+        }
+        if (StringUtil.isNotEmpty(form.getRegisteredCapital())) {
+            if (!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(form.getRegisteredCapital())).matches()) {
+                return "请输入正确的金额";
+            }
+        }
+        if (StringUtil.isEmpty(form.getBankAccount())) {
+            return "银行账号不能为空";
         }
-    }
-                if(StringUtil.isEmpty(form.getBankAccount())){
-                    return "银行账号不能为空";
-                }
         return countRecover;
     }
+
     /**
-    * 新增修改数据(事务回滚)
-    * @param id
-    * @param enterpriseMerchantsForm
-    * @return
-    */
+     * 新增修改数据(事务回滚)
+     *
+     * @param id
+     * @param enterpriseMerchantsForm
+     * @return
+     */
     @Override
     @Transactional
-    public void saveOrUpdate(EnterpriseMerchantsForm enterpriseMerchantsForm,String id, boolean isSave) throws Exception{
-        UserInfo userInfo=userProvider.get();
+    public void saveOrUpdate(EnterpriseMerchantsForm enterpriseMerchantsForm, String id, boolean isSave) throws Exception {
+        UserInfo userInfo = userProvider.get();
         UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
         enterpriseMerchantsForm = JsonUtil.getJsonToBean(
-        generaterSwapUtil.swapDatetime(EnterpriseMerchantsConstant.getFormData(),enterpriseMerchantsForm),EnterpriseMerchantsForm.class);
+                generaterSwapUtil.swapDatetime(EnterpriseMerchantsConstant.getFormData(), enterpriseMerchantsForm), EnterpriseMerchantsForm.class);
         EnterpriseMerchantsEntity entity = JsonUtil.getJsonToBean(enterpriseMerchantsForm, EnterpriseMerchantsEntity.class);
 
-        if(isSave){
-            String mainId =  RandomUtil.uuId() ;
+        if (isSave) {
+            String mainId = RandomUtil.uuId();
             entity.setId(mainId);
             entity.setVersion(0);
-        }else{
+        } else {
         }
         this.saveOrUpdate(entity);
 
     }
+
+    @Override
+    public void updateStatus(String contractStatus, String contractName, String parkId) {
+        log.info("合同状态变更及时更新商户状态，变更状态：{}，商户id：{}，园区id：{}", contractStatus, contractName, parkId);
+        EnterpriseMerchantsEntity entity = this.getById(contractName);
+        if (ObjectUtil.isNull(entity)) {
+            return;
+        }
+        //如果是合同确认 并且状态是同意的   驳回不更改状态
+        if ("20".equals(contractStatus)) {
+            entity.setEntryStatus("2");
+        } else if ("30".equals(contractStatus)) {
+            entity.setEntryStatus("1");
+        }
+        entity.setParkId(parkId);
+        this.updateById(entity);
+    }
 }
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/contract/change.vue b/jnpf-java-boot/jnpf-web/src/views/scm/contract/change.vue
new file mode 100644
index 0000000..a80e0af
--- /dev/null
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/contract/change.vue
@@ -0,0 +1,935 @@
+<template>
+    <transition name="el-zoom-in-center">
+        <div class="JNPF-preview-main">
+            <div class="JNPF-common-page-header">
+                <el-page-header @back="goBack"/>变更合同
+                <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>
+            </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="8">
+                            <jnpf-form-tip-item label="合同编号" prop="contractNumber">
+                                <JnpfInput v-model="dataForm.contractNumber" @change="changeData('contractNumber', -1)"
+                                    placeholder="自动生成" disabled :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="合同名称" prop="contractName">
+                                <JnpfInput v-model="dataForm.contractName" @change="changeData('contractName', -1)"
+                                    placeholder="请输入合同名称" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="计价方式" prop="pricingMethod">
+                                <JnpfSelect v-model="dataForm.pricingMethod" @change="changeData('pricingMethod', -1)"
+                                    placeholder="请选择计价方式" clearable :style='{ "width": "100%" }'
+                                    :options="pricingMethodOptions" :props="pricingMethodProps">
+                                </JnpfSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="签订日期" prop="signingDate">
+                                <JnpfDatePicker v-model="dataForm.signingDate" disabled @change="changeData('signingDate', -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="8">
+                            <jnpf-form-tip-item label="园区名称" prop="parkId">
+                                <JnpfSelect v-model="dataForm.parkId" @change="changeData('parkId', -1)"
+                                    placeholder="请选择园区" clearable :style='{ "width": "100%" }' :options="parkIdOptions"
+                                    :props="parkIdProps">
+                                </JnpfSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="商户名称" prop="merchantName">
+                                <JnpfSelect v-model="dataForm.merchantName" disabled @change="changeData('merchantName', -1)"
+                                    placeholder="请选择" clearable :style='{ "width": "100%" }' filterable
+                                    :options="merchantNameOptions" :props="merchantNameProps">
+                                </JnpfSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="租金总价" prop="totalRentalPrice">
+                                <JnpfInput v-model="dataForm.totalRentalPrice"
+                                    @change="changeData('totalRentalPrice', -1)" placeholder="请输入租金总价" clearable
+                                    :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="押金总计" prop="totalDeposit">
+                                <JnpfInput v-model="dataForm.totalDeposit" @change="changeData('totalDeposit', -1)"
+                                    placeholder="请输入押金总计" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="支付方式" prop="payDeposit">
+                                <JnpfSelect v-model="dataForm.payDeposit" @change="changeData('payDeposit', -1)"
+                                    placeholder="请选择押金支付方式" clearable :style='{ "width": "100%" }'
+                                    :options="payDepositOptions" :props="payDepositProps">
+                                </JnpfSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="退还方式" prop="returnDeposit">
+                                <JnpfSelect v-model="dataForm.returnDeposit" @change="changeData('returnDeposit', -1)"
+                                    placeholder="请选择押金退还方式" clearable :style='{ "width": "100%" }'
+                                    :options="returnDepositOptions" :props="returnDepositProps">
+                                </JnpfSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="开始时间" prop="startTime">
+                                <JnpfDatePicker v-model="dataForm.startTime" @change="changeData('startTime', -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="8">
+                            <jnpf-form-tip-item label="结束时间" prop="endTime">
+                                <JnpfDatePicker v-model="dataForm.endTime" @change="changeData('endTime', -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="8">
+                            <jnpf-form-tip-item label="租期" prop="leaseTerm">
+                                <JnpfInput v-model="dataForm.leaseTerm" @change="changeData('leaseTerm', -1)"
+                                    placeholder="自动生成" disabled addonAfter="月" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="联系人" prop="contacts">
+                                <JnpfInput v-model="dataForm.contacts" @change="changeData('contacts', -1)"
+                                    placeholder="请输入联系人" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="联系电话" prop="contactsPhone">
+                                <JnpfInput v-model="dataForm.contactsPhone" @change="changeData('contactsPhone', -1)"
+                                    placeholder="请输入联系电话" clearable :style='{ "width": "100%" }'>
+                                </JnpfInput>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <jnpf-form-tip-item label="合同状态" prop="contractStatus">
+                                <JnpfSelect v-model="dataForm.contractStatus" @change="changeData('contractStatus', -1)"
+                                    placeholder="请选择" disabled clearable :style='{ "width": "100%" }'
+                                    :options="contractStatusOptions" :props="contractStatusProps">
+                                </JnpfSelect>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="合同说明" prop="contractExplain">
+                                <JnpfTextarea v-model="dataForm.contractExplain"
+                                    @change="changeData('contractExplain', -1)" placeholder="请输入合同说明"
+                                    :style='{ "width": "100%" }' true type="textarea"
+                                    :autosize='{ "minRows": 4, "maxRows": 4 }'>
+                                </JnpfTextarea>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label="合同附件" prop="contractEnclosure">
+                                <JnpfUploadFile v-model="dataForm.contractEnclosure"
+                                    @change="changeData('contractEnclosure', -1)" :fileSize="10" sizeUnit="MB"
+                                    :limit="9" pathType="defaultPath" :isAccount="0" buttonText="点击上传">
+                                </JnpfUploadFile>
+                            </jnpf-form-tip-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <jnpf-form-tip-item label-width="0">
+                                <div class="JNPF-common-title">
+                                    <h2>空间列表</h2>
+                                </div>
+                                <el-table :data="dataForm.spacecontractList" size='mini'>
+                                    <el-table-column type="index" width="50" label="序号" align="center" />
+                                    <el-table-column label="合同行号" tipLabel="后台自动生成" prop="contractLineNumber">
+                                        <template slot="header" v-if="false">
+                                            <span class="required-sign">*</span>合同行号
+                                            <span slot="label">
+                                                <el-tooltip placement="top" content='后台自动生成'>
+                                                    <a class='el-icon-question tooltip-question'></a>
+                                                </el-tooltip>
+                                            </span>
+                                        </template>
+                                        <template slot-scope="scope">
+                                            <JnpfInput v-model="scope.row.contractLineNumber"
+                                                @change="changeData('spacecontract-contractLineNumber', scope.$index)"
+                                                placeholder="合同行号" disabled clearable :style='{ "width": "100%" }'>
+                                            </JnpfInput>
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column label="空间名称" prop="spaceName">
+                                        <template slot="header" v-if="false">
+                                            <span class="required-sign">*</span>空间名称
+                                        </template>
+                                        <template slot-scope="scope">
+                                            <JnpfPopupSelect v-model="scope.row.spaceName"
+                                                @change="changeData('spacecontract-spaceName', scope.$index)"
+                                                :rowIndex="scope.$index" :formData="dataForm"
+                                                :templateJson="interfaceRes.spacecontractspaceName" placeholder="请选择"
+                                                propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                                                relationField='name' :field="'spaceName' + scope.$index"
+                                                interfaceId="582491427901014533" :pageSize="20"
+                                                :columnOptions="spacecontractspaceNamecolumnOptions" clearable
+                                                :style='{ "width": "100%" }'>
+                                            </JnpfPopupSelect>
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column label="空间面积" prop="spaceArea">
+                                        <template slot="header" v-if="false">
+                                            <span class="required-sign">*</span>空间面积
+                                        </template>
+                                        <template slot-scope="scope">
+                                            <JnpfInput v-model="scope.row.spaceArea"
+                                                @change="changeData('spacecontract-spaceArea', scope.$index)"
+                                                placeholder="请输入空间面积" disabled clearable :style='{ "width": "100%" }'>
+                                            </JnpfInput>
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column label="租金总价" prop="totalRentalPrice">
+                                        <template slot="header" v-if="false">
+                                            <span class="required-sign">*</span>租金总价
+                                        </template>
+                                        <template slot-scope="scope">
+                                            <JnpfInput v-model="scope.row.totalRentalPrice"
+                                                @change="changeData('spacecontract-totalRentalPrice', scope.$index)"
+                                                placeholder="请输入租金总价" clearable :style='{ "width": "100%" }'>
+                                            </JnpfInput>
+                                        </template>
+                                    </el-table-column>
+                                    <!-- <el-table-column label="操作" width="50">
+                                        <template slot-scope="scope">
+                                            <el-button size="mini" type="text" class="JNPF-table-delBtn"
+                                                @click="delspacecontractList(scope.$index)">删除</el-button>
+                                        </template>
+                                    </el-table-column> -->
+                                </el-table>
+                                <!-- <div class="table-actions" @click="addspacecontractList()">
+                                    <el-button type="text" icon="el-icon-plus">添加</el-button>
+                                </div> -->
+                            </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>
+
+
+<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() {
+        return {
+            dataFormSubmitType: 0,
+            continueBtnLoading: false,
+            index: 0,
+            prevDis: false,
+            nextDis: false,
+            allList: [],
+            visible: false,
+            loading: false,
+            btnLoading: false,
+            formRef: 'formRef',
+            setting: {},
+            eventType: '',
+            userBoxVisible: false,
+            selectDialogVisible: false,
+            currTableConf: {},
+            dataValueAll: {},
+            addTableConf: {
+                spacecontractList: { "popupType": "dialog", "hasPage": true, "popupTitle": "选择数据", "pageSize": 20, "columnOptions": [], "interfaceId": "", "interfaceName": "", "relationOptions": [], "templateJson": [], "popupWidth": "800px" },
+            },
+            //可选范围默认值
+            ableAll: {
+            },
+            tableRows: {
+                spacecontractList: {
+                    contractLineNumber: '',
+                    contractLineNumberOptions: [],
+                    spaceName: '',
+                    spaceNameOptions: [],
+                    spaceArea: '',
+                    spaceAreaOptions: [],
+                    totalRentalPrice: '',
+                    totalRentalPriceOptions: [],
+                    enabledmark: undefined
+                },
+            },
+            Vmodel: "",
+            currVmodel: "",
+            dataForm: {
+                contractNumber: undefined,
+                contractName: undefined,
+                pricingMethod: undefined,
+                signingDate: undefined,
+                parkId: undefined,
+                merchantName: undefined,
+                totalRentalPrice: undefined,
+                totalDeposit: undefined,
+                payDeposit: undefined,
+                returnDeposit: undefined,
+                startTime: undefined,
+                endTime: undefined,
+                leaseTerm: undefined,
+                contacts: undefined,
+                contactsPhone: undefined,
+                contractStatus: "10",
+                creationTime: undefined,
+                contractExplain: undefined,
+                contractEnclosure: [],
+                spacecontractList: [],
+                version: 0,
+            },
+            tableRequiredData: {},
+            dataRule:
+            {
+                contractName: [
+                    {
+                        required: true,
+                        message: '请输入合同名称',
+                        trigger: 'blur'
+                    },
+                ],
+                pricingMethod: [
+                    {
+                        required: true,
+                        message: '请选择计价方式',
+                        trigger: 'change'
+                    },
+                ],
+                signingDate: [
+                    {
+                        required: true,
+                        message: '请选择签订日期',
+                        trigger: 'change'
+                    },
+                ],
+                parkId: [
+                    {
+                        required: true,
+                        message: '请选择园区',
+                        trigger: 'change'
+                    },
+                ],
+                merchantName: [
+                    {
+                        required: true,
+                        message: '请选择',
+                        trigger: 'change'
+                    },
+                ],
+                totalRentalPrice: [
+                    {
+                        required: true,
+                        message: '请输入租金总价',
+                        trigger: 'blur'
+                    },
+                    {
+                        pattern: /^([1-9][\d]*|0)(\.[\d]+)?$/,
+                        message: '请输入正确的金额',
+                        trigger: 'blur'
+                    },
+                ],
+                totalDeposit: [
+                    {
+                        required: true,
+                        message: '请输入押金总计',
+                        trigger: 'blur'
+                    },
+                    {
+                        pattern: /^([1-9][\d]*|0)(\.[\d]+)?$/,
+                        message: '请输入正确的金额',
+                        trigger: 'blur'
+                    },
+                ],
+                payDeposit: [
+                    {
+                        required: true,
+                        message: '请选择押金支付方式',
+                        trigger: 'change'
+                    },
+                ],
+                returnDeposit: [
+                    {
+                        required: true,
+                        message: '请选择押金退还方式',
+                        trigger: 'change'
+                    },
+                ],
+                startTime: [
+                    {
+                        required: true,
+                        message: '请选择',
+                        trigger: 'change'
+                    },
+                ],
+                endTime: [
+                    {
+                        required: true,
+                        message: '请选择',
+                        trigger: 'change'
+                    },
+                ],
+                leaseTerm: [
+                    {
+                        required: true,
+                        message: '自动生成',
+                        trigger: 'blur'
+                    },
+                ],
+                contacts: [
+                    {
+                        required: true,
+                        message: '请输入联系人',
+                        trigger: 'blur'
+                    },
+                ],
+                contactsPhone: [
+                    {
+                        required: true,
+                        message: '请输入联系电话',
+                        trigger: 'blur'
+                    },
+                ],
+                contractStatus: [
+                    {
+                        required: true,
+                        message: '请至少选择一个',
+                        trigger: 'change'
+                    },
+                ],
+                contractEnclosure: [
+                    {
+                        required: true,
+                        message: '请至少选择一个',
+                        trigger: 'change'
+                    },
+                ],
+            },
+            pricingMethodOptions: [{ "fullName": "月付", "id": "1" }, { "fullName": "季付", "id": "2" }, { "fullName": "年付", "id": "3" }],
+            pricingMethodProps: { "label": "fullName", "value": "id" },
+            parkIdOptions: [],
+            parkIdProps: { "label": "park_name", "value": "park_number" },
+            merchantNameOptions: [],
+            merchantNameProps: { "label": "cmp_nm", "value": "id" },
+            payDepositOptions: [{ "fullName": "选项1", "id": "1" }, { "fullName": "选项2", "id": "2" }],
+            payDepositProps: { "label": "fullName", "value": "id" },
+            returnDepositOptions: [{ "fullName": "选项一", "id": "1" }, { "fullName": "选项二", "id": "2" }],
+            returnDepositProps: { "label": "fullName", "value": "id" },
+            contractStatusOptions: [{ "fullName": "待确认", "id": "10" }, { "fullName": "已确认", "id": "20" }, { "fullName": "已结案", "id": "30" }, { "fullName": "待确认", "id": "21" }],
+            contractStatusProps: { "label": "fullName", "value": "id" },
+            spacecontractspaceNamecolumnOptions: [{ "label": "园区编码", "value": "code" }, { "label": "园区名称", "value": "name" },],
+            childIndex: -1,
+            isEdit: false,
+            interfaceRes: {
+                contractNumber: [],
+                contractName: [],
+                pricingMethod: [],
+                signingDate: [],
+                parkId: [],
+                merchantName: [],
+                totalRentalPrice: [],
+                totalDeposit: [],
+                payDeposit: [],
+                returnDeposit: [],
+                startTime: [],
+                endTime: [],
+                leaseTerm: [],
+                contacts: [],
+                contactsPhone: [],
+                contractStatus: [],
+                creationTime: [],
+                contractExplain: [],
+                contractEnclosure: [],
+                spacecontractcontractLineNumber: [],
+                spacecontractspaceName: [],
+                spacecontractspaceArea: [],
+                spacecontracttotalRentalPrice: [],
+            },
+        }
+    },
+    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)
+                }
+            }
+        },
+        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/example/Contract/' + id,
+                method: 'get'
+            }).then(res => {
+                this.dataInfo(res.data)
+            });
+        },
+        goBack() {
+            this.visible = false
+            this.$emit('refreshDataList', true)
+        },
+        changeData(model, index) {
+            if (model == 'startTime' && this.dataForm.endTime != undefined) {
+                const date1 = new Date(this.dataForm.startTime);
+                const date2 = new Date(this.dataForm.endTime);
+                let yearsDiff = date2.getFullYear() - date1.getFullYear();
+                let monthsDiff = date2.getMonth() - date1.getMonth();
+                if (monthsDiff < 0) {
+                    monthsDiff += 12;
+                    yearsDiff--;
+                }
+                const daysDiff = date2.getDate() - date1.getDate();
+                if (daysDiff > 0) {
+                    monthsDiff++;
+                }
+                this.dataForm.leaseTerm = yearsDiff * 12 + monthsDiff;
+            }
+            if (model == 'endTime' && this.dataForm.startTime != undefined) {
+                const date1 = new Date(this.dataForm.startTime);
+                const date2 = new Date(this.dataForm.endTime);
+                let yearsDiff = date2.getFullYear() - date1.getFullYear();
+                let monthsDiff = date2.getMonth() - date1.getMonth();
+                if (monthsDiff < 0) {
+                    monthsDiff += 12;
+                    yearsDiff--;
+                }
+                const daysDiff = date2.getDate() - date1.getDate();
+                if (daysDiff > 0) {
+                    monthsDiff++;
+                }
+                this.dataForm.leaseTerm = yearsDiff * 12 + monthsDiff;
+            }
+            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
+                        }
+                    }
+                } else {
+                    this.dataForm[data] = defaultValue
+                }
+            }
+        },
+        dataAll() {
+            this.getparkIdOptions();
+            this.getmerchantNameOptions();
+        },
+        spacecontractExist() {
+            let isOk = true;
+            for (let i = 0; i < this.dataForm.spacecontractList.length; i++) {
+                const e = this.dataForm.spacecontractList[i];
+                if (e.totalRentalPrice) {
+                    var regPos = [{ "pattern": "/^([1-9][\\d]*|0)(\\.[\\d]+)?$/", "message": "请输入正确的金额" }]
+                    for (let i = 0; i < regPos.length; i++) {
+                        const element = regPos[i];
+                        if (element.pattern && !eval(element.pattern).test(e.totalRentalPrice)) {
+                            this.$message({
+                                message: element.message,
+                                type: 'error',
+                                duration: 1000
+                            });
+                            isOk = false
+                            break;
+                        }
+                    }
+                }
+            }
+            return isOk;
+        },
+        getparkIdOptions() {
+            const index = this.childIndex
+            let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.parkId))
+            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('582491427901014533', template).then(res => {
+                let data = res.data
+                this.parkIdOptions = data
+                this.changeDataFormData(1, 'parkId', 'parkId', index, '')
+            })
+        },
+        getmerchantNameOptions() {
+            const index = this.childIndex
+            let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.merchantName))
+            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('582842667524685829', template).then(res => {
+                let data = res.data
+                this.merchantNameOptions = data
+                this.changeDataFormData(1, 'merchantName', 'merchantName', 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
+                }
+            } 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/example/Contract/' + 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) {
+                    if (!this.spacecontractExist()) return
+                    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/example/Contract',
+                    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)
+                        }
+                    })
+                }).catch(() => {
+                    this.btnLoading = false
+                    this.continueBtnLoading = false
+                })
+            } else {
+                request({
+                    url: '/api/example/Contract/' + 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
+                })
+            }
+        },
+        addspacecontractList() {
+            let item = {
+                contractLineNumber: undefined,
+                spaceName: '',
+                spaceArea: undefined,
+                totalRentalPrice: undefined,
+            }
+            this.getspacecontractList(item)
+        },
+        delspacecontractList(index) {
+            this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+                type: 'warning'
+            }).then(() => {
+                this.dataForm.spacecontractList.splice(index, 1);
+            }).catch(() => {
+            });
+        },
+        getspacecontractList(value) {
+            let item = { ...this.tableRows.spacecontractList, ...value }
+            this.dataForm.spacecontractList.push(item)
+            this.childIndex = this.dataForm.spacecontractList.length - 1
+            this.isEdit = true
+            this.isEdit = false
+            this.childIndex = -1
+        },
+        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()
+                    }
+                }
+            }
+            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()
+            for (let i = 0; i < _dataAll.spacecontractList.length; i++) {
+                this.childIndex = i
+            }
+            this.childIndex = -1
+        },
+    },
+}
+
+</script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/contract/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/contract/index.vue
index 08fe2cc..9486333 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/contract/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/contract/index.vue
@@ -65,7 +65,7 @@
                         </el-button>
                         <el-button type="warning" icon="icon-ym icon-ym-btn-download" @click="showDialog = true"">合同确认
                         </el-button>
-                        <el-button type="success" icon="icon-ym icon-ym-btn-download" @click="showEndDialog = true"">合同结束
+                        <el-button type=" success" icon="icon-ym icon-ym-btn-download" @click="showEndDialog = true"">合同结束
                         </el-button>
                     </div>
                     <div class=" JNPF-common-head-right">
@@ -138,12 +138,13 @@
                             <el-button type="text" v-show="scope.row.contractStatus === '待确认'"
                                 @click="addOrUpdateHandle(scope.row)">编辑
                             </el-button>
-                            <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+                            <el-button type="text" class="JNPF-table-delBtn"
+                                @click="handleDel(scope.row.id, scope.row.contractStatus)">删除
                             </el-button>
                             <el-button type="text" @click="goDetail(scope.row.id)">详情
                             </el-button>
                             <el-button type="text" v-show="scope.row.contractStatus === '已确认'"
-                                @click="addOrUpdateHandle(scope.row)">变更合同
+                                @click="changeHandle(scope.row)">变更合同
                             </el-button>
                         </template>
                     </el-table-column>
@@ -154,10 +155,6 @@
         </div>
         <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
         <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
-
-
-
-
         <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
         <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
         <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
@@ -167,6 +164,7 @@
             :onRollback="rollback" />
         <DialogEndComponent :showEndDialog.sync="showEndDialog" @update:showEndDialog="showEndDialog = $event"
             :onEndSubmit="handleEndSubmit" />
+        <Change v-if="changeVisible" ref="Change" @refresh="refresh" />
     </div>
     </div>
 </template>
@@ -177,6 +175,7 @@ import request from '@/utils/request'
 import { mapGetters } from "vuex";
 import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 import JNPFForm from './form'
+import Change from './change'
 import Detail from './Detail'
 import ExportBox from '@/components/ExportBox'
 import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
@@ -196,6 +195,7 @@ export default {
         DialogComponent,
         DialogEndComponent,
         JNPFForm,
+        Change,
         Detail,
         ExportBox, ToFormDetail, SuperQuery
     },
@@ -245,6 +245,7 @@ export default {
                 sidx: "",
             },
             formVisible: false,
+            changeVisible: false,
             flowVisible: false,
             flowListVisible: false,
             flowList: [],
@@ -490,7 +491,11 @@ export default {
                 this.listLoading = false
             })
         },
-        handleDel(id) {
+        handleDel(id, contractStatus) {
+            if (contractStatus != '待确认') {
+                this.$message.error('该合同状态不是待确认状态，不允许删除！');
+                return;
+            }
             this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
                 type: 'warning'
             }).then(() => {
@@ -533,6 +538,13 @@ export default {
                 this.$refs.JNPFForm.init(id, isDetail, this.list)
             })
         },
+        changeHandle(row, isDetail) {
+            let id = row ? row.id : ""
+            this.changeVisible = true
+            this.$nextTick(() => {
+                this.$refs.Change.init(id, isDetail, this.list)
+            })
+        },
         exportData() {
             this.exportBoxVisible = true
             this.$nextTick(() => {
@@ -561,6 +573,7 @@ export default {
         },
         refresh(isrRefresh) {
             this.formVisible = false
+            this.changeVisible = false
             if (isrRefresh) this.reset()
         },
         reset() {
@@ -572,85 +585,73 @@ export default {
             if (isrRefresh) this.reset()
         },
         handleSubmit(rows) {
-            // if (this.selectedIds.length == 0) {
-            //     this.$message.error("请选择要审核的单据！");
-            //     return;
-            // }
-            // if (rows.adjustComm == null || rows.adjustComm == "") {
-            //     this.$message.error("请填写您的审核意见！");
-            //     return;
-            // }
-            // let _query = {
-            //     adjustStatus: 1,
-            //     ids: this.selectedIds,
-            //     adjustComm: rows.adjustComm
-            // };
-            // request({
-            //     url: `/api/scm/RecycleDeliveryOrder/auditBatch`,
-            //     method: "post",
-            //     data: _query
-            // }).then(res => {
-            //     this.$message({
-            //         message: res.msg,
-            //         type: "success",
-            //         duration: 1000
-            //     });
-            //     this.initData();
-            // });
+            if (this.selectedRowId == null || this.selectedRowId == undefined) {
+                this.$message.error("请选择要确认的合同！");
+                return;
+            }
+            let _query = {
+                contractStatus: 20,
+                id: this.selectedRowId,
+                approveRemarks: rows.approveRemarks
+            };
+            request({
+                url: `/api/example/Contract/confirmation`,
+                method: "post",
+                data: _query
+            }).then(res => {
+                this.$message({
+                    message: res.msg,
+                    type: "success",
+                    duration: 1000
+                });
+                this.initData();
+            });
         },
         rollback(rows) {
-            // if (this.selectedIds.length == 0) {
-            //     this.$message.error("请选择要审核的单据！");
-            //     return;
-            // }
-            // if (rows.adjustComm == null || rows.adjustComm == "") {
-            //     this.$message.error("请填写您的审核意见！");
-            //     return;
-            // }
-            // let _query = {
-            //     adjustStatus: 1,
-            //     ids: this.selectedIds,
-            //     adjustComm: rows.adjustComm
-            // };
-            // request({
-            //     url: `/api/scm/RecycleDeliveryOrder/auditBatch`,
-            //     method: "post",
-            //     data: _query
-            // }).then(res => {
-            //     this.$message({
-            //         message: res.msg,
-            //         type: "success",
-            //         duration: 1000
-            //     });
-            //     this.initData();
-            // });
+            if (this.selectedRowId == null || this.selectedRowId == undefined) {
+                this.$message.error("请选择要确认的合同！");
+                return;
+            }
+            let _query = {
+                contractStatus: 10,
+                id: this.selectedRowId,
+                approveRemarks: rows.approveRemarks
+            };
+            request({
+                url: `/api/example/Contract/confirmation`,
+                method: "post",
+                data: _query
+            }).then(res => {
+                this.$message({
+                    message: res.msg,
+                    type: "success",
+                    duration: 1000
+                });
+                this.initData();
+            });
         },
         handleEndSubmit(rows) {
-            // if (this.selectedIds.length == 0) {
-            //     this.$message.error("请选择要审核的单据！");
-            //     return;
-            // }
-            // if (rows.adjustComm == null || rows.adjustComm == "") {
-            //     this.$message.error("请填写您的审核意见！");
-            //     return;
-            // }
-            // let _query = {
-            //     adjustStatus: 1,
-            //     ids: this.selectedIds,
-            //     adjustComm: rows.adjustComm
-            // };
-            // request({
-            //     url: `/api/scm/RecycleDeliveryOrder/auditBatch`,
-            //     method: "post",
-            //     data: _query
-            // }).then(res => {
-            //     this.$message({
-            //         message: res.msg,
-            //         type: "success",
-            //         duration: 1000
-            //     });
-            //     this.initData();
-            // });
+            if (this.selectedRowId == null || this.selectedRowId == undefined) {
+                this.$message.error("请选择要结束的合同！");
+                return;
+            }
+            let _query = {
+                contractStatus: 30,
+                id: this.selectedRowId,
+                approveRemarks: rows.approveRemarks
+            };
+            request({
+                url: `/api/example/Contract/finish`,
+                method: "post",
+                data: _query
+            }).then(res => {
+                this.$message({
+                    message: res.msg,
+                    type: "success",
+                    duration: 1000
+                });
+                this.initData();
+            });
         }
     }
 }