Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
zhanglei
dimengzhe 2 years ago
parent
commit
52413da886
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java
  2. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java
  3. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java
  4. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java
  5. 1
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml
  6. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java
  7. 30
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
  8. 9
      anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/fininvoiceapply.js
  9. 14
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue
  10. 56
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyAdd.vue
  11. 40
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyInfo.vue
  12. 102
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagement.vue
  13. 57
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagementAdd.vue
  14. 57
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagementInfo.vue
  15. 82
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyByFileDaiBanInfo.vue
  16. 77
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyDaiBanInfo.vue
  17. 54
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue
  18. 75
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyYiBanInfo.vue
  19. 14
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue
  20. 2
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
  21. 1
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListQuery.java
  22. 1
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListVo.java
  23. 2
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
  24. 3
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
  25. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java
  26. 1
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java
  27. 9
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  28. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageQuery.java
  29. 6
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

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

@ -142,7 +142,7 @@ public interface BaseDistributorFeign {
@ApiOperation("查询所有经销商信息")
@GetMapping("/selectAllDisList")
ResultBean<List<BaseDistributorListVo>> selectAllDisList();
ResultBean<List<BaseDistributorListVo>> selectAllDisList(@RequestParam("orgSid") String orgSid,@RequestParam("staffSid") String staffSid);
@ApiOperation("根据sid查询所有经销商信息")
@GetMapping("/selectDisListBySid/{sid}")

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

@ -153,7 +153,7 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign {
}
@Override
public ResultBean<List<BaseDistributorListVo>> selectAllDisList() {
public ResultBean<List<BaseDistributorListVo>> selectAllDisList(String orgSid, String staffSid) {
return null;
}

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

@ -22,6 +22,4 @@ public class BaseDistributorListVo implements Vo {
private String invoBankNum;//开票银行账号
private String openTickRemarks;
}

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

@ -131,7 +131,7 @@ public interface BaseDistributorMapper extends BaseMapper<BaseDistributor> {
@Select("select * from base_distributor where disName = #{disName} and createOrg = #{createOrg} and isDelete = 0 and sid != #{sid}")
BaseDistributorsListVo selByNameAndOrgSidAndSid(@Param("disName") String disName,@Param("createOrg") String createOrg,@Param("sid") String sid);
List<BaseDistributorListVo> selectAllDisList();
List<BaseDistributorListVo> selectAllDisList(String orgSid);
BaseDistributorListVo selectDisListBySid(String sid);
}

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

@ -233,6 +233,7 @@
invoBankNum
FROM base_distributor
WHERE isDelete = 0
AND createOrg = #{orgSid}
</select>
<select id="selectDisListBySid" resultType="com.yxt.anrui.base.api.basedistributor.BaseDistributorListVo">

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

@ -263,8 +263,8 @@ public class BaseDistributorRest implements BaseDistributorFeign {
}
@Override
public ResultBean<List<BaseDistributorListVo>> selectAllDisList() {
return baseDistributorService.selectAllDisList();
public ResultBean<List<BaseDistributorListVo>> selectAllDisList(String orgSid, String staffSid) {
return baseDistributorService.selectAllDisList(orgSid, staffSid);
}
@Override

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

@ -14,6 +14,9 @@ import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffVo;
import com.yxt.anrui.base.api.basemiddleman.BaseMiddleman;
import com.yxt.anrui.base.biz.basedistributorappendix.BaseDistributorAppendixService;
import com.yxt.anrui.base.biz.basedistributorstaff.BaseDistributorStaffService;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempListQuery;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempListVo;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@ -63,6 +66,8 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
private BaseDistributorAppendixService baseDistributorAppendixService;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private CrmCustomerTempFeign crmCustomerTempFeign;
/**
* 经销商分页列表
@ -852,28 +857,41 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
return rb.success().setData(list);
}
public ResultBean<List<BaseDistributorListVo>> selectAllDisList() {
public ResultBean<List<BaseDistributorListVo>> selectAllDisList(String orgSid, String staffSid) {
ResultBean rb = ResultBean.fireFail();
List<BaseDistributorListVo> baseDistributorListVos = baseMapper.selectAllDisList();
List<BaseDistributorListVo> baseDistributorListVos = baseMapper.selectAllDisList(orgSid);
for (BaseDistributorListVo baseDistributorListVo : baseDistributorListVos) {
String openTickRemarks = "";
if (StringUtils.isNotBlank(openTickRemarks + baseDistributorListVo.getRegistNum())){
openTickRemarks = openTickRemarks + baseDistributorListVo.getRegistNum() + ";";
}
if (StringUtils.isNotBlank(baseDistributorListVo.getRegistDetailAddress())){
openTickRemarks = baseDistributorListVo.getRegistDetailAddress() + ";";
openTickRemarks = openTickRemarks + baseDistributorListVo.getRegistDetailAddress() + ";";
}
if (StringUtils.isNotBlank(baseDistributorListVo.getInvoPhone())){
openTickRemarks = baseDistributorListVo.getInvoPhone() + ";";
openTickRemarks = openTickRemarks + baseDistributorListVo.getInvoPhone() + ";";
}
if (StringUtils.isNotBlank(baseDistributorListVo.getInvoBank())){
openTickRemarks = baseDistributorListVo.getInvoBank() + ";";
openTickRemarks = openTickRemarks + baseDistributorListVo.getInvoBank() + ";";
}
if (StringUtils.isNotBlank(baseDistributorListVo.getInvoBankNum())){
openTickRemarks = baseDistributorListVo.getInvoBankNum() + ";";
openTickRemarks = openTickRemarks + baseDistributorListVo.getInvoBankNum() + ";";
}
baseDistributorListVo.setOpenTickRemarks(openTickRemarks);
}
CrmCustomerTempListQuery crmCustomerTempListQuery = new CrmCustomerTempListQuery();
crmCustomerTempListQuery.setStaffSid(staffSid);
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(orgSid).getData();
crmCustomerTempListQuery.setOrgPath(sysOrganizationVo.getOrgSidPath());
crmCustomerTempListQuery.setCertificateTypeKey("01");
List<CrmCustomerTempListVo> crmCustomerTempListVos = crmCustomerTempFeign.selectCustomerList(crmCustomerTempListQuery).getData();
for (CrmCustomerTempListVo crmCustomerTempListVo : crmCustomerTempListVos) {
BaseDistributorListVo baseDistributorListVo = new BaseDistributorListVo();
baseDistributorListVo.setName(crmCustomerTempListVo.getName());
baseDistributorListVo.setSid(crmCustomerTempListVo.getSid());
baseDistributorListVo.setOpenTickRemarks(crmCustomerTempListVo.getIdCard());
baseDistributorListVos.add(baseDistributorListVo);
}
return rb.success().setData(baseDistributorListVos);
}

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

@ -32,3 +32,12 @@ export function saveOrUpdate(data) {
})
}
// 通过sid作废一条或多条记录
export function cancellation(params) {
return request({
url: '/fin/v1/finvehicleinvoice/cancellation',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
}

14
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue

@ -108,7 +108,7 @@
</el-table-column>
<el-table-column label="开票名称" align="center">
<template slot-scope="scope">
<el-select v-model="scope.row.openTickName" placeholder="请选择" @change="changeOpenTickName($event, scope.row)" clearable>
<el-select v-model="scope.row.openTickName" placeholder="请选择" @change="changeOpenTickName($event, scope.row)" filterable>
<el-option v-for="item in openTick_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
</el-select>
</template>
@ -301,7 +301,7 @@ export default {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.formobj.useOrgSid = res.data
selectAllDisList({ orgSid: res.data }).then((resp) => {
selectAllDisList({ orgSid: res.data, staffSid: window.sessionStorage.getItem('staffSid') }).then((resp) => {
if (resp.success) {
this.openTick_list = resp.data
}
@ -495,6 +495,16 @@ export default {
this.$message({ showClose: true, type: 'error', message: '请选择车辆' })
return
}
for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
if (this.formobj.finBillVehicles[i].openTickName === '') {
this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票名称不能为空' })
return
}
if (this.formobj.finBillVehicles[i].openTickRemarks === '') {
this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票信息为空,请完善经销商信息或客户信息' })
return
}
}
this.submitdisabled = true
submit(this.formobj).then((res) => {
if (res.success) {

56
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyAdd.vue

@ -94,14 +94,14 @@
</el-table-column>
<el-table-column label="开票类型" align="center">
<template slot-scope="scope">
<el-select v-model="scope.row.billTypeValue" placeholder="请选择" @change="changeBillType($event, scope.row)" clearable>
<el-select v-model="scope.row.billTypeValue" placeholder="请选择" @change="changeBillType($event, scope.row)">
<el-option v-for="item in openTickType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="开票名称" align="center">
<template slot-scope="scope">
<el-select v-model="scope.row.openTickName" placeholder="请选择" @change="changeOpenTickName($event, scope.row)" clearable>
<el-select v-model="scope.row.openTickName" placeholder="请选择" @change="changeOpenTickName($event, scope.row)" filterable>
<el-option v-for="item in openTick_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
</el-select>
</template>
@ -130,25 +130,27 @@
<el-form-item><span class="addinputInfo">{{ formobj.billStateValue }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">挂车开票信息(挂车的开票类型开票名称与主车相同)</div>
<el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="挂车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.gcVinNo }}</span>
</template>
</el-table-column>
<el-table-column label="主车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="开票金额" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.oneBillMoney" @keyup.native="UpNumber" clearable placeholder=""/>
</template>
</el-table-column>
</el-table>
<div v-if="formobj.finBillTrailers !== null">
<div class="title">挂车开票信息(挂车的开票类型开票名称与主车相同)</div>
<el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="挂车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.gcVinNo }}</span>
</template>
</el-table-column>
<el-table-column label="主车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="开票金额" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.oneBillMoney" @keyup.native="UpNumber" clearable placeholder=""/>
</template>
</el-table-column>
</el-table>
</div>
<div class="title"><span class="icon">*</span>证件(营业执照或身份证)</div>
<el-row>
<el-col :span="24">
@ -297,7 +299,7 @@ export default {
this.formobj.orgSidPath = window.sessionStorage.getItem('defaultOrgPath')
this.formobj.instanceId = res.data.procInstSid
this.formobj.userSid = window.sessionStorage.getItem('userSid')
selectAllDisList({orgSid: this.formobj.useOrgSid}).then((resp) => {
selectAllDisList({ orgSid: this.formobj.useOrgSid, staffSid: window.sessionStorage.getItem('staffSid') }).then((resp) => {
if (resp.success) {
this.openTick_list = resp.data
}
@ -401,6 +403,16 @@ export default {
this.$message({ showClose: true, type: 'error', message: '单台开票金额不能为空' })
return
}
for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
if (this.formobj.finBillVehicles[i].openTickName === '') {
this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票名称不能为空' })
return
}
if (this.formobj.finBillVehicles[i].openTickRemarks === '') {
this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票信息为空,请完善经销商信息或客户信息' })
return
}
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.getUrl()

40
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyInfo.vue

@ -117,25 +117,27 @@
<el-form-item><span class="addinputInfo">{{ formobj.billStateValue }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">挂车开票信息(挂车的开票类型开票名称与主车相同)</div>
<el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="挂车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.gcVinNo }}</span>
</template>
</el-table-column>
<el-table-column label="主车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="开票金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.oneBillMoney }}</span>
</template>
</el-table-column>
</el-table>
<div v-if="formobj.finBillTrailers !== null">
<div class="title">挂车开票信息(挂车的开票类型开票名称与主车相同)</div>
<el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="挂车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.gcVinNo }}</span>
</template>
</el-table-column>
<el-table-column label="主车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="开票金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.oneBillMoney }}</span>
</template>
</el-table-column>
</el-table>
</div>
<div class="title">证件(营业执照或身份证)</div>
<el-row>
<el-col :span="24">

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

@ -58,11 +58,11 @@
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<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 label="操作" width="150" align="center">
<el-table-column fixed label="操作" width="100" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" v-show="scope.row.billingState !== '作废' && scope.row.transferState !== '已移交'" @click="toEdit(scope.row)">编辑</el-button>
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
@ -155,7 +155,7 @@
</template>
<script>
import { listPage } from '@/api/anruifinmanagement/fininvoiceapply'
import { listPage, cancellation } from '@/api/anruifinmanagement/fininvoiceapply'
import { getOrgSidByPath, typeValues } from '@/api/jichuxinxi/dictcommons'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
@ -177,6 +177,20 @@ export default {
btndisabled: false,
viewState: 1,
btnList: [
{
type: 'primary',
size: 'small',
icon: 'edit',
btnKey: 'toEdit',
btnLabel: '编辑'
},
{
type: 'danger',
size: 'small',
icon: '',
btnKey: 'doCancellation',
btnLabel: '作废'
},
{
type: 'info',
size: 'small',
@ -192,6 +206,8 @@ export default {
// -----------
tableKey: 0,
list: [],
sids: [],
nodeState_list: [],
srcList: [],
invoiceType_list: [],
state_list: [],
@ -211,7 +227,8 @@ export default {
invoiceCode: '',
createStartTime: '',
createEndTime: '',
createOrgSid: ''
createOrgSid: '',
orgSidPath: ''
},
current: 1,
size: 10,
@ -241,6 +258,12 @@ export default {
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'toEdit':
this.toEdit()
break
case 'doCancellation':
this.doCancellation()
break
case 'doClose':
this.doClose()
break
@ -278,9 +301,22 @@ export default {
var pageindex = index + 1 + pagestart
return pageindex
},
// sid
handleSelectionChange(row) {
const aa = []
const bb = []
row.forEach(element => {
aa.push(element.sid)
bb.push(element.billingState)
})
this.sids = aa
this.nodeState_list = bb
console.log('获取sids数组', this.sids)
},
//
getList() {
this.listLoading = true
this.listQuery.params.orgSidPath = window.sessionStorage.getItem('defaultOrgPath')
listPage(this.listQuery).then((response) => {
console.log('列表查询结果:', response)
this.listLoading = false
@ -312,7 +348,8 @@ export default {
invoiceCode: '',
createStartTime: '',
createEndTime: '',
createOrgSid: ''
createOrgSid: '',
orgSidPath: ''
},
current: 1,
size: 10,
@ -321,8 +358,57 @@ export default {
this.init()
},
toEdit(row) {
this.viewState = 2
this.$refs['divAdd'].showEdit(row)
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] === '作废' || this.nodeState_list[i] === '已移交') {
this.$message({ showClose: true, type: 'error', message: '因选择的记录中包含作废或已移交的,操作失败' })
return
}
}
}
this.viewState = 2
this.$refs['divAdd'].showEdit(row)
} else {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑操作' })
return
}
},
doCancellation() {
if (this.sids.length === 0) {
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] === '作废') {
this.$message({ showClose: true, type: 'error', message: '因选择的记录中包含作废的,操作失败' })
return
}
}
}
const tip = '请确认是否作废所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
cancellation(this.sids).then(resp => {
loading.close()
if (resp.success) {
this.$message({ type: 'success', message: resp.msg, showClose: true })
this.getList()
}
}).catch(e => {
loading.close()
})
}).catch(() => {})
},
toInfo(row) {
this.viewState = 3

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

@ -81,6 +81,59 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">开票申请附件</div>
<el-form-item>
<div class="addinputInfo">
<el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in formobj.bitlingFilePaths" :key="index" :src="item" :preview-src-list="formobj.bitlingFilePaths"></el-image>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">合格证</div>
<el-form-item>
<div class="addinputInfo">
<el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in formobj.certificatePaths" :key="index" :src="item" :preview-src-list="formobj.certificatePaths"></el-image>
</div>
</el-form-item>
</el-col>
</el-row>
<div class="title">开票信息</div>
<el-row>
<el-col :span="12">
<div class="span-sty">开票名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.invoicingName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">纳税人识别号</div>
<el-form-item><span class="addinputInfo">{{ formobj.taxpayerNo }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">地址</div>
<el-form-item><span class="addinputInfo">{{ formobj.address }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">电话</div>
<el-form-item><span class="addinputInfo">{{ formobj.telPhone }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">开户行</div>
<el-form-item><span class="addinputInfo">{{ formobj.openingBank }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">银行账号</div>
<el-form-item><span class="addinputInfo">{{ formobj.bankNum }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
@ -115,6 +168,8 @@ export default {
invoiceNo: '',
invoiceCode: '',
filePaths: [],
bitlingFilePaths: [],
certificatePaths: [],
vinNo: ''
},
rules: {}
@ -165,6 +220,8 @@ export default {
aa.push(this.diploma_list[i].url)
}
this.formobj.filePaths = aa
} else {
this.formobj.filePaths = []
}
console.log(this.formobj, this.diploma_list)
},

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

@ -42,7 +42,7 @@
</el-col>
<el-col :span="8">
<div class="span-sty">开票状态</div>
<el-form-item><span class="addinputInfo">{{ formobj.state }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.billingState }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
@ -81,6 +81,59 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">开票申请附件</div>
<el-form-item>
<div class="addinputInfo">
<el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in formobj.bitlingFilePaths" :key="index" :src="item" :preview-src-list="formobj.bitlingFilePaths"></el-image>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">合格证</div>
<el-form-item>
<div class="addinputInfo">
<el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in formobj.certificatePaths" :key="index" :src="item" :preview-src-list="formobj.certificatePaths"></el-image>
</div>
</el-form-item>
</el-col>
</el-row>
<div class="title">开票信息</div>
<el-row>
<el-col :span="24">
<div class="span-sty">开票名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.invoicingName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">纳税人识别号</div>
<el-form-item><span class="addinputInfo">{{ formobj.taxpayerNo }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">地址</div>
<el-form-item><span class="addinputInfo">{{ formobj.address }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">电话</div>
<el-form-item><span class="addinputInfo">{{ formobj.telPhone }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">开户行</div>
<el-form-item><span class="addinputInfo">{{ formobj.openingBank }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">银行账号</div>
<el-form-item><span class="addinputInfo">{{ formobj.bankNum }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
@ -108,6 +161,8 @@ export default {
invoiceNo: '',
invoiceCode: '',
filePaths: [],
billingFilePaths: [],
certificatePaths: [],
vinNo: ''
},
rules: {}

82
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyByFileDaiBanInfo.vue

@ -100,6 +100,16 @@
<span>{{ scope.row.openTickRemarks }}</span>
</template>
</el-table-column>
<el-table-column label="开票金额" align="center">
<template>
<span>{{ formobj.oneBillMoney }}</span>
</template>
</el-table-column>
<el-table-column label="合格证状态" align="center">
<template slot-scope="scope">
<span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
</template>
</el-table-column>
</el-table>
<el-row>
<el-col :span="24">
@ -119,25 +129,47 @@
<el-form-item><span class="addinputInfo">{{ formobj.billStateValue }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">挂车开票信息(挂车的开票类型开票名称与主车相同)</div>
<el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="挂车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.gcVinNo }}</span>
</template>
</el-table-column>
<el-table-column label="主车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="开票金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.oneBillMoney }}</span>
</template>
</el-table-column>
</el-table>
<div v-if="formobj.finBillTrailers !== null">
<div class="title">挂车开票信息(挂车的开票类型开票名称与主车相同)</div>
<el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="挂车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.gcVinNo }}</span>
</template>
</el-table-column>
<el-table-column label="主车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="开票类型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.billTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="开票名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.openTickName }}</span>
</template>
</el-table-column>
<el-table-column label="开票信息" align="center">
<template slot-scope="scope">
<span>{{ scope.row.openTickRemarks }}</span>
</template>
</el-table-column>
<el-table-column label="开票金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.oneBillMoney }}</span>
</template>
</el-table-column>
<el-table-column label="合格证" align="center">
<template slot-scope="scope">
<span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
</template>
</el-table-column>
</el-table>
</div>
<div class="title"><span class="icon">*</span>证件(营业执照或身份证)</div>
<el-row>
<el-col :span="24">
@ -166,6 +198,11 @@
</el-row>
</el-form>
</div>
<el-dialog :visible.sync="dialogVisible" :append-to-body="true">
<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 title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form class="formadd" >
@ -209,6 +246,8 @@ export default {
tableKey: 0,
billingKey: 1,
index: 0,
dialogVisible: false,
srcList: [],
image_list1: [],
image_list2: [],
image_list3: [],
@ -361,6 +400,11 @@ export default {
}
})
},
handleLook(row) {
this.srcList = []
this.dialogVisible = true
this.srcList = row
},
getUrl() {
if (this.image_list1.length > 0) {
const aa = []

77
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyDaiBanInfo.vue

@ -100,6 +100,16 @@
<span>{{ scope.row.openTickRemarks }}</span>
</template>
</el-table-column>
<el-table-column label="开票金额" align="center">
<template>
<span>{{ formobj.oneBillMoney }}</span>
</template>
</el-table-column>
<el-table-column label="合格证状态" align="center">
<template slot-scope="scope">
<span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
</template>
</el-table-column>
</el-table>
<el-row>
<el-col :span="24">
@ -119,25 +129,42 @@
<el-form-item><span class="addinputInfo">{{ formobj.billStateValue }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">挂车开票信息(挂车的开票类型开票名称与主车相同)</div>
<el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="挂车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.gcVinNo }}</span>
</template>
</el-table-column>
<el-table-column label="主车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="开票金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.oneBillMoney }}</span>
</template>
</el-table-column>
</el-table>
<div v-if="formobj.finBillTrailers !== null">
<div class="title">挂车开票信息(挂车的开票类型开票名称与主车相同)</div>
<el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="挂车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.gcVinNo }}</span>
</template>
</el-table-column>
<el-table-column label="主车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="开票名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.openTickName }}</span>
</template>
</el-table-column>
<el-table-column label="开票信息" align="center">
<template slot-scope="scope">
<span>{{ scope.row.openTickRemarks }}</span>
</template>
</el-table-column>
<el-table-column label="开票金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.oneBillMoney }}</span>
</template>
</el-table-column>
<el-table-column label="合格证" align="center">
<template slot-scope="scope">
<span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
</template>
</el-table-column>
</el-table>
</div>
<div class="title">证件(营业执照或身份证)</div>
<el-row>
<el-col :span="24">
@ -168,6 +195,11 @@
</el-row>
</el-form>
</div>
<el-dialog :visible.sync="dialogVisible" :append-to-body="true">
<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 title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form class="formadd" >
@ -207,6 +239,8 @@ export default {
tableKey: 0,
billingKey: 1,
index: 0,
dialogVisible: false,
srcList: [],
image_list1: [],
image_list2: [],
image_list3: [],
@ -343,6 +377,11 @@ export default {
}
})
},
handleLook(row) {
this.srcList = []
this.dialogVisible = true
this.srcList = row
},
//
openAgree(val) {
this.operation = val

54
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue

@ -100,7 +100,7 @@
</el-table-column>
<el-table-column label="开票名称" align="center">
<template slot-scope="scope">
<el-select v-model="scope.row.openTickName" placeholder="请选择" @change="changeOpenTickName($event, scope.row)" clearable>
<el-select v-model="scope.row.openTickName" placeholder="请选择" @change="changeOpenTickName($event, scope.row)" filterable>
<el-option v-for="item in openTick_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
</el-select>
</template>
@ -129,25 +129,27 @@
<el-form-item><span class="addinputInfo">{{ formobj.billStateValue }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">挂车开票信息(挂车的开票类型开票名称与主车相同)</div>
<el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="挂车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.gcVinNo }}</span>
</template>
</el-table-column>
<el-table-column label="主车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="开票金额" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.oneBillMoney" @keyup.native="UpNumber" clearable placeholder=""/>
</template>
</el-table-column>
</el-table>
<div v-if="formobj.finBillTrailers !== null">
<div class="title">挂车开票信息(挂车的开票类型开票名称与主车相同)</div>
<el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="挂车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.gcVinNo }}</span>
</template>
</el-table-column>
<el-table-column label="主车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="开票金额" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.oneBillMoney" @keyup.native="UpNumber" clearable placeholder=""/>
</template>
</el-table-column>
</el-table>
</div>
<div class="title"><span class="icon">*</span>证件(营业执照或身份证)</div>
<el-row>
<el-col :span="24">
@ -313,7 +315,7 @@ export default {
this.formobj.orgSidPath = window.sessionStorage.getItem('defaultOrgPath')
this.formobj.instanceId = res.data.procInstSid
this.formobj.userSid = window.sessionStorage.getItem('userSid')
selectAllDisList({orgSid: this.formobj.useOrgSid}).then((resp) => {
selectAllDisList({ orgSid: this.formobj.useOrgSid, staffSid: this.formobj.staffSid }).then((resp) => {
if (resp.success) {
this.openTick_list = resp.data
}
@ -424,6 +426,16 @@ export default {
this.$message({ showClose: true, type: 'error', message: '单条开票金额不能为空' })
return
}
for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
if (this.formobj.finBillVehicles[i].openTickName === '') {
this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票名称不能为空' })
return
}
if (this.formobj.finBillVehicles[i].openTickRemarks === '') {
this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票信息为空,请完善经销商信息或客户信息' })
return
}
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.getUrl()

75
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyYiBanInfo.vue

@ -98,6 +98,16 @@
<span>{{ scope.row.openTickRemarks }}</span>
</template>
</el-table-column>
<el-table-column label="开票金额" align="center">
<template>
<span>{{ formobj.oneBillMoney }}</span>
</template>
</el-table-column>
<el-table-column label="合格证状态" align="center">
<template slot-scope="scope">
<span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
</template>
</el-table-column>
</el-table>
<el-row>
<el-col :span="24">
@ -117,25 +127,42 @@
<el-form-item><span class="addinputInfo">{{ formobj.billStateValue }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">挂车开票信息(挂车的开票类型开票名称与主车相同)</div>
<el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="挂车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.gcVinNo }}</span>
</template>
</el-table-column>
<el-table-column label="主车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="开票金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.oneBillMoney }}</span>
</template>
</el-table-column>
</el-table>
<div v-if="formobj.finBillTrailers !== null">
<div class="title">挂车开票信息(挂车的开票类型开票名称与主车相同)</div>
<el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="挂车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.gcVinNo }}</span>
</template>
</el-table-column>
<el-table-column label="主车车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="开票名称" align="center">
<template slot-scope="scope">
<span>{{ scope.row.openTickName }}</span>
</template>
</el-table-column>
<el-table-column label="开票信息" align="center">
<template slot-scope="scope">
<span>{{ scope.row.openTickRemarks }}</span>
</template>
</el-table-column>
<el-table-column label="开票金额" align="center">
<template slot-scope="scope">
<span>{{ scope.row.oneBillMoney }}</span>
</template>
</el-table-column>
<el-table-column label="合格证" align="center">
<template slot-scope="scope">
<span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
</template>
</el-table-column>
</el-table>
</div>
<div class="title">证件(营业执照或身份证)</div>
<el-row>
<el-col :span="24">
@ -166,6 +193,9 @@
</el-row>
</el-form>
</div>
<el-dialog :visible.sync="dialogVisible" :append-to-body="true">
<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>
</div>
</template>
@ -179,6 +209,8 @@ export default {
tableKey: 0,
billingKey: 1,
index: 0,
dialogVisible: false,
srcList: [],
image_list1: [],
image_list2: [],
image_list3: [],
@ -301,6 +333,11 @@ export default {
}
})
},
handleLook(row) {
this.srcList = []
this.dialogVisible = true
this.srcList = row
},
/** 确认撤回任务 */
openRevoke() {
this.$confirm('是否确认执行撤回操作', '提示', {

14
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue

@ -107,7 +107,7 @@
</el-table-column>
<el-table-column label="开票名称" align="center">
<template slot-scope="scope">
<el-select v-model="scope.row.openTickName" placeholder="请选择" @change="changeOpenTickName($event, scope.row)" clearable>
<el-select v-model="scope.row.openTickName" placeholder="请选择" @change="changeOpenTickName($event, scope.row)" filterable>
<el-option v-for="item in openTick_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
</el-select>
</template>
@ -338,7 +338,7 @@ export default {
this.moneyEdit = res.data.isEdit
}
})
selectAllDisList({ orgSid: this.formobj.useOrgSid }).then((resp) => {
selectAllDisList({ orgSid: this.formobj.useOrgSid, staffSid: this.formobj.staffSid }).then((resp) => {
if (resp.success) {
this.openTick_list = resp.data
}
@ -469,6 +469,16 @@ export default {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.getUrl()
for (var i = 0; i < this.formobj.finBillVehicles.length; i++) {
if (this.formobj.finBillVehicles[i].openTickName === '') {
this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票名称不能为空' })
return
}
if (this.formobj.finBillVehicles[i].openTickRemarks === '') {
this.$message({ showClose: true, type: 'error', message: this.formobj.finBillVehicles[i].vinNo + '的开票信息为空,请完善经销商信息或客户信息' })
return
}
}
this.submitdisabled = true
submit(this.formobj).then((res) => {
if (res.success) {

2
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java

@ -57,7 +57,7 @@ public interface CrmCustomerTempFeign {
@ApiOperation("推送财务客户-否")
@PostMapping("/sendFinCustomer/{orgCode}")
public ResultBean sendFinCustomer(@RequestBody String[] customerSids, @PathVariable("orgCode") String orgCode);
public ResultBean sendFinCustomer(@RequestBody String[] customerSids,@PathVariable("orgCode") String orgCode);
@ApiOperation("推送财务客户-是")
@PostMapping("/sendFinCustomerTrue")

1
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListQuery.java

@ -17,4 +17,5 @@ public class CrmCustomerTempListQuery implements Query {
private String staffSid;
@ApiModelProperty("组织机构全路径sid")
private String orgPath;
private String certificateTypeKey; //证件类型
}

1
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListVo.java

@ -16,6 +16,7 @@ public class CrmCustomerTempListVo implements Vo {
private String name;
private String sid;
private String mobile;
private String idCard; //身份证号
@ApiModelProperty("客户编码")
private String customerNo;

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

@ -201,7 +201,7 @@
</select>
<select id="selectCustomerList" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempListVo">
select ct.name, ct.sid, ct.mobile, ct.customerNo
select ct.name, ct.sid, ct.mobile, ct.customerNo, ct.IDNumber as idCard
from crm_customer_temp ct
<where>
${ew.sqlSegment}

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

@ -995,6 +995,9 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
orgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
qw.eq("ct.createOrgSid", orgSid);
}
if (StringUtils.isNotBlank(query.getCertificateTypeKey())){
qw.eq("ct.certificateTypeKey", query.getCertificateTypeKey());
}
qw.eq("ct.staffSid", staffSid);
List<CrmCustomerTempListVo> list = baseMapper.selectCustomerList(qw);
list.removeAll(Collections.singleton(null));

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java

@ -62,12 +62,13 @@ public class FinVehicleInvoiceDetailsVo implements Vo {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("移交日期")
private Date transferTime;
@ApiModelProperty("纳税人识别号")
private String taxpayerNo;
@ApiModelProperty("图片地址集合")
private List<String> filePaths;
@ApiModelProperty("开票申请附件")
private List<String> billingFilePaths;
@ApiModelProperty("合格证照片")
private List<String> certificatePaths;
@ApiModelProperty("纳税人识别号")
private String taxpayerNo;
}

1
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java

@ -80,5 +80,4 @@ public interface FinVehicleInvoiceFeign {
public ResultBean<FinInvoiceInformationVo> invoiceInformation(@PathVariable("sid") String sid);
}

9
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@ -183,6 +183,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
qw.and(wrapper -> wrapper.eq("fba.billStateKey", "001").or().eq("fba.billStateKey", "002"));
qw.eq("fba.useOrgSid", query.getUseOrgSid());
qw.eq("fba.createBySid", query.getCreateBySid());
if ("1".equals(query.getType())) {
qw.eq("fba.nodeState", "待提交");
} else if ("2".equals(query.getType())) {
qw.ne("fba.nodeState", "待提交");
}
if (StringUtils.isNotBlank(query.getSaleTypeKey())) {
qw.eq("fba.saleTypeKey", query.getSaleTypeKey());
}
@ -214,6 +219,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
qw.apply(StringUtils.isNotEmpty(returnedMoneyStartDate), "date_format (fba.returnedMoneyDate,'%Y-%m-%d') >= date_format('" + returnedMoneyStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(returnedMoneyEndDate), "date_format (fba.returnedMoneyDate,'%Y-%m-%d') <= date_format('" + returnedMoneyEndDate + "','%Y-%m-%d')"
);
qw.orderByDesc("fba.createTime");
return qw;
}
@ -404,17 +410,18 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
public FinBillApplicationDetailsVo fetchDetailsVoBySid(String sid) {
FinBillApplication entity = fetchBySid(sid);
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid);
String contractNo = entity.getContractNo();
List<FinBillApplicationDetailsVo> finBillApplicationVos = baseMapper.selectByContractNo(contractNo);
if (finBillApplicationVos != null && finBillApplicationVos.size() > 0) {
FinBillApplicationDetailsVo finBillApplicationVo = finBillApplicationVos.get(0);
if (StringUtils.isNotBlank(finBillApplicationVo.getOneBillMoney())) {
entity.setOneBillMoney(new BigDecimal(finBillApplicationVo.getOneBillMoney()));
entity.setTotalBillMoney(new BigDecimal(finBillApplicationVo.getOneBillMoney()).multiply(new BigDecimal(finBillVehicleVos.size())));
}
}
FinBillApplicationDetailsVo vo = new FinBillApplicationDetailsVo();
BeanUtil.copyProperties(entity, vo);
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid);
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(finBillVehicleVo.getVehSid()).getData();
if (baseVehicleCertificateVo != null){

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageQuery.java

@ -16,4 +16,6 @@ public class BillApplicationPageQuery implements Query {
private String name;
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("1待办2已办")
private String type;
}

6
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@ -54,6 +54,7 @@ public class InvoicedService {
finBillApplicationQuery.setCreateBySid(params.getUserSid());
finBillApplicationQuery.setCustomerName(params.getName());
finBillApplicationQuery.setOrgPath(params.getOrgPath());
finBillApplicationQuery.setType(params.getType());
PagerQuery<FinBillApplicationQuery> pcq = new PagerQuery<>();
pcq.setParams(finBillApplicationQuery);
ResultBean<PagerVo<FinBillApplicationVo>> resultBean = finBillApplicationFeign.listPage(pcq);
@ -72,6 +73,7 @@ public class InvoicedService {
billApplicationPageVo.setContractNo(record.getContractNo());
billApplicationPageVo.setSid(record.getSid());
billApplicationPageVo.setBillState(record.getBillStateValue());
billApplicationPageVo.setNodeState(record.getNodeState());
if (record.getNodeState().equals("待提交")){
billApplicationPageVo.setShowUpData(true);
}else {
@ -190,7 +192,7 @@ public class InvoicedService {
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
finBillApplicationDto.setUseOrgSid(useOrgSid);
finBillApplicationDto.setCreateBySid(dto.getUserSid());
finBillApplicationDto.setTotalBillMoney(dto.getInvoiceMoney());
finBillApplicationDto.setTotalBillMoney(dto.getInvoiceTotal());
finBillApplicationDto.setOrgSidPath(dto.getOrgPath());
finBillApplicationDto.setSaleTypeValue(dto.getSaleType());
finBillApplicationDto.setSaleDeptName(dto.getSellerName());
@ -219,6 +221,7 @@ public class InvoicedService {
for (VinListDto vinListDto : vinList) {
FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto();
finBillVehicleDto.setVinNo(vinListDto.getVin());
finBillVehicleDto.setVehSid(vinListDto.getVinSid());
finBillVehicleDto.setCertificateStateKey(vinListDto.getCertificateStateKey());
finBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateState());
finBillVehicleDto.setBillTypeKey(vinListDto.getInvoiceTypeKey());
@ -395,6 +398,7 @@ public class InvoicedService {
for (VinListDto vinListDto : vinList) {
FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto();
finBillVehicleDto.setVinNo(vinListDto.getVin());
finBillVehicleDto.setVehSid(vinListDto.getVinSid());
finBillVehicleDto.setCertificateStateKey(vinListDto.getCertificateStateKey());
finBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateState());
finBillVehicleDto.setBillTypeKey(vinListDto.getInvoiceTypeKey());

Loading…
Cancel
Save