Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 2 years ago
parent
commit
a44d72ef50
  1. 2
      anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js
  2. 4
      anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js
  3. 13
      anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/billingapplicationAdd.vue
  4. 144
      anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/weihukaipiaoxinxi.vue
  5. 13
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/kaipiaoAdd.vue
  6. 145
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/weihukaipiao.vue
  7. 2
      anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/finwaitinvoiceapply.js
  8. 11
      anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js
  9. 28
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/finginvoiceapplyAdd.vue
  10. 138
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/backups/relation/weihukaipiaoxinxi.vue
  11. 27
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyEdit.vue
  12. 138
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/relation/weihukaipiaoxinxi.vue
  13. 14
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

2
anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js

@ -219,7 +219,7 @@ export function saveOrUpdate(data) {
// 判断申请中单台开票金额是否可以填写(只允许第一次填写)--出库申请开票申请合并
export function fetchByContractNo(data) {
return request({
url: '/buscenter/v1/bussalesorder/fetchByContractNo/' + data,
url: '/buscenter/v1/bussalesorder/fetchByContractNo2/' + data,
method: 'get'
})
}

4
anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js

@ -154,9 +154,9 @@ export function selectOrgList(data) {
}
// 获取所有经销商
export function selectAllDisList(data) {
export function selectAllDisList2(data) {
return request({
url: '/base/v1/basedistributor/selectAllDisList',
url: '/base/v1/basedistributor/selectAllDisList2',
method: 'get',
params: data
})

13
anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/billingapplicationAdd.vue

@ -63,7 +63,7 @@
<el-row>
<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-form-item><el-input :disabled="formobj.saleTypeKey == '2'" v-model="formobj.oneBillMoney" @keyup.native="UpNumber" clearable placeholder="" class="addinputw"/></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">开票类型默认</div>
@ -188,7 +188,7 @@
<script>
import { fetchDetailByCkSid, save, fetchByContractNo } from '@/api/chukuguanli/chukubanli'
import { selectAllDisList, typeValues } from '@/api/dictcommons/dictcommons'
import { selectAllDisList2, typeValues } from '@/api/dictcommons/dictcommons'
import upload from '@/components/uploadFile/uploadImg'
import xiaoshoudingdanInfo from '@/components/publicPage/dingdanInfo'
import weihukaipiaoxinxi from './weihukaipiaoxinxi'
@ -205,7 +205,6 @@ export default {
viewTitle: '',
viewState: 1,
submitdisabled: false,
isEdit: false,
diploma_list: [],
accept: '.jpg,.jpeg,.png,.JPG,.JPEG',
tableKey: 0,
@ -299,7 +298,6 @@ export default {
this.formobj = res.data
fetchByContractNo(this.formobj.contractNo).then((res) => {
if (res.success) {
this.isEdit = res.data.isEdit
if (res.data.oneBillMoney !== '') {
this.formobj.oneBillMoney = res.data.oneBillMoney
}
@ -307,7 +305,7 @@ export default {
})
this.formobj.orgSidPath = window.sessionStorage.getItem('defaultOrgPath')
this.formobj.userSid = window.sessionStorage.getItem('userSid')
selectAllDisList({ orgSid: this.formobj.useOrgSid, staffSid: window.sessionStorage.getItem('staffSid') }).then((resp) => {
selectAllDisList2({ orgSid: this.formobj.useOrgSid, staffSid: window.sessionStorage.getItem('staffSid'), state: '1' }).then((resp) => {
if (resp.success) {
this.openTick_list = resp.data
}
@ -382,7 +380,7 @@ export default {
},
handlePreserve() {
this.viewState = 3
this.$refs['divAdd'].showEdit(this.formobj.openTickName, this.formobj.useOrgSid)
this.$refs['divAdd'].showEdit(this.formobj.openTickName, this.formobj.useOrgSid, this.openTick_list, '出库开票申请')
},
handleSave() {
if (this.formobj.oneBillMoney === '') {
@ -481,7 +479,7 @@ export default {
},
resetData() {
this.viewState = 1
selectAllDisList({ orgSid: this.formobj.useOrgSid, staffSid: window.sessionStorage.getItem('staffSid') }).then((resp) => {
selectAllDisList2({ orgSid: this.formobj.useOrgSid, staffSid: window.sessionStorage.getItem('staffSid'), state: '1' }).then((resp) => {
if (resp.success) {
this.openTick_list = resp.data
}
@ -544,7 +542,6 @@ export default {
this.image_list1 = []
this.image_list2 = []
this.image_list4 = []
this.isEdit = false
this.submitdisabled = false
this.$refs['form_obj'].resetFields()
this.$emit('doback')

144
anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/weihukaipiaoxinxi.vue

@ -7,7 +7,7 @@
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="add()">新增
<el-button type="primary" size="small" v-show="btnVisible" :disabled="submitdisabled" @click="add()">新增
</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存
</el-button>
@ -42,12 +42,24 @@
</el-form-item>
</el-col>
</el-row>
<el-row v-if="print == '1'">
<el-col :span="6" class="tleftb">
<span><span class="icon">*</span>开票类型</span>
</el-col>
<el-col :span="18">
<el-form-item>
<el-select v-model="formobj.openTickTypeKey" style="width: 30%" filterable placeholder="" @change="changeOpenTickType">
<el-option v-for="item in openTickType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6" class="tleftb">
<span><span class="icon">*</span>开票名称</span>
</el-col>
<el-col :span="18">
<el-form-item prop="name"><el-input v-model="formobj.name" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
<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>
@ -55,41 +67,41 @@
<span><span class="icon">*</span>纳税人识别号</span>
</el-col>
<el-col :span="18">
<el-form-item prop="taxpayerNo"><el-input v-model="formobj.taxpayerNo" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
<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 class="icon">*</span>电话</span>
<span><span v-show="formobj.openTickTypeKey == '02' || print == '0'" class="icon">*</span>电话</span>
</el-col>
<el-col :span="18">
<el-form-item prop="phone"><el-input v-model="formobj.phone" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
<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-if="print == '1'">
<el-col :span="6" class="tleftb">
<span><span class="icon">*</span>地址</span>
<span><span v-show="formobj.openTickTypeKey == '02'" class="icon">*</span>地址</span>
</el-col>
<el-col :span="18">
<el-form-item prop="address"><el-input v-model="formobj.address" clearable placeholder="" class="addinputw"></el-input></el-form-item>
<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-if="print == '1'">
<el-col :span="6" class="tleftb">
<span><span class="icon">*</span>开户行</span>
<span><span v-show="formobj.openTickTypeKey == '02'" class="icon">*</span>开户行</span>
</el-col>
<el-col :span="18">
<el-form-item prop="bankName">
<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-if="print == '1'">
<el-col :span="6" class="tleftb">
<span><span class="icon">*</span>银行账号</span>
<span><span v-show="formobj.openTickTypeKey == '02'" class="icon">*</span>银行账号</span>
</el-col>
<el-col :span="18">
<el-form-item prop="bankAccount"><el-input v-model="formobj.bankAccount" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
<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>
@ -100,17 +112,18 @@
</template>
<script>
import { saveQiYe, saveGeren } from '@/api/chukuguanli/chukubanli'
import { selectAllDisList, typeValues, fetchBySid } from '@/api/dictcommons/dictcommons'
import { save, saveGeren } from '@/api/anruifinmanagement/finwaitinvoiceapply'
import { typeValues, fetchBySid } from '@/api/jichuxinxi/dictcommons'
export default {
name: 'WeiHuKaiPiaoXinXi',
name: 'weihukaipiaoxinxi',
data() {
return {
viewTitle: '',
index: 0,
tableKey: 0,
bank_list: [],
openTickType_list: [],
openTick_list: [],
print: '',
nameAndPhone: '',
@ -127,16 +140,12 @@ export default {
useOrgSid: '',
orgSidPath: '',
staffSid: '',
createBySid: ''
},
rules: {
name: [{ required: true, message: '开票名称不能为空', trigger: 'blur' }],
taxpayerNo: [{ required: true, message: '纳税人识别号不能为空', trigger: 'blur' }],
phone: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
bankName: [{ required: true, message: '开户行不能为空', trigger: 'blur' }],
bankAccount: [{ required: true, message: '银行账号不能为空', trigger: 'blur' }]
createBySid: '',
openTickTypeKey: '',
openTickTypeValue: ''
},
rules: {},
btnVisible: false,
submitdisabled: false
}
},
@ -147,26 +156,30 @@ export default {
this.bank_list = res.data
}
})
typeValues({ type: 'invoiceType' }).then((res) => {
if (res.success) {
this.openTickType_list = res.data
}
})
},
showEdit(name, useOrgSid) {
showEdit(name, useOrgSid, list, source) {
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 !== '' && name !== undefined) {
this.changeOpenTick(name)
if (this.formobj.bankAccount !== '') {
this.print = '1'
} else {
this.print = '0'
}
}
this.openTick_list = list
if (source === '出库开票申请') {
this.btnVisible = true
}
if (name !== null && name !== '' && name !== undefined) {
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')
@ -187,12 +200,22 @@ export default {
this.formobj.bankAccount = choose[0].invoBankNum
this.formobj.sid = choose[0].sid
this.nameAndPhone = choose[0].name
this.formobj.openTickTypeKey = choose[0].openTickTypeKey
this.formobj.openTickTypeValue = choose[0].openTickTypeValue
if (this.formobj.bankAccount !== '') {
this.print = '1'
} else {
this.print = '0'
}
},
changeOpenTickType(value) {
const choose = this.openTickType_list.filter((item) => item.dictKey === value)
if (choose != null && choose.length > 0) {
this.formobj.openTickTypeValue = choose[0].dictValue
} else {
this.formobj.openTickTypeValue = ''
}
},
add() {
this.formobj.sid = ''
this.formobj.address = ''
@ -203,6 +226,8 @@ export default {
this.formobj.taxpayerNo = ''
this.print = ''
this.nameAndPhone = ''
this.formobj.openTickTypeKey = ''
this.formobj.openTickTypeValue = ''
},
save() {
this.$refs['form_obj'].validate((valid) => {
@ -211,9 +236,39 @@ export default {
this.$message({ showClose: true, message: '请选择企业或个人', type: 'error' })
return
}
this.submitdisabled = true
if (this.print === '1') {
saveQiYe(this.formobj).then((resp) => {
if (this.formobj.openTickTypeKey === '') {
this.$message({ showClose: true, type: 'error', message: '开票类型不能为空' })
return
}
if (this.formobj.name === '') {
this.$message({ showClose: true, type: 'error', message: '开票名称不能为空' })
return
}
if (this.formobj.taxpayerNo === '') {
this.$message({ showClose: true, type: 'error', message: '纳税人识别号不能为空' })
return
}
if (this.formobj.openTickTypeKey === '02') {
if (this.formobj.address === '') {
this.$message({ showClose: true, type: 'error', message: '地址不能为空' })
return
}
if (this.formobj.phone === '') {
this.$message({ showClose: true, type: 'error', message: '电话不能为空' })
return
}
if (this.formobj.bankName === '') {
this.$message({ showClose: true, type: 'error', message: '开户行不能为空' })
return
}
if (this.formobj.bankAccount === '') {
this.$message({ showClose: true, type: 'error', message: '银行账号不能为空' })
return
}
}
this.submitdisabled = true
save(this.formobj).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.handleReturn('true')
@ -224,6 +279,11 @@ export default {
this.submitdisabled = false
})
} else if (this.print === '0') {
if (this.formobj.phone === '') {
this.$message({ showClose: true, type: 'error', message: '电话不能为空' })
return
}
this.submitdisabled = true
saveGeren(this.formobj).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
@ -256,9 +316,15 @@ export default {
useOrgSid: '',
orgSidPath: '',
staffSid: '',
createBySid: ''
createBySid: '',
openTickTypeKey: '',
openTickTypeValue: ''
}
this.print = ''
this.nameAndPhone = ''
this.submitdisabled = false
this.btnVisible = false
this.openTick_list = []
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}

13
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/kaipiaoAdd.vue

@ -63,7 +63,7 @@
<el-row>
<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-form-item><el-input :disabled="formobj.saleTypeKey == '2'" v-model="formobj.oneBillMoney" @keyup.native="UpNumber" clearable placeholder="" class="addinputw"/></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">开票类型默认</div>
@ -188,7 +188,7 @@
<script>
import { fetchDetailByCkSid, save, fetchByContractNo } from '@/api/chukuguanli/chukubanli'
import { selectAllDisList, typeValues } from '@/api/dictcommons/dictcommons'
import { selectAllDisList2, typeValues } from '@/api/dictcommons/dictcommons'
import upload from '@/components/uploadFile/uploadImg'
import xiaoshoudingdanInfo from '../../../publicPage/dingdanInfo'
import weihukaipiaoxinxi from './weihukaipiao'
@ -205,7 +205,6 @@ export default {
viewTitle: '',
viewState: 1,
submitdisabled: false,
isEdit: false,
diploma_list: [],
accept: '.jpg,.jpeg,.png,.JPG,.JPEG',
tableKey: 0,
@ -299,7 +298,6 @@ export default {
this.formobj = res.data
fetchByContractNo(this.formobj.contractNo).then((res) => {
if (res.success) {
this.isEdit = res.data.isEdit
if (res.data.oneBillMoney !== '') {
this.formobj.oneBillMoney = res.data.oneBillMoney
}
@ -307,7 +305,7 @@ export default {
})
this.formobj.orgSidPath = window.sessionStorage.getItem('defaultOrgPath')
this.formobj.userSid = window.sessionStorage.getItem('userSid')
selectAllDisList({ orgSid: this.formobj.useOrgSid, staffSid: window.sessionStorage.getItem('staffSid') }).then((resp) => {
selectAllDisList2({ orgSid: this.formobj.useOrgSid, staffSid: this.formobj.staffSid, state: '1' }).then((resp) => {
if (resp.success) {
this.openTick_list = resp.data
}
@ -382,7 +380,7 @@ export default {
},
handlePreserve() {
this.viewState = 3
this.$refs['divAdd'].showEdit(this.formobj.openTickName, this.formobj.useOrgSid)
this.$refs['divAdd'].showEdit(this.formobj.openTickName, this.formobj.useOrgSid, this.openTick_list, '出库开票申请')
},
handleSave() {
if (this.formobj.oneBillMoney === '') {
@ -481,7 +479,7 @@ export default {
},
resetData() {
this.viewState = 1
selectAllDisList({ orgSid: this.formobj.useOrgSid, staffSid: window.sessionStorage.getItem('staffSid') }).then((resp) => {
selectAllDisList2({ orgSid: this.formobj.useOrgSid, staffSid: this.formobj.staffSid, state: '1' }).then((resp) => {
if (resp.success) {
this.openTick_list = resp.data
}
@ -544,7 +542,6 @@ export default {
this.image_list1 = []
this.image_list2 = []
this.image_list4 = []
this.isEdit = false
this.submitdisabled = false
this.$refs['form_obj'].resetFields()
this.$emit('doback')

145
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/weihukaipiao.vue

@ -7,7 +7,7 @@
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="add()">新增
<el-button type="primary" size="small" v-show="btnVisible" :disabled="submitdisabled" @click="add()">新增
</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存
</el-button>
@ -42,12 +42,24 @@
</el-form-item>
</el-col>
</el-row>
<el-row v-if="print == '1'">
<el-col :span="6" class="tleftb">
<span><span class="icon">*</span>开票类型</span>
</el-col>
<el-col :span="18">
<el-form-item>
<el-select v-model="formobj.openTickTypeKey" style="width: 30%" filterable placeholder="" @change="changeOpenTickType">
<el-option v-for="item in openTickType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6" class="tleftb">
<span><span class="icon">*</span>开票名称</span>
</el-col>
<el-col :span="18">
<el-form-item prop="name"><el-input v-model="formobj.name" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
<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>
@ -55,41 +67,41 @@
<span><span class="icon">*</span>纳税人识别号</span>
</el-col>
<el-col :span="18">
<el-form-item prop="taxpayerNo"><el-input v-model="formobj.taxpayerNo" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
<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 class="icon">*</span>电话</span>
<span><span v-show="formobj.openTickTypeKey == '02' || print == '0'" class="icon">*</span>电话</span>
</el-col>
<el-col :span="18">
<el-form-item prop="phone"><el-input v-model="formobj.phone" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
<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-if="print == '1'">
<el-col :span="6" class="tleftb">
<span><span class="icon">*</span>地址</span>
<span><span v-show="formobj.openTickTypeKey == '02'" class="icon">*</span>地址</span>
</el-col>
<el-col :span="18">
<el-form-item prop="address"><el-input v-model="formobj.address" clearable placeholder="" class="addinputw"></el-input></el-form-item>
<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-if="print == '1'">
<el-col :span="6" class="tleftb">
<span><span class="icon">*</span>开户行</span>
<span><span v-show="formobj.openTickTypeKey == '02'" class="icon">*</span>开户行</span>
</el-col>
<el-col :span="18">
<el-form-item prop="bankName">
<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-if="print == '1'">
<el-col :span="6" class="tleftb">
<span><span class="icon">*</span>银行账号</span>
<span><span v-show="formobj.openTickTypeKey == '02'" class="icon">*</span>银行账号</span>
</el-col>
<el-col :span="18">
<el-form-item prop="bankAccount"><el-input v-model="formobj.bankAccount" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
<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>
@ -100,17 +112,18 @@
</template>
<script>
import { saveQiYe, saveGeren } from '@/api/chukuguanli/chukubanli'
import { selectAllDisList, typeValues, fetchBySid } from '@/api/dictcommons/dictcommons'
import { save, saveGeren } from '@/api/anruifinmanagement/finwaitinvoiceapply'
import { typeValues, fetchBySid } from '@/api/jichuxinxi/dictcommons'
export default {
name: 'WeiHuKaiPiaoXinXi',
name: 'weihukaipiaoxinxi',
data() {
return {
viewTitle: '',
index: 0,
tableKey: 0,
bank_list: [],
openTickType_list: [],
openTick_list: [],
print: '',
nameAndPhone: '',
@ -127,16 +140,12 @@ export default {
useOrgSid: '',
orgSidPath: '',
staffSid: '',
createBySid: ''
},
rules: {
name: [{ required: true, message: '开票名称不能为空', trigger: 'blur' }],
taxpayerNo: [{ required: true, message: '纳税人识别号不能为空', trigger: 'blur' }],
phone: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
bankName: [{ required: true, message: '开户行不能为空', trigger: 'blur' }],
bankAccount: [{ required: true, message: '银行账号不能为空', trigger: 'blur' }]
createBySid: '',
openTickTypeKey: '',
openTickTypeValue: ''
},
rules: {},
btnVisible: false,
submitdisabled: false
}
},
@ -147,26 +156,30 @@ export default {
this.bank_list = res.data
}
})
typeValues({ type: 'invoiceType' }).then((res) => {
if (res.success) {
this.openTickType_list = res.data
}
})
},
showEdit(name, useOrgSid) {
showEdit(name, useOrgSid, list, source) {
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 !== '' && name !== undefined) {
this.changeOpenTick(name)
if (this.formobj.bankAccount !== '') {
this.print = '1'
} else {
this.print = '0'
}
}
this.openTick_list = list
if (source === '开票申请') {
this.btnVisible = true
}
if (name !== null && name !== '' && name !== undefined) {
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')
@ -187,12 +200,22 @@ export default {
this.formobj.bankAccount = choose[0].invoBankNum
this.formobj.sid = choose[0].sid
this.nameAndPhone = choose[0].name
this.formobj.openTickTypeKey = choose[0].openTickTypeKey
this.formobj.openTickTypeValue = choose[0].openTickTypeValue
if (this.formobj.bankAccount !== '') {
this.print = '1'
} else {
this.print = '0'
}
},
changeOpenTickType(value) {
const choose = this.openTickType_list.filter((item) => item.dictKey === value)
if (choose != null && choose.length > 0) {
this.formobj.openTickTypeValue = choose[0].dictValue
} else {
this.formobj.openTickTypeValue = ''
}
},
add() {
this.formobj.sid = ''
this.formobj.address = ''
@ -203,6 +226,8 @@ export default {
this.formobj.taxpayerNo = ''
this.print = ''
this.nameAndPhone = ''
this.formobj.openTickTypeKey = ''
this.formobj.openTickTypeValue = ''
},
save() {
this.$refs['form_obj'].validate((valid) => {
@ -211,9 +236,39 @@ export default {
this.$message({ showClose: true, message: '请选择企业或个人', type: 'error' })
return
}
this.submitdisabled = true
if (this.print === '1') {
saveQiYe(this.formobj).then((resp) => {
if (this.formobj.openTickTypeKey === '') {
this.$message({ showClose: true, type: 'error', message: '开票类型不能为空' })
return
}
if (this.formobj.name === '') {
this.$message({ showClose: true, type: 'error', message: '开票名称不能为空' })
return
}
if (this.formobj.taxpayerNo === '') {
this.$message({ showClose: true, type: 'error', message: '纳税人识别号不能为空' })
return
}
if (this.formobj.openTickTypeKey === '02') {
if (this.formobj.address === '') {
this.$message({ showClose: true, type: 'error', message: '地址不能为空' })
return
}
if (this.formobj.phone === '') {
this.$message({ showClose: true, type: 'error', message: '电话不能为空' })
return
}
if (this.formobj.bankName === '') {
this.$message({ showClose: true, type: 'error', message: '开户行不能为空' })
return
}
if (this.formobj.bankAccount === '') {
this.$message({ showClose: true, type: 'error', message: '银行账号不能为空' })
return
}
}
this.submitdisabled = true
save(this.formobj).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.handleReturn('true')
@ -224,6 +279,11 @@ export default {
this.submitdisabled = false
})
} else if (this.print === '0') {
if (this.formobj.phone === '') {
this.$message({ showClose: true, type: 'error', message: '电话不能为空' })
return
}
this.submitdisabled = true
saveGeren(this.formobj).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
@ -256,9 +316,15 @@ export default {
useOrgSid: '',
orgSidPath: '',
staffSid: '',
createBySid: ''
createBySid: '',
openTickTypeKey: '',
openTickTypeValue: ''
}
this.print = ''
this.nameAndPhone = ''
this.submitdisabled = false
this.btnVisible = false
this.openTick_list = []
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}
@ -268,3 +334,4 @@ export default {
<style scoped>
</style>
·

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

@ -28,7 +28,7 @@ export function getSelectVinsList(data) {
// 判断申请中单台开票金额是否可以填写(只允许第一次填写)
export function fetchByContractNo(data) {
return request({
url: '/buscenter/v1/bussalesorder/fetchByContractNo/' + data,
url: '/buscenter/v1/bussalesorder/fetchByContractNo2/' + data,
method: 'get'
})
}

11
anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js

@ -163,7 +163,7 @@ export function selectOrgList(data) {
})
}
// 获取所有经销商
// 获取开票信息(限制有效期内)
export function selectAllDisList(data) {
return request({
url: '/base/v1/basedistributor/selectAllDisList',
@ -172,6 +172,15 @@ export function selectAllDisList(data) {
})
}
// 获取开票信息--开票名称等(0不查询有效期,1查询有效期内)
export function selectAllDisList2(data) {
return request({
url: '/base/v1/basedistributor/selectAllDisList2',
method: 'get',
params: data
})
}
// 根据当前登录用户的角色获取菜单分页列表页面右上角按钮的隐藏
export function getButtonPermissions(data) {
return request({

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

@ -66,7 +66,7 @@
<el-row>
<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-form-item><el-input :disabled="formobj.saleTypeKey == '2'" v-model="formobj.oneBillMoney" @keyup.native="UpNumber" clearable placeholder="" class="addinputw"/></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">开票类型默认</div>
@ -92,36 +92,36 @@
</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"/>
<el-table-column v-if="formobj.saleTypeKey == '2'" label="车架号" align="center">
<el-table-column v-if="formobj.saleTypeKey == '2'" label="操作" align="center" width="80">
<template slot-scope="scope">
<el-button type="danger" size="mini" @click="handleDelete(scope.row, scope.$index)">删除</el-button>
</template>
</el-table-column>
<el-table-column label="车架号" align="center">
<el-table-column label="车架号" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="合格证状态" align="center">
<el-table-column label="合格证状态" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.certificateStateValue }}</span>
</template>
</el-table-column>
<el-table-column label="开票类型" align="center">
<el-table-column label="开票类型" align="center" width="250">
<template slot-scope="scope">
<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">
<el-table-column label="开票名称" align="center" width="250">
<template slot-scope="scope">
<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>
</el-table-column>
<el-table-column label="开票信息" align="center">
<el-table-column label="开票信息" align="center" min-width="300">
<template slot-scope="scope">
<span>{{ scope.row.openTickRemarks }}</span>
</template>
@ -197,7 +197,7 @@
<script>
import { fetchDetailsBySid, saveOrUpdate, submit, fetchByContractNo } from '@/api/anruifinmanagement/finwaitinvoiceapply'
import { selectAllDisList, typeValues } from '@/api/jichuxinxi/dictcommons'
import { selectAllDisList2, typeValues } from '@/api/jichuxinxi/dictcommons'
import upload from '@/components/uploadFile/upload'
import salesOrder from '@/components/publicPage/salesOrder'
import weihukaipiaoxinxi from './relation/weihukaipiaoxinxi'
@ -216,7 +216,6 @@ export default {
viewTitle: '',
viewState: 1,
submitdisabled: false,
isEdit: false,
diploma_list: [],
accept: '.jpg,.jpeg,.png,.JPG,.JPEG',
tableKey: 0,
@ -322,7 +321,6 @@ export default {
this.formobj = res.data
fetchByContractNo(this.formobj.contractNo).then((res) => {
if (res.success) {
this.isEdit = res.data.isEdit
if (res.data.oneBillMoney !== '') {
this.formobj.oneBillMoney = res.data.oneBillMoney
}
@ -331,7 +329,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, staffSid: window.sessionStorage.getItem('staffSid') }).then((resp) => {
selectAllDisList2({ orgSid: this.formobj.useOrgSid, staffSid: window.sessionStorage.getItem('staffSid'), state: '1' }).then((resp) => {
if (resp.success) {
this.openTick_list = resp.data
}
@ -407,13 +405,12 @@ export default {
this.formobj.modelSid = value[0].modelSid
fetchByContractNo(this.formobj.contractNo).then((res) => {
if (res.success) {
this.isEdit = res.data.isEdit
if (res.data.oneBillMoney !== '') {
this.formobj.oneBillMoney = res.data.oneBillMoney
}
}
})
selectAllDisList({ orgSid: this.formobj.useOrgSid, staffSid: this.formobj.staffSid }).then((resp) => {
selectAllDisList2({ orgSid: this.formobj.useOrgSid, staffSid: this.formobj.staffSid, state: '1' }).then((resp) => {
if (resp.success) {
this.openTick_list = resp.data
}
@ -480,7 +477,7 @@ export default {
},
handlePreserve() {
this.viewState = 3
this.$refs['divAdd'].showEdit(this.formobj.openTickName, this.formobj.useOrgSid)
this.$refs['divAdd'].showEdit(this.formobj.openTickName, this.formobj.useOrgSid, this.openTick_list, '开票申请')
},
handleSave() {
if (this.formobj.oneBillMoney === '') {
@ -597,7 +594,7 @@ export default {
},
resetData() {
this.viewState = 1
selectAllDisList({ orgSid: this.formobj.useOrgSid, staffSid: window.sessionStorage.getItem('staffSid') }).then((resp) => {
selectAllDisList2({ orgSid: this.formobj.useOrgSid, staffSid: window.sessionStorage.getItem('staffSid'), state: '1' }).then((resp) => {
if (resp.success) {
this.openTick_list = resp.data
}
@ -662,7 +659,6 @@ export default {
this.image_list1 = []
this.image_list2 = []
this.image_list4 = []
this.isEdit = false
this.submitdisabled = false
this.$refs['form_obj'].resetFields()
this.$emit('doback')

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

@ -7,7 +7,7 @@
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="add()">新增
<el-button type="primary" size="small" v-show="btnVisible" :disabled="submitdisabled" @click="add()">新增
</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存
</el-button>
@ -42,12 +42,24 @@
</el-form-item>
</el-col>
</el-row>
<el-row v-if="print == '1'">
<el-col :span="6" class="tleftb">
<span><span class="icon">*</span>开票类型</span>
</el-col>
<el-col :span="18">
<el-form-item>
<el-select v-model="formobj.openTickTypeKey" style="width: 30%" filterable placeholder="" @change="changeOpenTickType">
<el-option v-for="item in openTickType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6" class="tleftb">
<span><span class="icon">*</span>开票名称</span>
</el-col>
<el-col :span="18">
<el-form-item prop="name"><el-input v-model="formobj.name" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
<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>
@ -55,41 +67,41 @@
<span><span class="icon">*</span>纳税人识别号</span>
</el-col>
<el-col :span="18">
<el-form-item prop="taxpayerNo"><el-input v-model="formobj.taxpayerNo" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
<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 class="icon">*</span>电话</span>
<span><span v-show="formobj.openTickTypeKey == '02' || print == '0'" class="icon">*</span>电话</span>
</el-col>
<el-col :span="18">
<el-form-item prop="phone"><el-input v-model="formobj.phone" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
<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-if="print == '1'">
<el-col :span="6" class="tleftb">
<span><span class="icon">*</span>地址</span>
<span><span v-show="formobj.openTickTypeKey == '02'" class="icon">*</span>地址</span>
</el-col>
<el-col :span="18">
<el-form-item prop="address"><el-input v-model="formobj.address" clearable placeholder="" class="addinputw"></el-input></el-form-item>
<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-if="print == '1'">
<el-col :span="6" class="tleftb">
<span><span class="icon">*</span>开户行</span>
<span><span v-show="formobj.openTickTypeKey == '02'" class="icon">*</span>开户行</span>
</el-col>
<el-col :span="18">
<el-form-item prop="bankName">
<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-if="print == '1'">
<el-col :span="6" class="tleftb">
<span><span class="icon">*</span>银行账号</span>
<span><span v-show="formobj.openTickTypeKey == '02'" class="icon">*</span>银行账号</span>
</el-col>
<el-col :span="18">
<el-form-item prop="bankAccount"><el-input v-model="formobj.bankAccount" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
<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>
@ -101,7 +113,7 @@
<script>
import { save, saveGeren } from '@/api/anruifinmanagement/finwaitinvoiceapply'
import { selectAllDisList, typeValues, fetchBySid } from '@/api/jichuxinxi/dictcommons'
import { typeValues, fetchBySid } from '@/api/jichuxinxi/dictcommons'
export default {
name: 'weihukaipiaoxinxi',
@ -111,6 +123,7 @@ export default {
index: 0,
tableKey: 0,
bank_list: [],
openTickType_list: [],
openTick_list: [],
print: '',
nameAndPhone: '',
@ -127,16 +140,12 @@ export default {
useOrgSid: '',
orgSidPath: '',
staffSid: '',
createBySid: ''
},
rules: {
name: [{ required: true, message: '开票名称不能为空', trigger: 'blur' }],
taxpayerNo: [{ required: true, message: '纳税人识别号不能为空', trigger: 'blur' }],
phone: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
bankName: [{ required: true, message: '开户行不能为空', trigger: 'blur' }],
bankAccount: [{ required: true, message: '银行账号不能为空', trigger: 'blur' }]
createBySid: '',
openTickTypeKey: '',
openTickTypeValue: ''
},
rules: {},
btnVisible: false,
submitdisabled: false
}
},
@ -147,26 +156,30 @@ export default {
this.bank_list = res.data
}
})
typeValues({ type: 'invoiceType' }).then((res) => {
if (res.success) {
this.openTickType_list = res.data
}
})
},
showEdit(name, useOrgSid) {
showEdit(name, useOrgSid, list, source) {
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 !== '' && name !== undefined) {
this.changeOpenTick(name)
if (this.formobj.bankAccount !== '') {
this.print = '1'
} else {
this.print = '0'
}
}
this.openTick_list = list
if (source === '开票申请') {
this.btnVisible = true
}
if (name !== null && name !== '' && name !== undefined) {
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')
@ -187,12 +200,22 @@ export default {
this.formobj.bankAccount = choose[0].invoBankNum
this.formobj.sid = choose[0].sid
this.nameAndPhone = choose[0].name
this.formobj.openTickTypeKey = choose[0].openTickTypeKey
this.formobj.openTickTypeValue = choose[0].openTickTypeValue
if (this.formobj.bankAccount !== '') {
this.print = '1'
} else {
this.print = '0'
}
},
changeOpenTickType(value) {
const choose = this.openTickType_list.filter((item) => item.dictKey === value)
if (choose != null && choose.length > 0) {
this.formobj.openTickTypeValue = choose[0].dictValue
} else {
this.formobj.openTickTypeValue = ''
}
},
add() {
this.formobj.sid = ''
this.formobj.address = ''
@ -203,6 +226,8 @@ export default {
this.formobj.taxpayerNo = ''
this.print = ''
this.nameAndPhone = ''
this.formobj.openTickTypeKey = ''
this.formobj.openTickTypeValue = ''
},
save() {
this.$refs['form_obj'].validate((valid) => {
@ -211,8 +236,38 @@ export default {
this.$message({ showClose: true, message: '请选择企业或个人', type: 'error' })
return
}
this.submitdisabled = true
if (this.print === '1') {
if (this.formobj.openTickTypeKey === '') {
this.$message({ showClose: true, type: 'error', message: '开票类型不能为空' })
return
}
if (this.formobj.name === '') {
this.$message({ showClose: true, type: 'error', message: '开票名称不能为空' })
return
}
if (this.formobj.taxpayerNo === '') {
this.$message({ showClose: true, type: 'error', message: '纳税人识别号不能为空' })
return
}
if (this.formobj.openTickTypeKey === '02') {
if (this.formobj.address === '') {
this.$message({ showClose: true, type: 'error', message: '地址不能为空' })
return
}
if (this.formobj.phone === '') {
this.$message({ showClose: true, type: 'error', message: '电话不能为空' })
return
}
if (this.formobj.bankName === '') {
this.$message({ showClose: true, type: 'error', message: '开户行不能为空' })
return
}
if (this.formobj.bankAccount === '') {
this.$message({ showClose: true, type: 'error', message: '银行账号不能为空' })
return
}
}
this.submitdisabled = true
save(this.formobj).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
@ -224,6 +279,11 @@ export default {
this.submitdisabled = false
})
} else if (this.print === '0') {
if (this.formobj.phone === '') {
this.$message({ showClose: true, type: 'error', message: '电话不能为空' })
return
}
this.submitdisabled = true
saveGeren(this.formobj).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
@ -256,9 +316,15 @@ export default {
useOrgSid: '',
orgSidPath: '',
staffSid: '',
createBySid: ''
createBySid: '',
openTickTypeKey: '',
openTickTypeValue: ''
}
this.print = ''
this.nameAndPhone = ''
this.submitdisabled = false
this.btnVisible = false
this.openTick_list = []
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}

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

@ -65,7 +65,7 @@
<el-row>
<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-form-item><el-input :disabled="formobj.saleTypeKey == '2'" v-model="formobj.oneBillMoney" @keyup.native="UpNumber" clearable placeholder="" class="addinputw"/></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">开票类型默认</div>
@ -91,36 +91,36 @@
</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"/>
<el-table-column v-if="formobj.saleTypeKey == ''" label="车架号" align="center">
<el-table-column v-if="formobj.saleTypeKey == ''" label="操作" align="center" width="80">
<template slot-scope="scope">
<el-button type="danger" size="mini" @click="handleDelete(scope.row, scope.$index)">删除</el-button>
</template>
</el-table-column>
<el-table-column label="车架号" align="center">
<el-table-column label="车架号" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="合格证状态" align="center">
<el-table-column label="合格证状态" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.certificateStateValue }}</span>
</template>
</el-table-column>
<el-table-column label="开票类型" align="center">
<el-table-column label="开票类型" align="center" width="250">
<template slot-scope="scope">
<el-select v-model="scope.row.billTypeValue" placeholder="请选择" @change="changeBillType($event, scope.row)" clearable>
<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">
<el-table-column label="开票名称" align="center" width="250">
<template slot-scope="scope">
<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>
</el-table-column>
<el-table-column label="开票信息" align="center">
<el-table-column label="开票信息" align="center" min-width="300">
<template slot-scope="scope">
<span>{{ scope.row.openTickRemarks }}</span>
</template>
@ -197,7 +197,7 @@
<script>
import { fetchDetailsBySid, saveOrUpdate, submit, fetchByContractNo } from '@/api/anruifinmanagement/finwaitinvoiceapply'
import { selectAllDisList, typeValues } from '@/api/jichuxinxi/dictcommons'
import { selectAllDisList2, typeValues } from '@/api/jichuxinxi/dictcommons'
import upload from '@/components/uploadFile/upload'
import salesOrder from '../publicPage/salesOrder'
import weihukaipiaoxinxi from './relation/weihukaipiaoxinxi'
@ -216,7 +216,6 @@ export default {
viewTitle: '',
viewState: 1,
submitdisabled: false,
isEdit: false,
diploma_list: [],
accept: '.jpg,.jpeg,.png,.JPG,.JPEG',
tableKey: 0,
@ -328,7 +327,6 @@ export default {
this.formobj = res.data
fetchByContractNo(this.formobj.contractNo).then((res) => {
if (res.success) {
this.isEdit = res.data.isEdit
if (res.data.oneBillMoney !== '') {
this.formobj.oneBillMoney = res.data.oneBillMoney
}
@ -337,7 +335,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, staffSid: this.formobj.staffSid }).then((resp) => {
selectAllDisList2({ orgSid: this.formobj.useOrgSid, staffSid: this.formobj.staffSid, state: '1' }).then((resp) => {
if (resp.success) {
this.openTick_list = resp.data
}
@ -378,7 +376,7 @@ export default {
},
resetData() {
this.viewState = 1
selectAllDisList({ orgSid: this.formobj.useOrgSid, staffSid: window.sessionStorage.getItem('staffSid') }).then((resp) => {
selectAllDisList2({ orgSid: this.formobj.useOrgSid, staffSid: this.formobj.staffSid, state: '1' }).then((resp) => {
if (resp.success) {
this.openTick_list = resp.data
}
@ -428,13 +426,12 @@ export default {
this.formobj.modelSid = value[0].modelSid
fetchByContractNo(this.formobj.contractNo).then((res) => {
if (res.success) {
this.isEdit = res.data.isEdit
if (res.data.oneBillMoney !== '') {
this.formobj.oneBillMoney = res.data.oneBillMoney
}
}
})
selectAllDisList({ orgSid: this.formobj.useOrgSid, staffSid: this.formobj.staffSid }).then((resp) => {
selectAllDisList2({ orgSid: this.formobj.useOrgSid, staffSid: this.formobj.staffSid, state: '1' }).then((resp) => {
if (resp.success) {
this.openTick_list = resp.data
}
@ -497,7 +494,7 @@ export default {
},
handlePreserve() {
this.viewState = 3
this.$refs['divAdd'].showEdit(this.formobj.openTickName, this.formobj.useOrgSid)
this.$refs['divAdd'].showEdit(this.formobj.openTickName, this.formobj.useOrgSid, this.openTick_list, '开票申请')
},
handleSave() {
if (this.formobj.oneBillMoney === '') {

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

@ -7,7 +7,7 @@
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="add()">新增
<el-button type="primary" size="small" v-show="btnVisible" :disabled="submitdisabled" @click="add()">新增
</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存
</el-button>
@ -42,12 +42,24 @@
</el-form-item>
</el-col>
</el-row>
<el-row v-if="print == '1'">
<el-col :span="6" class="tleftb">
<span><span class="icon">*</span>开票类型</span>
</el-col>
<el-col :span="18">
<el-form-item>
<el-select v-model="formobj.openTickTypeKey" style="width: 30%" filterable placeholder="" @change="changeOpenTickType">
<el-option v-for="item in openTickType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6" class="tleftb">
<span><span class="icon">*</span>开票名称</span>
</el-col>
<el-col :span="18">
<el-form-item prop="name"><el-input v-model="formobj.name" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
<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>
@ -55,41 +67,41 @@
<span><span class="icon">*</span>纳税人识别号</span>
</el-col>
<el-col :span="18">
<el-form-item prop="taxpayerNo"><el-input v-model="formobj.taxpayerNo" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
<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 class="icon">*</span>电话</span>
<span><span v-show="formobj.openTickTypeKey == '02' || print == '0'" class="icon">*</span>电话</span>
</el-col>
<el-col :span="18">
<el-form-item prop="phone"><el-input v-model="formobj.phone" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
<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-if="print == '1'">
<el-col :span="6" class="tleftb">
<span><span class="icon">*</span>地址</span>
<span><span v-show="formobj.openTickTypeKey == '02'" class="icon">*</span>地址</span>
</el-col>
<el-col :span="18">
<el-form-item prop="address"><el-input v-model="formobj.address" clearable placeholder="" class="addinputw"></el-input></el-form-item>
<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-if="print == '1'">
<el-col :span="6" class="tleftb">
<span><span class="icon">*</span>开户行</span>
<span><span v-show="formobj.openTickTypeKey == '02'" class="icon">*</span>开户行</span>
</el-col>
<el-col :span="18">
<el-form-item prop="bankName">
<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-if="print == '1'">
<el-col :span="6" class="tleftb">
<span><span class="icon">*</span>银行账号</span>
<span><span v-show="formobj.openTickTypeKey == '02'" class="icon">*</span>银行账号</span>
</el-col>
<el-col :span="18">
<el-form-item prop="bankAccount"><el-input v-model="formobj.bankAccount" clearable placeholder="" style="width: 30%"></el-input></el-form-item>
<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>
@ -101,7 +113,7 @@
<script>
import { save, saveGeren } from '@/api/anruifinmanagement/finwaitinvoiceapply'
import { selectAllDisList, typeValues, fetchBySid } from '@/api/jichuxinxi/dictcommons'
import { typeValues, fetchBySid } from '@/api/jichuxinxi/dictcommons'
export default {
name: 'weihukaipiaoxinxi',
@ -111,6 +123,7 @@ export default {
index: 0,
tableKey: 0,
bank_list: [],
openTickType_list: [],
openTick_list: [],
print: '',
nameAndPhone: '',
@ -127,16 +140,12 @@ export default {
useOrgSid: '',
orgSidPath: '',
staffSid: '',
createBySid: ''
},
rules: {
name: [{ required: true, message: '开票名称不能为空', trigger: 'blur' }],
taxpayerNo: [{ required: true, message: '纳税人识别号不能为空', trigger: 'blur' }],
phone: [{ required: true, message: '电话不能为空', trigger: 'blur' }],
address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
bankName: [{ required: true, message: '开户行不能为空', trigger: 'blur' }],
bankAccount: [{ required: true, message: '银行账号不能为空', trigger: 'blur' }]
createBySid: '',
openTickTypeKey: '',
openTickTypeValue: ''
},
rules: {},
btnVisible: false,
submitdisabled: false
}
},
@ -147,26 +156,30 @@ export default {
this.bank_list = res.data
}
})
typeValues({ type: 'invoiceType' }).then((res) => {
if (res.success) {
this.openTickType_list = res.data
}
})
},
showEdit(name, useOrgSid) {
showEdit(name, useOrgSid, list, source) {
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 !== '' && name !== undefined) {
this.changeOpenTick(name)
if (this.formobj.bankAccount !== '') {
this.print = '1'
} else {
this.print = '0'
}
}
this.openTick_list = list
if (source === '开票申请') {
this.btnVisible = true
}
if (name !== null && name !== '' && name !== undefined) {
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')
@ -187,12 +200,22 @@ export default {
this.formobj.bankAccount = choose[0].invoBankNum
this.formobj.sid = choose[0].sid
this.nameAndPhone = choose[0].name
this.formobj.openTickTypeKey = choose[0].openTickTypeKey
this.formobj.openTickTypeValue = choose[0].openTickTypeValue
if (this.formobj.bankAccount !== '') {
this.print = '1'
} else {
this.print = '0'
}
},
changeOpenTickType(value) {
const choose = this.openTickType_list.filter((item) => item.dictKey === value)
if (choose != null && choose.length > 0) {
this.formobj.openTickTypeValue = choose[0].dictValue
} else {
this.formobj.openTickTypeValue = ''
}
},
add() {
this.formobj.sid = ''
this.formobj.address = ''
@ -203,6 +226,8 @@ export default {
this.formobj.taxpayerNo = ''
this.print = ''
this.nameAndPhone = ''
this.formobj.openTickTypeKey = ''
this.formobj.openTickTypeValue = ''
},
save() {
this.$refs['form_obj'].validate((valid) => {
@ -211,8 +236,38 @@ export default {
this.$message({ showClose: true, message: '请选择企业或个人', type: 'error' })
return
}
this.submitdisabled = true
if (this.print === '1') {
if (this.formobj.openTickTypeKey === '') {
this.$message({ showClose: true, type: 'error', message: '开票类型不能为空' })
return
}
if (this.formobj.name === '') {
this.$message({ showClose: true, type: 'error', message: '开票名称不能为空' })
return
}
if (this.formobj.taxpayerNo === '') {
this.$message({ showClose: true, type: 'error', message: '纳税人识别号不能为空' })
return
}
if (this.formobj.openTickTypeKey === '02') {
if (this.formobj.address === '') {
this.$message({ showClose: true, type: 'error', message: '地址不能为空' })
return
}
if (this.formobj.phone === '') {
this.$message({ showClose: true, type: 'error', message: '电话不能为空' })
return
}
if (this.formobj.bankName === '') {
this.$message({ showClose: true, type: 'error', message: '开户行不能为空' })
return
}
if (this.formobj.bankAccount === '') {
this.$message({ showClose: true, type: 'error', message: '银行账号不能为空' })
return
}
}
this.submitdisabled = true
save(this.formobj).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
@ -224,6 +279,11 @@ export default {
this.submitdisabled = false
})
} else if (this.print === '0') {
if (this.formobj.phone === '') {
this.$message({ showClose: true, type: 'error', message: '电话不能为空' })
return
}
this.submitdisabled = true
saveGeren(this.formobj).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
@ -256,9 +316,15 @@ export default {
useOrgSid: '',
orgSidPath: '',
staffSid: '',
createBySid: ''
createBySid: '',
openTickTypeKey: '',
openTickTypeValue: ''
}
this.print = ''
this.nameAndPhone = ''
this.submitdisabled = false
this.btnVisible = false
this.openTick_list = []
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}

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

@ -2472,7 +2472,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<String> orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/"));
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
String nextNodeUserSids_ = sysOrganization.getManagerSid();
bv.setNextNodeUserSids(nextNodeUserSids_);
if(StringUtils.isBlank(nextNodeUserSids_)){
bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
}else{
bv.setNextNodeUserSids(nextNodeUserSids_);
}
}
//=======================================
if (r == 1) {
@ -2566,7 +2571,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<String> orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/"));
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
String nextNodeUserSids_ = sysOrganization.getManagerSid();
bv.setNextNodeUserSids(nextNodeUserSids_);
if(StringUtils.isBlank(nextNodeUserSids_)){
bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
}else{
bv.setNextNodeUserSids(nextNodeUserSids_);
}
}
//=======================================
if (bv.getTaskId().equals(finBillApplication.getTaskId())) {

Loading…
Cancel
Save