Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java
zhanglei
ligaode 3 months ago
parent
commit
e87c428707
  1. 8
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java
  2. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java
  3. 12
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/VehicleCustomerVo.java
  4. 9
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.java
  5. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml
  6. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java
  7. 20
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java
  8. 2
      yxt-as-ui/src/views/basicinformation/claimantManufacturer/claimantManufacturer.vue
  9. 2
      yxt-as-ui/src/views/basicinformation/sparePartsCommission/sparePartsCommission.vue
  10. 2
      yxt-as-ui/src/views/client/filing/maintenanceEnterprise.vue
  11. 131
      yxt-as-ui/src/views/warehouse/warehouse/index.vue
  12. 282
      yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue
  13. 142
      yxt-as-ui/src/views/warehouse/warehouse/warehouseInfo.vue
  14. 1
      yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java
  15. 33
      yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java
  16. 7
      yxt-crm-biz/src/main/java/com/yxt/crm/feign/base/basevehicleoutapply/BaseVehicleOutApplyFeign.java
  17. 11
      yxt-crm-biz/src/main/java/com/yxt/crm/feign/base/basevehicleoutapply/VehicleCustomerVo.java

8
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeign.java

@ -25,16 +25,14 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.base.api.basevehicleoutapply; package com.yxt.anrui.base.api.basevehicleoutapply;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* Project: anrui-base(销售出库单) <br/> * Project: anrui-base(销售出库单) <br/>
* File: BaseVehicleOutApplyFeign.java <br/> * File: BaseVehicleOutApplyFeign.java <br/>
@ -78,5 +76,5 @@ public interface BaseVehicleOutApplyFeign {
@ApiOperation("查询根据车架号查询销售订单信息") @ApiOperation("查询根据车架号查询销售订单信息")
@PostMapping("/selectSidByVinNo") @PostMapping("/selectSidByVinNo")
ResultBean<String> selectSidByVinNo(@RequestParam("vinNo") String vinNo); ResultBean<VehicleCustomerVo> selectSidByVinNo(@RequestParam("vinNo") String vinNo);
} }

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyFeignFallback.java

@ -30,8 +30,6 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List;
/** /**
* Project: anrui-base(销售出库单) <br/> * Project: anrui-base(销售出库单) <br/>
* File: BaseVehicleOutApplyFeignFallback.java <br/> * File: BaseVehicleOutApplyFeignFallback.java <br/>
@ -71,7 +69,7 @@ public class BaseVehicleOutApplyFeignFallback implements BaseVehicleOutApplyFeig
} }
@Override @Override
public ResultBean<String> selectSidByVinNo(String vinNo) { public ResultBean<VehicleCustomerVo> selectSidByVinNo(String vinNo) {
return null; return null;
} }
} }

12
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/VehicleCustomerVo.java

@ -0,0 +1,12 @@
package com.yxt.anrui.base.api.basevehicleoutapply;
import lombok.Data;
@Data
public class VehicleCustomerVo {
private String customerSid;
private String saleDate;
private String useOrgName;
}

9
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.java

@ -27,15 +27,16 @@ package com.yxt.anrui.base.biz.basevehicleoutapply;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApply;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVo;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVoNew; import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVoNew;
import com.yxt.anrui.base.api.basevehicleoutapply.VehicleCustomerVo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApply;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyVo;
import java.util.List; import java.util.List;
@ -67,5 +68,5 @@ public interface BaseVehicleOutApplyMapper extends BaseMapper<BaseVehicleOutAppl
int selectPageVoCount(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicleOutApply> qw); int selectPageVoCount(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicleOutApply> qw);
String selectSidByVinNo(@Param("vinNo") String vinNo); VehicleCustomerVo selectSidByVinNo(@Param("vinNo") String vinNo);
} }

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml

@ -78,13 +78,15 @@
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
</select> </select>
<select id="selectSidByVinNo" resultType="java.lang.String"> <select id="selectSidByVinNo" resultType="com.yxt.anrui.base.api.basevehicleoutapply.VehicleCustomerVo">
SELECT SELECT
s.sid date_format (o.createTime,'%Y-%m-%d') saleDate,
a.customerSid,
s.`name` useOrgName
FROM FROM
base_vehicle_out AS o base_vehicle_out AS o
LEFT JOIN base_vehicle_out_apply AS a ON o.mainSid = a.sid LEFT JOIN base_vehicle_out_apply AS a ON o.mainSid = a.sid
LEFT JOIN anrui_buscenter.bus_sales_order as s ON a.contractNo = s.contractNo LEFT JOIN anrui_portal.sys_organization AS s ON s.sid = a.createOrgSid
WHERE o.isDelete = '0' AND o.vinNo LIKE CONCAT( '%', #{vinNo}, '%' ) WHERE o.isDelete = '0' AND o.vinNo LIKE CONCAT( '%', #{vinNo}, '%' )
</select> </select>
</mapper> </mapper>

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java

@ -94,7 +94,7 @@ public class BaseVehicleOutApplyRest implements BaseVehicleOutApplyFeign {
} }
@Override @Override
public ResultBean<String> selectSidByVinNo(String vinNo) { public ResultBean<VehicleCustomerVo> selectSidByVinNo(String vinNo) {
return baseVehicleOutApplyService.selectSidByVinNo(vinNo); return baseVehicleOutApplyService.selectSidByVinNo(vinNo);
} }
} }

20
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java

@ -32,44 +32,35 @@ import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo;
import com.yxt.anrui.base.api.basevehicleoutapply.*; import com.yxt.anrui.base.api.basevehicleoutapply.*;
import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsFeign; import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsFeign;
import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyDetailQuery;
import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyDetailVo;
import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyFeign; import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice; import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign; import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
import com.yxt.anrui.fin.api.finvehicleinvoice.VehicleInvoiceVo;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
import java.util.List; import java.util.List;
import static java.util.Comparator.comparing;
/** /**
* Project: anrui-base(销售出库单) <br/> * Project: anrui-base(销售出库单) <br/>
@ -299,11 +290,10 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
return vo; return vo;
} }
public ResultBean<String> selectSidByVinNo(String vinNo) { public ResultBean<VehicleCustomerVo> selectSidByVinNo(String vinNo) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
String sid = "";
String substringVinNo = vinNo.substring(vinNo.length() - 8); String substringVinNo = vinNo.substring(vinNo.length() - 8);
sid = baseMapper.selectSidByVinNo(substringVinNo); VehicleCustomerVo vo = baseMapper.selectSidByVinNo(substringVinNo);
return rb.success().setData(sid); return rb.success().setData(vo);
} }
} }

2
yxt-as-ui/src/views/basicinformation/claimantManufacturer/claimantManufacturer.vue

@ -45,7 +45,7 @@
<!--End查询列表部分--> <!--End查询列表部分-->
</div> </div>
</div> </div>
<el-dialog center :visible.sync="dialogVisible" width="60%"> <el-dialog center :visible.sync="dialogVisible" width="60%" :show-close="false">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02"> <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB"> <el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="12"> <el-col :span="12">

2
yxt-as-ui/src/views/basicinformation/sparePartsCommission/sparePartsCommission.vue

@ -10,7 +10,7 @@
<div v-show="isSearchShow" class="search"> <div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header"> <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="岗位名称"> <el-form-item label="岗位名称">
<el-select v-model="listQuery.params.postSid" class="addinputw" placeholder="请选择"> <el-select v-model="listQuery.params.postSid" class="addinputw" placeholder="请选择" filterable clearable>
<el-option v-for="item in post_list" :key="item.sid" :label="item.name" :value="item.sid"/> <el-option v-for="item in post_list" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select> </el-select>
</el-form-item> </el-form-item>

2
yxt-as-ui/src/views/client/filing/maintenanceEnterprise.vue

@ -139,7 +139,7 @@ export default {
size: 'small', size: 'small',
icon: 'plus', icon: 'plus',
btnKey: 'toAdd', btnKey: 'toAdd',
btnLabel: '新增' btnLabel: '补充备案'
}, },
{ {
type: 'danger', type: 'danger',

131
yxt-as-ui/src/views/warehouse/warehouse/index.vue

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div v-show="viewState == 1"> <div v-show="viewState == 1">
<button-bar ref="btnbar" view-title="仓库列表" :btndisabled="btndisabled" @btnhandle="btnHandle" /> <button-bar ref="btnbar" view-title="仓库列表" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content"> <div class="main-content">
<div class="searchcon"> <div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow"> <el-button size="small" class="searchbtn" @click="clicksearchShow">
@ -11,20 +11,18 @@
<el-form :inline="true" class="tab-header"> <el-form :inline="true" class="tab-header">
<el-form-item label="仓库类型"> <el-form-item label="仓库类型">
<el-select v-model="queryParams.params.warehouseTypeValue" placeholder="请选择仓库类型"> <el-select v-model="queryParams.params.warehouseTypeValue" placeholder="请选择仓库类型">
<el-option v-for="item in warehouseTypeList" :key="item.dictValue" :label="item.dictValue" <el-option v-for="item in warehouseTypeList" :key="item.dictValue" :label="item.dictValue" :value="item.dictValue"/>
:value="item.dictValue" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="仓库名称"> <el-form-item label="仓库名称">
<el-input v-model="queryParams.params.name" placeholder="" clearable /> <el-input v-model="queryParams.params.name" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="仓库编码"> <el-form-item label="仓库编码">
<el-input v-model="queryParams.params.code" placeholder="" clearable /> <el-input v-model="queryParams.params.code" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="仓库地址"> <el-form-item label="仓库地址">
<el-input v-model="queryParams.params.address" placeholder="" clearable /> <el-input v-model="queryParams.params.address" placeholder="" clearable/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="btn" style="text-align: center;"> <div class="btn" style="text-align: center;">
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button> <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
@ -39,66 +37,57 @@
<!-- End 项目列表头部 --> <!-- End 项目列表头部 -->
<!-- Start 项目列表 --> <!-- Start 项目列表 -->
<div class=""> <div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="selectionLineChangeHandle">
@selection-change="selectionLineChangeHandle"> <el-table-column fixed width="50" type="selection" align="center"/>
<el-table-column fixed width="50" type="selection" align="center" /> <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column label="操作" align="center" width="100"> <el-table-column label="操作" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">详情</el-button> <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">详情</el-button>
<!-- <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">编辑</el-button> -->
<!-- <el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否可用" align="center" width="140"> <el-table-column label="是否可用" align="center" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch v-model="scope.row.usageStatus" active-text="" inactive-text="" active-value="1" <el-switch v-model="scope.row.usageStatus" active-text="" inactive-text="" active-value="1" inactive-value="0" @change="enableChange(scope.row.sid,scope.row.usageStatus)"/>
inactive-value="0" @change="enableChange(scope.row.sid,scope.row.usageStatus)" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="warehouseTypeValue" label="仓库类型" align="center" /> <el-table-column prop="warehouseTypeValue" label="仓库类型" align="center"/>
<el-table-column prop="warehouseName" label="仓库名称" align="center" /> <el-table-column prop="warehouseName" label="仓库名称" align="center"/>
<el-table-column prop="warehouseCode" label="仓库编码" align="center" /> <el-table-column prop="warehouseCode" label="仓库编码" align="center"/>
<el-table-column prop="manager" label="仓库主管" align="center" /> <el-table-column prop="manager" label="仓库主管" align="center"/>
<!-- <el-table-column prop="telephone" label="联系电话" align="center" /> --> <el-table-column prop="squareMeter" label="占地面积" align="center"/>
<el-table-column prop="squareMeter" label="占地面积" align="center" /> <el-table-column prop="address" label="仓库地址" align="center"/>
<el-table-column prop="address" label="仓库地址" align="center" /> <el-table-column prop="sortNo" label="排序" align="center"/>
<el-table-column prop="sortNo" label="排序" align="center" /> <el-table-column prop="deptName" label="隶属部门 " align="center"/>
<el-table-column prop="deptName" label="隶属部门 " align="center" /> <el-table-column prop="createOrgName" label="分公司 " align="center"/>
<el-table-column prop="createOrgName" label="分公司 " align="center" />
</el-table> </el-table>
</div> </div>
<!-- End 项目列表 --> <!-- End 项目列表 -->
<div class="pages"> <div class="pages">
<div class="tit" /> <div class="tit"/>
<!-- 翻页 --> <!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div> </div>
</div> </div>
</div> </div>
<!-- End 查询和其列表部分 --> <!-- End 查询和其列表部分 -->
<!-- 新增修改部分组件 --> <!-- 新增修改部分组件 -->
<divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" /> <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList"/>
<divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" /> <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList"/>
</div> </div>
</template> </template>
<script> <script>
import req from '@/api/warehouse/warehouse.js' import req from '@/api/warehouse/warehouse.js'
import ButtonBar from '@/components/ButtonBar' import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye' import divAdd from './warehouseAdd.vue'
import divAdd from './warehouseAdd.vue' import divInfo from './warehouseInfo.vue'
import divInfo from './warehouseInfo.vue' import { getTypeValueList } from '@/api/Common/dictcommons.js'
import {
typeValues, export default {
} from '@/api/Common/dictcommons.js'
export default {
components: { components: {
ButtonBar, ButtonBar,
Pagination, Pagination,
pageye,
divAdd, divAdd,
divInfo divInfo
}, },
@ -110,7 +99,8 @@
searchxianshitit: '显示查询条件', searchxianshitit: '显示查询条件',
tableLoading: false, tableLoading: false,
dataList: [], dataList: [],
btnList: [{ btnList: [
{
type: 'primary', type: 'primary',
size: 'small', size: 'small',
icon: 'plus', icon: 'plus',
@ -144,15 +134,18 @@
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
warehouseTypeValue: "", warehouseTypeValue: '',
name: '', name: '',
code: "", code: '',
address: "" address: '',
orgPath: '',
menuUrl: '',
userSid: ''
} }
}, },
sids: [], sids: [],
selectionList: [], selectionList: [],
warehouseTypeList: [], warehouseTypeList: []
} }
}, },
mounted() { mounted() {
@ -160,32 +153,20 @@
}, },
created() { created() {
this.loadList() this.loadList()
getTypeValueList({ type: 'warehouse', groupNum: 'shfw' }).then(resp => {
var params = { if (resp.success) {
type: "warehouse",
psid: '0'
}
typeValues(params).then(resp => {
console.log('>>>>>>>>>typeValues', resp)
this.warehouseTypeList = resp.data this.warehouseTypeList = resp.data
}).catch(() => {}) }
})
}, },
methods: { methods: {
selectionLineChangeHandle(val) { selectionLineChangeHandle(val) {
console.log("val", val);
this.selectionList = val this.selectionList = val
const aa = [] const aa = []
val.forEach(element => { val.forEach(element => {
aa.push(element.sid) aa.push(element.sid)
}) })
this.sids = aa this.sids = aa
}, },
// //
clicksearchShow() { clicksearchShow() {
@ -251,10 +232,13 @@
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
warehouseTypeValue: "", warehouseTypeValue: '',
name: '', name: '',
code: "", code: '',
address: "" address: '',
orgPath: '',
menuUrl: '',
userSid: ''
} }
} }
this.loadList() this.loadList()
@ -263,17 +247,15 @@
this.viewState = 2 this.viewState = 2
this.$refs['divadd'].showAdd() this.$refs['divadd'].showAdd()
}, },
toEdit() { toEdit() {
if (this.selectionList.length != 1) { if (this.selectionList.length !== 1) {
this.$message({ this.$message({
type: 'warning', type: 'warning',
message: "请选择一条数据。", message: '请选择一条数据。',
showClose: true showClose: true
}) })
return return
} }
this.viewState = 3 this.viewState = 3
this.$refs['divadd'].showEdit(this.selectionList[0]) this.$refs['divadd'].showEdit(this.selectionList[0])
}, },
@ -285,9 +267,7 @@
this.viewState = 4 this.viewState = 4
this.$refs['divinfo'].showEdit(row) this.$refs['divinfo'].showEdit(row)
}, },
doDel() { doDel() {
if (this.sids.length > 0) { if (this.sids.length > 0) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?' const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', { this.$confirm(tip, '提示', {
@ -316,7 +296,8 @@
}).catch(e => { }).catch(e => {
loading.close() loading.close()
}) })
}).catch(() => {}) }).catch(() => {
})
} else { } else {
this.$message({ this.$message({
showClose: true, showClose: true,
@ -324,15 +305,11 @@
}) })
} }
}, },
resetState() { resetState() {
this.viewState = 1 this.viewState = 1
this.loadList() this.loadList()
}, },
enableChange(sid, state) { enableChange(sid, state) {
console.log('sid', sid)
console.log('state', state)
req.updateIsEnable(sid, state).then((resp) => { req.updateIsEnable(sid, state).then((resp) => {
if (resp.success) { if (resp.success) {
this.$message({ this.$message({
@ -345,9 +322,9 @@
}).catch(e => { }).catch(e => {
console.log(e) console.log(e)
}) })
},
} }
} }
}
</script> </script>
<style scoped> <style scoped>
</style> </style>

282
yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue

@ -1,114 +1,76 @@
<template> <template>
<div> <div>
<div class="tab-header webtop"> <div class="tab-header webtop">
<!-- 标题 -->
<div>仓库信息</div> <div>仓库信息</div>
<!-- start 添加修改按钮 -->
<div> <div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button> <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button> <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div> </div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div> </div>
<div class="listconadd"> <div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02"> <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="first_row"> <el-row class="first_row">
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">仓库编码</div> <div class="span-sty">仓库编码</div>
<el-form-item prop="warehouseCode"> <el-form-item prop="warehouseCode">
<span class="addinputw addinputInfo">{{formobj.warehouseCode}}</span> <span class="addinputw addinputInfo">{{ formobj.warehouseCode }}</span>
<!-- <el-input v-model="formobj.warehouseCode" placeholder="仓库编码" class="addinputw addinputInfo" clearable
oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" /> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<div class="span-sty"><span class="must">*</span> 仓库类型</div> <div class="span-sty"><span class="must">*</span> 仓库类型</div>
<el-form-item prop="warehouseTypeValue"> <el-form-item prop="warehouseTypeValue">
<el-select v-model="formobj.warehouseTypeValue" placeholder="请选择仓库类型" class="addinputw addinputInfo" <el-select v-model="formobj.warehouseTypeValue" placeholder="请选择仓库类型" class="addinputw addinputInfo" @change="selectWarehouseTypeChange">
@change="selectWarehouseTypeChange"> <el-option v-for="item in warehouseTypeList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
<el-option v-for="item in warehouseTypeList" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty"><span class="must">*</span> 仓库名称</div> <div class="span-sty"><span class="must">*</span> 仓库名称</div>
<el-form-item prop="warehouseName"> <el-form-item prop="warehouseName">
<el-input v-model="formobj.warehouseName" placeholder="按配件所属车辆品牌命名" class="addinputw addinputInfo" <el-input v-model="formobj.warehouseName" placeholder="按配件所属车辆品牌命名" class="addinputw addinputInfo" clearable/>
clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">仓库面积</div> <div class="span-sty">仓库面积</div>
<el-form-item> <el-form-item>
<el-input v-model="formobj.squareMeter" placeholder="仓库面积" class="addinputw addinputInfo" clearable <el-input v-model="formobj.squareMeter" placeholder="仓库面积" class="addinputw addinputInfo" clearable oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"/>
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty"><span class="must">*</span> 仓库管理员</div> <div class="span-sty"><span class="must">*</span> 仓库管理员</div>
<el-form-item> <el-form-item>
<el-form-item prop="manager"> <el-form-item prop="manager">
<el-select v-model="formobj.manager" placeholder="请选择仓库管理员" class="addinputw addinputInfo" <el-select v-model="formobj.manager" placeholder="请选择仓库管理员" class="addinputw addinputInfo" @change="selectManager">
@change="selectManager"> <el-option v-for="item in managerList" :key="item.sid" :label="item.name" :value="item.sid"/>
<el-option v-for="item in managerList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-input v-model="formobj.manager" placeholder="仓库管理员" class="addinputw addinputInfo" clearable /> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">仓库地址</div> <div class="span-sty">仓库地址</div>
<el-form-item> <el-form-item>
<el-input v-model="formobj.address" placeholder="仓库地址" class="addinputw addinputInfo" clearable /> <el-input v-model="formobj.address" placeholder="仓库地址" class="addinputw addinputInfo" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">经度</div> <div class="span-sty">经度</div>
<el-form-item> <el-form-item>
<el-input v-model="formobj.longitude" placeholder="经度" class="addinputw addinputInfo" clearable <el-input v-model="formobj.longitude" placeholder="经度" class="addinputw addinputInfo" clearable oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"/>
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<div class="span-sty">纬度</div> <div class="span-sty">纬度</div>
<el-form-item> <el-form-item>
<el-input v-model="formobj.latitude" placeholder="纬度" class="addinputw addinputInfo" clearable <el-input v-model="formobj.latitude" placeholder="纬度" class="addinputw addinputInfo" clearable oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"/>
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row> <!-- <el-row>
<el-col :span="8"> <el-col :span="8">
@ -134,55 +96,44 @@
</el-col> </el-col>
</el-row> --> </el-row> -->
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty"><span class="must">*</span> 排序</div> <div class="span-sty"><span class="must">*</span> 排序</div>
<el-form-item prop="sortNo"> <el-form-item prop="sortNo">
<el-input v-model="formobj.sortNo" placeholder="排序" class="addinputw addinputInfo" clearable <el-input v-model="formobj.sortNo" placeholder="排序" class="addinputw addinputInfo" clearable oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"/>
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<div class="span-sty"><span class="must">*</span> 使用状态</div> <div class="span-sty"><span class="must">*</span> 使用状态</div>
<el-form-item prop="usageStatus"> <el-form-item prop="usageStatus">
<el-radio-group v-model="formobj.usageStatus" size="small" @change="changeTheme" <el-radio-group v-model="formobj.usageStatus" size="small" class="addinputw addinputInfo">
class="addinputw addinputInfo">
<el-radio :label="'1'">正常</el-radio> <el-radio :label="'1'">正常</el-radio>
<el-radio :label="'0'">停用</el-radio> <el-radio :label="'0'">停用</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item> <el-form-item>
<el-input v-model="formobj.remarks" placeholder="备注" class="addinputw addinputInfo" clearable /> <el-input v-model="formobj.remarks" placeholder="备注" class="addinputw addinputInfo" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import req from '@/api/warehouse/warehouse.js' import req from '@/api/warehouse/warehouse.js'
import { import {
typeValues, getTypeValueList,
getOrgSidByPath getOrgSidByPath
} from '@/api/Common/dictcommons.js' } from '@/api/Common/dictcommons.js'
export default {
export default {
components: {}, components: {},
data() { data() {
return { return {
@ -193,193 +144,119 @@
warehouseCode: '由系统自动生成', warehouseCode: '由系统自动生成',
warehouseTypeKey: '', warehouseTypeKey: '',
warehouseTypeValue: '', warehouseTypeValue: '',
contacts: "", contacts: '',
mob: "", mob: '',
telephone: "", telephone: '',
manager: '', manager: '',
managerSid: '', managerSid: '',
longitude: '', longitude: '',
latitude: '', latitude: '',
usageStatus: "1", usageStatus: '1',
address: '', address: '',
squareMeter: '', squareMeter: '',
sortNo: '', sortNo: '',
remarks: '', remarks: '',
warehouseType: "0", warehouseType: '0',
useOrgSid: window.sessionStorage.getItem('departmentSid'), useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'), orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'), createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid')
}, },
warehouseTypeList: [], warehouseTypeList: [],
managerList: [], managerList: [],
rules: { rules: {
warehouseName: [{ warehouseName: [{ required: true, message: '仓库名称不能为空', trigger: 'blur' }],
required: true, sortNo: [{ required: true, message: '排序不能为空', trigger: 'blur' }],
message: '仓库名称不能为空', usageStatus: [{ required: true, message: '请选择使用状态', trigger: 'change' }],
trigger: 'blur' manager: [{ required: true, message: '请选择仓库管理员', trigger: 'change' }],
}], warehouseTypeValue: [{ required: true, message: '请选择仓库类型', trigger: 'change' }]
sortNo: [{
required: true,
message: '排序不能为空',
trigger: 'blur'
}],
usageStatus: [{
required: true,
message: '请选择使用状态',
trigger: 'change'
}],
manager: [{
required: true,
message: '请选择仓库管理员',
trigger: 'change'
}],
warehouseTypeValue: [{
required: true,
message: '请选择仓库类型',
trigger: 'change'
}],
} }
} }
},
created() {
}, },
methods: { methods: {
changeTheme(val) {
},
selectManager(val) { selectManager(val) {
const choose = this.managerList.filter((item) => item.sid == val) const choose = this.managerList.filter((item) => item.sid === val)
console.log('>>>>>>>>>selectWarehouseTypeChange', choose) console.log('>>>>>>>>>selectWarehouseTypeChange', choose)
this.formobj.manager = choose[0].name this.formobj.manager = choose[0].name
this.formobj.managerSid = choose[0].sid this.formobj.managerSid = choose[0].sid
}, },
getDictValue() { getDictValue() {
getTypeValueList({ type: 'warehouse', groupNum: 'shfw' }).then(resp => {
var params = { if (resp.success) {
type: "warehouse",
psid: '0'
}
typeValues(params).then(resp => {
console.log('>>>>>>>>>typeValues', resp)
this.warehouseTypeList = resp.data this.warehouseTypeList = resp.data
}).catch(() => {}) }
})
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) { if (res.success) {
this.formobj.createOrgSid = res.data this.formobj.createOrgSid = res.data
} }
}) })
req.selMangerByRole({ useOrgSid: window.sessionStorage.getItem('departmentSid') }).then(resp => {
req.selMangerByRole({
useOrgSid: window.sessionStorage.getItem('departmentSid')
})
.then(resp => {
if (resp.success) { if (resp.success) {
this.managerList = resp.data this.managerList = resp.data
} }
}) })
.catch(e => {})
}, },
selectWarehouseTypeChange(val) { selectWarehouseTypeChange(val) {
const choose = this.warehouseTypeList.filter((item) => item.dictKey === val)
const choose = this.warehouseTypeList.filter((item) => item.dictKey == val)
console.log('>>>>>>>>>selectWarehouseTypeChange', choose) console.log('>>>>>>>>>selectWarehouseTypeChange', choose)
this.formobj.warehouseTypeKey = choose[0].dictKey this.formobj.warehouseTypeKey = choose[0].dictKey
this.formobj.warehouseTypeValue = choose[0].dictValue this.formobj.warehouseTypeValue = choose[0].dictValue
}, },
saveOrUpdate() { saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj) console.log('>>>>>>>>>saveOrUpdate', this.formobj)
this.$refs['form_obj'].validate((valid) => { this.$refs['form_obj'].validate((valid) => {
if (valid) { if (valid) {
req.saveWarehouse(this.formobj).then(resp => {
req.saveWarehouse(this.formobj)
.then(resp => {
if (resp.success) { if (resp.success) {
this.$message({ this.$message({ showClose: true, type: 'success', message: '保存成功', duration: 1000 })
showClose: true, if (this.formobj.sid === '') {
type: 'success',
message: resp.msg
})
this.$confirm('是否继续添加仓库信息?', '温馨提示', { this.$confirm('是否继续添加仓库信息?', '温馨提示', {
confirmButtonText: '是', confirmButtonText: '是',
cancelButtonText: '否', cancelButtonText: '否',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
// //
var warehouseTypeKey = this.formobj.warehouseTypeKey var warehouseTypeKey = this.formobj.warehouseTypeKey
var warehouseTypeValue = this.formobj.warehouseTypeValue var warehouseTypeValue = this.formobj.warehouseTypeValue
this.formobj = { this.formobj = {
sid: '', sid: '',
warehouseName: '', warehouseName: '',
warehouseCode: '由系统自动生成', warehouseCode: '由系统自动生成',
warehouseTypeKey: warehouseTypeKey, warehouseTypeKey: warehouseTypeKey,
warehouseTypeValue: warehouseTypeValue, warehouseTypeValue: warehouseTypeValue,
contacts: "", contacts: '',
mob: "", mob: '',
telephone: "", telephone: '',
manager: '', manager: '',
longitude: '', longitude: '',
latitude: '', latitude: '',
usageStatus: "1", usageStatus: '1',
address: '', address: '',
squareMeter: '', squareMeter: '',
sortNo: '', sortNo: '',
remarks: '', remarks: '',
warehouseType: "0", warehouseType: '0',
useOrgSid: window.sessionStorage.getItem('departmentSid'), useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'), orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'), createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid')
} }
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
}) })
}).catch(() => { }).catch(() => {
// //
this.handleReturn('true')
this.formobj = { })
sid: '', } else {
warehouseName: '', this.handleReturn('true')
warehouseCode: '由系统自动生成',
warehouseTypeKey: '',
warehouseTypeValue: '',
contacts: "",
mob: "",
telephone: "",
manager: '',
longitude: '',
latitude: '',
usageStatus: "1",
address: '',
squareMeter: '',
sortNo: '',
remarks: '',
warehouseType: "0",
useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'),
} }
this.$emit('doback')
});
} else { } else {
// resp.code // resp.code
} }
}).catch(() => {
}) })
.catch(() => {})
} }
}) })
}, },
@ -391,22 +268,22 @@
warehouseCode: '由系统自动生成', warehouseCode: '由系统自动生成',
warehouseTypeKey: '', warehouseTypeKey: '',
warehouseTypeValue: '', warehouseTypeValue: '',
contacts: "", contacts: '',
mob: "", mob: '',
telephone: "", telephone: '',
manager: '', manager: '',
longitude: '', longitude: '',
latitude: '', latitude: '',
usageStatus: "1", usageStatus: '1',
address: '', address: '',
squareMeter: '', squareMeter: '',
sortNo: '', sortNo: '',
remarks: '', remarks: '',
warehouseType: "0", warehouseType: '0',
useOrgSid: window.sessionStorage.getItem('departmentSid'), useOrgSid: window.sessionStorage.getItem('departmentSid'),
orgPath: window.sessionStorage.getItem('defaultOrgPath'), orgPath: window.sessionStorage.getItem('defaultOrgPath'),
createOrgSid: window.sessionStorage.getItem('orgSid'), createOrgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid'), userSid: window.sessionStorage.getItem('userSid')
} }
this.$emit('doback') this.$emit('doback')
}, },
@ -415,66 +292,61 @@
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
}) })
}, },
showEdit(row) { showEdit(row) {
this.getDictValue() this.getDictValue()
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
}) })
req.initWarehouse(row.sid).then(resp => {
req.initWarehouse(row.sid)
.then(resp => {
if (resp.success) { if (resp.success) {
this.formobj = resp.data this.formobj = resp.data
} }
}) }).catch(e => {
.catch(e => {
this.formobj = row this.formobj = row
}) })
},
} }
} }
}
</script> </script>
<style scoped> <style scoped>
/deep/ .el-form-item__error { /deep/ .el-form-item__error {
margin-left: 120px !important; margin-left: 120px !important;
} }
.must { .must {
color: #f00; color: #f00;
} }
.span-sty { .span-sty {
width: 130px !important; width: 130px !important;
align-items: center; align-items: center;
} }
.addinputInfo { .addinputInfo {
margin-left: 120px !important; margin-left: 120px !important;
} }
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw { .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important; margin-left: 120px !important;
width: calc(100% - 115px); width: calc(100% - 115px);
} }
.first_row { .first_row {
border-top: 1px solid #E0E3EB; border-top: 1px solid #E0E3EB;
} }
.titleOne { .titleOne {
padding: 7px; padding: 7px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group { .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline; display: inline;
line-height: 1px; line-height: 1px;
vertical-align: middle; vertical-align: middle;
} }
</style> </style>

142
yxt-as-ui/src/views/warehouse/warehouse/warehouseInfo.vue

@ -1,94 +1,69 @@
<template> <template>
<div> <div>
<div class="tab-header webtop"> <div class="tab-header webtop">
<!-- 标题 -->
<div>仓库信息</div> <div>仓库信息</div>
<!-- start 添加修改按钮 -->
<div> <div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button> <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div> </div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div> </div>
<div class="listconadd"> <div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02"> <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row class="first_row"> <el-row class="first_row">
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">仓库编码</div> <div class="span-sty">仓库编码</div>
<el-form-item> <el-form-item>
<span class="addinputInfo">{{formobj.warehouseCode}}</span> <span class="addinputInfo">{{ formobj.warehouseCode }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<div class="span-sty">仓库类型</div> <div class="span-sty">仓库类型</div>
<el-form-item> <el-form-item>
<span class="addinputInfo">{{formobj.warehouseTypeValue}}</span> <span class="addinputInfo">{{ formobj.warehouseTypeValue }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">仓库名称</div> <div class="span-sty">仓库名称</div>
<el-form-item> <el-form-item>
<span class="addinputInfo">{{formobj.warehouseName}}</span> <span class="addinputInfo">{{ formobj.warehouseName }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">仓库面积</div> <div class="span-sty">仓库面积</div>
<el-form-item> <el-form-item>
<span class="addinputInfo">{{formobj.squareMeter}}</span> <span class="addinputInfo">{{ formobj.squareMeter }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">仓库管理员</div> <div class="span-sty">仓库管理员</div>
<el-form-item> <el-form-item>
<span class="addinputInfo">{{formobj.manager}}</span> <span class="addinputInfo">{{ formobj.manager }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">仓库地址</div> <div class="span-sty">仓库地址</div>
<el-form-item> <el-form-item>
<span class="addinputInfo">{{formobj.address}}</span> <span class="addinputInfo">{{ formobj.address }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">经度</div> <div class="span-sty">经度</div>
<el-form-item> <el-form-item>
<span class="addinputInfo">{{formobj.longitude}}</span> <span class="addinputInfo">{{ formobj.longitude }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<div class="span-sty">纬度</div> <div class="span-sty">纬度</div>
<el-form-item> <el-form-item>
<span class="addinputInfo">{{formobj.latitude}}</span> <span class="addinputInfo">{{ formobj.latitude }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row > <!-- <el-row >
<el-col :span="8"> <el-col :span="8">
@ -115,48 +90,39 @@
</el-row> --> </el-row> -->
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">排序</div> <div class="span-sty">排序</div>
<el-form-item> <el-form-item>
<span class="addinputInfo">{{formobj.sortNo}}</span> <span class="addinputInfo">{{ formobj.sortNo }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<div class="span-sty">使用状态</div> <div class="span-sty">使用状态</div>
<el-form-item> <el-form-item>
<el-radio-group v-model="formobj.usageStatus" size="small" :disabled='true' <el-radio-group v-model="formobj.usageStatus" size="small" :disabled='true' class="addinputw addinputInfo">
class="addinputw addinputInfo">
<el-radio :label="'1'">正常</el-radio> <el-radio :label="'1'">正常</el-radio>
<el-radio :label="'0'">停用</el-radio> <el-radio :label="'0'">停用</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item> <el-form-item>
<span class="addinputInfo">{{formobj.remarks}}</span> <span class="addinputInfo">{{ formobj.remarks }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import req from '@/api/warehouse/warehouse.js' import req from '@/api/warehouse/warehouse.js'
export default {
export default {
components: {}, components: {},
data() { data() {
return { return {
@ -165,103 +131,69 @@
sid: '', sid: '',
warehouseName: '', warehouseName: '',
warehouseCode: '', warehouseCode: '',
contacts: "", contacts: '',
mob: "", mob: '',
telephone: "", telephone: '',
manager: '', manager: '',
longitude: '', longitude: '',
latitude: '', latitude: '',
usageStatus: "", usageStatus: '',
address: '', address: '',
squareMeter: '', squareMeter: '',
sortNo: '', sortNo: '',
remarks: '', remarks: '',
warehouseType: "0" warehouseType: '0'
},
} }
},
created() {},
methods: {
changeTheme(val) {
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
req.saveWarehouse(this.formobj)
.then(resp => {
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: resp.msg
})
this.handleReturn('true')
} else {
// resp.code
} }
})
.catch(() => {})
}, },
handleReturn(isreload) { methods: {
if (isreload === 'true') this.$emit('reloadlist') handleReturn() {
this.formobj = { this.formobj = {
sid: '', sid: '',
warehouseName: '', warehouseName: '',
warehouseCode: '', warehouseCode: '',
contacts: "", contacts: '',
mob: "", mob: '',
telephone: "", telephone: '',
manager: '', manager: '',
longitude: '', longitude: '',
latitude: '', latitude: '',
usageStatus: "", usageStatus: '',
address: '', address: '',
squareMeter: '', squareMeter: '',
sortNo: '', sortNo: '',
remarks: '', remarks: '',
warehouseType: "0" warehouseType: '0'
} }
this.$emit('doback') this.$emit('doback')
}, },
showAdd() {},
showEdit(row) { showEdit(row) {
req.initWarehouse(row.sid) req.initWarehouse(row.sid).then(resp => {
.then(resp => {
if (resp.success) { if (resp.success) {
this.formobj = resp.data this.formobj = resp.data
} }
}) }).catch(e => {
.catch(e => {
this.formobj = row this.formobj = row
}) })
},
} }
} }
}
</script> </script>
<style scoped> <style scoped>
.span-sty { .span-sty {
width: 130px !important; width: 130px !important;
} }
.addinputInfo { .addinputInfo {
margin-left: 120px !important; margin-left: 120px !important;
} }
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw { .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important; margin-left: 120px !important;
width: calc(100% - 115px); width: calc(100% - 115px);
} }
.first_row { .first_row {
border-top: 1px solid #E0E3EB; border-top: 1px solid #E0E3EB;
} }
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style> </style>

1
yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java

@ -276,6 +276,7 @@ public class AsCustomerVehicleService extends MybatisBaseService<AsCustomerVehic
} }
if (StringUtils.isNotBlank(dto.getSaleDate())) { if (StringUtils.isNotBlank(dto.getSaleDate())) {
vehicleDetails.setSaleDate(dto.getSaleDate()); vehicleDetails.setSaleDate(dto.getSaleDate());
vehicleDetails.setBuyDate(dto.getSaleDate());
} }
vehicleDetails.setVehState("0"); vehicleDetails.setVehState("0");
} }

33
yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java

@ -26,7 +26,6 @@
package com.yxt.crm.biz.crmcustomer; package com.yxt.crm.biz.crmcustomer;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.service.MybatisBaseService;
@ -42,7 +41,7 @@ import com.yxt.crm.feign.as.ascustomervehicle.AsCustomerCrmVehVo;
import com.yxt.crm.feign.as.ascustomervehicle.AsCustomerVehicleDto; import com.yxt.crm.feign.as.ascustomervehicle.AsCustomerVehicleDto;
import com.yxt.crm.feign.as.ascustomervehicle.AsCustomerVehicleFeign; import com.yxt.crm.feign.as.ascustomervehicle.AsCustomerVehicleFeign;
import com.yxt.crm.feign.base.basevehicleoutapply.BaseVehicleOutApplyFeign; import com.yxt.crm.feign.base.basevehicleoutapply.BaseVehicleOutApplyFeign;
import com.yxt.crm.feign.bus.bussalesorder.BusSalesOrder; import com.yxt.crm.feign.base.basevehicleoutapply.VehicleCustomerVo;
import com.yxt.crm.feign.bus.bussalesorder.BusSalesOrderFeign; import com.yxt.crm.feign.bus.bussalesorder.BusSalesOrderFeign;
import com.yxt.crm.feign.portal.dictcommon.DictCommonFeign; import com.yxt.crm.feign.portal.dictcommon.DictCommonFeign;
import com.yxt.crm.feign.portal.dictcommon.DictCommonType; import com.yxt.crm.feign.portal.dictcommon.DictCommonType;
@ -116,7 +115,6 @@ public class CrmCustomerService extends MybatisBaseService<CrmCustomerMapper, Cr
} }
public void insertByDto(CrmCustomerDto dto) { public void insertByDto(CrmCustomerDto dto) {
CrmCustomer entity = new CrmCustomer(); CrmCustomer entity = new CrmCustomer();
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
@ -124,7 +122,6 @@ public class CrmCustomerService extends MybatisBaseService<CrmCustomerMapper, Cr
} }
public CrmCustomerDetailsVo fetchDetailsVoBySid(String sid) { public CrmCustomerDetailsVo fetchDetailsVoBySid(String sid) {
CrmCustomer entity = fetchBySid(sid); CrmCustomer entity = fetchBySid(sid);
CrmCustomerDetailsVo vo = new CrmCustomerDetailsVo(); CrmCustomerDetailsVo vo = new CrmCustomerDetailsVo();
@ -303,6 +300,7 @@ public class CrmCustomerService extends MybatisBaseService<CrmCustomerMapper, Cr
} }
return subList; return subList;
} }
public void disableState(String[] sid) { public void disableState(String[] sid) {
for (String s : sid) { for (String s : sid) {
CrmCustomer customerTemp = fetchBySid(s); CrmCustomer customerTemp = fetchBySid(s);
@ -318,6 +316,7 @@ public class CrmCustomerService extends MybatisBaseService<CrmCustomerMapper, Cr
baseMapper.updateById(customerTemp); baseMapper.updateById(customerTemp);
} }
} }
public PagerVo<AsCustomerListVo> asListPage(PagerQuery<AsCustomerListQuery> pq) { public PagerVo<AsCustomerListVo> asListPage(PagerQuery<AsCustomerListQuery> pq) {
AsCustomerListQuery query = pq.getParams(); AsCustomerListQuery query = pq.getParams();
QueryWrapper<CrmCustomer> qw = new QueryWrapper<>(); QueryWrapper<CrmCustomer> qw = new QueryWrapper<>();
@ -401,7 +400,7 @@ public class CrmCustomerService extends MybatisBaseService<CrmCustomerMapper, Cr
String sid = ""; String sid = "";
if (dto.getVehState().equals("0")) { if (dto.getVehState().equals("0")) {
CrmCustomer crmCustomerTemp = new CrmCustomer(); CrmCustomer crmCustomerTemp = new CrmCustomer();
BeanUtil.copyProperties(dto,crmCustomerTemp,"sid"); BeanUtil.copyProperties(dto, crmCustomerTemp, "sid");
String orgSid = ""; String orgSid = "";
if (StringUtils.isNotBlank(dto.getOrgPath())) { if (StringUtils.isNotBlank(dto.getOrgPath())) {
orgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); orgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
@ -421,6 +420,7 @@ public class CrmCustomerService extends MybatisBaseService<CrmCustomerMapper, Cr
if (StringUtils.isNotBlank(dto.getUseOrgSid())) { if (StringUtils.isNotBlank(dto.getUseOrgSid())) {
crmCustomerTemp.setUseOrgSid(dto.getUseOrgSid()); crmCustomerTemp.setUseOrgSid(dto.getUseOrgSid());
} }
crmCustomerTemp.setCreateBySid(dto.getUserSid());
save(crmCustomerTemp); save(crmCustomerTemp);
sid = crmCustomerTemp.getSid(); sid = crmCustomerTemp.getSid();
AsCustomerVehicleDto v = new AsCustomerVehicleDto(); AsCustomerVehicleDto v = new AsCustomerVehicleDto();
@ -432,6 +432,7 @@ public class CrmCustomerService extends MybatisBaseService<CrmCustomerMapper, Cr
} }
if (StringUtils.isNotBlank(dto.getSaleDate())) { if (StringUtils.isNotBlank(dto.getSaleDate())) {
v.setSaleDate(dto.getSaleDate()); v.setSaleDate(dto.getSaleDate());
v.setBuyDate(dto.getSaleDate());
} }
v.setVehState(0); v.setVehState(0);
v.setCustomerSid(sid); v.setCustomerSid(sid);
@ -624,19 +625,17 @@ public class CrmCustomerService extends MybatisBaseService<CrmCustomerMapper, Cr
vo.setVehState("1"); vo.setVehState("1");
if (StringUtils.isNotBlank(query.getVinNo())) { if (StringUtils.isNotBlank(query.getVinNo())) {
String vinNo = query.getVinNo(); String vinNo = query.getVinNo();
String orderSid = baseVehicleOutApplyFeign.selectSidByVinNo(vinNo).getData(); VehicleCustomerVo v = baseVehicleOutApplyFeign.selectSidByVinNo(vinNo).getData();
if (StringUtils.isNotBlank(orderSid)) { if (null != v) {
BusSalesOrder order = busSalesOrderFeign.fetchBySid(orderSid).getData(); vo.setVehState("0");
if (null != order) { vo.setSaleOrgName(v.getUseOrgName());
if (StringUtils.isNotBlank(order.getCustomerSid())) { vo.setSaleDate(v.getSaleDate());
String customerSid = order.getCustomerSid(); vo.setBuyDate(v.getSaleDate());
if (StringUtils.isNotBlank(v.getCustomerSid())) {
String customerSid = v.getCustomerSid();
CrmCustomerTemp customerTemp = crmCustomerTempFeign.fetchEntity(customerSid).getData(); CrmCustomerTemp customerTemp = crmCustomerTempFeign.fetchEntity(customerSid).getData();
if (null != customerTemp) { if (null != customerTemp) {
BeanUtils.copyProperties(customerTemp,vo,"isDesignatedEnterprise","filingIndate","sid"); BeanUtils.copyProperties(customerTemp, vo, "isDesignatedEnterprise", "filingIndate", "sid");
vo.setVehState("0");
vo.setSaleOrgName(order.getUseOrgName());
vo.setSaleDate(DateUtil.formatDate(order.getCreateDate()));
}
} }
} }
} }
@ -658,7 +657,7 @@ public class CrmCustomerService extends MybatisBaseService<CrmCustomerMapper, Cr
if (dto.getVehState().equals("0")) { if (dto.getVehState().equals("0")) {
CrmCustomer crmCustomerTemp = new CrmCustomer(); CrmCustomer crmCustomerTemp = new CrmCustomer();
sid = crmCustomerTemp.getSid(); sid = crmCustomerTemp.getSid();
BeanUtil.copyProperties(dto,crmCustomerTemp,"sid"); BeanUtil.copyProperties(dto, crmCustomerTemp, "sid");
String orgSid = ""; String orgSid = "";
if (StringUtils.isNotBlank(dto.getOrgPath())) { if (StringUtils.isNotBlank(dto.getOrgPath())) {
orgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); orgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();

7
yxt-crm-biz/src/main/java/com/yxt/crm/feign/base/basevehicleoutapply/BaseVehicleOutApplyFeign.java

@ -25,13 +25,12 @@
*********************************************************/ *********************************************************/
package com.yxt.crm.feign.base.basevehicleoutapply; package com.yxt.crm.feign.base.basevehicleoutapply;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
/** /**
* Project: anrui-base(销售出库单) <br/> * Project: anrui-base(销售出库单) <br/>
@ -56,5 +55,5 @@ public interface BaseVehicleOutApplyFeign {
@ApiOperation("查询根据车架号查询销售订单信息") @ApiOperation("查询根据车架号查询销售订单信息")
@PostMapping("/selectSidByVinNo") @PostMapping("/selectSidByVinNo")
ResultBean<String> selectSidByVinNo(@RequestParam("vinNo") String vinNo); ResultBean<VehicleCustomerVo> selectSidByVinNo(@RequestParam("vinNo") String vinNo);
} }

11
yxt-crm-biz/src/main/java/com/yxt/crm/feign/base/basevehicleoutapply/VehicleCustomerVo.java

@ -0,0 +1,11 @@
package com.yxt.crm.feign.base.basevehicleoutapply;
import lombok.Data;
@Data
public class VehicleCustomerVo {
private String customerSid;
private String saleDate;
private String useOrgName;
}
Loading…
Cancel
Save