Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java

@@ -92,4 +92,20 @@ public interface BaseDistributorFeign {
     @ApiOperation("移动-经销商详情")
     @GetMapping("/getDistributorDetail/{sid}")
     ResultBean<BaseDisDetailsVo> getDistributorDetail(@PathVariable("sid") String sid);
+
+    @ApiOperation("移动-经销商初始化详情")
+    @GetMapping("/getDistributorInfo/{sid}")
+    ResultBean<BaseDistribuDeailVo> getDistributorInfo(@PathVariable("sid") String sid);
+
+    @ApiOperation("移动-经销商删除")
+    @DeleteMapping("/deleteInfo/{sid}")
+    ResultBean deleteInfo(@PathVariable("sid") String sid);
+
+    @ApiOperation("移动-经销商删除人员")
+    @DeleteMapping("/deleteDistributorPersonnel/{sid}")
+    ResultBean deleteDistributorPersonnel(@PathVariable(value = "sid") String sid);
+
+    @ApiOperation("移动-经销商人员初始化")
+    @GetMapping("/getDistributorPersonnel/{sid}")
+    ResultBean<BasePersonalVo> getDistributorPersonnel(@PathVariable("sid") String sid);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java

@@ -92,5 +92,25 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<BaseDistribuDeailVo> getDistributorInfo(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean deleteInfo(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean deleteDistributorPersonnel(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<BasePersonalVo> getDistributorPersonnel(String sid) {
+        return null;
+    }
+
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseDistribuDeailVo.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.base.api.basedistributor.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/14 18:04
+ * @Description
+ */
+@Data
+public class BaseDistribuDeailVo implements Vo {
+    private static final long serialVersionUID = -1854151022333182857L;
+    @ApiModelProperty(value = "基础信息状态是否完善：0<值<1")
+    private Integer baseInfoState;
+    @ApiModelProperty(value = "开票信息状态")
+    private Integer invoiceInfoState;
+    @ApiModelProperty(value = "文件信息状态")
+    private Integer fileInfoState;
+
+    private List<BaseInfoListVo> records;
+}
+

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInfoListVo.java

@@ -0,0 +1,33 @@
+package com.yxt.anrui.base.api.basedistributor.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/14 18:08
+ * @Description
+ */
+@Data
+public class BaseInfoListVo implements Vo {
+    private static final long serialVersionUID = -7627404232931673522L;
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "身份类型key")
+    private String identityKey;
+
+    @ApiModelProperty(value = "身份类型value")
+    private String identityValue;
+
+    @ApiModelProperty(value = "联系电话")
+    private String mobile;
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+    @ApiModelProperty(value = "人员sid")
+    private String sid;
+
+    @ApiModelProperty(value = "经销商sid")
+    private String distributorSid;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BasePersonalVo.java

@@ -0,0 +1,30 @@
+package com.yxt.anrui.base.api.basedistributor.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/14 23:15
+ * @Description
+ */
+@Data
+public class BasePersonalVo implements Vo {
+    private static final long serialVersionUID = -8637873294371165497L;
+    @ApiModelProperty(value = "姓名")
+    private String name;
+    @ApiModelProperty(value = "身份类型key")
+    private String identityKey;
+    @ApiModelProperty(value = "身份类型value")
+    private String identityValue;
+    @ApiModelProperty(value = "联系电话")
+    private String mobile;
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+    @ApiModelProperty(value = "人员记录sid")
+    private String sid;
+
+    @ApiModelProperty(value = "经销商sid")
+    private String distributorSid;
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java

@@ -112,4 +112,8 @@ public interface BaseDistributorMapper extends BaseMapper<BaseDistributor> {
     BaseInfoVo getDistributorDetail(String sid);
 
     BaseInvoiceInfoVo getInfo(String sid);
+
+    BaseDistributor selectBySid(String sid);
+
+    BaseDistributor selectBySidOne(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml

@@ -165,4 +165,18 @@
         from base_distributor bd
         where bd.sid = #{sid}
     </select>
+
+    <select id="selectBySid" resultType="com.yxt.anrui.base.api.basedistributor.BaseDistributor">
+        select *
+        from base_distributor
+        where sid = #{sid}
+          and length(disName) = 0
+    </select>
+
+    <select id="selectBySidOne" resultType="com.yxt.anrui.base.api.basedistributor.BaseDistributor">
+        select *
+        from base_distributor
+        where sid = #{sid}
+          and length(invoPhone) = 0
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java

@@ -199,4 +199,24 @@ public class BaseDistributorRest implements BaseDistributorFeign {
     public ResultBean<BaseDisDetailsVo> getDistributorDetail(String distributorSid) {
         return baseDistributorService.getDistributorDetail(distributorSid);
     }
+
+    @Override
+    public ResultBean<BaseDistribuDeailVo> getDistributorInfo(String sid) {
+        return baseDistributorService.getDistributorInfo(sid);
+    }
+
+    @Override
+    public ResultBean deleteInfo(String sid) {
+        return baseDistributorService.deleteInfo(sid);
+    }
+
+    @Override
+    public ResultBean deleteDistributorPersonnel(String sid) {
+        return baseDistributorService.deleteDistributorPersonnel(sid);
+    }
+
+    @Override
+    public ResultBean<BasePersonalVo> getDistributorPersonnel(String sid) {
+        return baseDistributorService.getDistributorPersonnel(sid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -569,4 +569,69 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
         vo.setRecords(records);
         return rb.success().setData(vo);
     }
+
+    public ResultBean<BaseDistribuDeailVo> getDistributorInfo(String sid) {
+        ResultBean<BaseDistribuDeailVo> rb = ResultBean.fireFail();
+        BaseDistributor baseDistributor = fetchBySid(sid);
+        if (baseDistributor == null) {
+            return rb.setMsg("该经销商不存在");
+        }
+        BaseDistribuDeailVo vo = new BaseDistribuDeailVo();
+        //查询基础信息是否已完善
+        BaseDistributor distributor = baseMapper.selectBySid(sid);
+        if (distributor != null) {
+            vo.setBaseInfoState(0);
+        } else {
+            vo.setBaseInfoState(1);
+        }
+        BaseDistributor distributor1 = baseMapper.selectBySidOne(sid);
+        if (distributor1 != null) {
+            vo.setInvoiceInfoState(0);
+        } else {
+            vo.setInvoiceInfoState(1);
+        }
+        int count = baseDistributorAppendixService.selectByLinkSid(sid);
+        if (count > 0) {
+            vo.setFileInfoState(1);
+        } else {
+            vo.setFileInfoState(0);
+        }
+        List<BaseInfoListVo> records = baseDistributorStaffService.selectByListVo(sid);
+        records.removeAll(Collections.singleton(null));
+        vo.setRecords(records);
+        return rb.success().setData(vo);
+    }
+
+    public ResultBean deleteInfo(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseDistributor baseDistributor = fetchBySid(sid);
+        if (baseDistributor == null) {
+            return rb.setMsg("该数据不存在");
+        }
+        baseDistributorAppendixService.delByLinkSid(sid);
+        baseDistributorStaffService.deleteStaff(sid);
+        deleteBySid(sid);
+        return rb.success().setMsg("删除成功");
+    }
+
+    public ResultBean deleteDistributorPersonnel(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseDistributorStaff baseDistributorStaff = baseDistributorStaffService.fetchBySid(sid);
+        if (baseDistributorStaff == null) {
+            return rb.setMsg("该数据不存在");
+        }
+        baseDistributorStaffService.delBySid(sid);
+        return rb.success().setMsg("删除成功");
+    }
+
+    public ResultBean<BasePersonalVo> getDistributorPersonnel(String sid) {
+        ResultBean<BasePersonalVo> rb = ResultBean.fireFail();
+        BaseDistributorStaff baseDistributorStaff = baseDistributorStaffService.fetchBySid(sid);
+        if (baseDistributorStaff == null) {
+            return rb.setMsg("该数据不存在");
+        }
+        BasePersonalVo vo = new BasePersonalVo();
+        BeanUtil.copyProperties(baseDistributorStaff, vo);
+        return rb.success().setData(vo);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixMapper.java

@@ -44,4 +44,6 @@ public interface BaseDistributorAppendixMapper extends BaseMapper<BaseDistributo
     List<BaseDistributorAppendixVo> selByLinkSidAndAttachType(@Param("sid") String sid, @Param("attachType") String attachType);
 
     List<String> selByLinkSidAndAttachTypeOne(@Param("sid") String sid, @Param("s") String s, @Param("path") String path);
+
+    int selectByLinkSid(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixMapper.xml

@@ -43,4 +43,10 @@
         where linkSid = #{sid}
           and attachType = #{s}
     </select>
+
+    <select id="selectByLinkSid" resultType="int">
+        select count(*)
+        from base_distributor_appendix
+        where linkSid = #{sid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorappendix/BaseDistributorAppendixService.java

@@ -37,7 +37,7 @@ public class BaseDistributorAppendixService extends MybatisBaseService<BaseDistr
      */
     public List<BaseDistributorAppendixVo> selectListVo(BaseDistributorAppendixOneQuery query) {
         QueryWrapper<BaseDistributorAppendixVo> qw = buildQueryWrapper(query);
-        return baseMapper.selectListVo(qw,fileUploadComponent.getUrlPrefix());
+        return baseMapper.selectListVo(qw, fileUploadComponent.getUrlPrefix());
     }
 
 
@@ -60,6 +60,7 @@ public class BaseDistributorAppendixService extends MybatisBaseService<BaseDistr
         }
         return qw;
     }
+
     /**
      * 根据备案资料sid查询是否存在
      *
@@ -216,12 +217,16 @@ public class BaseDistributorAppendixService extends MybatisBaseService<BaseDistr
         return baseMapper.selByLinkSid(sid);
     }
 
-    public List<BaseDistributorAppendixVo> selByLinkSidAndAttachType(String sid,String attachType) {
-        return baseMapper.selByLinkSidAndAttachType(sid,attachType);
+    public List<BaseDistributorAppendixVo> selByLinkSidAndAttachType(String sid, String attachType) {
+        return baseMapper.selByLinkSidAndAttachType(sid, attachType);
     }
 
     public List<String> selByLinkSidAndAttachTypeOne(String sid, String s) {
         String path = fileUploadComponent.getUrlPrefix();
-        return baseMapper.selByLinkSidAndAttachTypeOne(sid,s,path);
+        return baseMapper.selByLinkSidAndAttachTypeOne(sid, s, path);
+    }
+
+    public int selectByLinkSid(String sid) {
+        return baseMapper.selectByLinkSid(sid);
     }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.base.api.basedistributor.app.BaseInfoListVo;
 import com.yxt.anrui.base.api.basedistributor.app.BaseRecordsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -64,4 +65,6 @@ public interface BaseDistributorStaffMapper extends BaseMapper<BaseDistributorSt
     List<BaseDistributorStaffVo> selbyDistributorSid(String sid);
 
     List<BaseRecordsVo> selectByVo(String sid);
+
+    List<BaseInfoListVo> selectByListVo(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffMapper.xml

@@ -44,6 +44,12 @@
                bs.remarks,
                bs.identityValue
         from base_distributor_staff bs
-        where distributorSid = #{sid}
+        where bs.distributorSid = #{sid}
+    </select>
+
+    <select id="selectByListVo" resultType="com.yxt.anrui.base.api.basedistributor.app.BaseInfoListVo">
+        select bs.name, bs.mobile, bs.remarks, bs.identityKey, bs.identityValue, bs.sid, bs.distributorSid
+        from base_distributor_staff bs
+        where bs.distributorSid = #{sid}
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorstaff/BaseDistributorStaffService.java

@@ -1,22 +1,10 @@
 package com.yxt.anrui.base.biz.basedistributorstaff;
 
-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.base.api.basedistributor.app.BaseInfoListVo;
 import com.yxt.anrui.base.api.basedistributor.app.BaseRecordsVo;
-import org.apache.commons.lang3.StringUtils;
-import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaff;
-import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffQuery;
 import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffVo;
-import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffDto;
-import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffFeign;
-
-import org.springframework.beans.factory.annotation.Autowired;
+import com.yxt.common.base.service.MybatisBaseService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -69,6 +57,7 @@ public class BaseDistributorStaffService extends MybatisBaseService<BaseDistribu
 
     /**
      * 根据经销商sid查询人员信息
+     *
      * @param sid 经销商sid
      * @return
      */
@@ -83,4 +72,8 @@ public class BaseDistributorStaffService extends MybatisBaseService<BaseDistribu
     public List<BaseRecordsVo> selectByVo(String sid) {
         return baseMapper.selectByVo(sid);
     }
+
+    public List<BaseInfoListVo> selectByListVo(String sid) {
+        return baseMapper.selectByListVo(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue

@@ -192,7 +192,7 @@
                 </el-col>
                 <el-col :span="8">
                   <el-form-item prop="idnumber">
-                    <el-input v-model="temp.idnumber" style="width:50%" maxlength="18 || 9" placeholder="请输入证件号码"
+                    <el-input v-model="temp.idnumber" style="width:50%" maxlength="18" placeholder="请输入证件号码"
                               class="addinputw" clearable
                               @keyup.native="temp.idnumber = oninput(temp.idnumber)"/>
                   </el-form-item>
@@ -609,13 +609,13 @@ export default {
             trigger: 'blur',
           },
         ],
-        idnumber: [
-          {
-            required: true,
-            // validator: identitycard,
-            trigger: 'blur',
-          },
-        ],
+        // idnumber: [
+        //   {
+        //     required: true,
+        //     // validator: identitycard,
+        //     trigger: 'blur',
+        //   },
+        // ],
         e_mail: [
           {
             required: true,

anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqing.vue

@@ -264,7 +264,7 @@ export default {
           applyStartDate: '',  // 申请开始日期
           applyEndDate: '',  // 申请结束日期
           callOutOrgSid: '',  // 调出分公司sid
-          createOrgSid: ''  // 创建组织
+          createOrgSid: this.useOrg  // 创建组织
         }
       }
       this.getPathSid()
@@ -278,13 +278,6 @@ export default {
           const data = resp.data
           _this.listQuery.total = data.total
           _this.dataList = data.records
-          for (var i = 0; i < this.dataList.length; i++) {
-            if (this.dataList[i].inspectedType == '1') {
-              this.dataList[i].inspectedType = '待验车'
-            } else {
-              this.dataList[i].inspectedType = '已验车'
-            }
-          }
         })
         .catch(() => {
           _this.tableLoading = false

anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingAdd.vue

@@ -28,22 +28,23 @@
         <el-form ref="dataForm" :model="temp" :rules="rules" :inline="true" label-width="120px">
           <div class="invoiceadd" style="margin-top: 5px;">
             <el-row>
-              <el-col :span="8">
-                <el-form-item prop="reason" label="调账类型">
-                  <el-select v-model="temp.accadjTypeValue" placeholder="请选择" clearable class="addinputw">
-                    <el-option v-for="item in accadjTypeValue_list" :key="item.dictKey" :label="item.dictValue"
-                               :value="item.dictKey"/>
-                  </el-select>
+              <el-col :span="8"> <!-- 默认为调入 -->
+                <el-form-item prop="reason" label="调车类型">
+                  <span>调入</span>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item prop="money" label="调出分公司">
-                  <el-input v-model="temp.money" placeholder="请输入" class="addinputw" clearable/>
+                <el-form-item prop="money" label="调入分公司">
+                  <span>{{temp.callInOrgName}}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item prop="money" label="调入分公司">
-                  <el-input v-model="temp.moneyOne" placeholder="请输入" class="addinputw" clearable/>
+                <el-form-item prop="money" label="调出分公司">
+                  <el-select v-model="temp.callOutOrgSid" placeholder="请选择" clearable class="addinputw"
+                             @change="callOutOrgSidChange">
+                    <el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name"
+                               :value="item.sid"/>
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -53,7 +54,7 @@
               <div class="titlename">
                 申请车辆列表
               </div>
-              <el-button size="medium" type="primary" @click="handleyudingcheliang" class="btntopbluebut">选择车辆
+              <el-button size="medium" type="primary" @click="handlediaocheliang" class="btntopbluebut">选择车辆
               </el-button>
             </div>
             <template class="tablelist">
@@ -68,7 +69,7 @@
                 </el-table-column>
                 <el-table-column width="210" label="车型" align="center">
                   <template slot-scope="scope">
-                    <span>{{ scope.row.modelName }}</span>
+                    <span>{{ scope.row.vehicleAlias }}</span>
                   </template>
                 </el-table-column>
                 <el-table-column width="260" label="常用配置" align="center">
@@ -78,7 +79,7 @@
                 </el-table-column>
                 <el-table-column width="180" label="合格证信息" align="center">
                   <template slot-scope="scope" @click="">
-                    <el-input v-model="scope.row.inboundDate" placeholder="请输入" class="addinputw"/>
+                    <el-input v-model="scope.row.certificate" placeholder="请输入" class="addinputw"/>
                   </template>
                 </el-table-column>
                 <el-table-column width="120" label="车架号" align="center">
@@ -88,26 +89,29 @@
                 </el-table-column>
                 <el-table-column width="110" label="内销价格" align="center">
                   <template slot-scope="scope">
-                    <span>{{ scope.row.inboundDate }}</span>
+                    <span>{{ scope.row.witPinMoney }}</span>
                   </template>
                 </el-table-column>
                 <el-table-column width="130" label="发票类型" align="center">
                   <template slot-scope="scope">
-                    <el-input v-model="scope.row.inboundDate" placeholder="请输入" class="addinputw"
-                              :readonly="depositVehicleList[scope.$index].inboundDate"/>
-                    <!--  <span>{{scope.row.inboundDate}}</span>-->
+                    <span>{{ scope.row.invoiceTypeValue }}</span>
+<!--                    <el-select v-model="temp.callOutOrgSid" placeholder="请选择" clearable class="addinputw"-->
+<!--                               @change="callOutOrgSidChange">-->
+<!--                      <el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name"-->
+<!--                                 :value="item.sid"/>-->
+<!--                    </el-select>-->
                   </template>
                 </el-table-column>
                 <el-table-column width="110" label="开票金额" align="center">
                   <template slot-scope="scope"><!-- 由发票类型决定,增值税票:开票金额=内销价格 -->
-                    <el-input v-model="scope.row.inboundDate" placeholder="请输入" class="addinputw" readonly
+                    <el-input v-model="scope.row.invoicinMoney" placeholder="请输入" class="addinputw" readonly
                               @keyup.native="scope.row.inboundDate = oninput(scope.row.inboundDate,2)"
                               :readonly="scope.row.inboundDate"/>
                   </template>
                 </el-table-column>
                 <el-table-column width="180" label="开票单位" align="center">
                   <template slot-scope="scope"><!-- 由发票类型决定,增值税票:开票单位=调入公司 -->
-                    <el-input v-model="scope.row.inboundDate" placeholder="请输入" class="addinputw" readonly
+                    <el-input v-model="scope.row.invoicinCompanyName" placeholder="请输入" class="addinputw" readonly
                               :readonly="scope.row.inboundDate"/>
                   </template>
                 </el-table-column>
@@ -119,7 +123,7 @@
                 </el-table-column>
                 <el-table-column width="200" label="备注" align="center">
                   <template slot-scope="scope">
-                    <span>{{ scope.row.inboundDate }}</span>
+                    <span>{{ scope.row.remarks }}</span>
                   </template>
                 </el-table-column>
               </el-table>
@@ -137,9 +141,9 @@
 <script>
 import diaochecheliangList from '@/views/supplychain/diaochekaipiaoshenqingguanli/relation/diaochecheliangList'
 import Upload from '@/components/uploadFile/uploadImg.vue'
-import req from '@/api/supplychain/purchasereturntowarehouse'
-import { getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
-import { typeValues } from '@/api/cheliang/dictcommons'
+import { getOrg, getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
+import { fetchDetailsBySid, save } from '@/api/supplychain/diaochekaipiaoshenqing.js'
+import { typeValues } from '@/api/supplychain/yancheguanli'
 
 export default {
   name: 'diaocheshenqingAdd',
@@ -154,18 +158,24 @@ export default {
       dialogStatus: '',
       index: 0,
       list: [],
-      depositVehicleList: [],
-      accadjTypeValue_list: [],
-      branchOfficeSid:'', // 当前登录人分公司sid
+      vehicleList: [],
+      branchOfficeSid: '', // 当前登录人分公司sid
+      useOrg_list: [],
       // 表单数据
       temp: {
-        sid: '', // 一条数据的sid
-        applicationCode: '',
-        name: '',
-        createTime: '',
-        money: '',
-        userSid: '', // 用户人sid
-        detailsList: []
+        sid: '',
+        createBySid: '',
+        applyDate: '',
+        accadjTypeKey: '',
+        accadjTypeValue: '',
+        callOutOrgSid: '',
+        callOutOrgName: '',
+        callInOrgSid: '',
+        callInOrgName: '',
+        useOrgSid: '',
+        createOrgSid: '',
+        nodeState: '',
+        baseShuntingInvoicinApplyeVehs: []
       },
       rules: {
         // money: [{ required: true, message: '费用不能为空', trigger: 'blur' }]
@@ -194,39 +204,94 @@ export default {
       }
       return val
     },
+    getType(){
+      typeValues({
+        type: 'invoiceType'
+      }).then((response) => {
+        if (response.code === '200' && response.data) {
+          this.accadjType_list = response.data
+        }
+      })
+    },
+    },
+    // 查询所有分公司
+    getListOrgAll() {
+      getOrg().then((res) => {
+        if (res.success) {
+          this.useOrg_list = res.data
+          this.getPathSid()
+        }
+      })
+    },
+    callOutOrgSidChange(val) {
+      const choosetItem = this.useOrg_list.filter((item) => item.sid == val)
+      this.temp.callOutOrgName = choosetItem[0].name
+      console.log('name:', this.temp.callOutOrgName, 'key:', this.temp.callOutOrgSid)
+    },
     // 根据登陆人sid查询分公司
     getPathSid() {
       const userSid = window.sessionStorage.getItem('userSid')
       getPathSidByUserSid({ userSid: userSid }).then((res) => {
         if (res.code === '200') {
-          this.branchOfficeSid = res.data
+          this.useOrg = res.data
+          this.temp.createOrgSid = res.data
+          this.temp.callInOrgSid = res.data
+          const name = this.useOrg_list.filter((item) => item.sid == this.temp.callInOrgSid)
+          this.temp.callInOrgName = name[0].name
         }
       })
     },
-    getType() {
-      typeValues({}).then((res) => {
-        if (res.code === '200') {
-          this.manPurOrderType_list = res.data
-        }
+    // 明细表添加一行数据
+    handlediaocheliang() {
+      if (this.temp.callOutOrgSid == '') {
+        this.$message({
+          showClose: true,
+          message: '请选择调出分公司',
+          type: 'error'
+        })
+        return
+      }
+      if (this.temp.callInOrgSid == '') {
+        this.$message({
+          showClose: true,
+          message: '请选择调入分公司',
+          type: 'error'
+        })
+        return
+      }
+      this.isXuanche = true
+      const vinNoList = []
+      this.list.forEach(element => {
+        vinNoList.push(element.sid)
       })
+      this.$refs['xuanChe'].showCheList( this.temp.callOutOrgSid, this.temp.callInOrgSid, vinNoList)
+    },
+    // 明细表删除一行数据
+    dataDelete(index, row) {
+      console.log('index', index)
+      console.log('row', row)
+      this.list.splice(index, 1)
+    },
+    resetState() {
+      this.isXuanche = false
+    },
+    selectVehicle(vehicleList) {
+      console.log('vehicleList', vehicleList)
+      this.vehicleList = vehicleList
+      for (var i = 0; i < vehicleList.length; i++) {
+        this.list.push({})
+      }
+      console.log('车辆表数据', this.list)
     },
     showAdd() {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
       this.temp.name = window.sessionStorage.getItem('name')
-      this.temp.userSid = window.sessionStorage.getItem('userSid')
-      req.detailsInfo(this.temp.sid).then(resp => {
-        const data = resp.data
-        this.temp.applicationCode = data.applicationCode
-        this.temp.createTime = data.createTime
-      }).catch(e => {
-        this.submitdisabled = false
-      })
+      this.temp.createBySid = window.sessionStorage.getItem('userSid')
       this.dialogStatus = 'add'
       this.viewTitle = '【新增】调车开票申请'
-      this.getPathSid()
-      this.getType()
+      this.getListOrgAll()
     },
     showEdit(row) {
       this.$nextTick(() => {
@@ -234,32 +299,25 @@ export default {
       })
       this.dialogStatus = 'edit'
       this.viewTitle = '【编辑】调车开票申请'
-      req.detailsInfo({
-        sid: row.sid
-      }).then(resp => {
+      fetchDetailsBySid(row.sid).then(resp => {
         if (resp.success) {
           const data = resp.data
           this.temp = data
-          this.list = data.voList
-          // ---修改名称 先把temp对象转化成json字符串做替换字符串操作，再转化成temp对象---
-          this.temp = JSON.parse(JSON.stringify(this.temp).replace(/voList/g, 'detailsList')
-          )
+          this.list = data.baseShuntingInvoicinApplyeVehs
           console.log('编辑初始化', this.temp)
         }
       }).catch(e => {
         this.submitdisabled = false
       })
-      this.getPathSid()
-      this.getType()
+      this.getListOrgAll()
     },
-
     handleCreate() {
       const _this = this
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
           this.submitdisabled = true
-          this.temp.detailsList = this.list
-          req.save(this.temp).then(resp => {
+          this.temp.baseShuntingInvoicinApplyeVehs = this.list
+          save(this.temp).then(resp => {
             this.submitdisabled = false
             if (resp.success) {
               if (resp.success) {
@@ -279,13 +337,20 @@ export default {
       if (isreload === 'true') this.$emit('reloadlist')
       this.temp = {
         sid: '',
-        applicationCode: '',
-        name: '',
-        createTime: '',
-        userSid: '',
-        detailsList: []
-      },
-        this.list = []
+        createBySid: '',
+        applyDate: '',
+        accadjTypeKey: '',
+        accadjTypeValue: '',
+        callOutOrgSid: '',
+        callOutOrgName: '',
+        callInOrgSid: '',
+        callInOrgName: '',
+        useOrgSid: '',
+        createOrgSid: '',
+        nodeState: '',
+        baseShuntingInvoicinApplyeVehs: []
+      }
+      this.list = []
       this.$refs['dataForm'].resetFields()
       this.$emit('doback')
     },
@@ -299,51 +364,23 @@ export default {
             cancelButtonText: '取消',
             type: 'warning'
           }).then(() => {
-            this.temp.detailsList = this.list
-            req.submitVehicleReturn(this.temp).then(resp => {
-              this.submitdisabled = false
-              if (resp.success) {
-                if (resp.success) {
-                  _this.handleReturn('true')
-                }
-              }
-            }).catch(() => {
-              this.submitdisabled = false
-            })
+            this.temp.baseShuntingInvoicinApplyeVehs = this.list
+            // submitVehicleReturn(this.temp).then(resp => {
+            //   this.submitdisabled = false
+            //   if (resp.success) {
+            //     if (resp.success) {
+            //       _this.handleReturn('true')
+            //     }
+            //   }
+            // }).catch(() => {
+            //   this.submitdisabled = false
+            // })
           })
         } else {
           return false
         }
       })
-    },
-    // 明细表添加一行数据
-    handleyudingcheliang() {
-      this.isXuanche = true
-      const vinNoList = []
-      this.list.forEach(element => {
-        vinNoList.push(element.vinNo)
-      })
-      this.$refs['xuanChe'].loadVinNo(vinNoList)
-    },
-    // 明细表删除一行数据
-    dataDelete(index, row) {
-      console.log('index', index)
-      console.log('row', row)
-      this.list.splice(index, 1)
-    },
-    resetState() {
-      this.isXuanche = false
-    },
-    selectVehicle(depositVehicleList) {
-      console.log('depositVehicleList', depositVehicleList)
-      this.depositVehicleList = depositVehicleList
-      for (var i = 0; i < depositVehicleList.length; i++) {
-        this.list.push({
-
-        })
-      }
-      console.log('车辆表数据', this.list)
-    },
+    }
 
   }
 }

anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/relation/diaochecheliangList.vue

@@ -13,15 +13,8 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form :inline="true" class="tab-header">
-<!--              <el-form-item label="调车类型">-->
-<!--                <el-select v-model="listQuery.params.purchaseType" placeholder="请选择" clearable class="addinputw">-->
-<!--                  <el-option v-for="item in purchaseType_list" :key="item.dictKey" :label="item.dictValue"-->
-<!--                             :value="item.dictKey"/>-->
-<!--                </el-select>-->
-<!--                &lt;!&ndash;  <el-input v-model="listQuery.params.vin" placeholder="请输入车架号" clearable/>&ndash;&gt;-->
-<!--              </el-form-item>-->
               <el-form-item label="车架号">
-                <el-input v-model="listQuery.params.vin" placeholder="请输入名称" clearable/>
+                <el-input v-model="listQuery.params.vinNo" placeholder="请输入名称" clearable/>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -47,17 +40,17 @@
             </el-table-column>
             <el-table-column label="调车类型" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.color }}</span>
+                <span>{{ scope.row.shuntingType }}</span>
               </template>
             </el-table-column>
             <el-table-column label="调出分公司" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.location }}</span>
+                <span>{{ scope.row.buyerOrgName }}</span>
               </template>
             </el-table-column>
             <el-table-column label="调入分公司" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.guidedPrice }}</span>
+                <span>{{ scope.row.sellerOrgName }}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -76,7 +69,7 @@
 <script>
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
-import req from '@/api/supplychain/purchasereturntowarehouse'
+import { fetchVeh } from '@/api/supplychain/diaochekaipiaoshenqing'
 
 export default {
   name: 'diaochecheliangList',
@@ -93,15 +86,6 @@ export default {
       btndisabled: false,
       viewState: 1, // 1、列表 2、添加-车辆预定 3、编辑  4、查看 5、订金-定金收取
       // 查询 -----------
-      carbrand_list: [], // 品牌
-      vehicleFunction_list: [], // 功能
-      productLine_list: [], // 系列
-      gearboxType_list: [], // 变速箱
-      driveForm_list: [], // 驱动
-      emissionStandard_list: [], // 排放标准
-      power_list: [], // 马力
-      fuelType_list: [], // 燃料
-      vehicleVersion_list: [], // 版本
       tableKey: 0,
       list: [],
       sids: [],
@@ -112,25 +96,15 @@ export default {
         current: 1,
         size: 20,
         params: {
-          carbrand: '',
-          driveForm: '',
-          emissionStandard: '',
-          fuelType: '',
-          gearboxType: '',
-          lockedState: '',
-          power: '',
-          productLine: '',
-          vehicleState: '',
-          vehicleType: '',
-          vehicleVersion: ''
+          vinNo: '',
+          callOutOrgSid: '',
+          callInOrgSid: '',
+          sids: []
         }
       },
-      selectDate: undefined,
-      temp: {}, // 添加和编辑
       vinNoList: [],
-      depositVehicleList: [],
+      vehicle_list: [],
       visible: true,
-      hetongdanganguanliInfoShow: false
       // ------------------------------------
     }
   },
@@ -140,6 +114,12 @@ export default {
       this.handleFilter()
       this.getType()
     },
+    showCheList(callOutOrgSid, callInOrgSid, vinNoList){
+      this.listQuery.params.callOutOrgSid = callOutOrgSid
+      this.listQuery.params.callInOrgSid = callInOrgSid
+      this.listQuery.params.sids = vinNoList
+      this.getList()
+    },
     // 搜索条件效果
     clicksearchShow() {
       this.isSearchShow = !this.isSearchShow
@@ -151,28 +131,14 @@ export default {
     },
     // 重置
     handleReset() {
-      this.listQuery = {
-        current: 1,
-        size: 20,
-        params: {
-          carbrand: '',
-          driveForm: '',
-          emissionStandard: '',
-          fuelType: '',
-          gearboxType: '',
-          lockedState: '',
-          power: '',
-          productLine: '',
-          vehicleState: '',
-          vehicleType: '',
-          vehicleVersion: ''
-        }
-      }
+      this.listQuery.current = 1
+      this.listQuery.size = 20
+      this.listQuery.params.vinNo = ''
     },
     // 勾选
     handleSelectionChange(row) {
       console.log('row', row)
-      this.depositVehicleList = row
+      this.vehicle_list = row
       const aa = []
       row.forEach((element) => {
         aa.push(element.sid)
@@ -183,38 +149,46 @@ export default {
     // 确认
     handleConfirm() {
       if (this.sids.length > 0) {
-        if (this.vinNoList.length > 0) {
-          console.log('已选择的数据', this.vinNoList)
-          for (var i = 0; i < this.vinNoList.length; i++) {
-            for (var j = 0; j < this.depositVehicleList.length; j++) {
-              if (this.vinNoList[i] == this.depositVehicleList[j].vinNo) {
-                const index = this.depositVehicleList.findIndex(val => {
-                  return this.depositVehicleList[j].vinNo === this.vinNoList[i]
-                })
-                this.depositVehicleList.splice(index, 1)
-                console.log('进入if判断', index)
-              }
-            }
-          }
-
-        }
-        this.$emit('handleVehicle', this.depositVehicleList)
+        // if (this.vinNoList.length > 0) {
+        //   console.log('已选择的数据', this.vinNoList)
+          // for (var i = 0; i < this.vinNoList.length; i++) {
+          //   for (var j = 0; j < this.vehicle_list.length; j++) {
+          //     if (this.vinNoList[i] == this.vehicle_list[j].vinNo) {
+          //       const index = this.vehicle_list.findIndex(val => {
+          //         return this.vehicle_list[j].vinNo === this.vinNoList[i]
+          //       })
+          //       this.vehicle_list.splice(index, 1)
+          //       console.log('进入if判断', index)
+          //     }
+          //   }
+          // }
+        // }
+        this.$emit('handleVehicle', this.vehicle_list)
         this.$nextTick(() => {
           this.$refs.multipleTable.clearSelection()
         })
         this.handleReturn()
       } else {
-        this.$notify({
-          title: '提示',
-          message: '没有选择车辆!',
-          type: 'error',
-          duration: 2000
+        this.$message({
+          showClose: true,
+          message: '请选择车辆!',
+          type: 'error'
         })
         return
       }
     },
     // 返回
     handleReturn() {
+      this.listQuery = {
+        current: 1,
+        size: 20,
+        params: {
+          vinNo: '',
+          callOutOrgSid: '',
+          callInOrgSid: '',
+          sids: []
+        }
+      }
       this.$emit('doback') // 到父页面
     },
     // 序号
@@ -226,15 +200,7 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
-      req.pagerList({
-        current: this.listQuery.current,
-        size: this.listQuery.size,
-        params: {
-          modelName: this.listQuery.modelName,
-          carModel: this.listQuery.carModel,
-          brandName: this.listQuery.brandName
-        }
-      }).then((response) => {
+      fetchVeh(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
         if (
@@ -244,6 +210,14 @@ export default {
         ) {
           this.list = response.data.records
           this.total = response.data.total
+          for (var i = 0; i < this.list.length; i++) {
+            if (this.list[i].shuntingType == '0') {
+              this.list[i].shuntingType = '调入'
+            }
+            if (this.list[i].shuntingType == '1') {
+              this.list[i].shuntingType = '调出'
+            }
+          }
         } else {
           this.list = []
           this.total = 0
@@ -254,10 +228,6 @@ export default {
     handleFilter() {
       this.listQuery.current = 1
       this.getList()
-    },
-    // 排除已选信息
-    loadVinNo(vinNoList) {
-      this.vinNoList = vinNoList
     }
   }
 }

anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/relation/tiaozhangcheliangList.vue

@@ -278,10 +278,6 @@ export default {
     handleFilter() {
       this.listQuery.current = 1
       this.getList()
-    },
-    // 排除已选信息
-    loadVinNo(vinNoList) {
-      this.vinNoList = vinNoList
     }
   }
 }

anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanli.vue

@@ -274,7 +274,7 @@ export default {
           accadjTypeKey: '',
           callOutOrgSid: '',
           callInOrgSid: '',
-          createOrgSid: '' // window.sessionStorage.getItem('orgSid'),
+          createOrgSid: this.useOrg // window.sessionStorage.getItem('orgSid'),
         }
       }
       this.getPathSid()
@@ -288,13 +288,6 @@ export default {
           const data = resp.data
           _this.listQuery.total = data.total
           _this.dataList = data.records
-          for (var i = 0; i < this.dataList.length; i++) {
-            if (this.dataList[i].inspectedType == '1') {
-              this.dataList[i].inspectedType = '待验车'
-            } else {
-              this.dataList[i].inspectedType = '已验车'
-            }
-          }
         })
         .catch(() => {
           _this.tableLoading = false
@@ -302,7 +295,7 @@ export default {
     },
     getType() {
       typeValues({
-        type: 'accadjType '
+        type: 'accadjType'
       }).then((response) => {
         if (response.code === '200' && response.data) {
           this.accadjType_list = response.data

anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliInfo.vue

@@ -45,47 +45,47 @@
             <template class="tablelist">
               <el-table :data="list" border style="width: 100%" :index="index">
                 <el-table-column align="center" fixed label="序号" type="index" width="50"/>
-                <el-table-column label="车型名称" align="center">
+                <el-table-column label="车型名称" align="center" width="190px">
                   <template slot-scope="scope">
                     <span>{{ scope.row.vehicleAlias }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="常用配置" align="center">
+                <el-table-column label="常用配置" align="center" width="360">
                   <template slot-scope="scope">
                     <span>{{ scope.row.configName }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="车架号" align="center">
+                <el-table-column label="车架号" align="center" width="120">
                   <template slot-scope="scope" @click="">
                     <span>{{ scope.row.vinNo }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="库存地点" align="center">
+                <el-table-column label="库存地点" align="center" width="200">
                   <template slot-scope="scope" @click="">
                     <span>{{ scope.row.inventoryLocationName }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="内销价格" align="center">
+                <el-table-column label="内销价格" align="center" width="90">
                   <template slot-scope="scope">
                     <span>{{ scope.row.witPinMoney }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="发票类型" align="center">
+                <el-table-column label="发票类型" align="center" width="140">
                   <template slot-scope="scope">
                     <span>{{ scope.row.invoiceTypeValue }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="运费" align="center">
+                <el-table-column label="运费" align="center" width="90">
                   <template slot-scope="scope">
                     <span>{{ scope.row.freight }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="运费承担方" align="center">
+                <el-table-column label="运费承担方" align="center" width="120">
                   <template slot-scope="scope">
                     <span>{{ scope.row.freightUndertakerName }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="备注" align="center">
+                <el-table-column label="备注" align="left" header-align="center" width="300">
                   <template slot-scope="scope">
                     <span>{{ scope.row.remarks }}</span>
                   </template>

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisInitDetailsVo.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.terminal.api.autoservice.distributor;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/14 21:43
+ * @Description
+ */
+@Data
+public class DisInitDetailsVo implements Vo {
+    private static final long serialVersionUID = -8457454906785752187L;
+
+    @ApiModelProperty(value = "基础信息状态是否完善：0<值<1")
+    private Integer baseInfoState;
+    @ApiModelProperty(value = "开票信息状态")
+    private Integer invoiceInfoState;
+    @ApiModelProperty(value = "文件信息状态")
+    private Integer fileInfoState;
+
+    private List<DisInitRecordVo> records;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisInitRecordVo.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.terminal.api.autoservice.distributor;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/14 21:44
+ * @Description
+ */
+@Data
+public class DisInitRecordVo implements Vo {
+    private static final long serialVersionUID = 6206055217585777689L;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "身份类型key")
+    private String identityKey;
+
+    @ApiModelProperty(value = "身份类型value")
+    private String identityValue;
+
+    @ApiModelProperty(value = "联系电话")
+    private String mobile;
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+    @ApiModelProperty(value = "人员sid")
+    private String sid;
+
+    @ApiModelProperty(value = "经销商sid")
+    private String distributorSid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisPersonVo.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.terminal.api.autoservice.distributor;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/14 23:29
+ * @Description
+ */
+@Data
+public class DisPersonVo implements Vo {
+    private static final long serialVersionUID = -7887942354086920464L;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+    @ApiModelProperty(value = "身份类型key")
+    private String identityKey;
+    @ApiModelProperty(value = "身份类型value")
+    private String identityValue;
+    @ApiModelProperty(value = "联系电话")
+    private String mobile;
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+    @ApiModelProperty(value = "人员记录sid")
+    private String sid;
+
+    @ApiModelProperty(value = "经销商sid")
+    private String distributorSid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DistributorFeign.java

@@ -26,9 +26,28 @@ public interface DistributorFeign {
     @ResponseBody
     ResultBean<PagerVo<DistributorVo>> getDistributorList(@RequestBody PagerQuery<DistributorQuery> pagerQuery);
 
-    @ApiOperation("移动端-经销商分页列表")
+    @ApiOperation("移动端-经销商详情")
     @GetMapping("/getDistributorDetail/{distributorSid}")
     @ResponseBody
     ResultBean<DisDetailsVo> getDistributorDetail(@PathVariable(value = "distributorSid") String distributorSid);
 
+    @ApiOperation("移动端-经销商初始化详情")
+    @GetMapping("/getDistributorInfo/{distributorSid}")
+    @ResponseBody
+    ResultBean<DisInitDetailsVo> getDistributorInfo(@PathVariable(value = "distributorSid") String sid);
+
+    @ApiOperation("移动端-经销商删除")
+    @DeleteMapping("/deleteDistributor/{distributorSid}")
+    @ResponseBody
+    ResultBean deleteDistributor(@PathVariable("distributorSid") String sid);
+
+    @ApiOperation("移动端-经销商删除人员")
+    @DeleteMapping("/deleteDistributorPersonnel/{sid}")
+    @ResponseBody
+    ResultBean deleteDistributorPersonnel(@PathVariable(value = "sid") String sid);
+
+    @ApiOperation("移动端-经销商人员初始化")
+    @GetMapping("/getDistributorPersonnel/{sid}")
+    @ResponseBody
+    ResultBean<DisPersonVo> getDistributorPersonnel(@PathVariable("sid")String sid);
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorRest.java

@@ -1,9 +1,6 @@
 package com.yxt.anrui.terminal.biz.autoservice.distributor;
 
-import com.yxt.anrui.terminal.api.autoservice.distributor.DisDetailsVo;
-import com.yxt.anrui.terminal.api.autoservice.distributor.DistributorFeign;
-import com.yxt.anrui.terminal.api.autoservice.distributor.DistributorQuery;
-import com.yxt.anrui.terminal.api.autoservice.distributor.DistributorVo;
+import com.yxt.anrui.terminal.api.autoservice.distributor.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -34,4 +31,24 @@ public class DistributorRest implements DistributorFeign {
     public ResultBean<DisDetailsVo> getDistributorDetail(String sid) {
         return distributorService.getDistributorDetail(sid);
     }
+
+    @Override
+    public ResultBean<DisInitDetailsVo> getDistributorInfo(String sid) {
+        return distributorService.getDistributorInfo(sid);
+    }
+
+    @Override
+    public ResultBean deleteDistributor(String sid) {
+        return distributorService.deleteDistributor(sid);
+    }
+
+    @Override
+    public ResultBean deleteDistributorPersonnel(String sid) {
+        return distributorService.deleteDistributorPersonnel(sid);
+    }
+
+    @Override
+    public ResultBean<DisPersonVo> getDistributorPersonnel(String sid) {
+        return distributorService.getDistributorPersonnel(sid);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/distributor/DistributorService.java

@@ -3,12 +3,8 @@ package com.yxt.anrui.terminal.biz.autoservice.distributor;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.yxt.anrui.base.api.basedistributor.BaseDistributorFeign;
-import com.yxt.anrui.base.api.basedistributor.app.BaseDisDetailsVo;
-import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsQuery;
-import com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsVo;
-import com.yxt.anrui.terminal.api.autoservice.distributor.DisDetailsVo;
-import com.yxt.anrui.terminal.api.autoservice.distributor.DistributorQuery;
-import com.yxt.anrui.terminal.api.autoservice.distributor.DistributorVo;
+import com.yxt.anrui.base.api.basedistributor.app.*;
+import com.yxt.anrui.terminal.api.autoservice.distributor.*;
 import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -53,4 +49,44 @@ public class DistributorService {
         BeanUtil.copyProperties(getDistributorDetail.getData(), vo);
         return rb.success().setData(vo);
     }
+
+    public ResultBean<DisInitDetailsVo> getDistributorInfo(String sid) {
+        ResultBean<DisInitDetailsVo> rb = ResultBean.fireFail();
+        ResultBean<BaseDistribuDeailVo> getDistributorInfo = baseDistributorFeign.getDistributorInfo(sid);
+        if (!getDistributorInfo.getSuccess()) {
+            return rb.setMsg(getDistributorInfo.getMsg());
+        }
+        DisInitDetailsVo vo = new DisInitDetailsVo();
+        BeanUtil.copyProperties(getDistributorInfo.getData(), vo);
+        return rb.success().setData(vo);
+    }
+
+    public ResultBean deleteDistributor(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        ResultBean resultBean = baseDistributorFeign.deleteInfo(sid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setMsg("删除成功");
+    }
+
+    public ResultBean deleteDistributorPersonnel(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        ResultBean resultBean = baseDistributorFeign.deleteDistributorPersonnel(sid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setMsg("删除成功");
+    }
+
+    public ResultBean<DisPersonVo> getDistributorPersonnel(String sid) {
+        ResultBean<DisPersonVo> rb = ResultBean.fireFail();
+        ResultBean<BasePersonalVo> resultBean = baseDistributorFeign.getDistributorPersonnel(sid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        DisPersonVo disPersonVo = new DisPersonVo();
+        BeanUtil.copyProperties(resultBean.getData(), disPersonVo);
+        return rb.success().setData(disPersonVo);
+    }
 }