Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java

@@ -29,6 +29,9 @@ 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.basemiddleman.*;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
@@ -65,6 +68,8 @@ public class BaseMiddlemanService extends MybatisBaseService<BaseMiddlemanMapper
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private SysUserFeign sysUserFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
 
     public PagerVo<BaseMiddlemanVo> listPageVo(PagerQuery<BaseMiddlemanQuery> pq) {
         IPage<BaseMiddleman> page = PagerUtil.queryToPage(pq);
@@ -90,7 +95,36 @@ public class BaseMiddlemanService extends MybatisBaseService<BaseMiddlemanMapper
             BeanUtil.copyProperties(dto, baseMiddleman, "sid");
             baseMiddleman.setCreateOrgSid(resultBean.getData());
             baseMiddleman.setUseOrgSid(resultBean.getData());
-            String middleCode = HanZiConverterPinYin.getPinYinFirst(baseMiddleman.getName()) + baseMiddleman.getMobile();
+            String customerNoPrefix = "";
+            //查询业务员的分公司简称和部门编码
+            ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
+            if (!userVoResultBean.getSuccess()) {
+                return rb.setMsg(userVoResultBean.getMsg());
+            }
+            ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+            if (staffOrgResultBean.getSuccess()) {
+                SysStaffOrg sysStaffOrg = staffOrgResultBean.getData();
+                if (sysStaffOrg != null) {
+                    ResultBean<String> resultBean1 = sysStaffOrgFeign.getOrgSidByPath(sysStaffOrg.getOrgSidPath());
+                    if (resultBean1.getSuccess()) {
+                        String osid = resultBean1.getData();
+                        if (StringUtils.isNotBlank(osid)) {
+                            ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(osid);
+                            if (sysOrganizationVoResultBean.getSuccess()) {
+                                SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData();
+                                customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgAbbre();
+                            }
+                        }
+                    }
+                    String orgSid1 = sysStaffOrg.getOrgSid();
+                    ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgSid1);
+                    if (sysOrganizationVoResultBean.getSuccess()) {
+                        SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData();
+                        customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgCode();
+                    }
+                }
+            }
+            String middleCode = customerNoPrefix + HanZiConverterPinYin.getPinYinFirst(baseMiddleman.getName()) + baseMiddleman.getMobile();
             baseMiddleman.setMiddleCode(middleCode);
             baseMapper.insert(baseMiddleman);
         } else {
@@ -99,7 +133,36 @@ public class BaseMiddlemanService extends MybatisBaseService<BaseMiddlemanMapper
                 return rb.setMsg("该数据不存在");
             }
             BeanUtil.copyProperties(dto, baseMiddleman);
-            String middleCode = HanZiConverterPinYin.getPinYinFirst(baseMiddleman.getName()) + baseMiddleman.getMobile();
+            String customerNoPrefix = "";
+            //查询业务员的分公司简称和部门编码
+            ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
+            if (!userVoResultBean.getSuccess()) {
+                return rb.setMsg(userVoResultBean.getMsg());
+            }
+            ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+            if (staffOrgResultBean.getSuccess()) {
+                SysStaffOrg sysStaffOrg = staffOrgResultBean.getData();
+                if (sysStaffOrg != null) {
+                    ResultBean<String> resultBean1 = sysStaffOrgFeign.getOrgSidByPath(sysStaffOrg.getOrgSidPath());
+                    if (resultBean1.getSuccess()) {
+                        String osid = resultBean1.getData();
+                        if (StringUtils.isNotBlank(osid)) {
+                            ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(osid);
+                            if (sysOrganizationVoResultBean.getSuccess()) {
+                                SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData();
+                                customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgAbbre();
+                            }
+                        }
+                    }
+                    String orgSid1 = sysStaffOrg.getOrgSid();
+                    ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgSid1);
+                    if (sysOrganizationVoResultBean.getSuccess()) {
+                        SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData();
+                        customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgCode();
+                    }
+                }
+            }
+            String middleCode = customerNoPrefix + HanZiConverterPinYin.getPinYinFirst(baseMiddleman.getName()) + baseMiddleman.getMobile();
             baseMiddleman.setMiddleCode(middleCode);
             baseMapper.updateById(baseMiddleman);
         }
@@ -116,12 +179,12 @@ public class BaseMiddlemanService extends MybatisBaseService<BaseMiddlemanMapper
         BaseMiddleQuery params = query.getParams();
         QueryWrapper<BaseMiddleman> qw = new QueryWrapper<>();
         if (params != null) {
-            if(StringUtils.isBlank(params.getOrgPath())){
+            if (StringUtils.isBlank(params.getOrgPath())) {
                 if (StringUtils.isNotBlank(params.getUserSid())) {
                     ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid());
                     qw.eq("useOrgSid", resultBean.getData());
                 }
-            }else{
+            } else {
                 String orgPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
                 qw.eq("useOrgSid", orgPath);
             }
@@ -138,7 +201,7 @@ public class BaseMiddlemanService extends MybatisBaseService<BaseMiddlemanMapper
         List<BaseMiddleListVo> list = new ArrayList<>();
         //查询用户sid
         ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.selectByStaffsid(staffSid);
-        if(sysUserVoResultBean.getSuccess()){
+        if (sysUserVoResultBean.getSuccess()) {
             list = baseMapper.selectMiddleList(sysUserVoResultBean.getData().getSid());
         }
         return rb.success().setData(list);

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java

@@ -119,4 +119,8 @@ public interface CrmCustomerTempMapper extends BaseMapper<CrmCustomerTemp> {
     CrmCustomerTempVo selByMobile(@Param("mobile") String mobile);
 
     List<CrmCustomerTempListVo> selectCustomerList(@Param("orgSid") String orgSid, @Param("staffSid") String staffSid);
+
+    CrmCustomerTempVo selectNo(String customerNo);
+
+    CrmCustomerTempVo selectNo1(@Param("customerNo") String customerNo, @Param("sid") String sid);
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml

@@ -13,7 +13,7 @@
                 FROM crm_visit cvi
                 WHERE cct.sid = cvi.customerSid) gjcounts
         FROM crm_customer_temp cct
-        LEFT JOIN anrui_portal.sys_organization so ON cct.createOrgSid = so.sid
+                 LEFT JOIN anrui_portal.sys_organization so ON cct.createOrgSid = so.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -211,4 +211,17 @@
         where createOrgSid = #{orgSid}
           and staffSid = #{staffSid}
     </select>
+
+    <select id="selectNo" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo">
+        select *
+        from crm_customer_temp
+        where customerNo = #{customerNo}
+    </select>
+
+    <select id="selectNo1" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo">
+        select *
+        from crm_customer_temp
+        where customerNo = #{customerNo}
+          and sid != #{sid}
+    </select>
 </mapper>

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -236,8 +236,11 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         map.put("staffSid", userOrgInfoVo.getStaffSid());
         if (StringUtils.isBlank(dto.getSid())) { // 新增
             if (StringUtils.isNotBlank(dto.getMobile())) { // 有手机号
-                map.put("mobile", dto.getMobile());
-                CrmCustomerTempVo customerTempVo = baseMapper.selectByMobileOrWx(map);
+                //查询业务员的分公司简称和部门简称
+                String customerNo = getPrefix(userOrgInfoVo.getStaffSid(), dto.getName(), dto.getMobile());
+                CrmCustomerTempVo customerTempVo = baseMapper.selectNo(customerNo);
+//                map.put("mobile", dto.getMobile());
+//                CrmCustomerTempVo customerTempVo = baseMapper.selectByMobileOrWx(map);
                 if (customerTempVo != null) {
                     // 是否为当前用户的客户
                     if (customerTempVo.getStaffSid().equals(userOrgInfoVo.getStaffSid())) {
@@ -267,14 +270,20 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
             }
         } else { // 修改
             if (StringUtils.isNotBlank(dto.getMobile())) {
-                AppCrmCustomerTempInfoVo appCrmCustomerTempInfoVo = baseMapper.selectBySid(dto.getSid());
+                //查询业务员的分公司简称和部门简称
+                String customerNo = getPrefix(userOrgInfoVo.getStaffSid(), dto.getName(), dto.getMobile());
+                CrmCustomerTempVo customerTempVo = baseMapper.selectNo1(customerNo,dto.getSid());
+                if(customerTempVo != null){
+                    return new ResultBean().fail().setMsg("该手机号已绑定其它客户，请重新添加");
+                }
+               /* AppCrmCustomerTempInfoVo appCrmCustomerTempInfoVo = baseMapper.selectBySid(dto.getSid());
                 String mobile = appCrmCustomerTempInfoVo.getMobile();
                 if (!mobile.equals(dto.getMobile())) {
                     int count = baseMapper.selBySidAndMobile(dto.getSid(), dto.getMobile());
                     if (count > 0) {
                         return new ResultBean().fail().setMsg("该手机号已绑定其它客户，请重新添加");
                     }
-                }
+                }*/
             }
 //            if (StringUtils.isNotBlank(dto.getWeixin())) {
 //                AppCrmCustomerTempInfoVo appCrmCustomerTempInfoVo = baseMapper.selectBySid(dto.getSid());
@@ -832,7 +841,10 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         String staffSid = sysUserInfoVo.getStaffSid();
         //根据客户的手机号以及当前登录者所在部门的sid查询该部门内是否有重复的
         if (StringUtils.isNotBlank(mobile)) {
-            CrmCustomerTempVo crmCustomerTempVo = baseMapper.selectByMobile(staffSid, mobile);
+            //客户编码
+            String customerNo = getPrefix(staffSid, dto.getName(), dto.getMobile());
+            CrmCustomerTempVo crmCustomerTempVo = baseMapper.selectNo(customerNo);
+//            CrmCustomerTempVo crmCustomerTempVo = baseMapper.selectByMobile(staffSid, mobile);
             if (crmCustomerTempVo == null) {
                 //新增潜在客户信息
                 CrmCustomerTemp crmCustomerTemp = saveCrmCustomerTemp(dto, sysUserInfoVo);
@@ -891,7 +903,7 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
             crmCustomerTemp.setFollow_state(dictCommonFeign.selectBykey(key, DictCommonType.FOLLOW_STATE).getData().getDictValue());
         }
         String customerNoPrefix = "";
-        //查询业务员的分公司简称和部门简称
+        //查询业务员的分公司简称和部门编码
         ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(sysUserInfoVo.getStaffSid());
         if (staffOrgResultBean.getSuccess()) {
             SysStaffOrg sysStaffOrg = staffOrgResultBean.getData();
@@ -916,7 +928,7 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
             }
         }
         //客户编码
-        String customerNo = customerNoPrefix + HanZiConverterPinYin.getPinYinFirst(crmCustomerTemp.getName()) + crmCustomerTemp.getMobile();
+        String customerNo = getPrefix(crmCustomerTemp.getStaffSid(), crmCustomerTemp.getName(), crmCustomerTemp.getMobile());
         crmCustomerTemp.setCustomerNo(customerNo);
         save(crmCustomerTemp);
         // 增加跟进记录
@@ -939,6 +951,36 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
 
     }
 
+    public String getPrefix(String staffSid, String name, String mobile) {
+        String customerNoPrefix = "";
+        //查询业务员的分公司简称和部门编码
+        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(staffSid);
+        if (staffOrgResultBean.getSuccess()) {
+            SysStaffOrg sysStaffOrg = staffOrgResultBean.getData();
+            if (sysStaffOrg != null) {
+                ResultBean<String> resultBean1 = sysStaffOrgFeign.getOrgSidByPath(sysStaffOrg.getOrgSidPath());
+                if (resultBean1.getSuccess()) {
+                    String osid = resultBean1.getData();
+                    if (StringUtils.isNotBlank(osid)) {
+                        ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(osid);
+                        if (sysOrganizationVoResultBean.getSuccess()) {
+                            SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData();
+                            customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgAbbre();
+                        }
+                    }
+                }
+                String orgSid1 = sysStaffOrg.getOrgSid();
+                ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgSid1);
+                if (sysOrganizationVoResultBean.getSuccess()) {
+                    SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData();
+                    customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgCode();
+                }
+            }
+        }
+        customerNoPrefix = customerNoPrefix + HanZiConverterPinYin.getPinYinFirst(name) + mobile;
+        return customerNoPrefix;
+    }
+
     private Map<String, String> genetrateCustomerNumO(String customerTypeKey, SysUserInfoVo sysUserInfoVo) {
         // 流水号
         int i = selectCountByOrgSid(sysUserInfoVo.getOrgCode());
@@ -977,7 +1019,9 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
             return rb.setMsg("联系电话和微信号二选一必填");
         }
         if (StringUtils.isNotBlank(mobile)) {
-            CrmCustomerTempVo crmCustomerTempVo = baseMapper.selectByMobile(staffSid, mobile);
+            String customerNo = getPrefix(staffSid, dto.getName(), dto.getMobile());
+            CrmCustomerTempVo crmCustomerTempVo = baseMapper.selectNo1(customerNo,sid);
+//            CrmCustomerTempVo crmCustomerTempVo = baseMapper.selectByMobile(staffSid, mobile);
             if (crmCustomerTempVo != null && !crmCustomerTempVo.getStaffSid().equals(sysUserInfoVo.getStaffSid())) {
                 return rb.setMsg("该手机号已绑定其他客户，请重新添加");
             }
@@ -996,30 +1040,9 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         //客户编码
         String customerNoPrefix = "";
         //查询业务员的分公司简称和部门简称
-        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(customerTemp.getStaffSid());
-        if (staffOrgResultBean.getSuccess()) {
-            SysStaffOrg sysStaffOrg = staffOrgResultBean.getData();
-            if (sysStaffOrg != null) {
-                ResultBean<String> resultBean1 = sysStaffOrgFeign.getOrgSidByPath(sysStaffOrg.getOrgSidPath());
-                if (resultBean1.getSuccess()) {
-                    String osid = resultBean1.getData();
-                    if (StringUtils.isNotBlank(osid)) {
-                        ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(osid);
-                        if (sysOrganizationVoResultBean.getSuccess()) {
-                            SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData();
-                            customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgAbbre();
-                        }
-                    }
-                }
-                String orgSid1 = sysStaffOrg.getOrgSid();
-                ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(orgSid1);
-                if (sysOrganizationVoResultBean.getSuccess()) {
-                    SysOrganizationVo sysOrganizationVo = sysOrganizationVoResultBean.getData();
-                    customerNoPrefix = customerNoPrefix + sysOrganizationVo.getOrgCode();
-                }
-            }
-        }
-        String customerNo = customerNoPrefix + HanZiConverterPinYin.getPinYinFirst(customerTemp.getName()) + customerTemp.getMobile();
+        String customerNo = getPrefix(staffSid, dto.getName(), dto.getMobile());
+//        CrmCustomerTempVo crmCustomerTempVo = baseMapper.selectNo(customerNo);
+//        String customerNo = customerNoPrefix + HanZiConverterPinYin.getPinYinFirst(customerTemp.getName()) + customerTemp.getMobile();
         customerTemp.setCustomerNo(customerNo);
         baseMapper.updateById(customerTemp);
         //更新运营信息

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/chexingbyconfiguration.vue

@@ -19,6 +19,9 @@
               <el-form-item label="常用配置:">
                 <el-input v-model="listQuery.params.configName" placeholder="" clearable class="filter-item"/>
               </el-form-item>
+              <el-form-item label="内部编码:">
+                <el-input v-model="listQuery.params.insideCode" placeholder="" clearable class="filter-item"/>
+              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center">
               <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
@@ -30,11 +33,21 @@
           <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" 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 label="车型编码" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleTypeCode }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="车型" align="center" width="250">
               <template slot-scope="scope">
                 <span>{{ scope.row.vehicleAlias }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="配置编码" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.configCode }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="常用配置" header-align="center" align="left">
               <template slot-scope="scope">
                 <span>{{ scope.row.configName }}</span>
@@ -85,6 +98,7 @@ export default {
           useOrgSid: '',
           vehicleStateValue: '',
           carBrandSid: '',
+          insideCode: '',
           sidList: []
         },
         total: 1
@@ -132,6 +146,7 @@ export default {
     },
     // 查询按钮
     handleFilter() {
+      this.listQuery.current = 1
       this.getPathSid()
     },
     // 重置按钮
@@ -142,6 +157,7 @@ export default {
       this.listQuery.params.vehicleAlias = ''
       this.listQuery.params.configName = ''
       this.listQuery.params.vehicleStateValue = ''
+      this.listQuery.params.insideCode = ''
       this.getPathSid()
     },
     handleSelectionChange(row) {

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/chexingbyconfiguration.vue

@@ -19,6 +19,9 @@
               <el-form-item label="常用配置:">
                 <el-input v-model="listQuery.params.configName" placeholder="" clearable class="filter-item"/>
               </el-form-item>
+              <el-form-item label="内部编码:">
+                <el-input v-model="listQuery.params.insideCode" placeholder="" clearable class="filter-item"/>
+              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center">
               <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
@@ -30,11 +33,21 @@
           <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" 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 label="车型编码" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleTypeCode }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="车型" align="center" width="250">
               <template slot-scope="scope">
                 <span>{{ scope.row.vehicleAlias }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="配置编码" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.configCode }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="常用配置" header-align="center" align="left">
               <template slot-scope="scope">
                 <span>{{ scope.row.configName }}</span>
@@ -85,6 +98,7 @@ export default {
           useOrgSid: '',
           vehicleStateValue: '',
           carBrandSid: '',
+          insideCode: '',
           sidList: []
         },
         total: 0
@@ -132,6 +146,7 @@ export default {
     },
     // 查询按钮
     handleFilter() {
+      this.listQuery.current = 1
       this.getPathSid()
     },
     // 重置按钮
@@ -142,6 +157,7 @@ export default {
       this.listQuery.params.vehicleAlias = ''
       this.listQuery.params.configName = ''
       this.listQuery.params.vehicleStateValue = ''
+      this.listQuery.params.insideCode = ''
       this.getPathSid()
     },
     handleSelectionChange(row) {

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue

@@ -181,6 +181,9 @@
                     <el-form-item label="常用配置">
                       <el-input v-model="listQuery.params.configName" maxlength="125" placeholder="请输入常用配置名称" class="addinputw" clearable/>
                     </el-form-item>
+                    <el-form-item label="配置编码">
+                      <el-input v-model="listQuery.params.configCode" maxlength="125" placeholder="" class="addinputw" clearable/>
+                    </el-form-item>
                   </el-row>
                 </div>
               </div>
@@ -226,6 +229,9 @@
                       <span style="padding: 0 8px">至</span>
                       <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.applicationDateEnd" clearable type="date" placeholder="结束日期"/>
                     </el-form-item>
+                    <el-form-item label="内部编码">
+                      <el-input v-model="listQuery.params.insideCode" placeholder="" clearable class="addinputw"/>
+                    </el-form-item>
                   </el-row>
                 </div>
               </div>
@@ -239,7 +245,7 @@
         </div>
         <div class="listtop">
           <div class="tit">车辆台账信息列表</div>
-          <pageye v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
         <div>
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
@@ -362,7 +368,7 @@
         </div>
         <div class="pages">
           <!-- 翻页 -->
-          <pagination v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
       </div>
     </div>
@@ -559,7 +565,6 @@ export default {
       imgList: [],
       srcList: [],
       dialogImgVisible: false,
-      total: 1,
       FormLoading: false,
       listLoading: false,
       listQuery: {
@@ -588,6 +593,7 @@ export default {
           bumperKey: '',
           carColorKey: '',
           configName: '',
+          configCode: '',
           configuringBaoKey: '',
           fuelTankKey: '',
           hubMaterialKey: '',
@@ -602,10 +608,12 @@ export default {
           suspensionKey: '',
           tireCoverKey: '',
           tireSizeKey: '',
-          wheelbaseKey: ''
+          wheelbaseKey: '',
+          insideCode: ''
         },
         current: 1,
-        size: 5
+        size: 5,
+        total: 0
       },
       queryParams: {
         current: 1,
@@ -1072,13 +1080,9 @@ export default {
       pagerList(this.listQuery).then((response) => {
         // console.log('列表查询结果：' + JSON.stringify(response))
         this.listLoading = false
-        if (
-          response.code === '200' &&
-          response.data &&
-          response.data.total > 0
-        ) {
+        if (response.success) {
           this.list = response.data.records
-          this.total = response.data.total // 0：未买断，1预买断，2买断
+          this.listQuery.total = response.data.total // 0：未买断，1预买断，2买断
           for (var i = 0; i < this.list.length; i++) {
             if (this.list[i].settlementStatus == '0') {
               this.list[i].settlementStatus = '未买断'
@@ -1092,7 +1096,7 @@ export default {
           }
         } else {
           this.list = []
-          this.total = 0
+          this.listQuery.total = 0
         }
       })
     },
@@ -1129,6 +1133,7 @@ export default {
           bumperKey: '',
           carColorKey: '',
           configName: '',
+          configCode: '',
           configuringBaoKey: '',
           fuelTankKey: '',
           hubMaterialKey: '',
@@ -1143,7 +1148,8 @@ export default {
           suspensionKey: '',
           tireCoverKey: '',
           tireSizeKey: '',
-          wheelbaseKey: ''
+          wheelbaseKey: '',
+          insideCode: ''
         },
         current: 1,
         size: 5

anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/cheliangxunjianhandle.vue

@@ -76,6 +76,10 @@
               </template>
             </el-table-column>
           </el-table>
+          <div class="pages">
+            <!-- 翻页 -->
+            <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+          </div>
         </el-form>
       </div>
     </div>
@@ -91,10 +95,12 @@ import { fetchByUseOrgSid } from '@/api/cheliang/dictcommons'
 import xunjiandan from './xunjiandan'
 import daixunjian from './daixunjian'
 import xunjianresolved from './xunjianresolved'
+import Pagination from '@/components/pagination'
 
 export default {
   name: 'cheliangxunjiancaozuo',
   components: {
+    Pagination,
     xunjiandan,
     daixunjian,
     xunjianresolved
@@ -115,7 +121,7 @@ export default {
           createOrgSid: ''
         },
         current: 1,
-        size: 10,
+        size: 5,
         total: 0
       },
       rules: {},
@@ -141,8 +147,10 @@ export default {
       req.pagelist(this.listQuery).then((res) => {
         if (res.success) {
           this.list = res.data.records
+          this.listQuery.total = res.data.total
         } else {
           this.list = []
+          this.listQuery.total = 0
         }
       })
     },

anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuAdd.vue

@@ -91,6 +91,10 @@
               </template>
             </el-table-column>
           </el-table>
+          <div class="pages">
+            <!-- 翻页 -->
+            <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+          </div>
         </el-form>
       </div>
     </div>
@@ -102,10 +106,12 @@
 import req from '@/api/kucunguanli/panku'
 import { getUserByOrgSid, fetchByUseOrgSid, typeValues } from '@/api/cheliang/dictcommons'
 import pankuByPanYing from './pankuByPanYing'
+import Pagination from '@/components/pagination'
 
 export default {
   name: 'pankuAdd',
   components: {
+    Pagination,
     pankuByPanYing
   },
   data() {
@@ -189,8 +195,10 @@ export default {
       req.pagelist(this.listQuery).then((res) => {
         if (res.success) {
           this.list = res.data.records
+          this.listQuery.total = res.data.total
         } else {
           this.list = []
+          this.listQuery.total = 0
         }
       })
     },

anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue

@@ -19,6 +19,9 @@
               <el-form-item label="常用配置:">
                 <el-input v-model="listQuery.params.configName" placeholder="" clearable class="filter-item"/>
               </el-form-item>
+              <el-form-item label="内部编码:">
+                <el-input v-model="listQuery.params.insideCode" placeholder="" clearable class="filter-item"/>
+              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center">
               <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
@@ -30,11 +33,21 @@
           <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" 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 label="车型编码" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleTypeCode }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="车型" align="center" width="300">
               <template slot-scope="scope">
                 <span>{{ scope.row.vehicleAlias }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="配置编码" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.configCode }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="常用配置" header-align="center" align="left">
               <template slot-scope="scope">
                 <span>{{ scope.row.configName }}</span>
@@ -72,23 +85,22 @@ export default {
       isSearchShow: false,
       searchxianshitit: '隐藏查询条件',
       tableKey: 0,
-      showbackState: 30,
       sids: [],
       list: [],
-      number: '',
       listLoading: false,
       userOrgSid: '',
       listQuery: {
         current: 1,
-        size: 10,
+        size: 5,
         params: {
           vehicleAlias: '',
           configName: '',
           useOrgSid: '',
           vehicleStateValue: '库存',
+          insideCode: '',
           sidList: []
         },
-        total: 1
+        total: 0
       }
     }
   },
@@ -105,7 +117,7 @@ export default {
     getPathSid() {
       const userSid = window.sessionStorage.getItem('userSid')
       getPathSidByUserSid({ userSid: userSid }).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.listQuery.params.useOrgSid = res.data
           this.getList()
         }
@@ -133,17 +145,19 @@ export default {
     },
     // 查询按钮
     handleFilter() {
+      this.listQuery.current = 1
       this.getList()
     },
     // 重置按钮
     handresetting() {
       this.listQuery.current = 1
-      this.listQuery.size = 10
+      this.listQuery.size = 5
       this.listQuery.total = 0
       this.listQuery.params.vehicleAlias = ''
       this.listQuery.params.configName = ''
       this.listQuery.params.vehicleStateValue = '库存'
       this.listQuery.params.useOrgSid = this.userOrgSid
+      this.listQuery.params.insideCode = ''
       this.getPathSid()
     },
     handleSelectionChange(row) {

anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/chexingbyconfiguration.vue

@@ -22,9 +22,6 @@
               <el-form-item label="内部编码:">
                 <el-input v-model="listQuery.params.insideCode" placeholder="" clearable class="filter-item"/>
               </el-form-item>
-              <el-form-item label="编码:">
-                <el-input v-model="listQuery.params.code" placeholder="" clearable class="filter-item"/>
-              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center">
               <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
@@ -111,7 +108,6 @@ export default {
           vehicleStateValue: '',
           carBrandSid: '',
           insideCode: '',
-          code: '',
           sidList: []
         },
         total: 1
@@ -159,6 +155,7 @@ export default {
     },
     // 查询按钮
     handleFilter() {
+      this.listQuery.current = 1
       this.getPathSid()
     },
     // 重置按钮
@@ -171,7 +168,6 @@ export default {
       this.listQuery.params.useOrgSid = ''
       this.listQuery.params.vehicleStateValue = ''
       this.listQuery.params.insideCode = ''
-      this.listQuery.params.code = ''
       this.getPathSid()
     },
     handleSelectionChange(row) {

anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue

@@ -22,9 +22,6 @@
               <el-form-item label="内部编码:">
                 <el-input v-model="listQuery.params.insideCode" placeholder="" clearable class="filter-item"/>
               </el-form-item>
-              <el-form-item label="编码:">
-                <el-input v-model="listQuery.params.code" placeholder="" clearable class="filter-item"/>
-              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center">
               <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
@@ -111,7 +108,6 @@ export default {
           vehicleStateValue: '',
           carBrandSid: '',
           insideCode: '',
-          code: '',
           sidList: []
         },
         total: 1
@@ -159,6 +155,7 @@ export default {
     },
     // 查询按钮
     handleFilter() {
+      this.listQuery.current = 1
       this.getPathSid()
     },
     // 重置按钮
@@ -171,7 +168,6 @@ export default {
       this.listQuery.params.useOrgSid = ''
       this.listQuery.params.vehicleStateValue = ''
       this.listQuery.params.insideCode = ''
-      this.listQuery.params.code = ''
       this.getPathSid()
     },
     handleSelectionChange(row) {

anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue

@@ -19,6 +19,9 @@
               <el-form-item label="常用配置:">
                 <el-input v-model="listQuery.params.configName" placeholder="" clearable class="filter-item"/>
               </el-form-item>
+              <el-form-item label="内部编码:">
+                <el-input v-model="listQuery.params.insideCode" placeholder="" clearable class="filter-item"/>
+              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center">
               <el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">查询</el-button>
@@ -30,11 +33,21 @@
           <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" 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 label="车型编码" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleTypeCode }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="车型" align="center" width="300">
               <template slot-scope="scope">
                 <span>{{ scope.row.vehicleAlias }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="配置编码" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.configCode }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="常用配置" header-align="center" align="left">
               <template slot-scope="scope">
                 <span>{{ scope.row.configName }}</span>
@@ -72,20 +85,19 @@ export default {
       isSearchShow: false,
       searchxianshitit: '隐藏查询条件',
       tableKey: 0,
-      showbackState: 30,
       sids: [],
       list: [],
-      number: '',
       listLoading: false,
       userOrgSid: '',
       listQuery: {
         current: 1,
-        size: 10,
+        size: 5,
         params: {
           vehicleAlias: '',
           configName: '',
           useOrgSid: '',
           vehicleStateValue: '库存',
+          insideCode: '',
           sidList: []
         },
         total: 1
@@ -133,17 +145,19 @@ export default {
     },
     // 查询按钮
     handleFilter() {
+      this.listQuery.current = 1
       this.getList()
     },
     // 重置按钮
     handresetting() {
       this.listQuery.current = 1
-      this.listQuery.size = 10
+      this.listQuery.size = 5
       this.listQuery.total = 0
       this.listQuery.params.vehicleAlias = ''
       this.listQuery.params.configName = ''
       this.listQuery.params.vehicleStateValue = '库存'
       this.listQuery.params.useOrgSid = this.userOrgSid
+      this.listQuery.params.insideCode = ''
       this.getList()
     },
     handleSelectionChange(row) {