Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 2 years ago
parent
commit
a277060610
  1. 14
      anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/qiyekaipiaoxinxi/kaipiaoxinxiAdd.vue
  2. 5
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileInfo.vue
  3. 27
      anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/finwaitinvoiceapply.js
  4. 28
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyAdd.vue
  5. 252
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/relation/weihukaipiaoxinxi.vue
  6. 28
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue
  7. 249
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/relation/weihukaipiaoxinxi.vue
  8. 4
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempUpdateDto.java
  9. 51
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

14
anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/qiyekaipiaoxinxi/kaipiaoxinxiAdd.vue

@ -51,11 +51,7 @@
<span>开户行</span>
</el-col>
<el-col :span="8">
<el-form-item>
<el-select v-model="formobj.bankName" placeholder="请选择" clearable filterable>
<el-option v-for="item in bank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
</el-form-item>
<el-form-item><el-input v-model="formobj.bankName" clearable placeholder="" class="addinputw"></el-input></el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>银行账号</span>
@ -73,7 +69,7 @@
<script>
import { fetchDetailsBySid, save } from '@/api/kaipiaoxinxi/openTicket'
import { typeValues, getOrgSidByPath,fetchBySid } from '@/api/dictcommons/dictcommons'
import { getOrgSidByPath,fetchBySid } from '@/api/dictcommons/dictcommons'
export default {
name: 'kaipiaoxinxiAdd',
@ -82,7 +78,6 @@ export default {
viewTitle: '',
index: 0,
tableKey: 0,
bank_list: [],
//
formobj: {
sid: '', // sid
@ -103,11 +98,6 @@ export default {
},
methods: {
init() {
typeValues({ type: 'bank' }).then((res) => {
if (res.success) {
this.bank_list = res.data
}
})
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
if (resp.success) {
this.formobj.useOrgSid = resp.data

5
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileInfo.vue

@ -300,7 +300,8 @@ export default {
vinList: [],
zjlLetter: [],
zjlLetterDownloadUrl: '',
allDownloadUrl: ''
allDownloadUrl: '',
finType: false
},
rules: {},
operation: '', //
@ -482,7 +483,7 @@ export default {
this.$message({ showClose: true, type: 'error', message: '请上传车辆买卖合同附件' })
return
}
if (this.linkByParameter.guaranteeLetter.length === 0) {
if (this.linkByParameter.guaranteeLetter.length === 0 && !this.formobj.finType) {
this.$message({ showClose: true, type: 'error', message: '请上传欠款提车担保承诺书附件' })
return
}

27
anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/finwaitinvoiceapply.js

@ -1,5 +1,4 @@
import request from '@/utils/request'
import {completeBy} from "@/api/anruifinmanagement/arrearsbilling";
// 待开票车辆条件查询 (已改)
export function listPage(data) {
@ -79,7 +78,6 @@ export function completeByKP(data) {
})
}
// 流程审批(驳回)
export function reject(data) {
return request({
@ -135,3 +133,28 @@ export function removeFile(data) {
}
})
}
// 维护开票信息(企业)
export function save(data) {
return request({
url: '/fin/v1/fincompanyinvoicing/qySaveOrUpdate',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
})
}
// 维护开票信息(企业)
export function saveGeren(data) {
return request({
url: '/crm/v1/crmcustomertemp/billApplicatSaveCust',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
})
}

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

@ -63,11 +63,11 @@
<div><el-button type="primary" size="mini" class="btntopblueline" @click="handleLookByDingDan()">查看销售订单</el-button></div>
</div>
<el-row>
<el-col :span="8">
<el-col :span="6">
<div class="span-sty"><span class="icon">*</span>单台开票金额</div>
<el-form-item><el-input :disabled="isEdit" v-model="formobj.oneBillMoney" @keyup.native="UpNumber" clearable placeholder="" class="addinputw"/></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<div class="span-sty">开票类型默认</div>
<el-form-item>
<el-select v-model="formobj.openTickTypeValue" placeholder="请选择" @change="changeOpenTickType" clearable class="addinputInfo">
@ -75,7 +75,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<div class="span-sty">开票名称默认</div>
<el-form-item>
<el-select v-model="formobj.openTickName" placeholder="请选择" @change="changeOpenTick" filterable clearable class="addinputInfo">
@ -83,6 +83,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" size="small" @click="handlePreserve">维护开票信息</el-button>
</el-form-item>
</el-col>
</el-row>
<el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
@ -185,6 +190,7 @@
</div>
</div>
<xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
<weihukaipiaoxinxi v-show="viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="resetData"/>
</div>
</template>
@ -193,12 +199,14 @@ import { fetchDetailsBySid, saveOrUpdate, submit, fetchByContractNo } from '@/ap
import { selectAllDisList, typeValues } from '@/api/jichuxinxi/dictcommons'
import upload from '@/components/uploadFile/upload'
import xiaoshoudingdanInfo from './relation/xiaoshoudingdanInfo'
import weihukaipiaoxinxi from './relation/weihukaipiaoxinxi'
export default {
name: '',
components: {
upload,
xiaoshoudingdanInfo
xiaoshoudingdanInfo,
weihukaipiaoxinxi
},
data() {
return {
@ -389,6 +397,10 @@ export default {
this.viewState = 2
this.$refs['divInfo'].showInfo(this.formobj.busSalesOrderSid)
},
handlePreserve() {
this.viewState = 3
this.$refs['divAdd'].showEdit(this.formobj.openTickName, this.formobj.useOrgSid)
},
handleSave() {
if (this.formobj.oneBillMoney === '') {
this.$message({ showClose: true, type: 'error', message: '单条开票金额不能为空' })
@ -520,6 +532,14 @@ export default {
resetState() {
this.viewState = 1
},
resetData() {
this.viewState = 1
selectAllDisList({ orgSid: this.formobj.useOrgSid, staffSid: window.sessionStorage.getItem('staffSid') }).then((resp) => {
if (resp.success) {
this.openTick_list = resp.data
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {

252
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/relation/weihukaipiaoxinxi.vue

@ -0,0 +1,252 @@
<template>
<div class="app-container">
<div>
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="add()">新增
</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存
</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="6" class="tleftb">
</el-col>
<el-col :span="18">
<el-form-item>
<el-radio-group :disabled="print != ''" v-model="print">
<el-radio label="1">企业</el-radio>
<el-radio label="0">个人</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6"></el-col>
<el-col :span="18">
<el-form-item>
<el-select v-model="nameAndPhone" placeholder="请选择" @change="changeOpenTick" filterable clearable class="addinputInfo">
<el-option v-for="item in openTick_list" :key="item.sid" :label="item.nameAndPhone" :value="item.name"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6" class="tleftb">
<span>开票名称</span>
</el-col>
<el-col :span="18">
<el-form-item><el-input v-model="formobj.name" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6" class="tleftb">
<span>纳税人识别号</span>
</el-col>
<el-col :span="18">
<el-form-item><el-input v-model="formobj.taxpayerNo" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6" class="tleftb">
<span>电话</span>
</el-col>
<el-col :span="18">
<el-form-item><el-input v-model="formobj.phone" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
</el-col>
</el-row>
<el-row v-show="print == '1'">
<el-col :span="6" class="tleftb">
<span>地址</span>
</el-col>
<el-col :span="18">
<el-form-item><el-input v-model="formobj.address" clearable placeholder="" class="addinputw"></el-input></el-form-item>
</el-col>
</el-row>
<el-row v-show="print == '1'">
<el-col :span="6" class="tleftb">
<span>开户行</span>
</el-col>
<el-col :span="18">
<el-form-item>
<el-input v-model="formobj.bankName" clearable placeholder="" style="width: 30%"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row v-show="print == '1'">
<el-col :span="6" class="tleftb">
<span>银行账号</span>
</el-col>
<el-col :span="18">
<el-form-item><el-input v-model="formobj.bankAccount" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
<!--End 添加修改部分-->
</div>
</template>
<script>
import { save, saveGeren } from '@/api/anruifinmanagement/finwaitinvoiceapply'
import { selectAllDisList, typeValues, fetchBySid } from '@/api/jichuxinxi/dictcommons'
export default {
name: 'weihukaipiaoxinxi',
data() {
return {
viewTitle: '',
index: 0,
tableKey: 0,
bank_list: [],
openTick_list: [],
print: '',
nameAndPhone: '',
//
formobj: {
sid: '', // sid
address: '',
bankAccount: '',
bankName: '',
name: '',
phone: '',
taxpayerNo: '',
useOrgName: '',
useOrgSid: '',
orgSidPath: '',
staffSid: '',
createBySid: ''
},
rules: {},
submitdisabled: false
}
},
methods: {
init() {
typeValues({ type: 'bank' }).then((res) => {
if (res.success) {
this.bank_list = res.data
}
})
},
showEdit(name, useOrgSid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
this.init()
})
this.viewTitle = '维护开票信息'
selectAllDisList({ orgSid: useOrgSid, staffSid: window.sessionStorage.getItem('staffSid') }).then((resp) => {
if (resp.success) {
this.openTick_list = resp.data
if (name !== null && name !== '') {
this.changeOpenTick(name)
if (this.formobj.bankAccount !== '') {
this.print = '1'
} else {
this.print = '0'
}
}
}
})
this.formobj.orgSidPath = window.sessionStorage.getItem('defaultOrgPath')
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.formobj.staffSid = window.sessionStorage.getItem('staffSid')
this.formobj.useOrgSid = useOrgSid
fetchBySid(useOrgSid).then((resp) => {
if (resp.success) {
this.formobj.useOrgName = resp.data.name
}
})
},
changeOpenTick(value) {
const choose = this.openTick_list.filter((item) => item.name === value)
this.formobj.name = choose[0].name
this.formobj.taxpayerNo = choose[0].registNum
this.formobj.phone = choose[0].invoPhone
this.formobj.address = choose[0].registDetailAddress
this.formobj.bankName = choose[0].invoBank
this.formobj.bankAccount = choose[0].invoBankNum
this.formobj.sid = choose[0].sid
this.nameAndPhone = choose[0].name
},
add() {
this.formobj.sid = ''
this.formobj.address = ''
this.formobj.bankAccount = ''
this.formobj.bankName = ''
this.formobj.name = ''
this.formobj.phone = ''
this.formobj.taxpayerNo = ''
this.print = ''
this.nameAndPhone = ''
},
save() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
if (this.print === '1') {
save(this.formobj).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
} else if (this.print === '0') {
saveGeren(this.formobj).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
} else {
return false
}
})
},
// ===
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
//
this.formobj = {
sid: '', // sid
address: '',
bankAccount: '',
bankName: '',
name: '',
phone: '',
taxpayerNo: '',
useOrgName: '',
useOrgSid: '',
orgSidPath: '',
staffSid: '',
createBySid: ''
}
this.submitdisabled = false
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}
}
}
</script>
<style scoped>
</style>

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

@ -62,11 +62,11 @@
<div><el-button type="primary" size="mini" class="btntopblueline" @click="handleLookByDingDan()">查看销售订单</el-button></div>
</div>
<el-row>
<el-col :span="8">
<el-col :span="6">
<div class="span-sty"><span class="icon">*</span>单台开票金额</div>
<el-form-item><el-input :disabled="isEdit" v-model="formobj.oneBillMoney" @keyup.native="UpNumber" clearable placeholder="" class="addinputw"/></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<div class="span-sty">开票类型默认</div>
<el-form-item>
<el-select v-model="formobj.openTickTypeValue" placeholder="请选择" @change="changeOpenTickType" clearable class="addinputInfo">
@ -74,7 +74,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<div class="span-sty">开票名称默认</div>
<el-form-item>
<el-select v-model="formobj.openTickName" placeholder="请选择" @change="changeOpenTick" filterable clearable class="addinputInfo">
@ -82,6 +82,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" size="small" @click="handlePreserve">维护开票信息</el-button>
</el-form-item>
</el-col>
</el-row>
<el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
@ -185,6 +190,7 @@
</div>
<!-- 查看销售订单详情 -->
<xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
<weihukaipiaoxinxi v-show="viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="resetData"/>
</div>
</template>
@ -193,12 +199,14 @@ import { fetchDetailsBySid, saveOrUpdate, submit, fetchByContractNo } from '@/ap
import { selectAllDisList, typeValues } from '@/api/jichuxinxi/dictcommons'
import upload from '@/components/uploadFile/upload'
import xiaoshoudingdanInfo from './relation/xiaoshoudingdanInfo'
import weihukaipiaoxinxi from './relation/weihukaipiaoxinxi'
export default {
name: '',
components: {
upload,
xiaoshoudingdanInfo
xiaoshoudingdanInfo,
weihukaipiaoxinxi
},
data() {
return {
@ -372,6 +380,14 @@ export default {
resetState() {
this.viewState = 1
},
resetData() {
this.viewState = 1
selectAllDisList({ orgSid: this.formobj.useOrgSid, staffSid: window.sessionStorage.getItem('staffSid') }).then((resp) => {
if (resp.success) {
this.openTick_list = resp.data
}
})
},
//
totalBillMoney() {
if (this.formobj.oneBillMoney !== '' && this.formobj.finBillVehicles.length > 0) {
@ -409,6 +425,10 @@ export default {
row.openTickSid = choose[0].sid
row.openTickRemarks = choose[0].openTickRemarks
},
handlePreserve() {
this.viewState = 3
this.$refs['divAdd'].showEdit(this.formobj.openTickName, this.formobj.useOrgSid)
},
handleSave() {
if (this.formobj.oneBillMoney === '') {
this.$message({ showClose: true, type: 'error', message: '单条开票金额不能为空' })

249
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/relation/weihukaipiaoxinxi.vue

@ -0,0 +1,249 @@
<template>
<div class="app-container">
<div>
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="add()">新增
</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存
</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="6" class="tleftb">
</el-col>
<el-col :span="18">
<el-form-item>
<el-radio-group :disabled="print != ''" v-model="print">
<el-radio label="1">企业</el-radio>
<el-radio label="0">个人</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6"></el-col>
<el-col :span="18">
<el-form-item>
<el-select v-model="nameAndPhone" placeholder="请选择" @change="changeOpenTick" filterable clearable class="addinputInfo">
<el-option v-for="item in openTick_list" :key="item.sid" :label="item.nameAndPhone" :value="item.name"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6" class="tleftb">
<span>开票名称</span>
</el-col>
<el-col :span="18">
<el-form-item><el-input v-model="formobj.name" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6" class="tleftb">
<span>纳税人识别号</span>
</el-col>
<el-col :span="18">
<el-form-item><el-input v-model="formobj.taxpayerNo" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6" class="tleftb">
<span>电话</span>
</el-col>
<el-col :span="18">
<el-form-item><el-input v-model="formobj.phone" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6" class="tleftb">
<span>地址</span>
</el-col>
<el-col :span="18">
<el-form-item><el-input v-model="formobj.address" clearable placeholder="" class="addinputw"></el-input></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6" class="tleftb">
<span>开户行</span>
</el-col>
<el-col :span="18">
<el-form-item>
<el-input v-model="formobj.bankName" clearable placeholder="" style="width: 30%"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6" class="tleftb">
<span>银行账号</span>
</el-col>
<el-col :span="18">
<el-form-item><el-input v-model="formobj.bankAccount" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
<!--End 添加修改部分-->
</div>
</template>
<script>
import { save, saveGeren } from '@/api/anruifinmanagement/finwaitinvoiceapply'
import { selectAllDisList, typeValues, fetchBySid } from '@/api/jichuxinxi/dictcommons'
export default {
name: 'weihukaipiaoxinxi',
data() {
return {
viewTitle: '',
index: 0,
tableKey: 0,
bank_list: [],
openTick_list: [],
print: '',
nameAndPhone: '',
//
formobj: {
sid: '', // sid
address: '',
bankAccount: '',
bankName: '',
name: '',
phone: '',
taxpayerNo: '',
useOrgName: '',
useOrgSid: '',
orgSidPath: '',
createBySid: ''
},
rules: {},
submitdisabled: false
}
},
methods: {
init() {
typeValues({ type: 'bank' }).then((res) => {
if (res.success) {
this.bank_list = res.data
}
})
},
showEdit(name, useOrgSid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
this.init()
})
this.viewTitle = '维护开票信息'
selectAllDisList({ orgSid: useOrgSid, staffSid: window.sessionStorage.getItem('staffSid') }).then((resp) => {
if (resp.success) {
this.openTick_list = resp.data
if (name !== null && name !== '') {
this.changeOpenTick(name)
if (this.formobj.bankAccount !== '') {
this.print = '1'
} else {
this.print = '0'
}
}
}
})
this.formobj.orgSidPath = window.sessionStorage.getItem('defaultOrgPath')
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.formobj.useOrgSid = useOrgSid
fetchBySid(useOrgSid).then((resp) => {
if (resp.success) {
this.formobj.useOrgName = resp.data.name
}
})
},
changeOpenTick(value) {
const choose = this.openTick_list.filter((item) => item.name === value)
this.formobj.name = choose[0].name
this.formobj.taxpayerNo = choose[0].registNum
this.formobj.phone = choose[0].invoPhone
this.formobj.address = choose[0].registDetailAddress
this.formobj.bankName = choose[0].invoBank
this.formobj.bankAccount = choose[0].invoBankNum
this.formobj.sid = choose[0].sid
this.nameAndPhone = choose[0].name
},
add() {
this.formobj.sid = ''
this.formobj.address = ''
this.formobj.bankAccount = ''
this.formobj.bankName = ''
this.formobj.name = ''
this.formobj.phone = ''
this.formobj.taxpayerNo = ''
this.print = ''
this.nameAndPhone = ''
},
save() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
if (this.print === '1') {
save(this.formobj).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
} else if (this.print === '0') {
saveGeren(this.formobj).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
} else {
return false
}
})
},
// ===
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
//
this.formobj = {
sid: '', // sid
address: '',
bankAccount: '',
bankName: '',
name: '',
phone: '',
taxpayerNo: '',
useOrgName: '',
useOrgSid: '',
orgSidPath: '',
createBySid: ''
}
this.submitdisabled = false
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}
}
}
</script>
<style scoped>
</style>

4
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempUpdateDto.java

@ -108,7 +108,9 @@ public class CrmCustomerTempUpdateDto implements Dto {
@ApiModelProperty(value = "备注")
private String remarks;
private String orgPath;
//运营信息
@ApiModelProperty(value = "运营信息")
private CrmBusinessDto crmBusinessDto;
private CrmBusinessDto crmBusinessDto = new CrmBusinessDto();
}

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

@ -1104,9 +1104,6 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
public ResultBean billApplicatSaveCust(CrmCustomerBillApplicationDto dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)){//新增
}
//手机号
String phone = dto.getPhone();
if (!phone.matches("^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$")) {
@ -1119,20 +1116,20 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
String name = dto.getName();
//业务员sid
String staffSid = dto.getStaffSid();
//生成客户编码:分公司简称+部门编码+手机号+姓名首字母大写拼写
String customerNo = getPrefix(staffSid, name, phone);
//查询该客户编码是否存在
CrmCustomerTemp crmCustomerTemp = baseMapper.selectByCustomerNo(customerNo);
if (crmCustomerTemp != null) {//存在
//查询该客户属于哪个业务员
String staffName = "";
SysUserVo sysCrmVo = sysUserFeign.fetchBySid(crmCustomerTemp.getCreateBySid()).getData();
if (sysCrmVo != null) {
staffName = sysCrmVo.getName();
return rb.setMsg("该客户已存在,为" + staffName + "销售专员客户");
if (StringUtils.isBlank(dtoSid)){//新增
//生成客户编码:分公司简称+部门编码+手机号+姓名首字母大写拼写
String customerNo = getPrefix(staffSid, name, phone);
//查询该客户编码是否存在
CrmCustomerTemp crmCustomerTemp = baseMapper.selectByCustomerNo(customerNo);
if (crmCustomerTemp != null) {//存在
//查询该客户属于哪个业务员
String staffName = "";
SysUserVo sysCrmVo = sysUserFeign.fetchBySid(crmCustomerTemp.getCreateBySid()).getData();
if (sysCrmVo != null) {
staffName = sysCrmVo.getName();
return rb.setMsg("该客户已存在,为" + staffName + "销售专员客户");
}
}
} else {//不存在
// 新增
SysUserVo sysUserVo = new SysUserVo();
sysUserVo.setStaffSid(staffSid);
CrmCustomerTempDto crmCustomerTempDto = new CrmCustomerTempDto();
@ -1143,8 +1140,28 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
crmCustomerTempDto.setOrgPath(dto.getOrgSidPath());
crmCustomerTempDto.setCertificateTypeKey("01");
crmCustomerTempDto.setCertificateType("身份证");
crmCustomerTempDto.setCustomerTypeKey("1");
crmCustomerTempDto.setCustomerType("个人");
crmCustomerTempDto.setIsOnRemindkey("0");
crmCustomerTempDto.setIsOnRemind("否");
crmCustomerTempDto.setRemind_day("未设置提醒");
saveCrmCustomerTemp(crmCustomerTempDto, sysUserVo);
return rb.success();
}
return rb.success();
CrmCustomerTempUpdateDto crmCustomerTempDto = new CrmCustomerTempUpdateDto();
crmCustomerTempDto.setName(name);
crmCustomerTempDto.setIDNumber(dto.getTaxpayerNo());
crmCustomerTempDto.setMobile(phone);
crmCustomerTempDto.setUserSid(dto.getCreateBySid());
crmCustomerTempDto.setOrgPath(dto.getOrgSidPath());
crmCustomerTempDto.setCertificateTypeKey("01");
crmCustomerTempDto.setCertificateType("身份证");
crmCustomerTempDto.setCustomerTypeKey("1");
crmCustomerTempDto.setCustomerType("个人");
ResultBean resultBean = updateCrmCustomer(crmCustomerTempDto, dtoSid);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setMsg(resultBean.getMsg());
}
}
Loading…
Cancel
Save