diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java
index 544f76ada3..2a80cb07c5 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java
@@ -7,6 +7,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -57,4 +58,12 @@ public interface BaseDistributorFeign {
     @ApiOperation("Pc端分页查询中介单位（经销商）")
     @GetMapping("/getPcDistributorList")
     ResultBean<List<Map<String, Object>>> getPcDistributorList(@RequestParam(value = "name", required = false) String name);
+
+
+    @ApiOperation("销售订单-中介单位下拉框")
+    @GetMapping("/getBaseDistributorList")
+    ResultBean<List<PcBaseDistributorVo>> getBaseDistributorList(@SpringQueryMap PcBaseDistributorQuery query);
+
+
+
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java
index a425926d19..e46c2c5d5c 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java
@@ -56,5 +56,10 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<PcBaseDistributorVo>> getBaseDistributorList(PcBaseDistributorQuery query) {
+        return null;
+    }
+
 
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/PcBaseDistributorQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/PcBaseDistributorQuery.java
new file mode 100644
index 0000000000..3bb5e111c5
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/PcBaseDistributorQuery.java
@@ -0,0 +1,16 @@
+package com.yxt.anrui.base.api.basedistributor;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/20 10:21
+ * @Description
+ */
+@Data
+public class PcBaseDistributorQuery implements Query {
+    private static final long serialVersionUID = -819696590662230234L;
+
+    private String staffSid;
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/PcBaseDistributorVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/PcBaseDistributorVo.java
new file mode 100644
index 0000000000..e9501c31b3
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/PcBaseDistributorVo.java
@@ -0,0 +1,22 @@
+package com.yxt.anrui.base.api.basedistributor;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/20 10:16
+ * @Description
+ */
+@Data
+public class PcBaseDistributorVo implements Vo {
+    private static final long serialVersionUID = 7712204411963730062L;
+
+    @ApiModelProperty(value = "中介单位")
+    private String distributorName;
+    @ApiModelProperty(value = "中介单位联系电话")
+    private String businessMobile;
+    @ApiModelProperty(value = "中介单位sid")
+    private String distributorSid;
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppVehicleModelPriceQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppVehicleModelPriceQuery.java
index 134c7994f0..103868e949 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppVehicleModelPriceQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppVehicleModelPriceQuery.java
@@ -18,6 +18,9 @@ public class AppVehicleModelPriceQuery implements Query {
     @ApiModelProperty(value = "名称（优先级最高，有值时 查询车型名称）")
     private String name;
 
+    @ApiModelProperty(value = "品牌名称")
+    private String brand;
+
     @ApiModelProperty(value = "排放标准")
     private String emissionStandard;
 
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java
index 77ae2352aa..3cece5805b 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java
@@ -79,4 +79,11 @@ public interface BaseDistributorMapper extends BaseMapper<BaseDistributor> {
 
     @Update("update base_distributor set isDelete = 1 where sid = #{sid}")
     int updateBySidIsDelete(String sid);
+
+    /**
+     * 查询中介单位
+     * @param query 查询条件
+     * @return
+     */
+    List<PcBaseDistributorVo> getBaseDistributorList(@Param(Constants.WRAPPER) QueryWrapper<PcBaseDistributorVo> qw);
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml
index 45ba9237a2..07d3350e8e 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml
@@ -106,4 +106,7 @@
             ${ew.customSqlSegment}
     </select>
 
+    <select id="getBaseDistributorList" resultType="com.yxt.anrui.base.api.basedistributor.PcBaseDistributorVo">
+        select * from base_distributor ${ew.customSqlSegment}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java
index d4f62e879e..94d31de6cd 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java
@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basedistributor.*;
 import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegalVo;
 import com.yxt.anrui.base.api.basedistributorperson.BaseDistributorPersonVo;
-import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaff;
-import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerExportVo;
 import com.yxt.anrui.base.biz.basedistributorlegal.BaseDistributorLegalService;
 import com.yxt.anrui.base.biz.basedistributorperson.BaseDistributorPersonService;
 import com.yxt.anrui.base.biz.basedistributorstaff.BaseDistributorStaffService;
@@ -24,7 +22,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -173,4 +170,11 @@ public class BaseDistributorRest implements BaseDistributorFeign {
         List<Map<String, Object>> stringList = baseDistributorService.namesDown(name);
         return new ResultBean<List<Map<String, Object>>>().success().setData(stringList);
     }
+
+    @Override
+    public ResultBean<List<PcBaseDistributorVo>> getBaseDistributorList(PcBaseDistributorQuery query) {
+        ResultBean<List<PcBaseDistributorVo>> rb = ResultBean.fireFail();
+        List<PcBaseDistributorVo> list = baseDistributorService.getBaseDistributorList(query);
+        return rb.success().setData(list);
+    }
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
index 6e03e4b918..96bcfe0943 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
@@ -9,6 +9,7 @@ import com.yxt.anrui.base.api.basedistributorlegal.BaseDistributorLegalDto;
 import com.yxt.anrui.base.api.basedistributorperson.BaseDistributorPersonDto;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -50,6 +51,8 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
 
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
 
     /**
      * 经销商分页列表
@@ -239,4 +242,20 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
     public int updateBySidIsDelete(String sid) {
         return baseMapper.updateBySidIsDelete(sid);
     }
+
+    public List<PcBaseDistributorVo> getBaseDistributorList(PcBaseDistributorQuery query) {
+        QueryWrapper<PcBaseDistributorVo> qw = new QueryWrapper<>();
+        if(query != null){
+            if (StringUtils.isNotBlank(query.getStaffSid())) {
+                String orgSid = "";
+                ResultBean<String> stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(query.getStaffSid());
+                if (stringResultBean.getSuccess()) {
+                    orgSid = stringResultBean.getData();
+                }
+                qw.lambda().apply("FIND_IN_SET ('" + orgSid + "',useOrg)");
+            }
+        }
+        List<PcBaseDistributorVo> voList = baseMapper.getBaseDistributorList(qw);
+        return voList;
+    }
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java
index 9277c15b76..c6b1f1f212 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java
@@ -183,7 +183,7 @@ public interface BaseModelConfigMapper extends BaseMapper<BaseModelConfig> {
     AppModelConfigDetailsVo getAppProductionSchedulingDetailsVo(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
 
     //查询车型信息
-    AppModelConfigVo getModelConfigList(String modelSid);
+    AppModelConfigVo getModelConfigList(@Param("modelSid") String modelSid,@Param("useOrgSid") String useOrgSid);
 
     List<AppModelConfigListVo> getModelConfigPageList(IPage<AppModelConfigListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppModelConfigListVo> qw);
 
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
index ecee9ea395..b13664bf4b 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
@@ -485,6 +485,7 @@
         FROM base_vehicle_model bvm
                  LEFT JOIN base_vehmodel_config bvc ON bvc.modelSid = bvm.sid
         where bvm.sid = #{modelSid}
+          and bvc.useOrgSid = #{useOrgSid}
     </select>
 
     <select id="getModelConfigPageList"
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
index 3ccb3f88e8..e702c96aba 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
@@ -3,12 +3,13 @@ package com.yxt.anrui.base.biz.basemodelconfig;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemodelconfig.*;
-import com.yxt.anrui.base.api.basevehicle.AppCurrentCarByPageListQuery;
-import com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo;
-import com.yxt.anrui.base.api.basevehicle.AppMoreConfigVo;
-import com.yxt.anrui.base.api.basevehicle.ConfigInfo;
+import com.yxt.anrui.base.api.basevehicle.*;
+import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendix;
+import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
+import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -39,6 +40,12 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
 
+    @Autowired
+    private BaseVehicleAppendixService baseVehicleAppendixService;
+
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+
     /**
      * 车型配置信息分页列表
      *
@@ -483,11 +490,11 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
             pagerQuery.getParams().setUseOrg(data.getSid());
         }
         String modelSid = pagerQuery.getParams().getModelSid();
-        AppModelConfigVo vo = baseMapper.getModelConfigList(modelSid);
-        List<String> modelImages = new ArrayList<>();
-        modelImages.add("123123");
-        modelImages.add("324");
-        modelImages.add("345");
+        String useOrgSid = data.getSid();
+        AppModelConfigVo vo = baseMapper.getModelConfigList(modelSid,useOrgSid);
+        String type = "0002";
+        String path = fileUploadComponent.getUrlPrefix();
+        List<String> modelImages = baseVehicleAppendixService.selectBySid(type, modelSid, path);
         vo.setModelImage(modelImages);
 
         //基础配置拼接
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
index 5773c097d7..4edb1e1b49 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
@@ -115,8 +115,9 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 		if (StringUtils.isNotBlank(query.getModelName())) {
 			qw.like("modelName", query.getModelName());
 		}
-		qw.eq("createBySid",query.getUserSid());
 		qw.eq("useOrgSid",query.getUseOrgSid());
+		qw.eq("createBySid",query.getUserSid());
+//		qw.eq("createBySid",query.getUserSid());
 		return qw;
 	}
 	
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepostprice/BasePostPriceService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepostprice/BasePostPriceService.java
index 9148f84acd..044e69c1a9 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepostprice/BasePostPriceService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepostprice/BasePostPriceService.java
@@ -105,6 +105,9 @@ public class BasePostPriceService extends MybatisBaseService<BasePostPriceMapper
         String brandSid = query.getBrandSid();
         String roleSid = query.getRoleSid();
         BaseOrderPostPriceVo vo = baseMapper.selectPostPrice(brandSid,roleSid);
+        if(vo == null){
+            return rb.setData(new BaseOrderPostPriceVo());
+        }
         return rb.success().setData(vo);
     }
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
index d4c8d8773f..adedd97f40 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
@@ -230,7 +230,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      * @param qw
      * @return
      */
-    IPage<AppVehicleModelPriceVo> getModelList(IPage<AppVehicleModelPriceQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppVehicleModelPriceVo> qw);
+    IPage<AppVehicleModelPriceVo> getModelList(IPage<AppVehicleModelPriceQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppVehicleModelPriceVo> qw,@Param("useOrgSid") String useOrgSid);
 
     /**
      * 手机端查询不本公司的现车，排产车
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
index ef103cd1aa..db001d3f8f 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
@@ -489,9 +489,12 @@
         bvm.fuelTypeValue,
         bvm.gearboxTypeValue,
         bvc.priceValidity,
-        bvc.guidedPrice,
-        (SELECT count(*) FROM base_vehmodel_config bvc WHERE bvc.modelSid = bvm.sid) AS configNum,
-        (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '03') AS nowCarNum,
+        (SELECT CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice)) FROM base_vehmodel_config bvc WHERE bvc.modelSid
+        = bvm.sid AND bvc.useOrgSid = #{useOrgSid}) AS guidedPrice,
+        (SELECT count(*) FROM base_vehmodel_config bvc WHERE bvc.modelSid = bvm.sid AND bvc.useOrgSid = #{useOrgSid}) AS
+        configNum,
+        (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '03' AND bv.useOrg =
+        #{useOrgSid}) AS nowCarNum,
         (SELECT count(*)
         FROM bus_vehicle_apply_detail bvad
         WHERE bvad.vehicleSid = bvm.sid) AS produceCarNum
@@ -526,7 +529,7 @@
                         FROM base_vehicle bv
                         WHERE bv.modelSid = bvm.sid
                           AND bv.modelConfigSid = bvc.configurationItemsSid
-                          AND lockedState = '0004')
+                          AND lockedState = '03')
                        +
                        (SELECT count(*)
                         FROM bus_vehicle_apply_detail bvad
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
index 1cac5b726e..b74a8b5583 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@@ -6,6 +6,7 @@ import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo;
 import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo;
 import com.yxt.anrui.base.api.basevehicle.*;
+import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendix;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
@@ -21,6 +22,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.DateUtils;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -29,10 +31,8 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import javax.xml.crypto.Data;
+import java.util.*;
 
 /**
  * Project: anrui-base(安瑞基础信息模块) <br/>
@@ -487,6 +487,11 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         String useOrg = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
 
         AppCurrentCarDetailConfigVo configDetailVo = baseMapper.getAppModelConfig(modelSid, configSid, useOrg);
+        String date = configDetailVo.getDate();
+        Date date1 = DateUtils.dateStrConvertDate(date, "yyyy-MM-dd");
+        long time = date1.getTime();
+        configDetailVo.setDateLong(time);
+
         //车型详细配置数据
         AppCurrentCarDetailVo currentCarVo = baseMapper.getAppCurrentCarDetailConfigVo(modelSid, configSid, useOrg);
         List<List<ConfigInfoSpanSize>> modelInfoList = new ArrayList<>();
@@ -746,10 +751,19 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
         IPage<AppVehicleModelPriceQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<AppVehicleModelPriceVo> qw = appExistingCarBuildQW(pagerQuery.getParams());
-        IPage<AppVehicleModelPriceVo> iPage = baseMapper.getModelList(page, qw);
+        IPage<AppVehicleModelPriceVo> iPage = baseMapper.getModelList(page, qw, data.getSid());
         // 3、 查询更多配置（其它分公司）
         for (AppVehicleModelPriceVo record : iPage.getRecords()) {
-            record.setModelImage("http//:192.168.1.101:8111/aaa.com");
+            String sid = record.getModelSid();
+            String type = "0002";
+            String path = fileUploadComponent.getUrlPrefix();
+            List<String> list = baseVehicleAppendixService.selectBySid(type, sid, path);
+            if (list.size() > 0) {
+                String s = list.get(0);
+                record.setModelImage(s);
+            } else {
+                record.setModelImage("");
+            }
             String useOrg = data.getSid();
             List<AppMoreConfigVo> moreConfigVos = baseMapper.getCompanyModelList(record.getModelSid(), useOrg);
             for (AppMoreConfigVo moreConfigVo : moreConfigVos) {
@@ -767,31 +781,34 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             qw.like("bvm.vehicleAlias", pagerQuery.getName());
         }
         if (StringUtils.isNotBlank(pagerQuery.getEmissionStandard())) { // 排放标准
-            qw.eq("bvm.emissionStandard", pagerQuery.getEmissionStandard());
+            qw.eq("bvm.emissionStandardValue", pagerQuery.getEmissionStandard());
         }
         if (StringUtils.isNotBlank(pagerQuery.getDriver())) { // 驱动
-            qw.eq("bvm.driveForm", pagerQuery.getDriver());
+            qw.eq("bvm.driveFormValue", pagerQuery.getDriver());
         }
         if (StringUtils.isNotBlank(pagerQuery.getGearbox())) { // 变速箱
-            qw.eq("bvm.gearboxType", pagerQuery.getGearbox());
+            qw.eq("bvm.gearboxTypeValue", pagerQuery.getGearbox());
         }
         if (StringUtils.isNotBlank(pagerQuery.getSeries())) { // 产品系别
-            qw.eq("bvm.department", pagerQuery.getSeries());
+            qw.eq("bvm.departmentValue", pagerQuery.getSeries());
         }
         if (StringUtils.isNotBlank(pagerQuery.getVehicleFunction())) { // 功能
-            qw.eq("bvm.vehicleType", pagerQuery.getVehicleFunction());
+            qw.eq("bvm.vehicleTypeValue", pagerQuery.getVehicleFunction());
         }
         if (StringUtils.isNotBlank(pagerQuery.getMarketSegments())) { // 细分市场
-            qw.eq("bvm.marketSegments", pagerQuery.getMarketSegments());
+            qw.eq("bvm.marketSegmentsValue", pagerQuery.getMarketSegments());
         }
         if (StringUtils.isNotBlank(pagerQuery.getVehicleVersion())) { // 版本
-            qw.eq("bvm.vehicleVersion", pagerQuery.getVehicleVersion());
+            qw.eq("bvm.vehicleVersionValue", pagerQuery.getVehicleVersion());
         }
         if (StringUtils.isNotBlank(pagerQuery.getFuelType())) { // 燃料
-            qw.eq("bvm.fuelType", pagerQuery.getFuelType());
+            qw.eq("bvm.fuelTypeValue", pagerQuery.getFuelType());
         }
         if (StringUtils.isNotBlank(pagerQuery.getHorsepower())) { // 马力
-            qw.eq("bvm.power", pagerQuery.getHorsepower());
+            qw.eq("bvm.powerValue", pagerQuery.getHorsepower());
+        }
+        if (StringUtils.isNotBlank(pagerQuery.getBrand())) { // 品牌
+            qw.eq("bvm.brandName", pagerQuery.getBrand());
         }
         if (StringUtils.isNotBlank(pagerQuery.getUseOrg())) { // 分公司
             qw.eq("bvc.useOrgSid", pagerQuery.getUseOrg());
@@ -1244,14 +1261,20 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             if (StringUtils.isNotBlank(query.getNames())) {
                 qw.like("bv.vinNo", query.getNames());//车架号
             }
-            if (StringUtils.isNotBlank(query.getNames())) {
-                qw.like("bv.vehicleStateValue", query.getNames());//状态
-            }
-            if (StringUtils.isNotBlank(query.getNames())) {
-                qw.like("bmc.carColor", query.getNames());//车身颜色
+//            if (StringUtils.isNotBlank(query.getNames())) {
+//                qw.eq("bv.vehicleStateValue", query.getNames());//状态
+//            }
+//            if (StringUtils.isNotBlank(query.getNames())) {
+//                qw.eq("bmc.carColor", query.getNames());//车身颜色
+//            }
+//            if (StringUtils.isNotBlank(query.getNames())) {
+//                qw.eq("bv.location", query.getNames());//存放地点
+//            }
+            if (StringUtils.isNotBlank(query.getModelSid())) {// 车型
+                qw.eq("bv.modelSid", query.getModelSid());
             }
-            if (StringUtils.isNotBlank(query.getNames())) {
-                qw.like("bv.location", query.getNames());//存放地点
+            if (StringUtils.isNotBlank(query.getConfigSid())) {//分公司
+                qw.eq("bv.modelConfigSid", query.getConfigSid());
             }
             if (StringUtils.isNotBlank(query.getUseOrg())) {//分公司
                 qw.eq("bv.useOrg", query.getUseOrg());
@@ -1290,7 +1313,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         QueryWrapper<AppBaseNowProduceCarVo> qw = new QueryWrapper<>();
         if (query != null) {
             if (StringUtils.isNotBlank(query.getNames())) {
-                qw.like("bvo.orderStatus", query.getNames());//订单状态
+                qw.like("bvo.orderNo", query.getNames());// 订单编号
             }
             if (StringUtils.isNotBlank(query.getUseOrg())) {//分公司
                 qw.eq("bvo.useOrg", query.getUseOrg());
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleappendix/BaseVehicleAppendixService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleappendix/BaseVehicleAppendixService.java
index ec648e875b..c3d5e029f6 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleappendix/BaseVehicleAppendixService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleappendix/BaseVehicleAppendixService.java
@@ -73,4 +73,8 @@ public class BaseVehicleAppendixService extends MybatisBaseService<BaseVehicleAp
     public int deletePath(String path) {
         return baseMapper.deletePath(path);
     }
+
+    public BaseVehicleAppendix selectByLinkSid(String modelSid, String type) {
+        return null;
+    }
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java
index ea4e9589c2..c166b8db48 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java
@@ -187,17 +187,22 @@ public class BusVehicleApplyDetailService extends MybatisBaseService<BusVehicleA
         int count = 0;
         int plat = 0;
         int locking = 0;
-        for (int i = 0; i < orderListVoList.size(); i++) {
-            String platformNo = orderListVoList.get(i).getPlatformNo();
-            String lockingNum = orderListVoList.get(i).getLockingNum();
-            if (StringUtils.isNotBlank(platformNo)) {
-                plat = Integer.parseInt(platformNo);
-                if (StringUtils.isNotBlank(lockingNum)) {
-                    locking = Integer.parseInt(lockingNum);
+        if(orderListVoList.size() != 0){
+            for (int i = 0; i < orderListVoList.size(); i++) {
+                if(orderListVoList.get(i) != null){
+                    String platformNo = orderListVoList.get(i).getPlatformNo();
+                    String lockingNum = orderListVoList.get(i).getLockingNum();
+                    if (StringUtils.isNotBlank(platformNo)) {
+                        plat = Integer.parseInt(platformNo);
+                        if (StringUtils.isNotBlank(lockingNum)) {
+                            locking = Integer.parseInt(lockingNum);
+                        }
+                    }
+                    count = count+(plat-locking);
                 }
             }
-            count = count+(plat-locking);
         }
+
         return rb.success().setData(count);
     }
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java
index 78ffce061c..89fe8e0adf 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java
@@ -8,6 +8,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDto;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDto;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto;
+import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmitDto;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDto;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDto;
 import com.yxt.common.core.dto.Dto;
@@ -118,4 +119,7 @@ public class BusSalesOrderAllDto implements Dto {
     private List<String> vehicleList = new ArrayList<>();
     @ApiModelProperty(value = "优惠包价值")
     private List<String> priceList = new ArrayList<>();
+
+    @ApiModelProperty(value = "提交接口使用参数：销售订单提交时补充的内容")
+    private BusSalesOrderSubmitDto busSalesOrderSubmit;
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java
index 752b18a7ea..99c223f291 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java
@@ -121,4 +121,10 @@ public class BusSalesOrderDetailsVo implements Vo {
 
     @ApiModelProperty("单台开票金额")
     private String oneBillMoney; // 单台开票金额
+    @ApiModelProperty(value = "客户类型key")
+    private String customerClassKey;
+    @ApiModelProperty(value = "客户类型")
+    private String customerClass;
+    @ApiModelProperty(value = "客户头像")
+    private String customerPhoto;
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDetailsVo.java
index 22e2926cf0..411e5c43cd 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDetailsVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDetailsVo.java
@@ -59,4 +59,7 @@ public class BusSalesOrderInsuranceDetailsVo implements Vo {
     @ApiModelProperty("公司入保期数")
     private Integer insuranceNum;
 
+    @ApiModelProperty(value = "保险备注")
+    private String remarks;
+
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDto.java
index 94d4067775..51acbc7230 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDto.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDto.java
@@ -56,4 +56,7 @@ public class BusSalesOrderInsuranceDto implements Dto {
     @ApiModelProperty("公司入保期数")
     private Integer insuranceNum;
 
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java
index 8b9571c113..b940870715 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java
@@ -72,5 +72,6 @@ public class BusSalesOrderMakeupDetailsVo implements Vo {
     private String moreConfig;
     @ApiModelProperty("合同上传")
     private String contractPath;
+    private String remarks;
 
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDto.java
index df40a18ee9..e7e61220fb 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDto.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDto.java
@@ -69,5 +69,6 @@ public class BusSalesOrderMakeupDto implements Dto {
     private String moreConfig;
     @ApiModelProperty("合同上传")
     private String contractPath;
+    private String remarks;
 
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModel.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModel.java
index 532ab60281..dd51606d25 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModel.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModel.java
@@ -52,6 +52,8 @@ public class BusSalesOrderModel extends BaseEntity {
 
     @ApiModelProperty("销售订单sid")
     private String salesOrderSid;
+    @ApiModelProperty(value = "品牌sid")
+    private String brandSid;
     @ApiModelProperty(value = "品牌")
     private String brandName;
     @ApiModelProperty("车型sid")
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java
index 510eb2a158..899c145aa1 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java
@@ -70,5 +70,9 @@ public class BusSalesOrderModelDetailsVo implements Vo {
     @ApiModelProperty("单台成交价")
     @JsonSerialize(using = ToStringSerializer.class)
     private String finalPrice;
+    @ApiModelProperty(value = "品牌sid")
+    private String brandSid;
+    @ApiModelProperty(value = "品牌")
+    private String brandName;
 
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmit.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmit.java
new file mode 100644
index 0000000000..81b0c87738
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmit.java
@@ -0,0 +1,41 @@
+package com.yxt.anrui.buscenter.api.bussalesordersubmit;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/20 9:20
+ * @Description
+ */
+@Data
+public class BusSalesOrderSubmit extends BaseEntity {
+    private static final long serialVersionUID = 1919809277011946278L;
+    @ApiModelProperty(value = "销售订单sid")
+    private String salesOrderSid;
+    @ApiModelProperty(value = "价格说明")
+    private String priceRemarks;
+
+    @ApiModelProperty(value = "优惠说明")
+    private String discountRemarks;
+    @ApiModelProperty(value = "中介名称")
+    private String distributorName;
+    @ApiModelProperty(value = "联系电话")
+    private String distributorMobile;
+
+    @ApiModelProperty(value = "中介单位sid")
+    private String distributorSid;
+    @ApiModelProperty(value = "单车中介服务费")
+    private BigDecimal distributorPrice;
+    @ApiModelProperty(value = "返利合计")
+    private BigDecimal distributorPriceAll;
+    @ApiModelProperty(value = "内部引荐人")
+    private String name;
+    @ApiModelProperty(value = "内部引荐人sid")
+    private String userSid;
+
+
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmitDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmitDto.java
new file mode 100644
index 0000000000..b34b61b020
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmitDto.java
@@ -0,0 +1,41 @@
+package com.yxt.anrui.buscenter.api.bussalesordersubmit;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/20 9:29
+ * @Description
+ */
+@Data
+public class BusSalesOrderSubmitDto implements Dto {
+    private static final long serialVersionUID = 4276394815492406556L;
+
+    @ApiModelProperty(value = "价格说明")
+    private String priceRemarks;
+
+    @ApiModelProperty(value = "优惠说明")
+    private String discountRemarks;
+    @ApiModelProperty(value = "中介名称")
+    private String distributorName;
+    @ApiModelProperty(value = "联系电话")
+    private String distributorMobile;
+
+    @ApiModelProperty(value = "中介单位sid")
+    private String distributorSid;
+    @ApiModelProperty(value = "单车中介服务费")
+    private String distributorPrice;
+    @ApiModelProperty(value = "返利合计")
+    private String distributorPriceAll;
+    @ApiModelProperty(value = "内部引荐人")
+    private String name;
+    @ApiModelProperty(value = "内部引荐人sid")
+    private String userSid;
+
+    @ApiModelProperty(value = "数量")
+    private Integer num;
+
+
+}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java
index 360ff57988..b05cf70975 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java
@@ -29,7 +29,6 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.*;
-import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit;
 import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -98,8 +97,7 @@ public class BusDepositFictitiousService extends MybatisBaseService<BusDepositFi
     }
 
     public int deleteByOrderSid(String sid) {
-        BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(sid);
-        return baseMapper.deleteByDepositSid(busSalesOrderDeposit.getSid());
+        return baseMapper.deleteByDepositSid(sid);
     }
 
     /**
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index e570cb6d51..71689222ef 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -49,6 +49,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDeta
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDto;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance;
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDto;
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo;
@@ -57,6 +58,7 @@ import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsV
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDto;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto;
+import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmitDto;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDto;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo;
@@ -68,6 +70,7 @@ import com.yxt.anrui.buscenter.biz.bussalesorderinsurance.BusSalesOrderInsurance
 import com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupService;
 import com.yxt.anrui.buscenter.biz.bussalesordermodel.BusSalesOrderModelService;
 import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
+import com.yxt.anrui.buscenter.biz.bussalesordersubmit.BusSalesOrderSubmitService;
 import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
 import com.yxt.anrui.buscenter.biz.bussalesvehicleorder.BusSalesVehicleOrderService;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@@ -87,6 +90,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.anrui.portal.config.DictCommonType;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.DateUtils;
 import com.yxt.common.base.utils.PagerUtil;
@@ -157,6 +161,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     private BaseVehiclePolicyFeign baseVehiclePolicyFeign;
     @Autowired
     private DictCommonFeign dictCommonFeign;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private BusSalesOrderSubmitService busSalesOrderSubmitService;
 
     /**
      * 构造查询条件
@@ -235,6 +243,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         BusSalesOrderDetailsVo vo = new BusSalesOrderDetailsVo();
         BeanUtil.copyProperties(entity, vo);
         vo.setCreateDate(DateUtil.formatDate(entity.getCreateDate()));
+        if (!entity.getCustomerPhoto().contains(fileUploadComponent.getUrlPrefix())) {
+            vo.setCustomerPhoto(fileUploadComponent.getUrlPrefix() + entity.getCustomerPhoto());
+        } else {
+            vo.setCustomerPhoto(entity.getCustomerPhoto());
+        }
         //查询主车车型信息
         BusSalesOrderModelDetailsVo busSalesOrderModelDetailsVo = busSalesOrderModelService.details(entity.getSid());
         if (busSalesOrderModelDetailsVo != null) {
@@ -271,12 +284,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             vo.setBusSalesOrderDiscountList(busSalesOrderDiscountDetailsVoList);
         }
         //查询保险说明
-        if ("1".equals(entity.getIsInsurance())) {
-            BusSalesOrderInsuranceDetailsVo busSalesOrderInsuranceDetailsVo = busSalesOrderInsuranceService.details(entity.getSid());
-            if (busSalesOrderInsuranceDetailsVo != null) {
-                vo.setBusSalesOrderInsurance(busSalesOrderInsuranceDetailsVo);
-            }
+
+        BusSalesOrderInsuranceDetailsVo busSalesOrderInsuranceDetailsVo = busSalesOrderInsuranceService.details(entity.getSid());
+        if (busSalesOrderInsuranceDetailsVo != null) {
+            vo.setBusSalesOrderInsurance(busSalesOrderInsuranceDetailsVo);
         }
+
         //查询订金信息
         BusSalesOrderDepositDetailsVo busSalesOrderDepositDetailsVo = busSalesOrderDepositService.details(entity.getSid());
         if (busSalesOrderDepositDetailsVo != null) {
@@ -298,6 +311,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
      * @param dto 数据传输对象
      * @return
      */
+    @Transactional(rollbackFor = Exception.class)
     public ResultBean<String> saveOrUpdateOrder(BusSalesOrderAllDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();
@@ -335,9 +349,20 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         } else if ("2".equals(dto.getType())) {
             //采购订单
             List<BusSalesVehicleOrderDto> busSalesVehicleOrderList = dto.getBusSalesVehicleOrderList();
-            for (int i = 0; i < busSalesVehicleOrderList.size(); i++) {
-                vehicleNum = vehicleNum + busSalesVehicleOrderList.get(i).getUsingNum();
+            if(busSalesVehicleOrderList.size()>0){
+                for (int i = 0; i < busSalesVehicleOrderList.size(); i++) {
+                    if(busSalesVehicleOrderList.get(i) != null){
+                        if(busSalesVehicleOrderList.get(i).getUsingNum()>busSalesVehicleOrderList.get(i).getUseNum()){
+                            return rb.setMsg("本次使用台数不允许大于可使用台数");
+                        }
+                        vehicleNum = vehicleNum + busSalesVehicleOrderList.get(i).getUsingNum();
+                    }else{
+                        return rb.setMsg("请选择采购订单数据");
+                    }
+
+                }
             }
+
         } else {
             vehicleNum = quantity;
         }
@@ -357,10 +382,20 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if ("1".equals(dto.getIsTop())) {
             //上装价格
             BusSalesOrderMakeupDto busSalesOrderMakeup = dto.getBusSalesOrderMakeup();
+            if (StringUtils.isBlank(busSalesOrderMakeup.getTopName())) {
+                return rb.setMsg("包含上装，上装名称不能为空");
+            }
             String topPrice = busSalesOrderMakeup.getTopPrice();
-//            String topPrice = dto.getBusSalesOrderMakeup().getTopPrice();
-            singleGuildPriceBig = singleGuildPriceBig.add(new BigDecimal(topPrice));
-            singleFinalPriceBig = singleFinalPriceBig.add(new BigDecimal(topPrice));
+            if (StringUtils.isNotBlank(topPrice)) {
+                singleGuildPriceBig = singleGuildPriceBig.add(new BigDecimal(topPrice));
+                singleFinalPriceBig = singleFinalPriceBig.add(new BigDecimal(topPrice));
+            }
+        }
+        if ("1".equals(dto.getIsInsurance())) {
+            BusSalesOrderInsuranceDto busSalesOrderInsurance = dto.getBusSalesOrderInsurance();
+            if (StringUtils.isBlank(busSalesOrderInsurance.getInsuranceName())) {
+                return rb.setMsg("公司入保下保险公司名称不能为空");
+            }
         }
         //单台指导价（主车+上装价格）
         String singleGuildPrice = dto.getBusSalesOrderPrice().getSingleGuildPrice();
@@ -421,7 +456,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //判断补交金额和订金合计-本次结转金额
             String makeUpDeposit = dto.getBusSalesOrderDeposit().getMakeUpDeposit();
             if (StringUtils.isNotBlank(makeUpDeposit)) {
-                if(depositBig.compareTo(new BigDecimal(depositAll))>0){
+                if (depositBig.compareTo(new BigDecimal(depositAll)) > 0) {
                     return rb.setMsg("本次结转金额之和已超订金合计金额");
                 }
                 if (new BigDecimal(makeUpDeposit).compareTo(new BigDecimal(depositAll).subtract(depositBig)) != 0) {
@@ -432,8 +467,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         return rb.success();
     }
-
-    private void updateOrder(BusSalesOrderAllDto dto) {
+    @Transactional(rollbackFor = Exception.class)
+    public void updateOrder(BusSalesOrderAllDto dto) {
         //主车车型信息
         BusSalesOrderModelDto busSalesOrderModelDto = dto.getBusSalesOrderModel();
         //现车车辆信息
@@ -454,6 +489,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         List<BusDepositFictitiousDto> busDepositFictitiousDtoList = dto.getBusDepositFictitiousList();
         BusSalesOrder busSalesOrder = fetchBySid(dto.getSid());
         BeanUtil.copyProperties(dto, busSalesOrder, "sid");
+        if (dto.getCustomerPhoto().contains(fileUploadComponent.getUrlPrefix())) {
+            busSalesOrder.setCustomerPhoto(dto.getCustomerPhoto().replace(fileUploadComponent.getUrlPrefix(), ""));
+        }
         baseMapper.updateById(busSalesOrder);
         //主车车型信息保存
         busSalesOrderModelService.saveModel(busSalesOrderModelDto, dto.getSid());
@@ -484,19 +522,28 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             busSalesOrderInsuranceService.deleteByOrderSid(dto.getSid());
             busSalesOrderInsuranceService.saveInsurance(busSalesOrderInsuranceDto, dto.getSid());
         } else {
-            busSalesOrderInsuranceService.deleteByOrderSid(dto.getSid());
+            if (dto.getBusSalesOrderInsurance() == null) {
+                busSalesOrderInsuranceService.deleteByOrderSid(dto.getSid());
+            } else {
+                busSalesOrderInsuranceService.updateByOrderSid(dto.getSid(), dto.getBusSalesOrderInsurance().getRemarks());
+            }
+
         }
         busSalesOrderDepositService.updateOrderDepo(busSalesOrderDepositDto, dto.getSid());
-        if ("01".equals(busSalesOrderDepositDto.getDepositTypeKey())) {
-            //现交订金
-            busDepositFictitiousService.deleteByOrderSid(dto.getSid());
-            busDepositFictitiousService.saveFictitious(busDepositFictitiousDtoList, dto.getSid());
-        } else {
-            busDepositFictitiousService.deleteByOrderSid(dto.getSid());
+        BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(dto.getSid());
+        if(busSalesOrderDeposit != null){
+            if ("02".equals(busSalesOrderDepositDto.getDepositTypeKey())) {
+                //结转金额
+                busDepositFictitiousService.deleteByOrderSid(busSalesOrderDeposit.getSid());
+                busDepositFictitiousService.saveFictitious(busDepositFictitiousDtoList, busSalesOrderDeposit.getSid());
+            } else {
+                busDepositFictitiousService.deleteByOrderSid(busSalesOrderDeposit.getSid());
+            }
         }
 
-    }
 
+    }
+    @Transactional(rollbackFor = Exception.class)
     public String save(BusSalesOrderAllDto dto) {
         //主车车型信息
         BusSalesOrderModelDto busSalesOrderModelDto = dto.getBusSalesOrderModel();
@@ -544,6 +591,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String isInsurance = dto.getIsInsurance();
         if ("1".equals(isInsurance)) {
             busSalesOrderInsuranceService.saveInsurance(busSalesOrderInsuranceDto, sid);
+        } else {
+            if (dto.getBusSalesOrderInsurance() != null) {
+                if (StringUtils.isNotBlank(dto.getBusSalesOrderInsurance().getRemarks())) {
+                    BusSalesOrderInsurance busSalesOrderInsurance = new BusSalesOrderInsurance();
+                    busSalesOrderInsurance.setSalesOrderSid(sid);
+                    busSalesOrderInsurance.setRemarks(dto.getBusSalesOrderInsurance().getRemarks());
+                    busSalesOrderInsuranceService.save(busSalesOrderInsurance);
+                }
+            }
         }
         String depositSid = busSalesOrderDepositService.saveOrderDepo(busSalesOrderDepositDto, sid);
         if ("02".equals(busSalesOrderDepositDto.getDepositTypeKey())) {
@@ -553,13 +609,29 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return sid;
 
     }
-
+    @Transactional(rollbackFor = Exception.class)
     public ResultBean submit(BusSalesOrderAllDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String orgSid = checkUserOrg(dto.getStaffSid());
         ResultBean<String> resultBean = saveOrUpdateOrder(dto);
         if (resultBean.getSuccess()) {
             String businessSid = resultBean.getData();
+            //保存提交时补充的内容
+            BusSalesOrderSubmitDto busSalesOrderSubmit = dto.getBusSalesOrderSubmit();
+            if(busSalesOrderSubmit != null){
+                if(StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorPrice()) && StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorPriceAll())){
+                    BigDecimal priceBig = new BigDecimal(busSalesOrderSubmit.getDistributorPrice());
+                    BigDecimal priceAll = new BigDecimal(busSalesOrderSubmit.getDistributorPriceAll());
+                    if(busSalesOrderSubmit.getNum() != null){
+                        if(priceAll.compareTo(priceBig.multiply(new BigDecimal(busSalesOrderSubmit.getNum().toString()))) != 0){
+                            return rb.setMsg("返利合计计算错误");
+                        }
+                    }
+
+                }
+                busSalesOrderSubmitService.saveOrderSubmit(busSalesOrderSubmit,businessSid);
+            }
+
             Map<String, Object> variables = new HashMap<>();
             variables.put("businessSid", businessSid);
             if ("01".equals(dto.getPayTypeKey())) {
@@ -645,9 +717,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 for (int i = 0; i < vehicleList.size(); i++) {
                     //根据sid去查询销售政策的sid，根据销售政策查询销售政策的金额
                     ResultBean<BaseVehiclePriceVo> priceResultBean = baseVehiclePolicyFeign.selectPrice(vehicleList.get(i));
-                    String price = priceResultBean.getData().getDiscountMoney();
-                    BigDecimal bigDecimal1 = new BigDecimal(price);
-                    initBigDecimal = initBigDecimal.add(bigDecimal1);
+                    if(priceResultBean.getSuccess() && priceResultBean.getData() != null){
+                        String price = priceResultBean.getData().getDiscountMoney();
+                        BigDecimal bigDecimal1 = new BigDecimal(price);
+                        initBigDecimal = initBigDecimal.add(bigDecimal1);
+                    }
+
                 }
             }
         }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java
index 08b20e94bc..983b5dc377 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java
@@ -75,4 +75,6 @@ public interface BusSalesOrderInsuranceMapper extends BaseMapper<BusSalesOrderIn
      * @return
      */
     BusSalesOrderInsuranceDetailsVo details(String sid);
+
+    int updateByOrderSid(@Param("sid") String sid, @Param("remarks") String remarks);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml
index ef707cd676..bdc4f8a9ff 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml
@@ -36,8 +36,18 @@
             resultType="com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo">
         select insuranceName,
                insuranceCarMoney,
-               insuranceNum
+               insuranceNum,
+               remarks
         from bus_sales_order_insurance
         where salesOrderSid = #{sid}
     </select>
+
+    <update id="updateByOrderSid">
+        update bus_sales_order_insurance
+        set insuranceNum     = NULL,
+            insuranceCarMoney=NULL,
+            insuranceName=NULL,
+            remarks          = #{remarks}
+        where salesOrderSid = #{sid}
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java
index 0c552e32ef..b209f90184 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java
@@ -103,4 +103,8 @@ public class BusSalesOrderInsuranceService extends MybatisBaseService<BusSalesOr
     public BusSalesOrderInsuranceDetailsVo selectOrderInsuranceStateBySid(String saleOrderSid) {
         return baseMapper.selectOrderInsuranceStateBySid(saleOrderSid);
     }
+
+    public int updateByOrderSid(String sid, String remarks) {
+        return baseMapper.updateByOrderSid(sid,remarks);
+    }
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
index 6094bcd6ec..41d521b7dd 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
@@ -43,7 +43,7 @@
                announcementModel,
                topPrice,
                moreConfig,
-               contractPath
+               contractPath,remarks
         from bus_sales_order_makeup
         where salesOrderSid = #{sid}
     </select>
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml
index 5c63af3123..22273ef677 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml
@@ -41,7 +41,9 @@
                moreConfig,
                specialConfig,
                guildPrice,
-               finalPrice
+               finalPrice,
+               brandName,
+               brandSid
         from bus_sales_order_model
         where salesOrderSid = #{sid}
     </select>
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.java
new file mode 100644
index 0000000000..3057a8d9b4
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.java
@@ -0,0 +1,14 @@
+package com.yxt.anrui.buscenter.biz.bussalesordersubmit;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/20 9:35
+ * @Description
+ */
+@Mapper
+public interface BusSalesOrderSubmitMapper extends BaseMapper<BusSalesOrderSubmit> {
+}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java
new file mode 100644
index 0000000000..81f3ef8824
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java
@@ -0,0 +1,38 @@
+package com.yxt.anrui.buscenter.biz.bussalesordersubmit;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit;
+import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmitDto;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/20 9:31
+ * @Description
+ */
+@Service
+public class BusSalesOrderSubmitService extends MybatisBaseService<BusSalesOrderSubmitMapper, BusSalesOrderSubmit> {
+    public void saveOrderSubmit(BusSalesOrderSubmitDto busSalesOrderSubmitDto, String businessSid) {
+        if (busSalesOrderSubmitDto != null) {
+            BusSalesOrderSubmit busSalesOrderSubmit1 = new BusSalesOrderSubmit();
+            BeanUtil.copyProperties(busSalesOrderSubmitDto, busSalesOrderSubmit1, "sid");
+            BigDecimal priceBig = new BigDecimal("0");
+            BigDecimal priceAll = new BigDecimal("0");
+            if (StringUtils.isNotBlank(busSalesOrderSubmitDto.getDistributorPrice())) {
+                priceBig = new BigDecimal(busSalesOrderSubmitDto.getDistributorPrice());
+                busSalesOrderSubmit1.setDistributorPrice(priceBig);
+
+            }
+            if (StringUtils.isNotBlank(busSalesOrderSubmitDto.getDistributorPriceAll())) {
+                priceAll = new BigDecimal(busSalesOrderSubmitDto.getDistributorPriceAll());
+                busSalesOrderSubmit1.setDistributorPriceAll(priceAll);
+            }
+            busSalesOrderSubmit1.setSalesOrderSid(businessSid);
+            save(busSalesOrderSubmit1);
+        }
+    }
+}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java
index 939bf3b191..e2d17fef72 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java
@@ -28,7 +28,6 @@ package com.yxt.anrui.buscenter.biz.bussalesvehicleorder;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.buscenter.api.bussalesorder.AppNowCar;
 import com.yxt.anrui.buscenter.api.bussalesorder.AppReadyCarList;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.*;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -89,13 +88,13 @@ public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehi
         if (stringList.size() > 0) {
             //删除
             baseMapper.deleteBySalesOrderSid(sid);
-            for (int i = 0; i < vehicleList.size(); i++) {
-                BusSalesVehicleOrderDto busSalesVehicleOrderDto = vehicleList.get(i);
-                BusSalesVehicleOrder busSalesVehicleOrder = new BusSalesVehicleOrder();
-                BeanUtil.copyProperties(busSalesVehicleOrderDto, busSalesVehicleOrder, "sid");
-                busSalesVehicleOrder.setSalesOrderSid(sid);
-                save(busSalesVehicleOrder);
-            }
+        }
+        for (int i = 0; i < vehicleList.size(); i++) {
+            BusSalesVehicleOrderDto busSalesVehicleOrderDto = vehicleList.get(i);
+            BusSalesVehicleOrder busSalesVehicleOrder = new BusSalesVehicleOrder();
+            BeanUtil.copyProperties(busSalesVehicleOrderDto, busSalesVehicleOrder, "sid");
+            busSalesVehicleOrder.setSalesOrderSid(sid);
+            save(busSalesVehicleOrder);
         }
     }
 
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandVo.java
index cb1a89a60b..b227ae5622 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandVo.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmVehicledemandVo.java
@@ -26,10 +26,11 @@ public class AppCrmVehicledemandVo implements Vo {
     private String createTime;
 
     @ApiModelProperty("销售指导价")
-    private String vehicleModelOffer;
+    private String guidancePrice;
 
     @ApiModelProperty("购车方式value")
-    private String purchaseMethod;
+    private String purchaseType;
+
 
 
 }
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java
index 22bef9db4e..f132c582dd 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemand.java
@@ -59,7 +59,7 @@ public class CrmVehicledemand extends BaseEntity {
     private String changeOptions;
 
     @ApiModelProperty("车型报价")
-    private String vehicleModelOffer;
+    private BigDecimal vehicleModelOffer;
 
     @ApiModelProperty("数量")
     private String number;
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomer/CrmCustomerMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomer/CrmCustomerMapper.java
index b3e664628d..5893b71855 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomer/CrmCustomerMapper.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomer/CrmCustomerMapper.java
@@ -158,5 +158,5 @@ public interface CrmCustomerMapper extends BaseMapper<CrmCustomer> {
 
     List<CrmCustomerSelectVo> cusList();
 
-    int updateRemindAndByCustomerSid(@Param("customerSid") String customerSid,@Param("remind_day") String remind_day, @Param("remind_remark") String remind_remark,@Param("isOnRemind") String isOnRemind, @Param("isOnRemindkey") String isOnRemindkey);
+    int updateRemindAndByCustomerSid(@Param("customerSid") String customerSid, @Param("remind_day") String remind_day, @Param("remind_remark") String remind_remark, @Param("isOnRemind") String isOnRemind, @Param("isOnRemindkey") String isOnRemindkey, @Param("follow_state") String follow_state);
 }
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomer/CrmCustomerMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomer/CrmCustomerMapper.xml
index 8c1036dc32..5a6fb08bed 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomer/CrmCustomerMapper.xml
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomer/CrmCustomerMapper.xml
@@ -137,7 +137,8 @@
         SET remind_day    = #{remind_day},
             remind_remark = #{remind_remark},
             isOnRemind    = #{isOnRemind},
-            isOnRemindkey=#{isOnRemindkey}
+            isOnRemindkey=#{isOnRemindkey},
+            follow_state  = #{follow_state}
         WHERE sid = #{customerSid}
     </update>
 
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomer/CrmCustomerService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomer/CrmCustomerService.java
index ae64865379..f6e661a822 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomer/CrmCustomerService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomer/CrmCustomerService.java
@@ -974,8 +974,8 @@ public class CrmCustomerService extends MybatisBaseService<CrmCustomerMapper, Cr
         return baseMapper.cusList();
     }
 
-    public int updateRemindAndByCustomerSid(String customerSid, String remind_day, String remind_remark, String isOnRemind, String isOnRemindkey) {
-        return baseMapper.updateRemindAndByCustomerSid(customerSid, remind_day, remind_remark, isOnRemind, isOnRemindkey);
+    public int updateRemindAndByCustomerSid(String customerSid, String remind_day, String remind_remark, String isOnRemind, String isOnRemindkey,String follow_state) {
+        return baseMapper.updateRemindAndByCustomerSid(customerSid, remind_day, remind_remark, isOnRemind, isOnRemindkey,follow_state);
     }
 
     /*获取身份证信息*/
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
index b2d1a23e20..3aa9087c50 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
@@ -41,7 +41,7 @@
         cct.companyName,
         (select Max(DATE_FORMAT(cv.createTime,'%Y-%m-%d')) from crm_visit cv where cv.customerSid = cct.sid order by
         cv.id DESC) as visitTime ,
-        cv.follow_state
+        cct.follow_state
         FROM
         crm_customer_temp cct
         LEFT JOIN crm_visit cv ON cct.sid = cv.customerSid
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java
index 9a1ff25fe6..2ee9c0983e 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java
@@ -106,4 +106,6 @@ public interface CrmVehicledemandMapper extends BaseMapper<CrmVehicledemand> {
      * @return
      */
     IPage<AppOrderCrmVehicleDemandVo> getWantCarList(IPage<CrmVehicledemand> page, @Param(Constants.WRAPPER) QueryWrapper<CrmVehicledemand> qw);
+
+    void updateByPrice(@Param("sid") String sid);
 }
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml
index aedcc769b9..6a54e4c4e5 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml
@@ -32,9 +32,9 @@
                cvcd.modelName,
                cvcd.modelSid,
                cvcd.comonConfigSid,
-               cvcd.saleReferencePrice  AS vehicleModelOffer,
+               cvcd.saleReferencePrice  AS guidancePrice,
                cvcd.createTime,
-               cvcd.purchaseMethodValue AS purchaseMethod
+               cvcd.purchaseMethodValue AS purchaseType
         FROM crm_vehicledemand cvcd
         WHERE cvcd.customerSid = #{customerSid}
           AND cvcd.states = 1
@@ -107,7 +107,7 @@
             resultType="com.yxt.anrui.crm.api.crmvehicledemand.AppCrmVehicleDemandParticularsVo">
         SELECT cv.purchaseMethodValue AS type,
                cv.modelSid,
-               cv.modelName           AS model,
+               cv.modelName,
                cv.brandName           AS brand,
                cv.saleReferencePrice  AS price,
                cv.vehicleModelOffer   AS quotation,
@@ -136,4 +136,12 @@
                cv.createTime
         from crm_vehicledemand cv ${ew.customSqlSegment}
     </select>
+
+    <update id="updateByPrice">
+        update
+            crm_vehicledemand
+        set vehicleModelOffer = NULL
+        where sid = #{sid}
+    </update>
+
 </mapper>
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java
index 240a65dd2d..3e79660782 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java
@@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -354,8 +355,14 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
         entity.setRemarks(appCrmVehicleDemandUpdateDto.getRemarks());
         entity.setNumber(appCrmVehicleDemandUpdateDto.getNumber());
         entity.setEstimatedPickupDate(appCrmVehicleDemandUpdateDto.getDate());
-        entity.setVehicleModelOffer(appCrmVehicleDemandUpdateDto.getPrice());
+        if (StringUtils.isNotBlank(appCrmVehicleDemandUpdateDto.getPrice())) {
+            BigDecimal bigDecimal = new BigDecimal(appCrmVehicleDemandUpdateDto.getPrice());
+            entity.setVehicleModelOffer(bigDecimal);
+        }
         baseMapper.updateById(entity);
+        if (StringUtils.isBlank(appCrmVehicleDemandUpdateDto.getPrice())) {
+           baseMapper.updateByPrice(entity.getSid());
+        }
         return rb.success();
     }
 
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.java
index 52e2f84be4..56245c8988 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.java
@@ -66,8 +66,8 @@ public interface CrmVisitMapper extends BaseMapper<CrmVisit> {
 
     List<String> selVisitMaterials(@Param("sid") String sid, @Param("staffSid") String staffSid);
 
-    int fetchByVisitSid(String sid);
+    int fetchByVisitSid(@Param("sid") String sid);
 
     @Update("UPDATE crm_visit SET visit_witness_materials = #{s} WHERE sid = #{sid}")
-    void updateAppendixUrl(@Param("s")String s,@Param("sid")String sid);
+    void updateAppendixUrl(@Param("s") String s, @Param("sid") String sid);
 }
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.xml
index afc42f59e2..b75e693b5f 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.xml
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.xml
@@ -57,7 +57,7 @@
                cv.remind_day,
                cv.remind_day_key
         FROM crm_visit cv
-                     LEFT JOIN crm_customer_temp cct ON cct.sid = cv.customerSid
+                 LEFT JOIN crm_customer_temp cct ON cct.sid = cv.customerSid
         where cv.sid = #{sid}
     </select>
     <!--查询本周记录条数-->
@@ -99,11 +99,8 @@
     </select>
     <select id="fetchByVisitSid" resultType="java.lang.Integer">
         SELECT count(*)
-        FROM crm_visit cv
-                 LEFT JOIN crm_visit_demand cvd ON cv.sid = cvd.visitSid
-                 LEFT JOIN crm_vehicledemand cvcd ON cvcd.sid = cvd.demandSid
-        WHERE cv.sid = #{sid}
-          AND cvcd.states = 0
+        FROM crm_visit_demand cvd
+        WHERE cvd.visitSid = #{sid}
     </select>
     <select id="getAppVisitByCustomerSid"
             resultType="com.yxt.anrui.crm.api.crmvisit.AppCrmVisitThumbDetailsVo">
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitRest.java
index dee12aa829..3b0c7f0c28 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitRest.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitRest.java
@@ -139,7 +139,8 @@ public class CrmVisitRest implements CrmVisitFeign {
             String remind_day = dto.getRemind_day();
             String remind_remark = dto.getRemind_remark();
             String isOnRemind = dto.getIsOnRemind();
-            crmCustomerService.updateRemindAndByCustomerSid(customerSid, remind_day, remind_remark, isOnRemind, isOnRemindkey);
+            String follow_state = dto.getFollow_state();
+            crmCustomerService.updateRemindAndByCustomerSid(customerSid, remind_day, remind_remark, isOnRemind, isOnRemindkey,follow_state);
             return rb.success().setMsg("添加成功");
         }
         return rb.fail().setMsg("保存失败，该客户不存在");
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitService.java
index 5d4ef07fcc..ccefddf2b8 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitService.java
@@ -349,6 +349,12 @@ public class CrmVisitService extends MybatisBaseService<CrmVisitMapper, CrmVisit
                 String format = new SimpleDateFormat("yyyy年MM月dd日").format(date);
                 appCrmVisitThumbDetailsVo.setFollow_time(format + "  " + DateUtils.getWeekOfDate(date));
             }
+            int i = baseMapper.fetchByVisitSid(appCrmVisitThumbDetailsVo.getSid());
+            if (i > 0) {
+                appCrmVisitThumbDetailsVo.setIntendedModel(true);
+            } else {
+                appCrmVisitThumbDetailsVo.setIntendedModel(false);
+            }
 //            if (StringUtils.isNotBlank(appCrmVisitThumbDetailsVo.getVisit_witness_materials())) {
 //                String[] urlArr = appCrmVisitThumbDetailsVo.getVisit_witness_materials().split(",");
 //                for (int i = 0; i < urlArr.length; i++) {
@@ -392,7 +398,8 @@ public class CrmVisitService extends MybatisBaseService<CrmVisitMapper, CrmVisit
         String remind_day = appCrmVisitDto.getRemind_day();
         String remind_remark = appCrmVisitDto.getRemind_remark();
         String isOnRemind = appCrmVisitDto.getIsOnRemind();
-        int i = crmCustomerService.updateRemindAndByCustomerSid(customerSid, remind_day, remind_remark, isOnRemind, isOnRemindkey);
+        String follow_state = appCrmVisitDto.getFollow_state();
+        int i = crmCustomerService.updateRemindAndByCustomerSid(customerSid, remind_day, remind_remark, isOnRemind, isOnRemindkey,follow_state);
         if (i > 0) {
             CrmVisit entity = new CrmVisit();
             List<String> materialsList = appCrmVisitDto.getMaterialsList();
diff --git a/anrui-management/anrui-management-ui/package.json b/anrui-management/anrui-management-ui/package.json
index ddefe99998..48c94f7525 100644
--- a/anrui-management/anrui-management-ui/package.json
+++ b/anrui-management/anrui-management-ui/package.json
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "axios": "0.18.1",
-    "core-js": "3.6.5",
+    "core-js": "^3.22.5",
     "element-ui": "2.13.2",
     "js-cookie": "2.2.0",
     "normalize.css": "7.0.0",
diff --git a/anrui-management/anrui-management-ui/src/api/management/yuangongguanli.js b/anrui-management/anrui-management-ui/src/api/management/yuangongguanli.js
index 0e15876442..d9c1d00a61 100644
--- a/anrui-management/anrui-management-ui/src/api/management/yuangongguanli.js
+++ b/anrui-management/anrui-management-ui/src/api/management/yuangongguanli.js
@@ -41,6 +41,15 @@ export default {
     })
   },
 
+  // 通过sid删除一条或多条记录
+  del: function(data) {
+    return request({
+      url: '/portal/v1/sysstaffinfo/del',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
   // 员工信息编辑初始化及详情
   fetchBySid: function(sid) {
     return request({
diff --git a/anrui-management/anrui-management-ui/src/components/ButtonBar/index.vue b/anrui-management/anrui-management-ui/src/components/ButtonBar/index.vue
index fe76690bf2..963a81e972 100644
--- a/anrui-management/anrui-management-ui/src/components/ButtonBar/index.vue
+++ b/anrui-management/anrui-management-ui/src/components/ButtonBar/index.vue
@@ -55,13 +55,6 @@ export default {
           btnKey: 'doDel',
           btnLabel: '删除'
         },
-        {
-          type: 'danger',
-          size: 'small',
-          icon: '',
-          btnKey: 'doQuit',
-          btnLabel: '离职'
-        },
         {
           type: 'success',
           size: 'small',
@@ -103,9 +96,12 @@ export default {
     },
     btnHandle(btnKey) {
       this.$emit('btnhandle', btnKey)
+    },
+    setButtonList(value) {
+      this.btnList = value
     }
   }
 }
 </script>
 
-<style></style>
\ No newline at end of file
+<style></style>
diff --git a/anrui-management/anrui-management-ui/src/components/uploadFileimg/upload.vue b/anrui-management/anrui-management-ui/src/components/uploadFileimg/upload.vue
index f010a15917..d87cf534ad 100644
--- a/anrui-management/anrui-management-ui/src/components/uploadFileimg/upload.vue
+++ b/anrui-management/anrui-management-ui/src/components/uploadFileimg/upload.vue
@@ -1,253 +1,224 @@
 <template>
   <div>
-    <el-upload ref="imgUpload" v-loading="loadding" class="avatar-uploader" :headers="accessToken"
-               :action="uploadFile" accept=".jpg,.jpeg,.png,.bmp,.pdf,.JPG,.JPEG,.BMP" list-type="picture-card"
-               :file-list="files" :on-remove="removeImage" :on-preview="handlePictureCardPreview"
-               :on-progress="uploadProgrees"
-               :on-error="uploadError" :on-success="uploadImgSuccess_FuJian">
+    <el-upload ref="imgUpload" v-loading="loadding" class="avatar-uploader" :headers="accessToken" :action="uploadFile" :accept="accept" list-type="picture-card" :limit="limit" :file-list="files" :on-remove="removeImage" :on-preview="handlePictureCardPreview" :on-progress="uploadProgrees" :on-error="uploadError" :on-success="uploadImgSuccess_FuJian">
       <i class="el-icon-plus avatar-uploader-icon"/>
     </el-upload>
-    <el-dialog :visible.sync="dialogVisible" :append-to-body="true" title="查看图片">
+    <el-dialog :visible.sync="dialogVisible"  title="查看图片">
       <img width="100%" :src="dialogImageUrl" alt="">
     </el-dialog>
-
-    <!--    <el-upload list-type="picture-card" :on-preview="handlePictureCardPreview" :on-remove="handleRemove">-->
-    <!--      <i class="el-icon-plus"></i>-->
-    <!--    </el-upload>-->
-    <!--    <el-dialog :visible.sync="dialogVisible">-->
-    <!--      <img width="100%" :src="dialogImageUrl" alt="">-->
-    <!--    </el-dialog>-->
-
-    <!--    <el-upload class="upload-demo" :headers="accessToken" :action="uploadFile" :accept="accept" :data="uploadData" :on-success="uploadImgSuccess_FuJian" :on-remove="handleRemove" :file-list="fileList_FuJian">-->
-    <!--      <el-button size="small" type="primary">点击上传</el-button>-->
-    <!--      &lt;!&ndash; <el-button v-show="isview" size="small" type="primary" @click="view()">查看</el-button> &ndash;&gt;-->
-    <!--      &lt;!&ndash; <div slot="tip" class="el-upload__tip">单个文件大小不允许超过100M,支持上传文件类型：{{ accept }}</div> &ndash;&gt;-->
-    <!--    </el-upload>-->
   </div>
 </template>
 
 <script>
-  import {uploadFile} from '@/api/Common/Upload.js'
-  import {getStorage} from '@/utils/auth.js' //token
-  import {mapGetters} from 'vuex'
+import { uploadFile } from '@/api/Common/Upload.js'
+import { getStorage } from '@/utils/auth.js'
 
-  export default {
-    model: {
-      prop: 'name',
-      event: 'change',
-    },
-    props: {
-      placeholder: {
-        type: String,
-        default: '',
-      },
-      bucket: {
-        type: String,
-        default: 'abc',
-      },
-      // 长度
-      width: {
-        type: String,
-        default: '270px',
-      },
-      limit: {
-        type: Number,
-        default: 1,
-      },
-      accept: {
-        type: String,
-        default:
-          '.jpg,.jpeg,.png,.bmp,.pdf,.JPG,.JPEG,.BMP,.PDF,.xls,.docx,.xlsx,.ppt,.pptx',
-      },
-      // 文件名称
-      name: {
-        type: Array,
-        required: true,
-      },
-      uploadData: {
-        type: Object,
-        default: {},
-      },
-    },
-    data() {
-      return {
-        dialogImageUrl: '',
-        dialogVisible: false,
-        accessToken: null,
-        uploadFile: uploadFile,
-        fileList_FuJian: [],
-        enclosure: '',
-        file_add: '',
-        file_catch: '',
-        files: [],
-        files_list: [],
-        filedUrl: '',
-        // fileUrl: fileUrl,
-        // showpicture:false,
-        isview: false,
-        nameArr: '',
-        loadding: false,
-      }
+export default {
+  model: {
+    prop: 'name',
+    event: 'change'
+  },
+  props: {
+    placeholder: {
+      type: String,
+      default: ''
     },
-    computed: {
-      ...mapGetters([
-        'id',
-        'departmentCode',
-        'departmentLevel',
-        'departmentType',
-        'token',
-      ]),
-    },
-    watch: {
-      name: {
-        deep: true,
-        immediate: true,
-        handler(newVal, oldVal) {
-          console.log('aaaa1', newVal)
-          this.files = newVal
-          console.log('aaaa2', this.files)
-        },
-      },
-    },
-    mounted() {
-      this.$nextTick(() => {
-        this.Init()
-      })
+    bucket: {
+      type: String,
+      default: 'abc'
+    },
+    // 长度
+    width: {
+      type: String,
+      default: '270px'
+    },
+    limit: {
+      type: Number,
+      default: ''
     },
-    created() {
-      this.uploadFile = uploadFile // 接口
-      this.accessToken = {
-        token: getStorage(),
+    accept: {
+      type: String,
+      default: '.jpg,.jpeg,.png,.bmp,.pdf,.JPG,.JPEG,.BMP,.PDF,.xls,.docx,.xlsx,.ppt,.pptx'
+    },
+    // 文件名称
+    name: {
+      type: Array,
+      required: true
+    },
+    uploadData: {
+      type: Object,
+      default: {}
+    }
+  },
+  data() {
+    return {
+      dialogImageUrl: '',
+      dialogVisible: false,
+      accessToken: null,
+      uploadFile: uploadFile,
+      fileList_FuJian: [],
+      enclosure: '',
+      file_add: '',
+      file_catch: '',
+      files: [],
+      files_list: [],
+      filedUrl: '',
+      // fileUrl: fileUrl,
+      // showpicture:false,
+      isview: false,
+      nameArr: '',
+      loadding: false
+    }
+  },
+  watch: {
+    name: {
+      deep: true,
+      immediate: true,
+      handler(newVal, oldVal) {
+        console.log('aaaa1', newVal)
+        this.files = newVal
+        console.log('aaaa2', this.files)
       }
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.Init()
+    })
+  },
+  created() {
+    this.uploadFile = uploadFile // 接口
+    this.accessToken = {
+      token: getStorage()
+    }
+  },
+  methods: {
+    showImg(imgList) {
+      this.files = imgList
+      console.log('123123123', this.files)
     },
-    methods: {
-      showImg(imgList){
-        this.files = imgList
-        console.log('123123123',this.files)
-      },
-      view() {
-        // window.open(this.filedUrl)
-      },
-      // 页面第一次加载
-      Init() {
-        if (this.name !== undefined) {
-          this.files = []
-          for (var i = 0; i < this.name.length; i++) {
-            this.files.push({
-              name: this.name[i],
-              url: this.name[i],
-            })
-          }
-        }
-      },
-      // 上传方案--成功后执行
-      uploadImgSuccess_FuJian(response, file, fileList) {
-        console.log('您选择的file:', file)
-        if (file.response.code === '200') {
-          this.loadding = false
-          // 返显图片
-          this.filedUrl = this.fileUrl + file.response.data
-          // var uid = file.response.data
+    view() {
+      // window.open(this.filedUrl)
+    },
+    // 页面第一次加载
+    Init() {
+      if (this.name !== undefined) {
+        this.files = []
+        for (var i = 0; i < this.name.length; i++) {
           this.files.push({
-            name: file.response.data.sourceFileName,
-            url: file.response.data.fullUrl,
-            size: file.response.data.size,
+            name: this.name[i],
+            url: this.name[i]
           })
-          this.$emit('change', this.files)
-          this.$emit('eett', this.files)
         }
-      },
+      }
+    },
+    handlePictureCardPreview(file) {
+      console.log(this.file)
+      this.dialogVisible = true
+      this.dialogImageUrl = file.url
+    },
+    // 上传方案--成功后执行
+    uploadImgSuccess_FuJian(response, file, fileList) {
+      console.log('您选择的file:', file)
+      if (file.response.code === '200') {
+        this.loadding = false
+        // 返显图片
+        this.filedUrl = this.fileUrl + file.response.data
+        // var uid = file.response.data
+        this.files.push({
+          name: file.response.data.sourceFileName,
+          url: file.response.data.fullUrl,
+          size: file.response.data.size
+        })
+        this.$emit('change', this.files)
+        this.$emit('eett', this.files)
+      }
+    },
 
-      removeImage(file, ImageFileList) {
-        this.files.splice(this.files.indexOf(file), 1)
-        const imgFiles = []
+    removeImage(file, ImageFileList) {
+      this.files.splice(this.files.indexOf(file), 1)
+      const imgFiles = []
 
-        this.files.forEach((o) => {
-          imgFiles.push(o.url)
-        })
-        this.$emit('fileChange', this.files)
-      },
-      handleRemove(file, fileList) {
-        console.log('file:' + JSON.stringify(file))
-        console.log('fileList:' + JSON.stringify(fileList))
-        this.enclosure = ''
-        // 1. 保存新增文件id(this.file_add)
-        this.getNewFileId(fileList)
-        // 2. 保存数据库读取的已有文件id(this.file_catch)
-        this.getCatchFileId(file)
-        // 3. 保存并拼接id
-        this.getFileId()
-        // 4. 返回拼接id
-        this.$emit('change', this.enclosure)
-      },
-      // 返回this.file_add(新上传文件的id拼接集合)
-      getNewFileId(fileList) {
-        // debugger
-        this.file_add = ''
-        for (var i = 0; i < fileList.length; i++) {
-          if (fileList[i].response && fileList[i].response.code === '200') {
-            this.file_add = this.file_add + fileList[i].response.data + ','
-          }
-        }
-        if (this.file_add !== '') {
-          this.file_add = this.file_add.substring(0, this.file_add.length - 1)
-        }
-        // console.log('1. this.file_add: ' + this.file_add)
-      },
-      // 返回this.file_catch（数库一寸照的文件的id的拼接集合）
-      getCatchFileId(file) {
-        for (var i = 0; i < this.files_list.length; i++) {
-          if (this.file_catch !== '') {
-            // 1. 检查当前删除的文件是否是修改文件列表里面的，如果是，将修改列表里去除此id
-            if (this.files_list[i].name === file.name) {
-              // 2. 拆开file_catch到fils_arry
-              var fils_arry = this.file_catch.split(',')
-              // 3. 从fils_arry去除 this.files_list[i].id
-              var arry = []
-              fils_arry.forEach((element) => {
-                // 不加载文件里面的
-                if (element !== this.files_list[i].id) {
-                  arry.push(element)
-                }
-              })
-              // 4. 重新拼接成file_catch
-              this.file_catch = arry.join(',')
-            }
-          }
+      this.files.forEach((o) => {
+        imgFiles.push(o.url)
+      })
+      this.$emit('fileChange', this.files)
+    },
+    handleRemove(file, fileList) {
+      console.log('file:' + JSON.stringify(file))
+      console.log('fileList:' + JSON.stringify(fileList))
+      this.enclosure = ''
+      // 1. 保存新增文件id(this.file_add)
+      this.getNewFileId(fileList)
+      // 2. 保存数据库读取的已有文件id(this.file_catch)
+      this.getCatchFileId(file)
+      // 3. 保存并拼接id
+      this.getFileId()
+      // 4. 返回拼接id
+      this.$emit('change', this.enclosure)
+    },
+    // 返回this.file_add(新上传文件的id拼接集合)
+    getNewFileId(fileList) {
+      // debugger
+      this.file_add = ''
+      for (var i = 0; i < fileList.length; i++) {
+        if (fileList[i].response && fileList[i].response.code === '200') {
+          this.file_add = this.file_add + fileList[i].response.data + ','
         }
-        // console.log('2. this.file_catch:' + this.file_catch)
-      },
-      // 保存并拼接id
-      getFileId() {
-        // console.log('3. this.file_catch:' + this.file_catch + ',this.file_add:' + this.file_add)
+      }
+      if (this.file_add !== '') {
+        this.file_add = this.file_add.substring(0, this.file_add.length - 1)
+      }
+      // console.log('1. this.file_add: ' + this.file_add)
+    },
+    // 返回this.file_catch（数库一寸照的文件的id的拼接集合）
+    getCatchFileId(file) {
+      for (var i = 0; i < this.files_list.length; i++) {
         if (this.file_catch !== '') {
-          if (this.file_add !== '') {
-            this.enclosure = this.file_catch + ',' + this.file_add
-          } else {
-            this.enclosure = this.file_catch
+          // 1. 检查当前删除的文件是否是修改文件列表里面的，如果是，将修改列表里去除此id
+          if (this.files_list[i].name === file.name) {
+            // 2. 拆开file_catch到fils_arry
+            var fils_arry = this.file_catch.split(',')
+            // 3. 从fils_arry去除 this.files_list[i].id
+            var arry = []
+            fils_arry.forEach((element) => {
+              // 不加载文件里面的
+              if (element !== this.files_list[i].id) {
+                arry.push(element)
+              }
+            })
+            // 4. 重新拼接成file_catch
+            this.file_catch = arry.join(',')
           }
-        } else {
-          this.enclosure = this.file_add
         }
-      },
-      handlePictureCardPreview(file) {
-        // this.dialogImageUrl = file.url
-        // this.dialogImageUrl = file.fullUrl
-        this.dialogImageUrl = file.url
-        // this.showpicture = true
-      },
-      // 上传失败
-      uploadError() {
-        this.loadding = false
-      },
-      uploadProgrees(event, file, fileList) {
-        if (Number(event.percent) > 0) {
-          this.loadding = true
+      }
+      // console.log('2. this.file_catch:' + this.file_catch)
+    },
+    // 保存并拼接id
+    getFileId() {
+      // console.log('3. this.file_catch:' + this.file_catch + ',this.file_add:' + this.file_add)
+      if (this.file_catch !== '') {
+        if (this.file_add !== '') {
+          this.enclosure = this.file_catch + ',' + this.file_add
+        } else {
+          this.enclosure = this.file_catch
         }
-        //   console.log('event:', event)
-      },
+      } else {
+        this.enclosure = this.file_add
+      }
     },
+    // 上传失败
+    uploadError() {
+      this.loadding = false
+    },
+    uploadProgrees(event, file, fileList) {
+      if (Number(event.percent) > 0) {
+        this.loadding = true
+      }
+      //   console.log('event:', event)
+    }
   }
+}
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/anrui-management/anrui-management-ui/src/components/uploadFileimg/upload_head.vue b/anrui-management/anrui-management-ui/src/components/uploadFileimg/upload_head.vue
index 489c60a484..6b133c40ec 100644
--- a/anrui-management/anrui-management-ui/src/components/uploadFileimg/upload_head.vue
+++ b/anrui-management/anrui-management-ui/src/components/uploadFileimg/upload_head.vue
@@ -1,270 +1,144 @@
 <template>
   <div>
-    <el-upload
-      ref="imgUpload"
-      v-loading="loadding"
-      class="avatar-uploader"
-      :headers="accessToken"
-      :action="uploadFile"
-      accept=".jpg,.jpeg,.png,.bmp,.pdf,.JPG,.JPEG,.BMP"
-      list-type="picture-card"
-      :file-list="files"
-      :on-remove="removeImage"
-      :on-preview="handlePictureCardPreview"
-      :on-progress="uploadProgrees"
-      :on-error="uploadError"
-      :on-success="uploadImgSuccess_FuJian"
-    >
-      <i class="el-icon-plus avatar-uploader-icon" />
+    <el-upload ref="imgUpload" class="avatar-uploader" :file-list="files" :headers="accessToken" :accept="accept" :action="uploadFile" :on-success="uploadImgSuccess_FuJian" :show-file-list="false">
+      <i v-if="Photo === '' && frontPhoto === ''" class="el-icon-plus avatar-uploader-icon" />
+      <img v-else :src="Photo != '' ? Photo : frontPhoto" class="avatar">
     </el-upload>
-    <el-dialog
-      :visible.sync="dialogVisible"
-      :append-to-body="true"
-      title="查看图片"
-    >
+    <el-dialog :visible.sync="dialogVisible" :append-to-body="true" title="查看图片">
       <img width="100%" :src="dialogImageUrl" alt="" />
     </el-dialog>
-
-    <!--    <el-upload list-type="picture-card" :on-preview="handlePictureCardPreview" :on-remove="handleRemove">-->
-    <!--      <i class="el-icon-plus"></i>-->
-    <!--    </el-upload>-->
-    <!--    <el-dialog :visible.sync="dialogVisible">-->
-    <!--      <img width="100%" :src="dialogImageUrl" alt="">-->
-    <!--    </el-dialog>-->
-
-    <!--    <el-upload class="upload-demo" :headers="accessToken" :action="uploadFile" :accept="accept" :data="uploadData" :on-success="uploadImgSuccess_FuJian" :on-remove="handleRemove" :file-list="fileList_FuJian">-->
-    <!--      <el-button size="small" type="primary">点击上传</el-button>-->
-    <!--      &lt;!&ndash; <el-button v-show="isview" size="small" type="primary" @click="view()">查看</el-button> &ndash;&gt;-->
-    <!--      &lt;!&ndash; <div slot="tip" class="el-upload__tip">单个文件大小不允许超过100M,支持上传文件类型：{{ accept }}</div> &ndash;&gt;-->
-    <!--    </el-upload>-->
   </div>
 </template>
 
 <script>
-import { uploadFile } from "@/api/Common/Upload.js";
-import { getStorage } from "@/utils/auth.js"; //token
-import { mapGetters } from "vuex";
+import { uploadFile } from '@/api/Common/Upload.js'
+import { getStorage } from '@/utils/auth'
 
 export default {
-  model: {
-    prop: "name",
-    event: "change",
-  },
+  // model: {
+  //   prop: 'name',
+  //   event: 'change'
+  // },
   props: {
-    placeholder: {
-      type: String,
-      default: "",
-    },
-    bucket: {
-      type: String,
-      default: "abc",
-    },
-    // 长度
-    width: {
-      type: String,
-      default: "270px",
-    },
     limit: {
       type: Number,
-      default: 1,
+      default: 1
     },
     accept: {
       type: String,
-      default:
-        ".jpg,.jpeg,.png,.bmp,.pdf,.JPG,.JPEG,.BMP,.PDF,.xls,.docx,.xlsx,.ppt,.pptx",
+      default: '.jpg,.jpeg,.png,.JPG,.JPEG,.PNG'
     },
+    frontPhoto: {
+      type: String,
+      default: ''
+    }
     // 文件名称
-    name: {
-      type: Array,
-      required: true,
-    },
-    uploadData: {
-      type: Object,
-      default: {},
-    },
+    // name: {
+    //   type: Array,
+    //   required: true
+    // }
   },
   data() {
     return {
-      dialogImageUrl: "",
+      dialogImageUrl: '',
       dialogVisible: false,
-      accessToken: null,
       uploadFile: uploadFile,
-      fileList_FuJian: [],
-      enclosure: "",
-      file_add: "",
-      file_catch: "",
       files: [],
-      files_list: [],
-      filedUrl: "",
-      // fileUrl: fileUrl,
-      // showpicture:false,
-      isview: false,
-      nameArr: "",
       loadding: false,
-    };
-  },
-  computed: {
-    ...mapGetters([
-      "id",
-      "departmentCode",
-      "departmentLevel",
-      "departmentType",
-      "token",
-    ]),
-  },
-  watch: {
-    name: {
-      deep: true,
-      immediate: true,
-      handler(newVal, oldVal) {
-        console.log("aaaa1", newVal);
-        this.files = newVal;
-        if (this.files.length > 1) {
-          this.files.splice(0, 1);
-        }
-        console.log("aaaa2", this.files);
-      },
-    },
-  },
-  mounted() {
-    this.$nextTick(() => {
-      this.Init();
-    });
+      Photo: ''
+    }
   },
+  // watch: {
+  //   name: {
+  //     deep: true,
+  //     immediate: true,
+  //     handler(newVal, oldVal) {
+  //       console.log('aaaa1', newVal)
+  //       this.files = newVal
+  //       if (this.files.length > 1) {
+  //         this.files.splice(0, 1)
+  //         console.log(111111)
+  //       }
+  //       // this.Photo = this.files[0].url
+  //       console.log('333333', this.Photo, this.files)
+  //       console.log('aaaa2', this.files)
+  //     }
+  //   }
+  // },
+  // mounted() {
+  //   this.$nextTick(() => {
+  //     this.Init()
+  //   })
+  // },
   created() {
-    this.uploadFile = uploadFile; // 接口
+    this.uploadFile = uploadFile // 接口
     this.accessToken = {
       token: getStorage(),
-    };
+    }
   },
   methods: {
-    showImg(imgList) {
-      this.files = imgList;
-      console.log("123123123", this.files);
-    },
-    view() {
-      // window.open(this.filedUrl)
-    },
-    // 页面第一次加载
-    Init() {
-      if (this.name !== undefined) {
-        this.files = [];
-        for (var i = 0; i < this.name.length; i++) {
-          this.files.push({
-            name: this.name[i],
-            url: this.name[i],
-          });
-        }
-      }
-    },
+    // showImg(imgList) {
+    //   this.files = imgList
+    //   console.log('123123123', this.files)
+    // },
+    // // 页面第一次加载
+    // Init() {
+    //   if (this.name !== undefined) {
+    //     this.files = []
+    //     for (var i = 0; i < this.name.length; i++) {
+    //       this.files.push({
+    //         name: this.name[i],
+    //         url: this.name[i]
+    //       })
+    //     }
+    //   }
+    // },
     // 上传方案--成功后执行
-    uploadImgSuccess_FuJian(response, file, fileList) {
-      console.log("您选择的file:", file);
-      if (file.response.code === "200") {
-        this.loadding = false;
+    uploadImgSuccess_FuJian(response, file) {
+      console.log('您选择的file:', file)
+      if (file.response.code === '200') {
+        this.loadding = false
         // 返显图片
-        this.filedUrl = this.fileUrl + file.response.data;
-        // var uid = file.response.data
+        this.Photo = file.response.data.fullUrl
         this.files.push({
           name: file.response.data.sourceFileName,
           url: file.response.data.fullUrl,
-          size: file.response.data.size,
-        });
-        this.$emit("change", this.files);
-        this.$emit("eett", this.files);
+          size: file.response.data.size
+        })
+        this.$emit('photoAdd', this.Photo)
+        this.$emit('eett', this.files)
       }
-    },
+    }
+  }
+}
+</script>
 
-    removeImage(file, ImageFileList) {
-      this.files.splice(this.files.indexOf(file), 1);
-      const imgFiles = [];
+<style scoped>
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
 
-      this.files.forEach((o) => {
-        imgFiles.push(o.url);
-      });
-      this.$emit("fileChange", this.files);
-    },
-    handleRemove(file, fileList) {
-      console.log("file:" + JSON.stringify(file));
-      console.log("fileList:" + JSON.stringify(fileList));
-      this.enclosure = "";
-      // 1. 保存新增文件id(this.file_add)
-      this.getNewFileId(fileList);
-      // 2. 保存数据库读取的已有文件id(this.file_catch)
-      this.getCatchFileId(file);
-      // 3. 保存并拼接id
-      this.getFileId();
-      // 4. 返回拼接id
-      this.$emit("change", this.enclosure);
-    },
-    // 返回this.file_add(新上传文件的id拼接集合)
-    getNewFileId(fileList) {
-      // debugger
-      this.file_add = "";
-      for (var i = 0; i < fileList.length; i++) {
-        if (fileList[i].response && fileList[i].response.code === "200") {
-          this.file_add = this.file_add + fileList[i].response.data + ",";
-        }
-      }
-      if (this.file_add !== "") {
-        this.file_add = this.file_add.substring(0, this.file_add.length - 1);
-      }
-      // console.log('1. this.file_add: ' + this.file_add)
-    },
-    // 返回this.file_catch（数库一寸照的文件的id的拼接集合）
-    getCatchFileId(file) {
-      for (var i = 0; i < this.files_list.length; i++) {
-        if (this.file_catch !== "") {
-          // 1. 检查当前删除的文件是否是修改文件列表里面的，如果是，将修改列表里去除此id
-          if (this.files_list[i].name === file.name) {
-            // 2. 拆开file_catch到fils_arry
-            var fils_arry = this.file_catch.split(",");
-            // 3. 从fils_arry去除 this.files_list[i].id
-            var arry = [];
-            fils_arry.forEach((element) => {
-              // 不加载文件里面的
-              if (element !== this.files_list[i].id) {
-                arry.push(element);
-              }
-            });
-            // 4. 重新拼接成file_catch
-            this.file_catch = arry.join(",");
-          }
-        }
-      }
-      // console.log('2. this.file_catch:' + this.file_catch)
-    },
-    // 保存并拼接id
-    getFileId() {
-      // console.log('3. this.file_catch:' + this.file_catch + ',this.file_add:' + this.file_add)
-      if (this.file_catch !== "") {
-        if (this.file_add !== "") {
-          this.enclosure = this.file_catch + "," + this.file_add;
-        } else {
-          this.enclosure = this.file_catch;
-        }
-      } else {
-        this.enclosure = this.file_add;
-      }
-    },
-    handlePictureCardPreview(file) {
-      // this.dialogImageUrl = file.url
-      // this.dialogImageUrl = file.fullUrl
-      this.dialogImageUrl = file.url;
-      // this.showpicture = true
-    },
-    // 上传失败
-    uploadError() {
-      this.loadding = false;
-    },
-    uploadProgrees(event, file, fileList) {
-      if (Number(event.percent) > 0) {
-        this.loadding = true;
-      }
-      //   console.log('event:', event)
-    },
-  },
-};
-</script>
+.avatar-uploader .el-upload:hover {
+  border-color: #409eff;
+}
+
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
+}
 
-<style lang="scss" scoped></style>
+.avatar {
+  margin-top: 5%;
+  width:  178px;
+  height: 178px;
+  display: block;
+}
+</style>
diff --git a/anrui-management/anrui-management-ui/src/styles/index.scss b/anrui-management/anrui-management-ui/src/styles/index.scss
index e74499658e..27872b95c0 100644
--- a/anrui-management/anrui-management-ui/src/styles/index.scss
+++ b/anrui-management/anrui-management-ui/src/styles/index.scss
@@ -120,7 +120,7 @@ div:focus {
 }
 .filter-item {
   padding: 0 10px;
-  width: 220px;
+  width: 168px;
   display: inline-block;
 }
 .listtop {
@@ -149,11 +149,11 @@ div:focus {
 	padding: 20px 0;
   // height: calc(100vh - 200px);overflow-y: auto;
 	.title {
-		padding: 10px;font-weight: bold;		
+		padding: 10px;font-weight: bold;
     font-size: 20px;
     background-color: $header-bg;
-    text-align: center;	
-    color: #ffffff;	
+    text-align: center;
+    color: #ffffff;
 	}
   .el-row {
       display:flex;
@@ -172,7 +172,7 @@ div:focus {
         }
       }
 
-		}  
+		}
     .footer{margin: 20px;}
 }
 
@@ -180,11 +180,11 @@ div:focus {
 .forminfo {
 	padding: 20px 0;
 	.title {
-		padding: 10px;font-weight: bold;		
+		padding: 10px;font-weight: bold;
     font-size: 20px;
     background-color: $header-bg;
-    text-align: center;	
-    color: #ffffff;	
+    text-align: center;
+    color: #ffffff;
 	}
   .el-row {
       display:flex;
@@ -197,12 +197,12 @@ div:focus {
         border-bottom: 1px solid $table-border-color;
         padding: 0px 15px 0px 15px !important;
         min-height: 50px;
-        line-height: 50px;  
-        font-size: 14px;    
+        line-height: 50px;
+        font-size: 14px;
 
       }
 
-		}  
+		}
     .footer{margin: 20px;}
 }
 
diff --git a/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongAdd.vue b/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongAdd.vue
index ee8d7c8900..e99a6ad0db 100644
--- a/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongAdd.vue
+++ b/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongAdd.vue
@@ -1,71 +1,28 @@
 <template>
   <div class="app-container">
-    <!--标题按钮部分开始-->
     <div class="tab-header webtop">
-      <!--标题-->
       <div>{{ viewTitle }}</div>
-      <!--start 添加修改按钮-->
       <div>
-        <el-button
-          type="primary"
-          size="small"
-          :disabled="submitdisabled"
-          @click="dialogStatus === 'add' ? saveAdd() : saveEdit()"
-        >保存
-        </el-button>
-        <el-button
-          type="primary"
-          size="small"
-          @click="dialogStatus === 'create' ? saveAdd() : saveEdit()"
-        >提交
-        </el-button>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="dialogStatus === 'add' ? saveAdd() : saveEdit()">保存</el-button>
+        <el-button type="primary" size="small" @click="dialogStatus === 'create' ? saveAdd() : saveEdit()">提交</el-button>
         <el-button type="primary" size="small">打印</el-button>
-        <el-button
-          type="info"
-          size="small"
-          @click="handleReturn()"
-        >返回
-        </el-button>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
       </div>
-      <!--end 添加修改按钮-->
-      <!--end 详情按钮-->
     </div>
-    <!--标题按钮部分结束-->
-    <!--Start 新增修改部分-->
     <div class="listconadd">
-      <el-form
-        ref="dataForm"
-        :model="temp"
-        label-position="right"
-        class="formadd"
-        :rules="rules"
-      >
-        <div
-          class="title"
-          style="
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-          "
-        >
+      <el-form ref="dataForm" :model="temp" label-position="right" class="formadd" :rules="rules">
+        <div class="title" style=" display: flex; align-items: center; justify-content: space-between;">
           <div>客户基础信息</div>
         </div>
         <el-container>
           <el-main>
             <el-row>
               <el-col :span="4">
-                <span><span class="icon">*</span>工号</span>
+                <span>工号</span>
               </el-col>
               <el-col :span="20">
                 <el-form-item prop="jobNumber">
-                  <el-input
-                    v-model="temp.jobNumber"
-                    maxlength="20"
-                    placeholder="系统自动生成"
-                    class="addinputw"
-                    clearable
-                    readonly
-                  />
+                  <el-input v-model="temp.jobNumber" maxlength="20" placeholder="系统自动生成" style="width: 28.5%" clearable readonly/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -75,13 +32,7 @@
               </el-col>
               <el-col :span="20">
                 <el-form-item prop="name">
-                  <el-input
-                    v-model="temp.name"
-                    maxlength="20"
-                    placeholder="请输入姓名"
-                    class="addinputw"
-                    clearable
-                  />
+                  <el-input v-model="temp.name" maxlength="20" placeholder="请输入姓名" style="width: 28.5%" clearable/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -102,138 +53,45 @@
               </el-col>
               <el-col :span="20">
                 <el-form-item prop="idNo">
-                  <el-input
-                    v-model="temp.idNo"
-                    maxlength="20"
-                    placeholder="请输入身份证号"
-                    class="addinputw"
-                    clearable
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="4">
-                <span><span class="icon">*</span>证件有效期</span>
-              </el-col>
-              <el-col :span="20">
-                <el-form-item prop="idTerm">
-                  <el-date-picker
-                    v-model="temp.idTerm"
-                    type="date"
-                    placeholder="选择日期"
-                    value-format="yyyy-MM-dd"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="4">
-                <span><span class="icon">*</span>出生年月日</span>
-              </el-col>
-              <el-col :span="20">
-                <el-form-item prop="birthday">
-                  <el-date-picker
-                    v-model="temp.birthday"
-                    type="date"
-                    placeholder="选择日期"
-                    value-format="yyyy-MM-dd"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="4">
-                <span><span class="icon">*</span>民族</span>
-              </el-col>
-              <el-col :span="20">
-                <el-form-item prop="national">
-                  <el-select
-                    v-model="temp.national"
-                    class="addinputw"
-                    placeholder="请选择民族"
-                    @change="getNational"
-                  >
-                    <el-option
-                      v-for="(item, index) in national_list"
-                      :key="index.dictKey"
-                      :label="item.dictValue"
-                      :value="item.dictKey"
-                    />
-                  </el-select>
+                  <el-input v-model="temp.idNo" maxlength="20" placeholder="请输入身份证号" style="width: 28.5%" clearable/>
                 </el-form-item>
               </el-col>
             </el-row>
           </el-main>
-          <el-aside width="410px">
-            <!--头像上传-->
-            <upload-head
-              ref="uploadImg"
-              v-model="photo_list"
-              :limit="1"
-              bucket="map"
-              :upload-data="{ type: '0001' }"
-            />
+          <el-aside style="text-align: center;width: 25%;border-right: 1px solid #e0e3eb">
+            <!--头像上传 :limit="1" bucket="map" :upload-data="{ type: '0001' }"-->
+            <upload-head ref="uploadImg" :front-photo="temp.photo" @photoAdd="photoPath"/>
           </el-aside>
         </el-container>
         <el-row>
           <el-col :span="3">
-            <span>籍贯</span>
+            <span><span class="icon">*</span>证件有效期</span>
           </el-col>
           <el-col :span="21" class="jiguan">
-            <el-form-item prop="">
-              <el-select
-                v-model="temp.province"
-                filterable
-                placeholder="请选择省"
-                class="filter-item"
-                style="width: 168px"
-                @change="getShen"
-              >
-                <el-option
-                  v-for="item in inputProvinceList"
-                  :key="item.sid"
-                  :label="item.name"
-                  :value="item.sid"
-                />
-              </el-select>
-              <el-select
-                v-model="temp.city"
-                filterable
-                placeholder="请选择市"
-                class="filter-item"
-                style="width: 168px"
-                @change="getShi"
-              >
-                <el-option
-                  v-for="item in inputCityList"
-                  :key="item.sid"
-                  :label="item.name"
-                  :value="item.sid"
-                />
-              </el-select>
-              <el-select
-                v-model="temp.county"
-                filterable
-                placeholder="请选择县"
-                class="filter-item"
-                style="width: 168px"
-                @change="getQu"
-              >
-                <el-option
-                  v-for="item in inputCountyList"
-                  :key="item.sid"
-                  :label="item.name"
-                  :value="item.sid"
-                />
+            <el-form-item prop="idTerm">
+              <el-date-picker v-model="temp.idTerm" style="width: 20%" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="3">
+            <span><span class="icon">*</span>出生年月日</span>
+          </el-col>
+          <el-col :span="21">
+            <el-form-item prop="birthday">
+              <el-date-picker v-model="temp.birthday" style="width: 20%" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="3">
+            <span><span class="icon">*</span>民族</span>
+          </el-col>
+          <el-col :span="21">
+            <el-form-item prop="national">
+              <el-select v-model="temp.national" style="width: 20%" placeholder="请选择民族" @change="getNational">
+                <el-option v-for="(item, index) in national_list" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
-              <el-input
-                v-model="temp.nativePlace"
-                maxlength="20"
-                placeholder="请输入详细地址"
-                class="addinputw"
-                clearable
-              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -243,13 +101,26 @@
           </el-col>
           <el-col :span="21">
             <el-form-item prop="address">
-              <el-input
-                v-model="temp.address"
-                maxlength="20"
-                placeholder="请输入住址"
-                class="addinputw"
-                clearable
-              />
+              <el-input v-model="temp.address" maxlength="20" placeholder="请输入住址" class="addinputw" clearable/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="3">
+            <span>籍贯</span>
+          </el-col>
+          <el-col :span="21">
+            <el-form-item prop="">
+              <el-select v-model="temp.province" filterable placeholder="请选择省" style="width: 148px" @change="getShen">
+                <el-option v-for="item in inputProvinceList" :key="item.sid" :label="item.name" :value="item.sid"/>
+              </el-select>
+              <el-select v-model="temp.city" filterable placeholder="请选择市" class="filter-item" @change="getShi">
+                <el-option v-for="item in inputCityList" :key="item.sid" :label="item.name" :value="item.sid"/>
+              </el-select>
+              <el-select v-model="temp.county" filterable placeholder="请选择县" style="width: 148px" @change="getQu">
+                <el-option v-for="item in inputCountyList" :key="item.sid" :label="item.name" :value="item.sid"/>
+              </el-select>
+              <el-input v-model="temp.nativePlace" maxlength="20" placeholder="请输入详细地址" style="width: 40%" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -259,13 +130,7 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="mobile">
-              <el-input
-                v-model="temp.mobile"
-                maxlength="20"
-                placeholder="请输入手机号码"
-                class="addinputw"
-                clearable
-              />
+              <el-input v-model="temp.mobile" maxlength="20" placeholder="请输入手机号码" style="width: 50%" clearable/>
             </el-form-item>
           </el-col>
           <el-col :span="3">
@@ -273,13 +138,7 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="email">
-              <el-input
-                v-model="temp.email"
-                maxlength="20"
-                placeholder="请输入邮箱"
-                class="addinputw"
-                clearable
-              />
+              <el-input v-model="temp.email" maxlength="20" placeholder="请输入邮箱" style="width: 50%" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -289,13 +148,7 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="emergencyContact">
-              <el-input
-                v-model="temp.emergencyContact"
-                maxlength="20"
-                placeholder="请输入紧急联系人"
-                class="addinputw"
-                clearable
-              />
+              <el-input v-model="temp.emergencyContact" maxlength="20" placeholder="请输入紧急联系人" style="width: 50%" clearable/>
             </el-form-item>
           </el-col>
           <el-col :span="3">
@@ -303,13 +156,7 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="emergencyMobile">
-              <el-input
-                v-model="temp.emergencyMobile"
-                maxlength="20"
-                placeholder="请输入紧急联系电话"
-                class="addinputw"
-                clearable
-              />
+              <el-input v-model="temp.emergencyMobile" maxlength="20" placeholder="请输入紧急联系电话" style="width: 50%" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -319,18 +166,8 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="poliCode">
-              <el-select
-                v-model="temp.poliCode"
-                class="addinputw"
-                placeholder="请选择政治面貌"
-                @change="getPoliCode"
-              >
-                <el-option
-                  v-for="(item, index) in political_list"
-                  :key="index.dictKey"
-                  :label="item.dictValue"
-                  :value="item.dictKey"
-                />
+              <el-select v-model="temp.poliCode" style="width: 50%" placeholder="请选择政治面貌" @change="getPoliCode">
+                <el-option v-for="(item, index) in political_list" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -339,30 +176,13 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="maritalStatus">
-              <el-select
-                v-model="temp.maritalStatus"
-                class="addinputw"
-                placeholder="请选择婚姻状况"
-                @change="getMari"
-              >
-                <el-option
-                  v-for="(item, index) in maritalstatus_list"
-                  :key="index.dictKey"
-                  :label="item.dictValue"
-                  :value="item.dictKey"
-                />
+              <el-select v-model="temp.maritalStatus" style="width: 50%" placeholder="请选择婚姻状况" @change="getMari">
+                <el-option v-for="(item, index) in maritalstatus_list" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
-        <div
-          class="title"
-          style="
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-          "
-        >
+        <div class="title" style=" display: flex; align-items: center; justify-content: space-between;">
           <div>更多信息</div>
         </div>
         <el-row>
@@ -371,18 +191,8 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="personType">
-              <el-select
-                v-model="temp.personType"
-                class="addinputw"
-                placeholder="请选择员工类型"
-                @change="getPersonType"
-              >
-                <el-option
-                  v-for="(item, index) in personType_list"
-                  :key="index.dictKey"
-                  :label="item.dictValue"
-                  :value="item.dictKey"
-                />
+              <el-select v-model="temp.personType" style="width: 50%" placeholder="请选择员工类型" @change="getPersonType">
+                <el-option v-for="(item, index) in personType_list" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -391,12 +201,7 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="joinCompnyDate">
-              <el-date-picker
-                v-model="temp.joinCompnyDate"
-                type="date"
-                placeholder="选择日期"
-                value-format="yyyy-MM-dd"
-              />
+              <el-date-picker v-model="temp.joinCompnyDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -406,18 +211,8 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="probPeriod">
-              <el-select
-                v-model="temp.probPeriod"
-                class="addinputw"
-                placeholder="请选择试用期"
-                @change="getProbPeriod"
-              >
-                <el-option
-                  v-for="(item, index) in probPeriod_list"
-                  :key="index.dictKey"
-                  :label="item.dictValue"
-                  :value="item.dictKey"
-                />
+              <el-select v-model="temp.probPeriod" style="width: 50%" placeholder="请选择试用期" @change="getProbPeriod">
+                <el-option v-for="(item, index) in probPeriod_list" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -426,12 +221,7 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="plannedConfirmDate">
-              <el-date-picker
-                v-model="temp.plannedConfirmDate"
-                type="date"
-                placeholder="选择日期"
-                value-format="yyyy-MM-dd"
-              />
+              <el-date-picker v-model="temp.plannedConfirmDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -441,47 +231,27 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="confirmationDate">
-              <el-date-picker
-                v-model="temp.confirmationDate"
-                type="date"
-                placeholder="选择日期"
-                value-format="yyyy-MM-dd"
-              />
+              <el-date-picker v-model="temp.confirmationDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"/>
             </el-form-item>
           </el-col>
           <el-col :span="12" />
         </el-row>
         <el-row>
           <el-col :span="3">
-            <span>所在部门</span>
+            <span><span class="icon">*</span>所在部门</span>
           </el-col>
           <el-col :span="9">
             <el-form-item prop="orgName">
-              <el-cascader
-                v-model="orgName_list"
-                :props="props"
-                :options="options"
-                @change="orgNameChange"
-              />
+              <el-cascader v-model="orgName_list" :props="props" :options="options" clearable ref="clearableCascader" @change="orgNameChange"/>
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <span>岗位</span>
+            <span><span class="icon">*</span>岗位</span>
           </el-col>
           <el-col :span="9">
             <el-form-item prop="postSid">
-              <el-select
-                v-model="temp.postName"
-                class="addinputw"
-                placeholder="请选择岗位"
-                @change="getPostSid"
-              >
-                <el-option
-                  v-for="(item, index) in postSid_list"
-                  :key="index.postCode"
-                  :label="item.name"
-                  :value="item.postCode"
-                />
+              <el-select v-model="temp.postName" style="width: 50%" placeholder="请选择岗位" @change="getPostSid">
+                <el-option v-for="(item, index) in postSid_list" :key="index.postCode" :label="item.name" :value="item.postCode"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -492,13 +262,7 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="bankCardNo">
-              <el-input
-                v-model="temp.bankCardNo"
-                maxlength="20"
-                placeholder="请输入银行账号"
-                class="addinputw"
-                clearable
-              />
+              <el-input v-model="temp.bankCardNo" maxlength="20" placeholder="请输入银行账号" style="width: 50%" clearable/>
             </el-form-item>
           </el-col>
           <el-col :span="3">
@@ -506,13 +270,7 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="openBank">
-              <el-input
-                v-model="temp.openBank"
-                maxlength="20"
-                placeholder="请输入开户行"
-                class="addinputw"
-                clearable
-              />
+              <el-input v-model="temp.openBank" maxlength="20" placeholder="请输入开户行" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -522,25 +280,13 @@
             <span>身份证(人像面)</span>
           </el-col>
           <el-col :span="9">
-            <Upload
-              ref="uploadImg"
-              v-model="idCardA_list"
-              :limit="1"
-              bucket="map"
-              :upload-data="{ type: '0001' }"
-            />
+            <Upload ref="uploadImg" v-model="idCardA_list" :limit="1" bucket="map" :upload-data="{ type: '0001' }"/>
           </el-col>
           <el-col :span="3">
             <span>身份证(国徽面)</span>
           </el-col>
           <el-col :span="9">
-            <Upload
-              ref="uploadImg"
-              v-model="idCardB_list"
-              :limit="1"
-              bucket="map"
-              :upload-data="{ type: '0001' }"
-            />
+            <Upload ref="uploadImg" v-model="idCardB_list" :limit="1" bucket="map" :upload-data="{ type: '0001' }"/>
           </el-col>
         </el-row>
         <el-row>
@@ -548,23 +294,10 @@
             <span>前公司离职证明</span>
           </el-col>
           <el-col :span="21">
-            <Upload
-              ref="uploadImg"
-              v-model="leave_list"
-              :limit="1"
-              bucket="map"
-              :upload-data="{ type: '0001' }"
-            />
+            <Upload ref="uploadImg" v-model="leave_list" :limit="1" bucket="map" :upload-data="{ type: '0001' }"/>
           </el-col>
         </el-row>
-        <div
-          class="title"
-          style="
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-          "
-        >
+        <div class="title" style=" display: flex; align-items: center; justify-content: space-between;">
           <div>学历/技能信息</div>
         </div>
         <el-row>
@@ -573,13 +306,7 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="graduate">
-              <el-input
-                v-model="temp.graduate"
-                maxlength="20"
-                placeholder="请输入毕业院校"
-                class="addinputw"
-                clearable
-              />
+              <el-input v-model="temp.graduate" maxlength="20" placeholder="请输入毕业院校" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
           <el-col :span="3">
@@ -587,18 +314,8 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="education">
-              <el-select
-                v-model="temp.education"
-                class="addinputw"
-                placeholder="请选择学历"
-                @change="getEducate"
-              >
-                <el-option
-                  v-for="(item, index) in educate_list"
-                  :key="index.dictKey"
-                  :label="item.dictValue"
-                  :value="item.dictKey"
-                />
+              <el-select v-model="temp.education" style="width: 50%" placeholder="请选择学历" @change="getEducate">
+                <el-option v-for="(item, index) in educate_list" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -609,13 +326,7 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="title">
-              <el-input
-                v-model="temp.title"
-                maxlength="20"
-                placeholder="请输入职称"
-                class="addinputw"
-                clearable
-              />
+              <el-input v-model="temp.title" maxlength="20" placeholder="请输入职称" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
           <el-col :span="3">
@@ -623,13 +334,7 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="qualification">
-              <el-input
-                v-model="temp.qualification"
-                maxlength="20"
-                placeholder="请输入资格认证"
-                class="addinputw"
-                clearable
-              />
+              <el-input v-model="temp.qualification" maxlength="20" placeholder="请输入资格认证" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -639,18 +344,8 @@
           </el-col>
           <el-col :span="21">
             <el-form-item prop="licenseType">
-              <el-select
-                v-model="temp.licenseType"
-                class="addinputw"
-                placeholder="请选择驾照类型"
-                @change="getLicenseType"
-              >
-                <el-option
-                  v-for="(item, index) in licenseType_list"
-                  :key="index.dictKey"
-                  :label="item.dictValue"
-                  :value="item.dictKey"
-                />
+              <el-select v-model="temp.licenseType" style="width: 20%" placeholder="请选择驾照类型" @change="getLicenseType">
+                <el-option v-for="(item, index) in licenseType_list" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -660,35 +355,16 @@
             <span>学历证书</span>
           </el-col>
           <el-col :span="9">
-            <Upload
-              ref="uploadImg"
-              v-model="diploma_list"
-              :limit="1"
-              bucket="map"
-              :upload-data="{ type: '0001' }"
-            />
+            <Upload ref="uploadImg" v-model="diploma_list" :limit="1" bucket="map" :upload-data="{ type: '0001' }"/>
           </el-col>
           <el-col :span="3">
             <span>学位证书</span>
           </el-col>
           <el-col :span="9">
-            <Upload
-              ref="uploadImg"
-              v-model="degree_list"
-              :limit="1"
-              bucket="map"
-              :upload-data="{ type: '0001' }"
-            />
+            <Upload ref="uploadImg" v-model="degree_list" :limit="1" bucket="map" :upload-data="{ type: '0001' }"/>
           </el-col>
         </el-row>
-        <div
-          class="title"
-          style="
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-          "
-        >
+        <div class="title" style=" display: flex; align-items: center; justify-content: space-between;">
           <div>社保信息</div>
         </div>
         <el-row>
@@ -706,13 +382,7 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="insuranceAddr">
-              <el-input
-                v-model="temp.insuranceAddr"
-                maxlength="20"
-                placeholder="请输入意外险参保地"
-                class="addinputw"
-                clearable
-              />
+              <el-input v-model="temp.insuranceAddr" maxlength="20" placeholder="请输入意外险参保地" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -722,12 +392,7 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="insuranceStartDate">
-              <el-date-picker
-                v-model="temp.insuranceStartDate"
-                type="date"
-                placeholder="选择日期"
-                value-format="yyyy-MM-dd"
-              />
+              <el-date-picker v-model="temp.insuranceStartDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"/>
             </el-form-item>
           </el-col>
           <el-col :span="3">
@@ -735,12 +400,7 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="insuranceEndDate">
-              <el-date-picker
-                v-model="temp.insuranceEndDate"
-                type="date"
-                placeholder="选择日期"
-                value-format="yyyy-MM-dd"
-              />
+              <el-date-picker v-model="temp.insuranceEndDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -790,13 +450,7 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="insuredPlace">
-              <el-input
-                v-model="temp.insuredPlace"
-                maxlength="20"
-                placeholder="请输入社保参保地"
-                class="addinputw"
-                clearable
-              />
+              <el-input v-model="temp.insuredPlace" maxlength="20" placeholder="请输入社保参保地" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
           <el-col :span="3">
@@ -804,24 +458,11 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="paperPlace">
-              <el-input
-                v-model="temp.paperPlace"
-                maxlength="20"
-                placeholder="请输入纸质档案保管地"
-                class="addinputw"
-                clearable
-              />
+              <el-input v-model="temp.paperPlace" maxlength="20" placeholder="请输入纸质档案保管地" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
-        <div
-          class="title"
-          style="
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-          "
-        >
+        <div class="title" style=" display: flex; align-items: center; justify-content: space-between;">
           <div>合同信息</div>
         </div>
         <el-row>
@@ -830,12 +471,7 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="contractStartDate">
-              <el-date-picker
-                v-model="temp.contractStartDate"
-                type="date"
-                placeholder="选择日期"
-                value-format="yyyy-MM-dd"
-              />
+              <el-date-picker v-model="temp.contractStartDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"/>
             </el-form-item>
           </el-col>
           <el-col :span="3">
@@ -843,24 +479,12 @@
           </el-col>
           <el-col :span="9">
             <el-form-item prop="contractEndDate">
-              <el-date-picker
-                v-model="temp.contractEndDate"
-                type="date"
-                placeholder="选择日期"
-                value-format="yyyy-MM-dd"
-              />
+              <el-date-picker v-model="temp.contractEndDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"/>
             </el-form-item>
           </el-col>
         </el-row>
-        <div v-show="isQuit == true">
-          <div
-            class="title"
-            style="
-              display: flex;
-              align-items: center;
-              justify-content: space-between;
-            "
-          >
+        <div v-show="isQuit">
+          <div class="title" style=" display: flex; align-items: center; justify-content: space-between;">
             <div>离职信息</div>
           </div>
           <el-row>
@@ -869,12 +493,7 @@
             </el-col>
             <el-col :span="9">
               <el-form-item prop="quitDate">
-                <el-date-picker
-                  v-model="temp.quitDate"
-                  type="date"
-                  placeholder="选择日期"
-                  value-format="yyyy-MM-dd"
-                />
+                <el-date-picker v-model="temp.quitDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"/>
               </el-form-item>
             </el-col>
             <el-col :span="3">
@@ -882,20 +501,13 @@
             </el-col>
             <el-col :span="9">
               <el-form-item prop="quitReason">
-                <el-input
-                  v-model="temp.quitReason"
-                  maxlength="20"
-                  placeholder="请输入离职理由"
-                  class="addinputw"
-                  clearable
-                />
+                <el-input v-model="temp.quitReason" maxlength="20" placeholder="请输入离职理由" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
           </el-row>
         </div>
       </el-form>
     </div>
-    <!--End 添加修改部分-->
   </div>
 </template>
 
@@ -951,7 +563,6 @@ export default {
       orgSid: '',
       orgName_list: [], // 所在部门
       dataArr: [],
-      refreshItem: 0, // 级联列表key值
       options: [], // 级联列表选项
       props: {
         // props传值
@@ -960,15 +571,13 @@ export default {
         children: 'children'
       },
       // 上传图片
-      photo_list: [],
+      // photo_list: [],
       idCardA_list: [],
       idCardB_list: [],
       diploma_list: [],
       degree_list: [],
       leave_list: [],
       sid: '', // 一条数据的sid
-      sysStaffOrgDto: {}, // 编辑回显所用
-      sysStaffPostDto: {},
       temp: {
         provinceCode: '',
         postName: '',
@@ -976,44 +585,20 @@ export default {
         countyCode: '',
         genderKey: '', // 性别code
         nativePlace: '', // 籍贯
-        sysStaffOrgDto: {
+        sysStaffOrg: {
           orgName: '',
           orgSid: ''
-        }, // 部门信息
-        sysStaffPostDto: {} // 岗位信息
+        },
+        sysStaffPost: {} // 岗位信息
       },
       rules: {
-        // jobNumber: [{required: true, message: '单据类型不能为空', trigger: 'change'}],
         name: [{ required: true, message: '姓名不能为空', trigger: 'change' }],
-        gender: [
-          { required: true, message: '性别不能为空', trigger: 'change' }
-        ],
-        idNo: [
-          {
-            required: true,
-            message: '身份证号不能为空',
-            validator: identitycard,
-            trigger: 'change'
-          }
-        ],
-        idTerm: [
-          { required: true, message: '证件有效期不能为空', trigger: 'change' }
-        ],
-        national: [
-          { required: true, message: '民族不能为空', trigger: 'change' }
-        ],
-        mobile: [
-          {
-            required: true,
-            message: '手机号不能为空',
-            validator: checkSubmit,
-            trigger: 'change'
-          }
-        ],
-        personType: [
-          { required: true, message: '员工类型不能为空', trigger: 'change' }
-        ]
-        // joinCompnyDate: [{required: true, message: '入职时间不能为空', trigger: 'change'}],
+        gender: [{ required: true, message: '性别不能为空', trigger: 'change' }],
+        idNo: [{ required: true, message: '身份证号不能为空', trigger: 'change' }],
+        idTerm: [{ required: true, message: '证件有效期不能为空', trigger: 'change' }],
+        national: [{ required: true, message: '民族不能为空', trigger: 'change' }],
+        mobile: [{ required: true, message: '手机号不能为空', validator: checkSubmit, trigger: 'change' }],
+        personType: [{ required: true, message: '员工类型不能为空', trigger: 'change' }]
       },
       submitdisabled: false
     }
@@ -1076,13 +661,7 @@ export default {
       })
       this.temp.city = bb.name
       this.temp.cityCode = bb.districtCode
-      // this.deCode.push(bb.districtCode)
       this.huoquXian(bb.sid)
-      // this.temp.orgmoneVakue.push(bb)
-      // let aa = ''
-      // this.temp.orgmoneVakue.forEach((e)=>{
-      //  aa = aa +e.districtCode
-      // })
     },
     huoquXian(sid1) {
       var sid = {
@@ -1107,8 +686,7 @@ export default {
         }
       })
       this.temp.county = bb.name
-      this.temp.countyCode = bb.districtCode
-      // this.deCode.push(bb.districtCode)
+      this.temp.countyCode = bb.districtCodes
       console.log('6666677777777', this.deCode)
     },
     // 级联列表 部门
@@ -1123,12 +701,14 @@ export default {
     },
     BuMen0(data) {
       data.forEach((e) => {
-        if (e.children.length !== 0) {
-          this.BuMen0(e.children)
-        } else {
-          delete e.children
-          this.dataArr.push(e)
-          return
+        if (e.children) {
+          if (e.children.length !== 0) {
+            this.BuMen0(e.children)
+          } else {
+            delete e.children
+            this.dataArr.push(e)
+            return
+          }
         }
       })
     },
@@ -1162,7 +742,7 @@ export default {
         result = result.substring(0, result.length - 1)
       }
       if (namePath !== '') {
-        namePath = namePath.substring(0, result.length - 1)
+        namePath = namePath.substring(0, namePath.length - 1)
       }
       if (result_Sid !== '') {
         result_Sid = result_Sid.substring(0, result_Sid.length - 1)
@@ -1173,147 +753,100 @@ export default {
       const orgNameArray = result.split(',')
       const orgName = orgNameArray[orgNameArray.length - 1]
 
-      this.temp.sysStaffOrgDto.orgName = orgName
-      this.temp.sysStaffOrgDto.orgSid = orgSid
-      this.temp.sysStaffOrgDto.orgSidPath = sidPath
-      this.temp.sysStaffOrgDto.orgNamePath = namePath
-      this.temp.sysStaffOrgDto.orgCode = result_code
-      console.log(
-        '选中名称：' + orgName,
-        orgSid,
-        sidPath,
-        namePath,
-        result_code
-      )
+      this.temp.sysStaffOrg.orgName = orgName
+      this.temp.sysStaffOrg.orgSid = orgSid
+      this.temp.sysStaffOrg.orgSidPath = sidPath
+      this.temp.sysStaffOrg.orgNamePath = namePath
+      this.temp.sysStaffOrg.orgCode = result_code
     },
-
     // --- 循环查询
     findOrgId(id, options) {
-      console.log('这是部门id', id)
-      for (var i = 0; i < options.length; i++) {
-        if (id === options[i].sid) {
-          this.select_temp_Name = options[i].name // 保存找到的内容
-          this.select_temp_Sid = options[i].sid
-          this.select_temp_NamePath = options[i].name
-          this.select_temp_SidPath = options[i].orgSidPath
-          this.select_temp_code = options[i].orgCode
-          return true
-        } else {
-          // 判断是否最后一级
-          if (options[i].children !== undefined) {
-            // 不是的话查询下一级
-            if (this.findOrgId(id, options[i].children)) {
-              return true
+      if (options.length > 0) {
+        for (var i = 0; i < options.length; i++) {
+          if (id === options[i].sid) {
+            this.select_temp_Name = options[i].name // 保存找到的内容
+            this.select_temp_Sid = options[i].sid
+            this.select_temp_NamePath = options[i].name
+            this.select_temp_SidPath = options[i].orgSidPath
+            this.select_temp_code = options[i].orgCode
+            return true
+          } else {
+            // 判断是否最后一级
+            if (options[i].children !== undefined && options[i].children !== null) {
+              // 不是的话查询下一级
+              if (this.findOrgId(id, options[i].children)) {
+                return true
+              }
             }
           }
         }
       }
+
     },
 
     // -------------------------数据字典下拉框-------------------------
     getType() {
-      req
-        .pullDown({
-          type: 'national'
-        })
-        .then((res) => {
-          if (res.code === '200') {
-            this.national_list = res.data
-            console.log('下拉框请求民族', res.data)
-          }
-        })
-
-      req
-        .pullDown({
-          type: 'maritalstatus'
-        })
-        .then((res) => {
-          if (res.code === '200') {
-            this.maritalstatus_list = res.data
-            console.log('下拉框请求婚姻', res.data)
-          }
-        })
-
-      req
-        .pullDown({
-          type: 'political'
-        })
-        .then((res) => {
-          if (res.code === '200') {
-            this.political_list = res.data
-            console.log('下拉框请求政治', res.data)
-          }
-        })
-
-      req
-        .pullDown({
-          type: 'personType'
-        })
-        .then((res) => {
-          if (res.code === '200') {
-            this.personType_list = res.data
-            console.log('下拉框员工类型', res.data)
-          }
-        })
-
-      req
-        .pullDown({
-          type: 'probPeriod'
-        })
-        .then((res) => {
-          if (res.code === '200') {
-            this.probPeriod_list = res.data
-            console.log('下拉框试用期', res.data)
-          }
-        })
-
-      req
-        .pullDown({
-          type: 'sex'
-        })
-        .then((res) => {
-          if (res.code === '200') {
-            this.gender_list = res.data
-            console.log('下拉框性别', res.data)
-          }
-        })
-
+      req.pullDown({ type: 'national' }).then((res) => {
+        if (res.code === '200') {
+          this.national_list = res.data
+          console.log('下拉框请求民族', res.data)
+        }
+      })
+      req.pullDown({ type: 'maritalstatus' }).then((res) => {
+        if (res.code === '200') {
+          this.maritalstatus_list = res.data
+          console.log('下拉框请求婚姻', res.data)
+        }
+      })
+      req.pullDown({ type: 'political' }).then((res) => {
+        if (res.code === '200') {
+          this.political_list = res.data
+          console.log('下拉框请求政治', res.data)
+        }
+      })
+      req.pullDown({ type: 'personType' }).then((res) => {
+        if (res.code === '200') {
+          this.personType_list = res.data
+          console.log('下拉框员工类型', res.data)
+        }
+      })
+      req.pullDown({ type: 'probPeriod' }).then((res) => {
+        if (res.code === '200') {
+          this.probPeriod_list = res.data
+          console.log('下拉框试用期', res.data)
+        }
+      })
+      req.pullDown({ type: 'sex' }).then((res) => {
+        if (res.code === '200') {
+          this.gender_list = res.data
+          console.log('下拉框性别', res.data)
+        }
+      })
       req.postName().then((res) => {
         if (res.code === '200') {
           this.postSid_list = res.data
           console.log('下拉框请求岗位', res.data)
         }
       })
-
-      req
-        .pullDown({
-          type: 'educationdegree'
-        })
-        .then((res) => {
-          if (res.code === '200') {
-            this.educate_list = res.data
-            console.log('下拉框请求学历', res.data)
-          }
-        })
-
-      req
-        .pullDown({
-          type: 'carType'
-        })
-        .then((res) => {
-          if (res.code === '200') {
-            this.licenseType_list = res.data
-            console.log('下拉框请求驾照', res.data)
-          }
-        })
+      req.pullDown({ type: 'educationdegree' }).then((res) => {
+        if (res.code === '200') {
+          this.educate_list = res.data
+          console.log('下拉框请求学历', res.data)
+        }
+      })
+      req.pullDown({ type: 'carType' }).then((res) => {
+        if (res.code === '200') {
+          this.licenseType_list = res.data
+          console.log('下拉框请求驾照', res.data)
+        }
+      })
     },
 
     getNational(value) {
       console.log('触发下拉框按钮')
-      let bb = {}
+      let bb = null
       this.national_list.forEach((e) => {
-        // eslint-disable-next-line eqeqeq
-        if (e.dictKey == value) {
+        if (e.dictKey === value) {
           bb = {
             type: e.dictType,
             name: e.dictValue,
@@ -1324,16 +857,14 @@ export default {
       })
       this.temp.national = bb.name
       this.temp.nationalKey = bb.key
-      // this.formobj.scmOtherInboundDto.billType = bb.sid
       console.log('name', this.temp.national)
     },
 
     getMari(value) {
       console.log('触发下拉框按钮')
-      let bb = {}
+      let bb = null
       this.maritalstatus_list.forEach((e) => {
-        // eslint-disable-next-line eqeqeq
-        if (e.dictKey == value) {
+        if (e.dictKey === value) {
           bb = {
             type: e.dictType,
             name: e.dictValue,
@@ -1344,16 +875,14 @@ export default {
       })
       this.temp.maritalStatus = bb.name
       this.temp.maritalStatusKey = bb.key
-      // this.formobj.scmOtherInboundDto.billType = bb.sid
       console.log('name', this.temp.maritalStatus)
     },
 
     getPoliCode(value) {
       console.log('触发下拉框按钮')
-      let bb = {}
+      let bb = null
       this.political_list.forEach((e) => {
-        // eslint-disable-next-line eqeqeq
-        if (e.dictKey == value) {
+        if (e.dictKey === value) {
           bb = {
             type: e.dictType,
             name: e.dictValue,
@@ -1362,17 +891,16 @@ export default {
           }
         }
       })
-      this.temp.political = bb.name
+      this.temp.poliCode = bb.name
       this.temp.poliCodeKey = bb.key
       console.log('name', this.temp.political)
     },
 
     getPersonType(value) {
       console.log('触发下拉框按钮')
-      let bb = {}
+      let bb = null
       this.personType_list.forEach((e) => {
-        // eslint-disable-next-line eqeqeq
-        if (e.dictKey == value) {
+        if (e.dictKey === value) {
           bb = {
             type: e.dictType,
             name: e.dictValue,
@@ -1393,10 +921,9 @@ export default {
 
     getProbPeriod(value) {
       console.log('触发下拉框按钮')
-      let bb = {}
+      let bb = null
       this.probPeriod_list.forEach((e) => {
-        // eslint-disable-next-line eqeqeq
-        if (e.dictKey == value) {
+        if (e.dictKey === value) {
           bb = {
             type: e.dictType,
             name: e.dictValue,
@@ -1412,10 +939,9 @@ export default {
 
     getPostSid(value) {
       console.log('触发下拉框按钮', value)
-      let bb = {}
+      let bb = null
       this.postSid_list.forEach((e) => {
-        // eslint-disable-next-line eqeqeq
-        if (e.postCode == value) {
+        if (e.postCode === value) {
           bb = {
             name: e.name,
             key: e.postCode,
@@ -1423,19 +949,17 @@ export default {
           }
         }
       })
-      this.temp.sysStaffPostDto.postSid = bb.sid
+      this.temp.sysStaffPost.postSid = bb.sid
       this.temp.postName = bb.name
-      this.temp.sysStaffPostDto.postCode = bb.key
-      // this.formobj.scmOtherInboundDto.billType = bb.sid
-      console.log('name', this.temp.sysStaffPostDto.postSid)
+      this.temp.sysStaffPost.postCode = bb.key
+      console.log('name', this.temp.sysStaffPost.postSid)
     },
 
     getEducate(value) {
       console.log('触发下拉框按钮', value)
-      let bb = {}
+      let bb = null
       this.educate_list.forEach((e) => {
-        // eslint-disable-next-line eqeqeq
-        if (e.dictKey == value) {
+        if (e.dictKey === value) {
           bb = {
             type: e.dictType,
             name: e.dictValue,
@@ -1446,15 +970,14 @@ export default {
       })
       this.temp.education = bb.name
       this.temp.educationKey = bb.key
-      console.log('name', this.temp.sysStaffPostDto.postSid)
+      console.log('name', this.temp.sysStaffPost.postSid)
     },
 
     getLicenseType(value) {
       console.log('触发下拉框按钮', value)
-      let bb = {}
+      let bb = null
       this.licenseType_list.forEach((e) => {
-        // eslint-disable-next-line eqeqeq
-        if (e.dictKey == value) {
+        if (e.dictKey === value) {
           bb = {
             type: e.dictType,
             name: e.dictValue,
@@ -1472,8 +995,7 @@ export default {
       console.log('触发下拉框按钮')
       let bb = {}
       this.gender_list.forEach((e) => {
-        // eslint-disable-next-line eqeqeq
-        if (e.dictValue == this.temp.gender) {
+        if (e.dictValue === this.temp.gender) {
           bb = {
             type: e.dictType,
             name: e.dictValue,
@@ -1485,47 +1007,56 @@ export default {
       if (this.temp.gender === bb.name) {
         this.temp.genderKey = bb.key
       }
-      // this.temp.probPeriod = bb.name
-      // this.temp.probPeriodKey = bb.key
-      // console.log('name', this.temp.probPeriod)
     },
-
+    photoPath(val) {
+      this.temp.photo = val
+    },
     // 上传附件
     getUrl() {
       // 员工照片
-      this.temp.photo = this.photo_list[this.photo_list.length - 1].url
+      // if (this.photo_list.length > 0) {
+      //   this.temp.photo = this.photo_list[this.photo_list.length - 1].url
+      // }
       // for (var i = 0; i < this.photo_list.length; i++) {
       //   this.temp.photo = this.photo_list[i].url;
       //   console.log("图片信息", this.temp.photo);
       // }
       // 身份证(人像面)
-      this.temp.idCardA = this.idCardA_list[this.idCardA_list.length - 1].url
+      if (this.idCardA_list.length > 0) {
+        this.temp.idCardA = this.idCardA_list[this.idCardA_list.length - 1].url
+      }
       // for (var i = 0; i < this.idCardA_list.length; i++) {
       //   this.temp.idCardA = this.idCardA_list[i].url;
       //   console.log("图片信息", this.temp.idCardA);
       // }
       // 身份证(国徽面)
-      this.temp.idCardB = this.idCardB_list[this.idCardB_list.length - 1].url
+      if (this.idCardB_list.length > 0) {
+        this.temp.idCardB = this.idCardB_list[this.idCardB_list.length - 1].url
+      }
       // for (var i = 0; i < this.idCardB_list.length; i++) {
       //   this.temp.idCardB = this.idCardB_list[i].url;
       //   console.log("图片信息", this.temp.idCardB);
       // }
       // 学历证书
-      this.temp.diploma = this.diploma_list[this.diploma_list.length - 1].url
+      if (this.diploma_list.length > 0) {
+        this.temp.diploma = this.diploma_list[this.diploma_list.length - 1].url
+      }
       // for (var i = 0; i < this.diploma_list.length; i++) {
       //   this.temp.diploma = this.diploma_list[i].url;
       //   console.log("图片信息", this.temp.diploma);
       // }
       // 学位证书
-      this.temp.degreeCertificate =
-        this.degree_list[this.degree_list.length - 1].url
+      if (this.degree_list.length > 0) {
+        this.temp.degreeCertificate = this.degree_list[this.degree_list.length - 1].url
+      }
       // for (var i = 0; i < this.degree_list.length; i++) {
       //   this.temp.degreeCertificate = this.degree_list[i].url;
       //   console.log("图片信息", this.temp.degreeCertificate);
       // }
       // 前公司离职证明 leaveCertificate
-      this.temp.leaveCertificate =
-        this.leave_list[this.leave_list.length - 1].url
+      if (this.leave_list.length > 0) {
+        this.temp.leaveCertificate = this.leave_list[this.leave_list.length - 1].url
+      }
       // for (var i = 0; i < this.leave_list.length; i++) {
       //   this.temp.leaveCertificate = this.leave_list[i].url;
       //   console.log("图片信息", this.temp.leaveCertificate);
@@ -1536,19 +1067,20 @@ export default {
     // 返回（===既判断又赋值）
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
-      this.photo_list = []
+      // this.photo_list = []
       this.idCardA_list = []
       this.idCardB_list = []
       this.diploma_list = []
       this.degree_list = []
       this.leave_list = []
       this.temp = {
-        sysStaffOrgDto: {}, // 部门信息
-        sysStaffPostDto: {} // 岗位信息
+        sysStaffOrg: {}, // 部门信息
+        sysStaffPost: {} // 岗位信息
       }
+      this.orgName_list = []
+      // this.$refs['clearableCascader'].checkedValue = ''
       this.$refs['dataForm'].resetFields()
       this.$emit('doback')
-      this.refreshItem++
     },
 
     showAdd() {
@@ -1556,7 +1088,7 @@ export default {
         this.$refs['dataForm'].clearValidate()
       })
       this.dialogStatus = 'add'
-      this.viewTitle = '员工信息登记'
+      this.viewTitle = '【新增】员工信息'
     },
 
     showEdit(sid, row) {
@@ -1564,127 +1096,105 @@ export default {
         this.$refs['dataForm'].clearValidate()
       })
       this.dialogStatus = 'edit'
-      this.viewTitle = '【编辑】其他入库单'
+      this.viewTitle = '【编辑】员工信息'
       console.log('编辑页面sid', sid)
-      req
-        .fetchBySid(sid)
-        .then((resp) => {
-          const data = resp.data
-          this.sid = sid
-          this.temp = data
-          this.orgName_list = data.sysStaffOrgDetailsVo.orgSid
-          // ---修改名称---
-          this.temp = JSON.parse(
-            JSON.stringify(this.temp).replace(
-              /sysStaffOrgDetailsVo/g,
-              'sysStaffOrgDto'
-            )
-          )
-          this.temp = JSON.parse(
-            JSON.stringify(this.temp).replace(
-              /sysStaffPostDetailsVo/g,
-              'sysStaffPostDto'
-            )
-          )
-          // ---修改名称---
-          // this.sysStaffOrgDto =data.sysStaffOrgDetailsVo
-          // this.sysStaffPostDto = data.sysStaffPostDetailsVo
-          // this.temp.sysStaffOrgDetailsVo = this.sysStaffOrgDto
-          // this.temp.sysStaffPostDetailsVo = this.sysStaffPostDto
-          // console.log('1111111',this.sysStaffOrgDto,this.sysStaffPostDto)
-          console.log('888999', this.temp)
-          let bb = {}
-          this.postSid_list.forEach((e) => {
-            if (e.sid === data.sysStaffPostDetailsVo.postSid) {
-              bb = {
-                name: e.name,
-                key: e.postCode,
-                sid: e.sid
-              }
+      req.fetchBySid(sid).then((resp) => {
+        const data = resp.data
+        this.sid = sid
+        this.temp = data
+        if (this.temp.personType === '全职') {
+          this.isQuit = false
+        } else {
+          this.isQuit = true
+        }
+        this.orgName_list = data.sysStaffOrg.orgSid
+        let bb = {}
+        this.postSid_list.forEach((e) => {
+          if (e.sid === data.sysStaffPost.postSid) {
+            bb = {
+              name: e.name,
+              key: e.postCode,
+              sid: e.sid
             }
-          })
-          this.temp.postName = bb.name
-          if (this.temp.photo !== '') {
-            const imgName = this.temp.photo.split('/')
-            this.photo_list.push({
-              name: imgName[imgName.length - 1],
-              url: this.temp.photo
-            })
-          }
-          if (this.temp.idCardA !== '') {
-            const imgName = this.temp.idCardA.split('/')
-            this.idCardA_list.push({
-              name: imgName[imgName.length - 1],
-              url: this.temp.idCardA
-            })
-          }
-          if (this.temp.idCardB !== '') {
-            const imgName = this.temp.idCardB.split('/')
-            this.idCardB_list.push({
-              name: imgName[imgName.length - 1],
-              url: this.temp.idCardB
-            })
-          }
-          if (this.temp.diploma !== '') {
-            const imgName = this.temp.diploma.split('/')
-            this.diploma_list.push({
-              name: imgName[imgName.length - 1],
-              url: this.temp.diploma
-            })
-          }
-          if (this.temp.degreeCertificate !== '') {
-            const imgName = this.temp.degreeCertificate.split('/')
-            this.degree_list.push({
-              name: imgName[imgName.length - 1],
-              url: this.temp.degreeCertificate
-            })
-          }
-          if (this.temp.leaveCertificate !== '') {
-            const imgName = this.temp.leaveCertificate.split('/')
-            this.leave_list.push({
-              name: imgName[imgName.length - 1],
-              url: this.temp.leaveCertificate
-            })
           }
         })
-        .catch((e) => {
-          this.temp = row
-        })
+        this.temp.postName = bb.name
+        // if (this.temp.photo !== '') {
+        //   const imgName = this.temp.photo.split('/')
+        //   this.photo_list.push({
+        //     name: imgName[imgName.length - 1],
+        //     url: this.temp.photo
+        //   })
+        // }
+        if (this.temp.idCardA !== '') {
+          const imgName = this.temp.idCardA.split('/')
+          this.idCardA_list.push({
+            name: imgName[imgName.length - 1],
+            url: this.temp.idCardA
+          })
+        }
+        if (this.temp.idCardB !== '') {
+          const imgName = this.temp.idCardB.split('/')
+          this.idCardB_list.push({
+            name: imgName[imgName.length - 1],
+            url: this.temp.idCardB
+          })
+        }
+        if (this.temp.diploma !== '') {
+          const imgName = this.temp.diploma.split('/')
+          this.diploma_list.push({
+            name: imgName[imgName.length - 1],
+            url: this.temp.diploma
+          })
+        }
+        if (this.temp.degreeCertificate !== '') {
+          const imgName = this.temp.degreeCertificate.split('/')
+          this.degree_list.push({
+            name: imgName[imgName.length - 1],
+            url: this.temp.degreeCertificate
+          })
+        }
+        if (this.temp.leaveCertificate !== '') {
+          const imgName = this.temp.leaveCertificate.split('/')
+          this.leave_list.push({
+            name: imgName[imgName.length - 1],
+            url: this.temp.leaveCertificate
+          })
+        }
+      }).catch((e) => {
+        this.temp = row
+      })
     },
 
     saveAdd() {
       const _this = this
+      this.getUrl()
       this.$refs['dataForm'].validate((valid) => {
         this.getGenderKey()
         this.getUrl()
         if (valid) {
           this.submitdisabled = true
-          req
-            .saveAdd(this.temp)
-            .then((resp) => {
-              this.submitdisabled = false
-              console.log(resp)
-              if (resp.success) {
-                _this.$message({
-                  showClose: true,
-                  type: 'success',
-                  message: resp.msg
-                })
-                _this.handleReturn('true')
-                // _this.handleReturn("true");
-                console.log('保存成功')
-              } else {
-                _this.$message({
-                  showClose: true,
-                  type: 'success',
-                  message: resp.msg
-                })
-                // resp.code
-              }
-            })
-            .catch(() => {
-              this.submitdisabled = false
-            })
+          req.saveAdd(this.temp).then((resp) => {
+            this.submitdisabled = false
+            console.log(resp)
+            if (resp.success) {
+              _this.$message({
+                showClose: true,
+                type: 'success',
+                message: resp.msg
+              })
+              _this.handleReturn('true')
+              console.log('保存成功')
+            } else {
+              _this.$message({
+                showClose: true,
+                type: 'success',
+                message: resp.msg
+              })
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
         } else {
           return false
         }
@@ -1693,40 +1203,20 @@ export default {
 
     saveEdit() {
       const _this = this
-      // Start
-      // var orgName_Sid = "";
-      // if (this.orgName_list.length > 0) {
-      //   console.log('114477885522',this.orgName_list)
-      //   this.orgName_list.forEach((item) => {
-      //     var last_id = item[item.length - 1];
-      //     this.select_temp_Sid = ""; //临时遍历，用来保存选中结果(组织Sid)
-      //     this.findOrgId(last_id, this.options);
-      //     orgName_Sid = orgName_Sid + this.select_temp_Sid + ",";
-      //   });
-      // }
-      // if (orgName_Sid !== "") {
-      //   orgName_Sid = orgName_Sid.substring(0, orgName_Sid.length - 1);
-      // }
-      // this.temp.sysStaffOrgDto.orgSid = orgName_Sid;
-      // console.log("重新赋值后的组织结构", this.temp.sysStaffOrgDto.orgSid);
-      // End
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
-          req
-            .saveEdit(this.temp, this.sid)
-            .then((resp) => {
-              this.submitdisabled = false
-              _this.$message({
-                showClose: true,
-                type: 'success',
-                message: resp.msg
-              })
-              _this.handleReturn('true')
-            })
-            .catch(() => {
-              this.submitdisabled = false
+          req.saveEdit(this.temp, this.sid).then((resp) => {
+            this.submitdisabled = false
+            _this.$message({
+              showClose: true,
+              type: 'success',
+              message: resp.msg
             })
+            _this.handleReturn('true')
+          }).catch(() => {
+            this.submitdisabled = false
+          })
         } else {
           return false
         }
@@ -1740,7 +1230,9 @@ export default {
 /deep/ .el-main {
   padding: 0;
 }
-
+.formadd {
+  margin: 0 15%;
+}
 /deep/ .el-form-item__content {
   margin-left: 0 !important;
 }
diff --git a/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongInfo.vue b/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongInfo.vue
index 1dba3b3c21..294810e6cc 100644
--- a/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongInfo.vue
+++ b/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongInfo.vue
@@ -1,283 +1,253 @@
 <template>
   <div class="app-container">
-    <!--标题按钮部分开始-->
     <div class="tab-header webtop">
-      <!--标题-->
       <div>{{ viewTitle }}</div>
-      <!--start 添加修改按钮-->
       <div>
         <el-button type="primary" size="small">打印</el-button>
-        <el-button type="info" size="small" @click="handleReturn()"
-          >返回</el-button
-        >
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
       </div>
-      <!--end 添加修改按钮-->
-      <!--end 详情按钮-->
     </div>
-    <!--标题按钮部分结束-->
-    <!--Start 新增修改部分-->
     <div class="listconadd">
-      <el-form
-        ref="dataForm"
-        :model="temp"
-        label-position="right"
-        label-width="190px"
-        class="formadd"
-      >
-        <!-- <div class="titwu">客户信息登记</div> -->
-        <div
-          class="title"
-          style="
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-          "
-        >
+      <el-form ref="dataForm" :model="temp" label-position="right" label-width="190px" class="formadd">
+        <div class="title" style=" display: flex; align-items: center; justify-content: space-between;">
           <div>客户基础信息</div>
         </div>
         <el-container>
           <el-main>
             <el-row>
               <el-col :span="4">
-                <el-form-item prop="name">
+                <el-form-item>
                   <span>工号</span>
                 </el-form-item>
               </el-col>
               <el-col :span="20">
-                <el-form-item prop="name">
+                <el-form-item>
                   <span>{{ temp.jobNumber }}</span>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="4">
-                <el-form-item prop="name">
+                <el-form-item>
                   <span>姓名</span>
                 </el-form-item>
               </el-col>
               <el-col :span="20">
-                <el-form-item prop="name">
+                <el-form-item>
                   <span>{{ temp.name }}</span>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="4">
-                <el-form-item prop="name">
+                <el-form-item>
                   <span>性别</span>
                 </el-form-item>
               </el-col>
               <el-col :span="20">
-                <el-form-item prop="name">
+                <el-form-item>
                   <span>{{ temp.gender }}</span>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="4">
-                <el-form-item prop="idNo">
+                <el-form-item>
                   <span>身份证</span>
                 </el-form-item>
               </el-col>
               <el-col :span="20">
-                <el-form-item prop="idNo">
+                <el-form-item>
                   <span>{{ temp.idNo }}</span>
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row>
-              <el-col :span="4">
-                <el-form-item prop="name">
-                  <span>证件有效期</span>
-                </el-form-item>
-              </el-col>
-              <el-col :span="20">
-                <el-form-item prop="name">
-                  <span>{{ temp.idTerm }}</span>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="4">
-                <el-form-item prop="name">
-                  <span>出生年月日</span>
-                </el-form-item>
-              </el-col>
-              <el-col :span="20">
-                <el-form-item prop="name">
-                  <span>{{ temp.birthday }}</span>
-                </el-form-item>                                                                                                                                                                                                                               
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="4">
-                <el-form-item prop="name">
-                  <span>民族</span>
-                </el-form-item>
-              </el-col>
-              <el-col :span="20">
-                <el-form-item prop="national">
-                  <span>{{ temp.national }}</span>
-                </el-form-item>
-              </el-col>
-            </el-row>
           </el-main>
-          <el-aside width="410px">
-            <img :src="temp.photo">
+          <el-aside style="width: 25%;text-align: center;border-right: 1px solid #e0e3eb">
+            <img v-show="temp.photo !=='' ? true : false" style="width: 178px;height: 178px;" :src="temp.photo" @click="open(temp.photo)">
           </el-aside>
         </el-container>
         <el-row>
           <el-col :span="3">
-            <el-form-item prop="name">
-              <span>籍贯</span>
+            <el-form-item>
+              <span>证件有效期</span>
             </el-form-item>
           </el-col>
           <el-col :span="21" class="jiguan">
-            <el-form-item prop="name">
+            <el-form-item>
+              <span>{{ temp.idTerm }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="3">
+            <el-form-item>
+              <span>出生年月日</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="21">
+            <el-form-item>
+              <span>{{ temp.birthday }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="3">
+            <el-form-item>
+              <span>民族</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="21">
+            <el-form-item>
+              <span>{{ temp.national }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="3">
+            <el-form-item>
+              <span>籍贯</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="21">
+            <el-form-item>
               <span>{{ temp.province + temp.city + temp.county }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>住址</span>
             </el-form-item>
           </el-col>
           <el-col :span="21">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>{{ temp.address }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>手机号码</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>{{ temp.mobile }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>邮箱</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>{{ temp.email }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>紧急联系人</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>{{ temp.emergencyContact }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>紧急联系电话</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>{{ temp.emergencyMobile }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>政治面貌</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>{{ temp.poliCode }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>婚姻状况</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>{{ temp.maritalStatus }}</span>
             </el-form-item>
           </el-col>
         </el-row>
-        <div
-          class="title"
-          style="
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-          "
-        >
+        <div class="title" style=" display: flex; align-items: center; justify-content: space-between;">
           <div>更多信息</div>
         </div>
         <el-row>
           <el-col :span="3">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>员工类型</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>{{ temp.personType }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>入职时间</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>{{ temp.joinCompnyDate }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>试用期</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>{{ temp.probPeriod }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>计划转正日期</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>{{ temp.plannedConfirmDate }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>实际转正日期</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>{{ temp.confirmationDate }}</span>
             </el-form-item>
           </el-col>
@@ -285,44 +255,44 @@
         </el-row>
         <el-row>
           <el-col :span="3">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>所在部门</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="orgName">
-              <span>{{ temp.sysStaffOrgDetailsVo.orgName }}</span>
+            <el-form-item>
+              <span>{{ temp.sysStaffOrg.orgName }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>岗位</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="name">
-              <span>{{ temp.sysStaffPostDetailsVo.postSid }}</span>
+            <el-form-item>
+              <span>{{ temp.sysStaffPost.name }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>银行账号</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>{{ temp.bankCardNo }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>开户行</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="name">
+            <el-form-item>
               <span>{{ temp.openBank }}</span>
             </el-form-item>
           </el-col>
@@ -330,337 +300,318 @@
         <!-- !!!!各种附件证明图片!!!! -->
         <el-row>
           <el-col :span="3">
-            <el-form-item prop="name">
-              <!-- <span class="icon">*</span> -->
+            <el-form-item>
               <span>身份证(人像面)</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="name">
-              <img :src="temp.idCardA">
+            <el-form-item>
+              <img v-show="temp.idCardA !=='' ? true : false" style="width: 178px;height: 178px;" :src="temp.idCardA" @click="open(temp.idCardA)">
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <el-form-item prop="name">
-              <!-- <span class="icon">*</span> -->
+            <el-form-item>
               <span>身份证(国徽面)</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="name">
-              <img :src="temp.idCardB">
+            <el-form-item>
+              <img v-show="temp.idCardB !=='' ? true : false" style="width: 178px;height: 178px;" :src="temp.idCardB" @click="open(temp.idCardB)">
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3">
-            <el-form-item prop="name">
-              <!-- <span class="icon">*</span> -->
+            <el-form-item>
               <span>前公司离职证明</span>
             </el-form-item>
           </el-col>
           <el-col :span="21">
-            <el-form-item prop="name">
-              <img :src="temp.leaveCertificate">                
+            <el-form-item>
+              <img v-show="temp.leaveCertificate !=='' ? true : false" style="width: 178px;height: 178px;" :src="temp.leaveCertificate" @click="open(temp.leaveCertificate)">
             </el-form-item>
           </el-col>
         </el-row>
-        <div
-          class="title"
-          style="
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-          "
-        >
+        <div class="title" style=" display: flex; align-items: center; justify-content: space-between;">
           <div>学历/技能信息</div>
         </div>
         <el-row>
           <el-col :span="3">
-            <el-form-item prop="">
+            <el-form-item>
               <span>毕业院校</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="graduate">
+            <el-form-item>
               <span>{{ temp.graduate }}</span>
-              <!-- <el-input v-model="temp.graduate" maxlength="20" placeholder="请输入毕业院校" class="addinputw" clearable/> -->
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <el-form-item prop="">
+            <el-form-item>
               <span>学历/专业</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="education">
+            <el-form-item>
               <span>{{ temp.education }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3">
-            <el-form-item prop="">
+            <el-form-item>
               <span>职称</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="title">
+            <el-form-item>
               <span>{{ temp.title }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <el-form-item prop="">
+            <el-form-item>
               <span>资格认证</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="qualification">
+            <el-form-item>
               <span>{{ temp.qualification }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3">
-            <el-form-item prop="">
+            <el-form-item>
               <span>驾照类型</span>
             </el-form-item>
           </el-col>
           <el-col :span="21">
-            <el-form-item prop="licenseType">
+            <el-form-item>
               <span>{{ temp.licenseType }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3">
-            <el-form-item prop="">
+            <el-form-item>
               <span>学历证书</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <img :src="temp.diploma">
+            <img v-show="temp.diploma !=='' ? true : false" style="width: 178px;height: 178px;" :src="temp.diploma" @click="open(temp.diploma)">
           </el-col>
           <el-col :span="3">
-            <el-form-item prop="">
+            <el-form-item>
               <span>学位证书</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <img :src="temp.degreeCertificate">
+            <img v-show="temp.degreeCertificate !=='' ? true : false" style="width: 178px;height: 178px;" :src="temp.degreeCertificate" @click="open(temp.degreeCertificate)">
           </el-col>
         </el-row>
-        <div
-          class="title"
-          style="
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-          "
-        >
+        <div class="title" style=" display: flex; align-items: center; justify-content: space-between;">
           <div>社保信息</div>
         </div>
         <el-row>
           <el-col :span="3">
-            <el-form-item prop="">
+            <el-form-item>
               <span>意外险参保</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="isHaveInsurance">
-              <el-radio v-model="temp.isHaveInsurance" :label="1">是</el-radio>
-              <el-radio v-model="temp.isHaveInsurance" :label="0">否</el-radio>
+            <el-form-item>
+              <span>{{ temp.isHaveInsuranceValue }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <el-form-item prop="">
+            <el-form-item>
               <span>意外险参保地</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="insuranceAddr">
+            <el-form-item>
               <span>{{ temp.insuranceAddr }}</span>
-              <!-- <el-input v-model="temp.insuranceAddr" maxlength="20" placeholder="请输入意外险参保地" class="addinputw" clearable/>        -->
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3">
-            <el-form-item prop="">
+            <el-form-item>
               <span>意外险参保时间</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="insuranceStartDate">
+            <el-form-item>
               <span>{{ temp.insuranceStartDate }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <el-form-item prop="">
+            <el-form-item>
               <span>意外险终止时间</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="insuranceEndDate">
+            <el-form-item>
               <span>{{ temp.insuranceEndDate }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3">
-            <el-form-item prop="">
+            <el-form-item>
               <span>养老</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="isHaveAged">
-              <el-radio v-model="temp.isHaveAged" :label="1">是</el-radio>
-              <el-radio v-model="temp.isHaveAged" :label="0">否</el-radio>
+            <el-form-item>
+              <span>{{ temp.isHaveAgedValue }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <el-form-item prop="">
+            <el-form-item>
               <span>医疗/生育</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="isHaveMedical">
-              <el-radio v-model="temp.isHaveMedical" :label="1">是</el-radio>
-              <el-radio v-model="temp.isHaveMedical" :label="0">否</el-radio>
+            <el-form-item>
+              <span>{{ temp.isHaveMedicalValue }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3">
-            <el-form-item prop="">
+            <el-form-item>
               <span>工伤</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="isHaveInjury">
-              <el-radio v-model="temp.isHaveInjury" :label="1">是</el-radio>
-              <el-radio v-model="temp.isHaveInjury" :label="0">否</el-radio>
+            <el-form-item>
+              <span>{{ temp.isHaveInjuryValue }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <el-form-item prop="">
+            <el-form-item>
               <span>失业</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="isHaveUnemploy">
-              <el-radio v-model="temp.isHaveUnemploy" :label="1">是</el-radio>
-              <el-radio v-model="temp.isHaveUnemploy" :label="0">否</el-radio>
+            <el-form-item>
+              <span>{{ temp.isHaveUnemployValue }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3">
-            <el-form-item prop="">
+            <el-form-item>
               <span>社保参保地</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="insuredPlace">
+            <el-form-item>
               <span>{{ temp.insuredPlace }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <el-form-item prop="">
+            <el-form-item>
               <span>纸质档案保管地</span>
             </el-form-item>
           </el-col>
           <el-col :span="9">
-            <el-form-item prop="paperPlace">
+            <el-form-item>
               <span>{{ temp.paperPlace }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <!-- <div v-show="isQuit == true"> -->
-        <div
-          class="title"
-          style="
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-          "
-        >
-          <div>离职信息</div>
+        <div v-show="isQuit">
+          <div class="title" style=" display: flex; align-items: center; justify-content: space-between;">
+            <div>离职信息</div>
+          </div>
+          <el-row>
+            <el-col :span="3">
+              <el-form-item>
+                <span>离职日期</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="9">
+              <el-form-item>
+                <span>{{ temp.quitDate }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item>
+                <span>离职理由</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="9">
+              <el-form-item>
+                <span>{{ temp.quitReason }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </div>
-        <el-row>
-          <el-col :span="3">
-            <el-form-item prop="">
-              <span>离职日期</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="9">
-            <el-form-item prop="quitDate">
-              <span>{{ temp.quitDate }}</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <el-form-item prop="">
-              <span>离职理由</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="9">
-            <el-form-item prop="quitReason">
-              <span>{{ temp.quitReason }}</span>
-            </el-form-item>
-          </el-col>
-        </el-row>
       </el-form>
     </div>
     <!--End 添加修改部分-->
+    <el-dialog :visible.sync="dialogVisible">
+      <img width="100%" :src="dialogUrl" alt="">
+    </el-dialog>
   </div>
 </template>
-</template>
 
 <script>
-import req from "@/api/management/yuangongguanli";
+import req from '@/api/management/yuangongguanli'
 export default {
-  name: "yuangongInfo",
+  name: 'yuangongInfo',
   data() {
     return {
-      viewTitle: "",
-      dialogStatus: "",
+      viewTitle: '',
+      dialogStatus: '',
+      dialogVisible: false,
+      dialogUrl: '',
       index: 0,
+      isQuit: false,
       temp: {
-        sid: "", // 一条数据的sid
-        sysStaffOrgDetailsVo: {
-          orgName: "",
-        }, //部门信息
-        sysStaffPostDetailsVo: {}, //岗位信息
-      },
-    };
+        sid: '', // 一条数据的sid
+        sysStaffOrg: {
+          orgName: ''
+        }, // 部门信息
+        sysStaffPost: {} // 岗位信息
+      }
+    }
   },
   methods: {
     handleReturn() {
-      this.temp = {};
-      this.$emit("doback");
+      this.temp = {}
+      this.$emit('doback')
     },
     showInfo(sid, row) {
       this.$nextTick(() => {
-        this.$refs["dataForm"].clearValidate();
-      });
-      this.dialogStatus = "edit";
-      this.viewTitle = "其他出库单详情";
-      const _this = this;
-      req
-        .fetchBySid(sid)
-        .then((resp) => {
-          const data = resp.data;
-          this.sid = sid;
-          this.temp = data;
-          data.isHaveAged = this.temp.isHaveAged;
-          console.log("编辑回显出的数据", this.temp);
-        })
-        .catch((e) => {
-          this.temp = row;
-        });
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.dialogStatus = 'edit'
+      this.viewTitle = '员工信息详情'
+      req.fetchBySid(sid).then((resp) => {
+        const data = resp.data
+        this.sid = sid
+        this.temp = data
+        if (this.temp.personType === '全职') {
+          this.isQuit = false
+        } else {
+          this.isQuit = true
+        }
+        data.isHaveAged = this.temp.isHaveAged
+        console.log('编辑回显出的数据', this.temp)
+      }).catch((e) => {
+        this.temp = row
+      })
     },
-  },
-};
+    open(val) {
+      this.dialogVisible = true
+      this.dialogUrl = val
+    }
+  }
+}
 </script>
 
 <style scoped>
@@ -685,4 +636,7 @@ export default {
   line-height: 40px !important;
   font-weight: 600;
 }
+.formadd {
+  margin: 0 15%;
+}
 </style>
diff --git a/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongguanli.vue b/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongguanli.vue
index a10113cc09..3a2cc6c20f 100644
--- a/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongguanli.vue
+++ b/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongguanli.vue
@@ -1,218 +1,94 @@
 <template>
   <div class="app-container">
     <div v-show="viewState == 1">
-      <button-bar
-        ref="btnbar"
-        view-title="员工管理"
-        :btndisabled="btndisabled"
-        @btnhandle="btnHandle"
-      />
+      <button-bar ref="btnbar" view-title="员工管理" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <div class="searchcon">
-        <el-button
-          size="small"
-          class="searchbtn"
-          @click="isSearchShow = !isSearchShow"
-        >
-          {{ isSearchShow ? "隐藏查询条件" : "显示藏查询条件" }}
-        </el-button>
+        <el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? "隐藏查询条件" : "显示藏查询条件" }}</el-button>
         <div v-show="isSearchShow" class="search">
           <el-form :inline="true" class="tab-header">
-            <el-form-item label="员工姓名" label-width="85px">
-              <el-input
-                v-model="queryParams.params.name"
-                placeholder="请输入员工姓名"
-                clearable
-                class="filter-item"
-              />
-            </el-form-item>
-            <el-form-item label="员工类型" label-width="85px">
-              <el-select
-                v-model="queryParams.params.personType"
-                class="addinputw"
-                placeholder="请选择员工类型"
-                @change="getPersonType"
-              >
-                <el-option
-                  v-for="(item, index) in personType_list"
-                  :key="index.dictKey"
-                  :label="item.dictValue"
-                  :value="item.dictKey"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="联系电话" label-width="85px">
-              <el-input
-                v-model="queryParams.params.mobile"
-                placeholder="请输入联系电话"
-                clearable
-                class="filter-item"
-              />
-            </el-form-item>
-            <el-form-item label="所在部门" label-width="85px">
-              <el-cascader
-                v-model="orgName_list"
-                :props="props"
-                :options="options"
-                @change="orgNameChange"
-              />
-            </el-form-item>
-            <el-form-item label="所在岗位" label-width="85px">
-              <el-select
-                v-model="queryParams.params.postSid"
-                class="addinputw"
-                placeholder="请选择岗位"
-                @change="getPostSid"
-              >
-                <el-option
-                  v-for="(item, index) in postSid_list"
-                  :key="index.postCode"
-                  :label="item.name"
-                  :value="item.postCode"
-                />
-              </el-select>
-              <!-- <el-input v-model="queryParams.params.postName" placeholder="请输入所在岗位" clearable class="filter-item"/> -->
-            </el-form-item>
-            <el-form-item label="入职日期" label-width="85px">
-              <el-date-picker
-                v-model="queryParams.params.joinCompnyDateStart"
-                type="date"
-                placeholder="选择日期"
-                value-format="yyyy-MM-dd"
-              />
-            </el-form-item>
-            <el-divider />
-            <div
-              style="text-align: center; position: relative; margin-left: -75px"
-            >
+            <el-row>
+              <el-form-item label="员工姓名">
+                <el-input v-model="queryParams.params.name" placeholder="请输入员工姓名" clearable class="addinputw"/>
+              </el-form-item>
+              <el-form-item label="员工类型">
+                <el-select v-model="queryParams.params.personTypeKey" class="addinputw" placeholder="请选择员工类型">
+                  <el-option v-for="(item, index) in personType_list" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="联系电话">
+                <el-input v-model="queryParams.params.mobile" placeholder="请输入联系电话" clearable class="addinputw"/>
+              </el-form-item>
+              <el-form-item label="所在部门">
+                <el-cascader v-model="orgName_list" :props="props" :options="options" class="addinputw" style="line-height: 32px" @change="orgNameChange"/>
+              </el-form-item>
+              <el-form-item label="所在岗位">
+                <el-select v-model="queryParams.params.postSid" class="addinputw" placeholder="请选择岗位">
+                  <el-option v-for="(item) in postSid_list" :key="item.sid" :label="item.name" :value="item.sid"/>
+                </el-select>
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="入职日期">
+<!--                <el-date-picker v-model="queryParams.params.joinCompnyDateStart" type="date" class="addinputw" placeholder="选择日期" value-format="yyyy-MM-dd"/>-->
+                <div class="block" style="float: left;">
+                  <el-date-picker v-model="queryParams.params.joinCompnyDateStart" type="date" value-format="yyyy-MM-dd" placeholder="开始日期">
+                  </el-date-picker>
+                </div>
+                <div style="float: left;margin: 0 5px">至</div>
+                <div class="block" style="float: left;">
+                  <el-date-picker v-model="queryParams.params.joinCompnyDateEnd" type="date" value-format="yyyy-MM-dd" placeholder="结束日期">
+                  </el-date-picker>
+                </div>
+              </el-form-item>
+            </el-row>
+            <el-divider/>
+            <div style="text-align: center; position: relative; margin-left: -75px">
               <el-button type="primary" @click="dosearch">查询</el-button>
               <el-button type="primary" @click="resetQuery">重置</el-button>
             </div>
           </el-form>
         </div>
       </div>
-      <!--Start 项目列表头部-->
       <div class="listtop">
         <div class="tit">员工信息列表</div>
-        <pageye
-          v-show="dataList.length > 0"
-          :total="queryParams.total"
-          :page.sync="queryParams.current"
-          :limit.sync="queryParams.size"
-          class="pagination"
-          @pagination="loadList"
-        />
+        <pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
       </div>
-      <!--End 项目列表头部-->
-
-      <!--Start 项目列表-->
       <div class="listcon">
-        <el-table
-          v-loading="tableLoading"
-          :data="dataList"
-          border
-          style="width: 100%"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column width="50px" type="selection" align="center" />
-          <el-table-column
-            width="80px"
-            label="序号"
-            type="index"
-            :index="indexMethod"
-            align="center"
-          />
+        <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
+          <el-table-column width="50px" type="selection" align="center"/>
+          <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
           <el-table-column prop="jobNumber" label="员工编号" align="center">
             <template slot-scope="scope">
-              <span class="tablerow-click" @click="toInfo(scope.row)">{{
-                scope.row.jobNumber
-              }}</span>
+              <span class="tablerow-click" @click="toInfo(scope.row)">{{ scope.row.jobNumber }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="name" label="员工姓名" align="center" />
-          <el-table-column prop="personType" label="员工姓名" align="center" />
-          <el-table-column prop="mobile" label="手机号" align="center" />
-          <el-table-column prop="orgName" label="所在部门" align="center" />
-          <el-table-column prop="postName" label="岗位" align="center" />
-          <el-table-column
-            prop="joinCompnyDate"
-            label="入职日期"
-            align="center"
-          />
+          <el-table-column prop="name" label="员工姓名" align="center"/>
+          <el-table-column prop="personType" label="员工姓名" align="center"/>
+          <el-table-column prop="mobile" label="手机号" align="center"/>
+          <el-table-column prop="orgName" label="所在部门" align="center"/>
+          <el-table-column prop="postName" label="岗位" align="center"/>
+          <el-table-column prop="joinCompnyDate" label="入职日期" align="center"/>
         </el-table>
       </div>
-      <!--End 项目列表-->
       <div class="pages">
-        <div class="tit" />
-        <!-- 翻页 -->
-        <pagination
-          v-show="dataList.length > 0"
-          :total="queryParams.total"
-          :page.sync="queryParams.current"
-          :limit.sync="queryParams.size"
-          class="pagination"
-          @pagination="loadList"
-        />
+        <div class="tit"/>
+        <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
       </div>
     </div>
     <!--End 查询和其列表部分-->
-    <yuangong-add
-      v-show="viewState == 2 || viewState == 3"
-      ref="divadd"
-      @doback="resetState"
-      @reloadlist="loadList"
-    />
-    <yuangong-info
-      v-show="viewState == 4"
-      ref="divinfo"
-      @doback="resetState"
-    />
-
-    <el-dialog
-      title="客户登记-类型"
-      :visible.sync="dialogVisible"
-      width="40%"
-      top="13%"
-    >
-      <el-form :model="personTypeForm">
-        <el-form-item label="员工类型" class="diaForm">
-          <el-select
-            v-model="personTypeForm.personType"
-            class="addinputw"
-            placeholder="请选择员工类型"
-            @change="getPersonType"
-          >
-            <el-option
-              v-for="(item, index) in personType_list"
-              :key="index.dictKey"
-              :label="item.dictValue"
-              :value="item.dictKey"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="离职时间" class="diaForm">
-          <el-date-picker
-            v-model="personTypeForm.quitDate"
-            type="date"
-            placeholder="选择日期"
-            value-format="yyyy-MM-dd"
-          />
+    <yuangong-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList"/>
+    <yuangong-info v-show="viewState == 4" ref="divinfo" @doback="resetState"/>
+    <el-dialog title="" :visible.sync="dialogVisible" width="40%" top="13%" center>
+      <el-form :model="personTypeForm" label-position="top">
+        <el-form-item label="离职时间">
+          <el-date-picker v-model="personTypeForm.quitDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"/>
         </el-form-item>
-        <el-form-item label="离职理由" class="diaForm">
-          <el-input
-            v-model="personTypeForm.quitReason"
-            maxlength="5"
-            placeholder="请输入紧急联系电话"
-            class="lizhiliyou"
-            clearable
-          />
+        <el-form-item label="离职理由">
+          <el-input v-model="personTypeForm.quitReason" maxlength="100" placeholder="" type="textarea" clearable/>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button
-          class="el-button-sure"
-          type="primary"
-          @click="handleOpen()"
-        >确 定</el-button>
+        <el-button class="el-button-sure" type="primary" @click="handleOpen()">确 定</el-button>
         <el-button @click="dialogVisible = false">取 消</el-button>
       </span>
     </el-dialog>
@@ -224,7 +100,6 @@ import req from '@/api/management/yuangongguanli'
 import ButtonBar from '@/components/ButtonBar'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
-import { setuser, getuser } from '@/utils/baocun'
 import yuangongAdd from './yuangongAdd'
 import yuangongInfo from './yuangongInfo'
 
@@ -239,7 +114,6 @@ export default {
   },
   data() {
     return {
-      pageType: 'staff',
       dialogVisible: false, // 弹窗
       btndisabled: false,
       viewState: 1, // 1、列表 2、添加 3、修改 4、查看
@@ -269,8 +143,60 @@ export default {
         current: 1,
         size: 10,
         total: 0,
-        params: {}
-      }
+        params: {
+          joinCompnyDateEnd: '',
+          joinCompnyDateStart: '',
+          mobile: '',
+          name: '',
+          orgSid: '',
+          personTypeKey: '',
+          postSid: ''
+        }
+      },
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'el-icon-plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'el-icon-edit',
+          btnKey: 'toEdit',
+          btnLabel: '编辑'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: '',
+          btnKey: 'doSubmit',
+          btnLabel: '提交'
+        },
+        {
+          type: 'danger',
+          size: 'small',
+          icon: '',
+          btnKey: 'doQuit',
+          btnLabel: '离职'
+        },
+        {
+          type: 'success',
+          size: 'small',
+          icon: '',
+          btnKey: 'doImport',
+          btnLabel: '导入'
+        },
+        {
+          type: 'success',
+          size: 'small',
+          icon: '',
+          btnKey: 'doExport',
+          btnLabel: '导出'
+        }
+      ]
     }
   },
   created() {
@@ -279,7 +205,7 @@ export default {
     this.getBuMen()
   },
   mounted() {
-    // this.$refs["btnbar"].setButtonList(this.btnList);
+    this.$refs["btnbar"].setButtonList(this.btnList)
   },
 
   methods: {
@@ -343,15 +269,12 @@ export default {
     doSubmit(row) {
       // 提交的代码
       this.btndisabled = true
-      req
-        .doSubmit(this.queryParams.params, this.sids)
-        .then((resp) => {
-          console.log(resp)
-          this.btndisabled = false
-        })
-        .catch(() => {
-          this.btndisabled = false
-        })
+      req.doSubmit(this.queryParams.params, this.sids).then((resp) => {
+        console.log(resp)
+        this.btndisabled = false
+      }).catch(() => {
+        this.btndisabled = false
+      })
     },
     // doDel() {
     //   this.$refs['btn'].btnList.some((item,i) => {
@@ -388,32 +311,27 @@ export default {
     },
     doImport(row) {
       // 导入的代码
-      req
-        .importExcel(this.queryParams.params, this.sids)
-        .then((resp) => {
-          console.log(resp)
-        })
-        .catch(() => {})
+      req.importExcel(this.queryParams.params, this.sids).then((resp) => {
+        console.log(resp)
+      }).catch(() => {
+      })
     },
     doExport(sids) {
       // 导出的代码
-      req
-        .exportExcel(this.queryParams.params, this.sids)
-        .then((resp) => {
-          var map = resp.data
-          const fileName = map.filename // 导出文件名
-          // // 对于<a>标签，只有 Firefox 和 Chrome（内核） 支持 download 属性
-          // // IE10以上支持blob但是依然不支持download
-          const link = document.createElement('a') // 创建a标签
-          link.download = fileName // a标签添加属性
-          link.style.display = 'none'
-          link.href = map.downurl
-          document.body.appendChild(link)
-          link.click() // 执行下载
-          URL.revokeObjectURL(link.href) // 释放url
-          document.body.removeChild(link) // 释放标签
-        })
-        .catch(() => {})
+      req.exportExcel(this.queryParams.params, this.sids).then((resp) => {
+        var map = resp.data
+        const fileName = map.filename // 导出文件名
+        // // 对于<a>标签，只有 Firefox 和 Chrome（内核） 支持 download 属性
+        // // IE10以上支持blob但是依然不支持download
+        const link = document.createElement('a') // 创建a标签
+        link.download = fileName // a标签添加属性
+        link.style.display = 'none'
+        link.href = map.downurl
+        document.body.appendChild(link)
+        link.click() // 执行下载
+        URL.revokeObjectURL(link.href) // 释放url
+        document.body.removeChild(link) // 释放标签
+      }).catch(() => {})
     },
     dosearch() {
       this.queryParams.current = 1
@@ -422,21 +340,18 @@ export default {
     handleOpen() {
       const _this = this
       this.personTypeForm.sid = this.sids[0]
-      req
-        .delBySids(this.personTypeForm)
-        .then((resp) => {
-          loading.close()
-          _this.$message({
-            type: 'success',
-            message: resp.msg,
-            showClose: true
-          })
-          _this.loadList()
-          this.dialogVisible = false
-        })
-        .catch((e) => {
-          loading.close()
+      req.del(this.personTypeForm).then((resp) => {
+        loading.close()
+        _this.$message({
+          type: 'success',
+          message: resp.msg,
+          showClose: true
         })
+        _this.loadList()
+        this.dialogVisible = false
+      }).catch((e) => {
+        loading.close()
+      })
     },
     // 获取数据sid
     handleSelectionChange(row) {
@@ -444,7 +359,6 @@ export default {
       const aa = []
       row.forEach((element) => {
         aa.push(element.sid)
-        setuser(this.sids)
       })
       this.sids = aa
       this.row = row
@@ -454,31 +368,36 @@ export default {
 
     // 重置
     resetQuery() {
-      this.queryParams.params = {}
-      this.queryParams.params.sid = '' // sid
-      this.queryParams.params.name = '' // 登录名
+      this.queryParams = {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          joinCompnyDateEnd: '',
+          joinCompnyDateStart: '',
+          mobile: '',
+          name: '',
+          orgSid: '',
+          personTypeKey: '',
+          postSid: ''
+        }
+      }
+      this.orgName_list = []
       this.dosearch()
     },
     // 查询
     loadList() {
       const _this = this
       this.tableLoading = true
-      req
-        .listPage(this.queryParams)
-        .then((resp) => {
-          console.log('查询列表', resp)
-          _this.tableLoading = false
-          const data = resp.data
-          _this.queryParams.total = data.total
-          _this.dataList = data.records
-          // for (var i = 0; i < data.records.length; i++) {
-          //   var timeArr = data.records[i].createTime.split(' ');
-          //   this.dataList[i].createTime = timeArr[0];
-          // }
-        })
-        .catch(() => {
-          _this.tableLoading = false
-        })
+      req.listPage(this.queryParams).then((resp) => {
+        console.log('查询列表', resp)
+        _this.tableLoading = false
+        const data = resp.data
+        _this.queryParams.total = data.total
+        _this.dataList = data.records
+      }).catch(() => {
+        _this.tableLoading = false
+      })
     },
     // 序号
     indexMethod(index) {
@@ -488,16 +407,12 @@ export default {
     },
 
     getType() {
-      req
-        .pullDown({
-          type: 'personType'
-        })
-        .then((res) => {
-          if (res.code === '200') {
-            this.personType_list = res.data
-            console.log('下拉框员工类型', res.data)
-          }
-        })
+      req.pullDown({ type: 'personType' }).then((res) => {
+        if (res.code === '200') {
+          this.personType_list = res.data
+          console.log('下拉框员工类型', res.data)
+        }
+      })
       req.postName().then((res) => {
         if (res.code === '200') {
           this.postSid_list = res.data
@@ -505,42 +420,6 @@ export default {
         }
       })
     },
-
-    getPersonType(value) {
-      console.log('触发下拉框按钮')
-      let bb = {}
-      this.personType_list.forEach((e) => {
-        // eslint-disable-next-line eqeqeq
-        if (e.dictKey == value) {
-          bb = {
-            type: e.dictType,
-            name: e.dictValue,
-            key: e.dictKey,
-            sid: e.sid
-          }
-        }
-      })
-      this.queryParams.params.personType = bb.name
-      console.log('name', this.queryParams.params.personType)
-    },
-    getPostSid(value) {
-      console.log('触发下拉框按钮', value)
-      let bb = {}
-      this.postSid_list.forEach((e) => {
-        // eslint-disable-next-line eqeqeq
-        if (e.postCode == value) {
-          bb = {
-            name: e.name,
-            key: e.postCode,
-            sid: e.sid
-          }
-        }
-      })
-      this.queryParams.params.postSid = bb.sid
-      // this.temp.nationalKey = bb.key
-      // this.formobj.scmOtherInboundDto.billType = bb.sid
-      console.log('name', this.queryParams.params.postSid)
-    },
     // 级联列表 部门
     getBuMen() {
       req.salesDepName().then((res) => {
@@ -553,61 +432,45 @@ export default {
     },
     BuMen0(data) {
       data.forEach((e) => {
-        if (e.children.length != 0) {
-          this.BuMen0(e.children)
-        } else {
-          delete e.children
-          this.dataArr.push(e)
-          return
+        if (e.children) {
+          if (e.children.length !== 0) {
+            this.BuMen0(e.children)
+          } else {
+            delete e.children
+            this.dataArr.push(e)
+            return
+          }
         }
       })
     },
     // 部门
     orgNameChange(e) {
       console.log('选中结果：' + JSON.stringify(e))
-      var result = ''
       var result_Sid = ''
-      var sidPath = ''
-      var namePath = ''
       if (e.length > 0) {
         // 循环多选项
         e.forEach((item) => {
           var last_id = item
           // 循环查找名字
-          this.select_temp_Name = '' // 临时遍历，用来保存选中结果(组织名称)
           this.select_temp_Sid = '' // 临时遍历，用来保存选中结果(组织Sid)
-          this.select_temp_NamePath = '' // 临时遍历，用来保存选中结果(名称路径)
-          this.select_temp_SidPath = '' // 临时遍历，用来保存选中结果(sid路径)
           this.findOrgId(last_id, this.options)
-          result = result + this.select_temp_Name + '/'
           result_Sid = result_Sid + this.select_temp_Sid + ','
-          sidPath = this.select_temp_SidPath
-          namePath = namePath + this.select_temp_Name + '/'
         })
       }
-      if (result !== '') {
-        result = result.substring(0, result.length - 1)
-      }
-      if (namePath !== '') {
-        namePath = namePath.substring(0, result.length - 1)
-      }
       if (result_Sid !== '') {
         result_Sid = result_Sid.substring(0, result_Sid.length - 1)
       }
       const orgSidArray = result_Sid.split(',')
       const orgSid = orgSidArray[orgSidArray.length - 1]
-      this.queryParams.params.orgName = result
-      // this.temp.sysStaffOrgDto.orgSid = orgSid
-      // this.temp.sysStaffOrgDto.orgSidPath = sidPath
-      // this.temp.sysStaffOrgDto.orgNamePath = namePath
-      console.log('选中名称：' + result, orgSid, sidPath, namePath)
+      this.queryParams.params.orgSid = orgSid
+      console.log('选中名称：' + orgSid)
     },
 
     // --- 循环查询
     findOrgId(id, options) {
       console.log('这是部门id', id)
       for (var i = 0; i < options.length; i++) {
-        if (id == options[i].sid) {
+        if (id === options[i].sid) {
           this.select_temp_Name = options[i].name // 保存找到的内容
           this.select_temp_Sid = options[i].sid
           this.select_temp_NamePath = options[i].name
@@ -615,7 +478,7 @@ export default {
           return true
         } else {
           // 判断是否最后一级
-          if (options[i].children !== undefined) {
+          if (options[i].children !== undefined && options[i].children !== null) {
             // 不是的话查询下一级
             if (this.findOrgId(id, options[i].children)) {
               return true
@@ -651,7 +514,4 @@ export default {
   border: #2cab69 1px solid;
   color: #2cab69;
 }
-.lizhiliyou {
-  width: 200px !important;
-}
 </style>
diff --git a/anrui-management/anrui-management-ui/vue.config.js b/anrui-management/anrui-management-ui/vue.config.js
index fb3fc36d4f..f44b706fa4 100644
--- a/anrui-management/anrui-management-ui/vue.config.js
+++ b/anrui-management/anrui-management-ui/vue.config.js
@@ -40,16 +40,16 @@ module.exports = {
     },
     proxy: {
       '/api': { // 匹配所有以 '/api'开头的请求路径
-        target: 'http://127.0.0.1:8111/',
-        // target: process.env.VUE_APP_URL, // 代理目标的基础路径
+        // target: 'http://127.0.0.1:8111/',
+        target: process.env.VUE_APP_URL, // 代理目标的基础路径
         changeOrigin: true, // 支持跨域
         pathRewrite: { // 重写路径: 去掉路径中开头的'/api'
           '^/api': ''
         }
       },
       '/upload': { // 匹配所有以 '/api'开头的请求路径
-         target: 'http://4424790b0u.qicp.vip/',
-        // target: process.env.VUE_APP_URL, // 代理目标的基础路径
+         // target: 'http://4424790b0u.qicp.vip/',
+        target: process.env.VUE_APP_URL, // 代理目标的基础路径
         changeOrigin: true, // 支持跨域
         pathRewrite: { // 重写路径: 去掉路径中开头的'/api'
           '^/upload': ''
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffQuery.java
new file mode 100644
index 0000000000..b13bfddbe0
--- /dev/null
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffQuery.java
@@ -0,0 +1,18 @@
+package com.yxt.anrui.portal.api.sysstaffinfo;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/20 15:47
+ * @Description
+ */
+@Data
+public class PcSysStaffQuery implements Query {
+    private static final long serialVersionUID = 1858291601540877140L;
+    @ApiModelProperty(value = "业务员sid")
+    private String staffSid;
+
+}
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffVo.java
new file mode 100644
index 0000000000..38d71fce43
--- /dev/null
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffVo.java
@@ -0,0 +1,17 @@
+package com.yxt.anrui.portal.api.sysstaffinfo;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/20 15:44
+ * @Description
+ */
+@Data
+public class PcSysStaffVo implements Vo {
+    private static final long serialVersionUID = -9042032921079833819L;
+
+    private String staffSid;
+    private String staffName;
+}
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java
index 8034ddd684..c3ce6e78f7 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java
@@ -6,6 +6,7 @@ import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -98,4 +99,9 @@ public interface SysStaffinfoFeign {
     @PostMapping("/searchAppContactsList")
     public ResultBean<PagerVo<SysStaffinfoAppContactsSearchVo>> searchAppContactsList(@RequestBody PagerQuery<SysStaffinfoQuery> pq);
 
+    @ApiOperation("销售订单-内部推荐人下拉框")
+    @ResponseBody
+    @GetMapping("/selectStaffList")
+    ResultBean<List<PcSysStaffVo>> selectStaffList(@SpringQueryMap PcSysStaffQuery pcSysStaffQuery);
+
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java
index 57df4f8df6..28328879d8 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java
@@ -5,6 +5,8 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * Project: anrui_portal(门户建设) <br/>
  * File: SysStaffinfoFeignFallback.java <br/>
@@ -63,4 +65,9 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign {
         return ResultBean.fireFail().setMsg("接口anrui_portal/searchAppContactsList无法访问");
     }
 
+    @Override
+    public ResultBean<List<PcSysStaffVo>> selectStaffList(PcSysStaffQuery pcSysStaffQuery) {
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java
index 79c7a7b9d6..90dcfc062b 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java
@@ -103,4 +103,12 @@ public interface SysStaffinfoMapper extends BaseMapper<SysStaffinfo> {
      */
     int updateBySid(@Param("personType") String personType, @Param("personTypeKey") String personTypeKey,
                      @Param("sid") String sid, @Param("date") Date date, @Param("reason") String reason);
+                    @Param("jobNumber") String jobNumber, @Param("sid") String sid, @Param("date") Date date, @Param("reason") String reason);
+
+    /**
+     * 查询当前分公司下的员工信息
+     * @param orgSid 分公司sid
+     * @return
+     */
+    List<PcSysStaffVo> selectStaffList(String orgSid);
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml
index e26e7a00b1..41db9f1cbd 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml
@@ -292,4 +292,10 @@
             quitReason    = #{reason}
         where sid = #{sid}
     </update>
+    <!--查询当前分公司下的员工信息-->
+    <select id="selectStaffList" resultType="com.yxt.anrui.portal.api.sysstaffinfo.PcSysStaffVo">
+        select sso.staffSid,si.name from sys_staff_org sso
+        left join sys_staffinfo si on sso.staffSid = si.sid
+        where find_in_set(#{orgSid},replace(sso.orgSidPath,'/',','))
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java
index aec9b92dd7..bef147f7d2 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java
@@ -165,5 +165,10 @@ public class SysStaffinfoRest implements SysStaffinfoFeign {
         return new ResultBean<PagerVo<SysStaffinfoAppContactsSearchVo>>().success().setData(pv_result);
     }
 
+    @Override
+    public ResultBean<List<PcSysStaffVo>> selectStaffList(PcSysStaffQuery pcSysStaffQuery) {
+        return sysStaffinfoService.selectStaffList(pcSysStaffQuery);
+    }
+
 
 }
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
index 77856d4e55..480caa71f9 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
@@ -495,4 +495,19 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         }
         return count;
     }
+
+    public ResultBean<List<PcSysStaffVo>> selectStaffList(PcSysStaffQuery pcSysStaffQuery) {
+        ResultBean<List<PcSysStaffVo>> rb = ResultBean.fireFail();
+        //根据当前staffSid查询分公司sid
+        String orgSid = "";
+        List<PcSysStaffVo> list = new ArrayList<>();
+        ResultBean<String> stringResultBean = sysStaffOrgService.selectSidPathByStaffSid(pcSysStaffQuery.getStaffSid());
+        if (stringResultBean.getSuccess()) {
+            orgSid = stringResultBean.getData();
+        }
+        if(StringUtils.isNotBlank(orgSid)){
+            list = baseMapper.selectStaffList(orgSid);
+        }
+        return rb.success().setData(list);
+    }
 }
\ No newline at end of file
diff --git a/doc/databases/bus-center_tables.sql b/doc/databases/bus-center_tables.sql
index 5998162959..aa97ba9a45 100644
--- a/doc/databases/bus-center_tables.sql
+++ b/doc/databases/bus-center_tables.sql
@@ -554,3 +554,33 @@ CREATE TABLE `bus_sales_order_insurance`
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='销售订单-保险信息';
 
+
+DROP TABLE IF EXISTS `bus_sales_order_submit`;
+CREATE TABLE `bus_sales_order_submit`
+(
+    `id`                  int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`                 varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`         int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`          timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`          timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`            int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`               int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`            int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`             varchar(255)         DEFAULT NULL COMMENT '备注：返利备注',
+    `createBySid`         varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`         varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `salesOrderSid`       VARCHAR(64)          DEFAULT NULL COMMENT '销售订单sid',
+    `priceRemarks`        varchar(500)         DEFAULT NULL COMMENT '价格说明',
+    `discountRemarks`     varchar(500)         DEFAULT NULL COMMENT '优惠说明',
+    `distributorName`     varchar(64)          DEFAULT NULL COMMENT '中介名称:即经销商名称',
+    `distributorMobile`   varchar(64)          DEFAULT NULL COMMENT '联系电话',
+    `distributorSid`      varchar(64)          DEFAULT NULL COMMENT '中介单位sid',
+    `distributorPrice`    decimal(10, 2)       DEFAULT NULL COMMENT '单车中介服务费',
+    `distributorPriceAll` decimal(10, 2)       DEFAULT NULL COMMENT '返利合计',
+    `name`                varchar(64)          DEFAULT NULL COMMENT '内部引荐人：本分公司的用户',
+    `userSid`             varchar(64)          DEFAULT NULL COMMENT '内部引荐人sid',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='销售订单-订单提交时补充的返利信息';
+