Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 2 years ago
parent
commit
f72b63f115
  1. 7
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java
  2. 7
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepare.java
  3. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java
  4. 7
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppBusHandoverPrepareInfoVo.java
  5. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoVo.java
  6. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java
  7. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandover.java
  8. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDto.java
  9. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  10. 21
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java
  11. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.java
  12. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml
  13. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java
  14. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java
  15. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue
  16. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuDaiBanInfo.vue
  17. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuYiBanInfo.vue
  18. 25
      anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/fininvoiceapply.js
  19. 258
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagement.vue
  20. 2
      anrui-scm/anrui-scm-ui/src/views/examinePage/chukushenhe/chukushenheInfo.vue
  21. 2
      anrui-scm/anrui-scm-ui/src/views/examinePage/chukushenhe/chukushenheTodo.vue
  22. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/CertificateInfoQuery.java
  23. 21
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/CertificateInfoVo.java
  24. 8
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/HandoverPrepareInfoVo.java

7
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java

@ -10,15 +10,11 @@ import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
import com.yxt.anrui.base.common.enums.CertificState;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordEnum;
import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordsDto;
import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordsFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
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;
@ -30,7 +26,6 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessagePushTransferDto;
import com.yxt.messagecenter.api.messagelist.MessageListFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -319,7 +314,7 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
messageFeign.pushTransferMessage(messagePushTransferDto);
baseMapper.updateTransferState(sid, CertificState.TransferState.TRANSTATE_YJZ.getCode(),CertificState.TransferState.TRANSTATE_YJZ.getRemarks());
}else {
rb.setMsg("不符合移交条件");
return rb.setMsg("不符合移交条件");
}
}
return rb.success();

7
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepare.java

@ -81,4 +81,11 @@ public class BusHandoverPrepare extends BaseEntity {
@ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("配置sid")
private String configSid;
@ApiModelProperty("组织全路径")
private String orgSidPath;
}

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java

@ -46,6 +46,10 @@ public class BusHandoverPrepareAddDto implements Dto {
private String model;
private String modelSid;
private String configSid;
private String orgSidPath;
}

7
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppBusHandoverPrepareInfoVo.java

@ -44,4 +44,11 @@ public class AppBusHandoverPrepareInfoVo implements Vo {
@ApiModelProperty("车辆列表")
private List<AppBusHandoverPrepareVehicleInfoVo> carDataList;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("配置sid")
private String configSid;
@ApiModelProperty("组织全路径")
private String orgSidPath;
}

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoVo.java

@ -34,4 +34,6 @@ public class AppCertificateInfoVo implements Vo {
@ApiModelProperty("合格证照片,多张")
private List<String> certificatePhoto;
private String remarks;
}

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bustransferrecords/BusTransferRecordsFeign.java

@ -38,7 +38,7 @@ public interface BusTransferRecordsFeign {
@ApiOperation("根据接收人sid以及车辆sid查询是否有待接收记录")
@GetMapping("/selectByVinSid")
ResultBean<BusTransferRecords> selectByVinSid(@RequestParam("vinSid") String vinSid, @RequestParam("receiveUserSid") String receiveUserSid);
ResultBean<BusTransferRecords> selectByVinSid(@RequestParam("vinSid") String vinSid, @RequestParam("receiveUserSid") String receiveUserSid,@RequestParam("goodsTypeKey") String goodsTypeKey);
@ApiOperation("根据来源sid删除")
@PostMapping("/delBySourceSid")

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandover.java

@ -21,6 +21,10 @@ public class BusVehicleInformationHandover extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("交接状态")
private Integer handoverState; // 交接状态
@ApiModelProperty("移交状态key002待移交 001未移交 004已移交 003移交中")
private String transferStateKey;
@ApiModelProperty("移交状态")
private String transferStateValue;
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("车辆sid")

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDto.java

@ -20,6 +20,10 @@ import java.util.List;
public class BusVehicleInformationHandoverDto implements Dto {
private String sid;
@ApiModelProperty("移交状态key002待移交 001未移交 004已移交 003移交中")
private String transferStateKey;
@ApiModelProperty("移交状态")
private String transferStateValue;
@ApiModelProperty("交接状态")
private Integer handoverState; // 交接状态
@ApiModelProperty("创建人sid")

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@ -759,6 +759,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
//创建组织sid、使用组织sid
dto.setCreateOrgSid(busDeliveredApply.getUseOrgSid());
dto.setUseOrgSid(busDeliveredApply.getUseOrgSid());
dto.setOrgSidPath(busDeliveredApply.getOrgSidPath());
dto.setModelSid(busDeliveredApply.getModelSid());
dto.setConfigSid(busDeliveredApply.getConfigSid());
//创建组织名称、使用组织名称
ResultBean<SysOrganizationVo> organizationVoResultBean = sysOrganizationFeign.fetchBySid(busDeliveredApply.getUseOrgSid());
if (organizationVoResultBean.getData() != null) {

21
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java

@ -44,6 +44,7 @@ import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepa
import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleInfoVo;
import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicle;
import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitDto;
import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordEnum;
import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecords;
import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandover;
import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService;
@ -174,7 +175,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
if (handoverPrepareVehicleDtos.size() > 0) {
for (AppBusHandoverPrepareVehicleDto handoverPrepareVehicleDto : handoverPrepareVehicleDtos) {
BusHandoverPrepareVehicle busHandoverPrepareVehicle = new BusHandoverPrepareVehicle();
BeanUtil.copyProperties(handoverPrepareVehicleDto, busHandoverPrepareVehicle,"sid");
BeanUtil.copyProperties(handoverPrepareVehicleDto, busHandoverPrepareVehicle, "sid");
busHandoverPrepareVehicle.setMainSid(busHandoverPrepare.getSid());
busHandoverPrepareVehicleService.insert(busHandoverPrepareVehicle);
}
@ -312,7 +313,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
BusHandoverPrepare busHandoverPrepare = fetchBySid(busHandoverPrepareVehicle.getMainSid());
String receiveUserSid = busHandoverPrepare.getCreateBySid();
//根据车辆sid以及销售专员的用户sid查询是否有待接收的记录
ResultBean<BusTransferRecords> busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepareVehicle.getVinSid(), receiveUserSid);
ResultBean<BusTransferRecords> busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepareVehicle.getVinSid(), receiveUserSid, BusTransferRecordEnum.FP.getCode());
if (busTransferRecordsResultBean.getData() == null) {
return rb.setMsg("发票未准备好");
}
@ -325,7 +326,7 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
vo.setInvoiceTitle(finVehicleInvoice.getInvoiceTitle());
vo.setInvoiceType(finVehicleInvoice.getInvoiceType());
vo.setDrawer(finVehicleInvoice.getDrawer());
if(finVehicleInvoice.getInvoiceDate() != null){
if (finVehicleInvoice.getInvoiceDate() != null) {
vo.setInvoiceDate(DateUtil.format(finVehicleInvoice.getInvoiceDate(), "yyyy-MM-dd"));
}
if (StringUtils.isNotBlank(finVehicleInvoice.getFilePath())) {
@ -345,17 +346,17 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
*/
public ResultBean<AppCertificateInfoVo> getCertificateInfo(AppCertificateInfoQuery query) {
ResultBean<AppCertificateInfoVo> rb = new ResultBean();
//根据sid查询交车准备数据
//根据车辆sid以及销售专员的用户sid查询是否有待接收的记录
BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(query.getSid());
//查询销售专员的用户sid
BusHandoverPrepare busHandoverPrepare = fetchBySid(busHandoverPrepareVehicle.getMainSid());
String receiveUserSid = busHandoverPrepare.getCreateBySid();
ResultBean<BusTransferRecords> busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepareVehicle.getVinSid(), receiveUserSid, BusTransferRecordEnum.HGZ.getCode());
if (busTransferRecordsResultBean.getData() == null) {
return rb.setMsg("合格证未准备好");
}
AppCertificateInfoVo vo = new AppCertificateInfoVo();
ResultBean<HandoverCertVo> resultBean = baseVehicleCertificateFeign.getCertificateInfoOne(busHandoverPrepareVehicle.getVinSid(), busHandoverPrepare.getUseOrgSid());
/* String vinNo = query.getVin();
String userSid = query.getUserSid();
ResultBean<AppHandoverCertificateInfoVo> resultBean = baseVehicleCertificateFeign.getCertificateInfo(vinNo, userSid);
AppHandoverCertificateInfoVo data = resultBean.getData();
BeanUtil.copyProperties(data, vo);
vo.setVin(vinNo);*/
HandoverCertVo handoverCertVo = resultBean.getData();
BeanUtil.copyProperties(handoverCertVo, vo);
return rb.success().setData(vo);

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.java

@ -19,7 +19,7 @@ import org.apache.ibatis.annotations.Param;
public interface BusTransferRecordsMapper extends BaseMapper<BusTransferRecords> {
IPage<BusTransferRecordsVo> pagerList(IPage<BusTransferRecords> page, @Param(Constants.WRAPPER)QueryWrapper<BusTransferRecords> qw);
BusTransferRecords selectByVinSid(@Param("vinSid") String vinSid, @Param("userSid") String receiveUserSid);
BusTransferRecords selectByVinSid(@Param("vinSid") String vinSid, @Param("userSid") String receiveUserSid,@Param("typeKey") String typeKey);
@Delete("DELETE FROM bus_transfer_records WHERE goodsSid = #{sourceSid}")
void delBySourceSid(String sourceSid);

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml

@ -10,7 +10,7 @@
transferName,
transferRemarks,
DATE_FORMAT(createTime, '%Y-%m-%d')
from scm_transfer_records
from bus_transfer_records
<where>
${ew.sqlSegment}
</where>
@ -18,8 +18,9 @@
<select id="selectByVinSid" resultType="com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecords">
select *
from scm_transfer_records
from bus_transfer_records
where vinSid = #{vinSid}
and receiveSid = #{userSid}
and goodsTypeKey = #{typeKey}
</select>
</mapper>

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsRest.java

@ -40,8 +40,8 @@ public class BusTransferRecordsRest implements BusTransferRecordsFeign {
}
@Override
public ResultBean<BusTransferRecords> selectByVinSid(String vinSid, String receiveUserSid) {
return busTransferRecordsService.selectByVinSid(vinSid, receiveUserSid);
public ResultBean<BusTransferRecords> selectByVinSid(String vinSid, String receiveUserSid,String goodsTypeKey) {
return busTransferRecordsService.selectByVinSid(vinSid, receiveUserSid,goodsTypeKey);
}
@Override

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java

@ -133,9 +133,9 @@ public class BusTransferRecordsService extends MybatisBaseService<BusTransferRec
return rb.success().setData(BusRecordsInvoiceVo);
}
public ResultBean<BusTransferRecords> selectByVinSid(String vinSid, String receiveUserSid) {
public ResultBean<BusTransferRecords> selectByVinSid(String vinSid, String receiveUserSid,String type) {
ResultBean<BusTransferRecords> rb = ResultBean.fireFail();
BusTransferRecords BusTransferRecords = baseMapper.selectByVinSid(vinSid,receiveUserSid);
BusTransferRecords BusTransferRecords = baseMapper.selectByVinSid(vinSid,receiveUserSid,type);
return rb.success().setData(BusTransferRecords);
}

2
anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue

@ -253,7 +253,7 @@ export default {
var aa = ''
for (var i = 0; i < row.discountUse.length; i++) {
if (row.discountUse[i].discountNum !== 0) {
aa = aa + row.discountUse[i].discountInfo + 'X' + row.discountUse[i].discountNum + ','
aa = aa + row.discountUse[i].discountName + row.discountUse[i].discountInfo + 'X' + row.discountUse[i].discountNum + ','
}
}
if (aa !== '') {

2
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuDaiBanInfo.vue

@ -353,7 +353,7 @@ export default {
var aa = ''
for (var i = 0; i < row.discountUse.length; i++) {
if (row.discountUse[i].discountNum !== 0) {
aa = aa + row.discountUse[i].discountInfo + 'X' + row.discountUse[i].discountNum + ','
aa = aa + row.discountUse[i].discountName + row.discountUse[i].discountInfo + 'X' + row.discountUse[i].discountNum + ','
}
}
if (aa !== '') {

2
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuYiBanInfo.vue

@ -311,7 +311,7 @@ export default {
var aa = ''
for (var i = 0; i < row.discountUse.length; i++) {
if (row.discountUse[i].discountNum !== 0) {
aa = aa + row.discountUse[i].discountInfo + 'X' + row.discountUse[i].discountNum + ','
aa = aa + row.discountUse[i].discountName + row.discountUse[i].discountInfo + 'X' + row.discountUse[i].discountNum + ','
}
}
if (aa !== '') {

25
anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/fininvoiceapply.js

@ -32,6 +32,31 @@ export function saveOrUpdate(data) {
})
}
// 开票管理--移交
export function invoiceYJ(data) {
return request({
url: '/fin/v1/finvehicleinvoice/invoiceYJ',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
})
}
// 开票管理--撤回
export function invoiceYJCH(data) {
return request({
url: '/fin/v1/finvehicleinvoice/invoiceYJCH',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
})
}
// 通过sid作废一条或多条记录
export function cancellation(params) {
return request({

258
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagement.vue

@ -162,48 +162,98 @@
<el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in srcList" :key="index" :src="item" :preview-src-list="srcList"></el-image>
</el-dialog>
<el-dialog :append-to-body="true" :visible.sync="dialogFileVisible">
<el-dialog :append-to-body="true" :visible.sync="dialogFileVisible" width="80%">
<el-form :model="formobj" ref="form_obj" :rules="rules" class="formadd">
<el-row style="border: 1px solid #E0E3EB">
<el-col :span="6" class="tleftb">
<span><span class="icon">*</span>移交日期</span>
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="4" class="tleftb">
<span>车架号</span>
</el-col>
<el-col :span="18">
<el-form-item prop="transferTime">
<el-date-picker v-model="formobj.transferTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
<el-col :span="20">
<el-form-item>
<span>{{ formobj.vinNo }}</span>
</el-form-item>
</el-col>
<el-col :span="6" class="tleftb">
<span><span class="icon">*</span>接收人</span>
</el-row>
<div v-if="formobj.invoiceTitle !== ''">
<el-row>
<el-col :span="4" class="tleftb">
<span>开票单位</span>
</el-col>
<el-col :span="20">
<el-form-item>
<span>{{ formobj.invoiceTitle }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>开票类型</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ formobj.invoiceType }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>开票名称</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ formobj.invoicingName }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>开票金额</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ formobj.invoiceAmount }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>发票号</span>
</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ formobj.invoiceNo }}</span>
</el-form-item>
</el-col>
</el-row>
</div>
<el-row>
<el-col :span="4" class="tleftb">
<span><span class="icon">*</span>选择接收岗位</span>
</el-col>
<el-col :span="18">
<el-form-item prop="recipient">
<el-select v-model="formobj.recipient" placeholder="请选择" @change="changeRecipient" filterable clearable>
<el-option v-for="item in user_list" :key="item.userSid" :label="item.userName" :value="item.userName"/>
<el-col :span="20">
<el-form-item prop="receiveRoleSid">
<el-select v-model="formobj.receiveRoleSid" placeholder="请选择" filterable clearable>
<el-option v-for="item in user_list" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" class="tleftb">
<span>移交备注</span>
<el-col :span="4" class="tleftb">
<span>备注</span>
</el-col>
<el-col :span="18">
<el-col :span="20">
<el-form-item>
<el-input v-model="formobj.transferRemarks" placeholder="若为邮寄发票,请写明快递公司、快递单号" clearable/>
<el-input v-model="formobj.transferDept" placeholder="若为邮寄发票,请写明快递公司、快递单号" clearable/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" type="primary" @click="handleConfirm">确定</el-button>
<el-button size="small" @click="dialogFileVisible = false">取消</el-button>
</span>
<div style="text-align: center;padding-top: 5px">
<el-button size="small" type="primary" @click="handleConfirm"></el-button>
<el-button size="small" @click="dialogFileVisible = false">关闭</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listPage, cancellation, saveOrUpdate } from '@/api/anruifinmanagement/fininvoiceapply'
import { getOrgSidByPath, typeValues, getButtonPermissions, getGressionUserList } from '@/api/jichuxinxi/dictcommons'
import { listPage, cancellation, invoiceYJ, invoiceYJCH } from '@/api/anruifinmanagement/fininvoiceapply'
import { getOrgSidByPath, typeValues, getButtonPermissions } from '@/api/jichuxinxi/dictcommons'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
@ -238,6 +288,13 @@ export default {
btnKey: 'doHandover',
btnLabel: '移交'
},
{
type: 'danger',
size: 'small',
icon: '',
btnKey: 'doRevocation',
btnLabel: '撤回'
},
{
type: 'danger',
size: 'small',
@ -261,12 +318,25 @@ export default {
tableKey: 0,
list: [],
sids: [],
nodeState_list: [],
multipleSelection: [],
srcList: [],
invoiceType_list: [],
state_list: [],
invoiceState_list: [],
user_list: [],
user_list: [
{
sid: '9b0cb349-4665-4908-9a44-bdb9c3871cbf',
name: '分公司销售内勤'
},
{
sid: 'b1a32e21-2d4b-4f99-82cf-e99d96da3d5d',
name: '分公司金融内勤'
},
{
sid: '89d7f310-a221-405b-858e-dd650e0993d5',
name: '分公司销售专员'
}
],
TakeTicket: [
{
dictKey: 1,
@ -301,16 +371,20 @@ export default {
total: 0
},
formobj: {
recipient: '',
recipientSid: '',
showTransfer: true,
transferTime: '',
transferRemarks: '',
sid: ''
vinNo: '',
invoiceTitle: '',
invoiceType: '',
invoicingName: '',
invoiceAmount: '',
invoiceNo: '',
sids: [],
transferSid: '',
orgPath: '',
receiveRoleSid: '',
transferDept: ''
},
rules: {
transferTime: [{ required: true, message: '移交日期不能为空', trigger: 'blur' }],
recipient: [{ required: true, message: '接收人不能为空', trigger: 'change' }]
receiveRoleSid: [{ required: true, message: '选择接收岗位不能为空', trigger: 'change' }]
}
}
},
@ -352,6 +426,9 @@ export default {
case 'doHandover':
this.doHandover()
break
case 'doRevocation':
this.doRevocation()
break
case 'doCancellation':
this.doCancellation()
break
@ -381,11 +458,6 @@ export default {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.listQuery.params.createOrgSid = res.data
getGressionUserList({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
if (resp.success) {
this.user_list = resp.data
}
})
this.getList()
console.log(this.listQuery.params.createOrgSid)
}
@ -399,17 +471,12 @@ export default {
},
// sid
handleSelectionChange(row) {
this.multipleSelection = row
const aa = []
const bb = []
row.forEach(element => {
aa.push(element.sid)
bb.push({
billingState: element.billingState,
transferState: element.transferState
})
})
this.sids = aa
this.nodeState_list = bb
console.log('获取sids数组', this.sids)
},
//
@ -458,10 +525,10 @@ export default {
this.init()
},
toEdit() {
if (this.sids.length === 1) {
if (this.nodeState_list.length > 0) {
for (var i = 0; i < this.nodeState_list.length; i++) {
if (this.nodeState_list[i].billingState === '作废' || this.nodeState_list[i].billingState === '已开票') {
if (this.multipleSelection.length === 1) {
if (this.multipleSelection.length > 0) {
for (var i = 0; i < this.multipleSelection.length; i++) {
if (this.multipleSelection[i].billingState === '作废' || this.multipleSelection[i].billingState === '已开票') {
this.$message({ showClose: true, type: 'error', message: '因选择的记录中包含作废或已开票的,操作失败' })
return
}
@ -475,42 +542,77 @@ export default {
}
},
doHandover() {
if (this.sids.length === 1) {
if (this.nodeState_list[0].billingState === '已开票' && this.nodeState_list[0].transferState === '未移交') {
var nowDate = new Date()
var date = {
year: nowDate.getFullYear(),
month: nowDate.getMonth() + 1,
day: nowDate.getDate()
}
var dayDate = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
this.formobj = {
recipient: '',
recipientSid: '',
showTransfer: true,
transferTime: dayDate,
transferRemarks: '',
sid: ''
this.formobj = {
vinNo: '',
invoiceTitle: '',
invoiceType: '',
invoicingName: '',
invoiceAmount: '',
invoiceNo: '',
sids: [],
transferSid: '',
orgPath: '',
receiveRoleSid: '',
transferDept: ''
}
if (this.multipleSelection.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请至少选择一条记录进行移交操作' })
return
} else {
for (var i = 0; i < this.multipleSelection.length; i++) {
if (this.multipleSelection[i].billingState !== '已开票' || this.multipleSelection[i].transferState !== '未移交' || this.multipleSelection[i].isTakeTicket !== '是') {
this.$message({ showClose: true, type: 'error', message: '请选择发票状态为已开票,交接状态为未移交,是否领取发票为是的进行移交操作' })
return
}
this.dialogFileVisible = true
}
if (this.multipleSelection.length === 1) {
this.formobj.vinNo = this.multipleSelection[0].vinNo
this.formobj.invoiceTitle = this.multipleSelection[0].invoiceTitle
this.formobj.invoiceType = this.multipleSelection[0].invoiceType
this.formobj.invoicingName = this.multipleSelection[0].invoicingName
this.formobj.invoiceAmount = this.multipleSelection[0].invoiceAmount
this.formobj.invoiceNo = this.multipleSelection[0].invoiceNo
} else {
this.$message({ showClose: true, type: 'error', message: '请选择发票状态为已开票且交接状态为未移交的进行移交操作' })
return
for (var k = 0; k < this.multipleSelection.length; k++) {
this.formobj.vinNo += this.multipleSelection[k].vinNo + ','
}
}
} else {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行移交操作' })
return
this.formobj.sids = this.sids
this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.formobj.transferSid = window.sessionStorage.getItem('userSid')
this.dialogFileVisible = true
}
},
changeRecipient(value) {
const choose = this.user_list.filter((item) => item.userName === value)
this.formobj.recipientSid = choose[0].userSid
doRevocation() {
if (this.multipleSelection.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请至少选择一条记录进行撤回操作' })
return
} else {
for (var i = 0; i < this.multipleSelection.length; i++) {
if (this.multipleSelection[i].transferState !== '移交中') {
this.$message({ showClose: true, type: 'error', message: '请选择交接状态为移交中的进行撤回操作' })
return
}
}
const tip = '请确认是否撤回所选' + this.sids.length + '条记录'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
invoiceYJCH(this.sids).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '撤回成功' })
this.getList()
}
})
})
}
},
handleConfirm() {
this.formobj.sid = this.sids[0]
this.$refs['form_obj'].validate((valid) => {
if (valid) {
saveOrUpdate(this.formobj).then((resp) => {
invoiceYJ(this.formobj).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '移交成功' })
this.getList()
@ -525,9 +627,9 @@ export default {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行作废操作' })
return
}
if (this.nodeState_list.length > 0) {
for (var i = 0; i < this.nodeState_list.length; i++) {
if (this.nodeState_list[i].billingState === '作废') {
if (this.multipleSelection.length > 0) {
for (var i = 0; i < this.multipleSelection.length; i++) {
if (this.multipleSelection[i].billingState === '作废') {
this.$message({ showClose: true, type: 'error', message: '因选择的记录中包含作废的,操作失败' })
return
}

2
anrui-scm/anrui-scm-ui/src/views/examinePage/chukushenhe/chukushenheInfo.vue

@ -276,7 +276,7 @@ export default {
var aa = ''
for (var i = 0; i < row.discountUse.length; i++) {
if (row.discountUse[i].discountNum !== 0) {
aa = aa + row.discountUse[i].discountInfo + 'X' + row.discountUse[i].discountNum + ','
aa = aa + row.discountUse[i].discountName + row.discountUse[i].discountInfo + 'X' + row.discountUse[i].discountNum + ','
}
}
if (aa !== '') {

2
anrui-scm/anrui-scm-ui/src/views/examinePage/chukushenhe/chukushenheTodo.vue

@ -280,7 +280,7 @@ export default {
var aa = ''
for (var i = 0; i < row.discountUse.length; i++) {
if (row.discountUse[i].discountNum !== 0) {
aa = aa + row.discountUse[i].discountInfo + 'X' + row.discountUse[i].discountNum + ','
aa = aa + row.discountUse[i].discountName + row.discountUse[i].discountInfo + 'X' + row.discountUse[i].discountNum + ','
}
}
if (aa !== '') {

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/CertificateInfoQuery.java

@ -1,6 +1,5 @@
package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -9,11 +8,11 @@ import lombok.Data;
public class CertificateInfoQuery implements Query {
private static final long serialVersionUID = 3659022580155238922L;
@ApiModelProperty("车架号")
/* @ApiModelProperty("车架号")
private String vin;
@ApiModelProperty("用户sid")
private String userSid;
private String userSid;*/
@ApiModelProperty("车辆列表sid")
private String sid;

21
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/CertificateInfoVo.java

@ -11,7 +11,7 @@ import java.util.List;
public class CertificateInfoVo implements Vo {
private static final long serialVersionUID = -4490288226803925013L;
@ApiModelProperty("车辆列表sid")
/* @ApiModelProperty("车辆列表sid")
@JsonProperty("vinSid")
private String sid;
@ -22,6 +22,23 @@ public class CertificateInfoVo implements Vo {
@ApiModelProperty("合格证日期")
private String date;
@ApiModelProperty("合格证附件")
private List<String> invoiceImages;
private List<String> invoiceImages;*/
@ApiModelProperty("车架号")
@JsonProperty("vin")
private String vinNo;
@ApiModelProperty("车辆型号")
private String carModel;
@ApiModelProperty("合格证编号")
@JsonProperty("certificateId")
private String certificationNo;
@ApiModelProperty("发证日期")
@JsonProperty("date")
private String certificateDate;
@ApiModelProperty("合格证照片,多张")
@JsonProperty("certificateImages")
private List<String> certificatePhoto;
@ApiModelProperty("备注")
private String remarks;
}

8
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/HandoverPrepareInfoVo.java

@ -37,5 +37,13 @@ public class HandoverPrepareInfoVo implements Vo {
@ApiModelProperty("车辆集合")
private List<HandoverPrepareVehicleInfoVo> carDataList;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("配置sid")
private String configSid;
@ApiModelProperty("组织全路径")
@JsonProperty("orgPath")
private String orgSidPath;
}

Loading…
Cancel
Save