Browse Source

Merge remote-tracking branch 'origin/master'

master
God 2 years ago
parent
commit
35c2e11c02
  1. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java
  2. 167
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
  3. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
  4. 10
      anrui-buscenter/anrui-finmanage-ui/src/api/moneycarriedforward/moneycarriedforward.js
  5. 91
      anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforward.vue
  6. 71
      anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforwardAdd.vue
  7. 9
      anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforwardInfo.vue
  8. 9
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardDaiBanInfo.vue
  9. 57
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardEdit.vue
  10. 9
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardYiBanInfo.vue
  11. 20
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.xml
  12. 112
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
  13. 40
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
  14. 6
      anrui-riskcenter-ui/src/views/financialpolicyreporting/financialpolicyreportingInfo.vue
  15. 5
      anrui-riskcenter-ui/src/views/workFlow/jinrongzhengceFlow/financialpolicyreportingByDivisionOperateInfo.vue
  16. 5
      anrui-riskcenter-ui/src/views/workFlow/jinrongzhengceFlow/financialpolicyreportingDaiBanInfo.vue
  17. 6
      anrui-riskcenter-ui/src/views/workFlow/jinrongzhengceFlow/financialpolicyreportingYiBanInfo.vue

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java

@ -78,7 +78,6 @@ public interface BusDeliveredMapper extends BaseMapper<BusDelivered> {
* @return
*/
IPage<AppBusDeliveredPageVo> getRetrievalNotList(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
IPage<AppBusDeliveredPageVo> getRetrievalNotLists(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
/**
* 查询车架号
@ -101,4 +100,6 @@ public interface BusDeliveredMapper extends BaseMapper<BusDelivered> {
List<String> selectByState();
IPage<BusDeliveredVo> selectListsVos(IPage<BusDelivered> page, @Param(Constants.WRAPPER)QueryWrapper<BusDelivered> qw);
IPage<AppBusDeliveredPageVo> getRetrievalNotLists(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER)QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
}

167
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml

@ -65,45 +65,6 @@
group by bd.contractNo
</select>
<resultMap id="ListMap" type="com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo">
<result column="sid" jdbcType="VARCHAR" property="sid"/>
<result column="contractNo" jdbcType="VARCHAR" property="contractNo"/>
<result column="paymentMethod" jdbcType="INTEGER" property="paymentMethod"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<collection property="vinList" ofType="com.yxt.anrui.buscenter.api.sysmobilemenu.SysMobileMenuListVo"
select="vinList" column="contractNo">
</collection>
</resultMap>
<select id="getRetrievalNotLists"
resultMap="ListMap">
SELECT bd.*
FROM bus_delivered bd
left join bus_sales_order bo on bo.contractNo = bd.contractNo
left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid
<where>
${ew.sqlSegment}
<if test="name != null and name != ''">
and concat(IFNULL(bd.contractNo
, '')
, ifnull(bd.`name`
, '')) LIKE concat('%'
, #{name}
, '%')
</if>
AND (
SELECT
count(*)
FROM
bus_sales_order_vehicle bbv
LEFT JOIN bus_sales_order bo ON bo.sid = bbv.salesOrderSid
WHERE
length( bbv.linkSid )> 0
AND bo.contractNo = bd.contractNo
)> 0
</where>
group by bd.contractNo
</select>
<select id="selVinListVo" resultType="com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo">
SELECT RIGHT(bv.linkNo, 8) as vin, bd.busVinSid, bd.subscription as businessState, bv.linkSid as vinSid
FROM bus_delivered bd
@ -138,7 +99,7 @@
</foreach>
</update>
<select id="selectListsVo" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredVo">
<!-- <select id="selectListsVo" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredVo">
SELECT bd.sid,
bd.contractNo,
bd.name,
@ -154,7 +115,7 @@
${ew.sqlSegment}
and length(bv.linkSid) > 0
</where>
</select>
</select>-->
<select id="selectListsVo" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredVo">
SELECT bd.sid,
@ -211,4 +172,128 @@
and length(bv.linkSid) > 0 and bbv.vehicleStateValue != '出库'
</where>
</select>
<resultMap id="listMap" type="com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo">
<result column="contractNo" jdbcType="VARCHAR" property="contractNo"/>
<collection property="vinList" ofType="com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo"
select="vinList" column="contractNo">
</collection>
</resultMap>
<select id="vinList">
SELECT
bv.linkNo vin,
bv.linkSid vinSid,
bv.sid busVinSid,
cast(
sum(
furd.`reveivableMoney` - COALESCE ( df.dbalance, 0 )) AS DECIMAL ( 10, 2 )) AS dblances,
bbv.vehicleStateValue
FROM
fin_uncollected_receivables_detailed furd
LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bv ON bv.sid = furd.busVinSid
LEFT JOIN (
SELECT
sum( dbalance ) AS dbalance,
d.receivablesSid
FROM
(
SELECT
d.sid,
d.receivablesSid,
d.`collSid`,
cast((
d.`subscriptionMoney` - COALESCE ( SUM( f.`thisUseMoney` ), 0 ) + COALESCE ( ffa.`useMoney`, 0 )) AS DECIMAL ( 10, 2 )) AS dbalance
FROM
fin_selected_receivables_detailed d
LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid`
LEFT JOIN (
SELECT
fa.sid,
ff.busSid,
ff.thisUseMoney AS useMoney
FROM
fin_funds_carried_forward_apply fa
LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
WHERE
fa.nodeState = '终止'
) ffa ON ffa.busSid = d.sid
WHERE
(d.auditState = 3 )
GROUP BY
d.`sid`
) d
GROUP BY
d.receivablesSid
) df ON df.receivablesSid = furd.`sid`
LEFT JOIN anrui_base.base_vehicle bbv ON bbv.sid = bv.linkSid
WHERE
bbv.vehicleStateValue != '出库'
AND length( bv.linkSid )> 0 and furd.contractNo = #{contractNo}
GROUP BY
furd.busVinSid
HAVING
dblances &lt;= 0
</select>
<select id="getRetrievalNotLists" resultMap="listMap">
SELECT
ds.contractNo
FROM
(
SELECT
furd.contractNo,
furd.busVinSid,
cast(
sum(
furd.`reveivableMoney` - COALESCE ( df.dbalance, 0 )) AS DECIMAL ( 10, 2 )) AS dblances,
bbv.vehicleStateValue
FROM
fin_uncollected_receivables_detailed furd
LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bv ON bv.sid = furd.busVinSid
LEFT JOIN (
SELECT
sum( dbalance ) AS dbalance,
d.receivablesSid
FROM
(
SELECT
d.sid,
d.receivablesSid,
d.`collSid`,
cast((
d.`subscriptionMoney` - COALESCE ( SUM( f.`thisUseMoney` ), 0 ) + COALESCE ( ffa.`useMoney`, 0 )) AS DECIMAL ( 10, 2 )) AS dbalance
FROM
fin_selected_receivables_detailed d
LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid`
LEFT JOIN (
SELECT
fa.sid,
ff.busSid,
ff.thisUseMoney AS useMoney
FROM
fin_funds_carried_forward_apply fa
LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
WHERE
fa.nodeState = '终止'
) ffa ON ffa.busSid = d.sid
WHERE
(d.auditState = 3 )
GROUP BY
d.`sid`
) d
GROUP BY
d.receivablesSid
) df ON df.receivablesSid = furd.`sid`
LEFT JOIN anrui_base.base_vehicle bbv ON bbv.sid = bv.linkSid
WHERE
bbv.vehicleStateValue != '出库'
AND length( bv.linkSid )> 0
GROUP BY
furd.busVinSid
HAVING
dblances &lt;= 0
) ds
GROUP BY
ds.contractNo order by ds.contractNo desc
</select>
</mapper>

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@ -554,6 +554,6 @@
</select>
<select id="selectBySid" resultType="java.lang.String">
select cc.sid from bus_sales_order bo left join anrui_base.common_contract cc on cc.contractNo = bo.contractNo
select cc.sid from bus_sales_order bo left join anrui_base.common_contract cc on cc.contractNo = bo.contractNo where bo.sid = #{sid}
</select>
</mapper>

10
anrui-buscenter/anrui-finmanage-ui/src/api/moneycarriedforward/moneycarriedforward.js

@ -145,3 +145,13 @@ export function getPreviousNodesForReject(data) {
params: data
})
}
// 下载
export function createPdf(data) {
return request({
url: '/fin/v1/finfundscarriedforwardapply/createPdf',
method: 'post',
params: data
})
}

91
anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforward.vue

@ -60,6 +60,11 @@
<span>{{ scope.row.applyDeptName }}</span>
</template>
</el-table-column>
<el-table-column label="单据编号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.billNo }}</span>
</template>
</el-table-column>
<el-table-column label="申请人" align="center">
<template slot-scope="scope">
<span>{{ scope.row.createByName }}</span>
@ -104,6 +109,28 @@
<el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
<iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
</el-dialog>
<!--下载打印-->
<el-dialog center :visible.sync="dialogVisible" width="40%">
<el-form class="formadd">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="6" class="tleftb">
<span>打印机类型</span>
</el-col>
<el-col :span="18">
<el-form-item>
<el-radio-group v-model="print">
<el-radio label="针孔式打印机">针孔式打印机</el-radio>
<el-radio label="激光打印机">激光打印机</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" :disabled="visibleDisabled" type="primary" @click="handleConfirm">确定</el-button>
<el-button size="small" :disabled="visibleDisabled" @click="dialogVisible = false">取消</el-button>
</span>
</el-dialog>
</div>
</template>
@ -111,12 +138,11 @@
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import { kxjzlist, delBySids } from '@/api/moneycarriedforward/moneycarriedforward'
import { kxjzlist, delBySids, createPdf } from '@/api/moneycarriedforward/moneycarriedforward'
import { getOrgSidByPath } from '@/api/jichuxinxi/dictcommons'
import { getStorage } from '@/utils/auth'
import moneycarriedforwardAdd from './moneycarriedforwardAdd'
import moneycarriedforwardInfo from './moneycarriedforwardInfo'
export default {
name: 'MoneyCarriedForward',
components: {
@ -132,6 +158,9 @@ export default {
dialogHeight: '80%',
centerDialogVisible: false,
btndisabled: false,
dialogVisible: false,
print: '',
printSid: '',
btnList: [
{
type: 'danger',
@ -309,26 +338,44 @@ export default {
this.$refs['divInfo'].showInfo(row)
},
toDownLoad(row) {
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + row.tzsqPath + '&outFileName=' + '调账申请', true)
xhr.setRequestHeader('token', getStorage())
xhr.responseType = 'blob'
xhr.onload = function(e) {
//
var blob = this.response
var filename = '调账.pdf'
var a = document.createElement('a')
// blob.type="application/octet-stream";
// url
var url = URL.createObjectURL(blob)
a.href = url
a.download = filename
a.click()
// URL
window.URL.revokeObjectURL(url)
}
//
xhr.send()
this.dialogVisible = true
this.print = ''
this.printSid = row.sid
},
handleConfirm() {
this.visibleDisabled = true
createPdf({ sid: this.printSid, pdfType: this.print }).then((resp) => {
if (resp.success && resp.data !== '') {
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data + '&outFileName=' + '调账单', true)
xhr.setRequestHeader('token', getStorage())
xhr.responseType = 'blob'
xhr.onload = function(e) {
//
var blob = this.response
var filename = '调账单.pdf'
var a = document.createElement('a')
// blob.type="application/octet-stream";
// url
var url = URL.createObjectURL(blob)
a.href = url
a.download = filename
a.click()
// URL
window.URL.revokeObjectURL(url)
}
//
xhr.send()
this.dialogVisible = false
this.printSid = ''
this.visibleDisabled = false
this.getList()
} else {
this.visibleDisabled = false
}
}).catch(() => {
this.visibleDisabled = false
})
},
doDel() {
if (this.sids.length === 0) {

71
anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforwardAdd.vue

@ -123,9 +123,7 @@
<el-col :span="24" style="padding: 0px">
<el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
<el-form-item label="采购系统:">
<el-select :disabled="dialogStatus == 'edit'" v-model="formobj.purchaseSystemSid" placeholder="请选择" @change="changePurchase" filterable clearable>
<el-option v-for="item in purchase_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.deptSid"/>
</el-select>
<el-input v-model="formobj.purchaseSystem" size="mini" placeholder="" clearable readonly/>
</el-form-item>
<el-form-item label="合同编号:">
<el-input v-model="listQuery.contractNo" size="mini" placeholder="" style="width: 110px" clearable/>
@ -273,7 +271,6 @@
import { fetchDetailBySid, saveOrUpdate, fetchDetails, submit } from '@/api/moneycarriedforward/moneycarriedforward'
import { listAll } from '@/api/anruifinmanagement/paymentConfirmation'
import amountpledged from '../anruifinmanagement/paymentConfirmation/relation/amountpledged'
import { fetchDetailsByUseOrgSid, getOrgSidByPath } from '@/api/jichuxinxi/dictcommons'
import upload from '@/components/uploadFile/upload'
export default {
@ -292,7 +289,6 @@ export default {
overduereceivableKey: 1,
selectedreceivableKey: 2,
overduereceivable_list: [],
purchase_list: [],
image_list1: [],
accept: '.jpg,.jpeg,.png,.JPG,.JPEG',
formobj: {
@ -329,7 +325,7 @@ export default {
purchaseSystemSid: ''
},
rules: {},
submitdisabled: false,
submitdisabled: false
}
},
methods: {
@ -345,15 +341,6 @@ export default {
e.target.value = parseFloat(e.target.value)
}
},
DataDictionary() {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
fetchDetailsByUseOrgSid(res.data).then((resp) => {
if (resp.success) {
this.purchase_list = resp.data
}
})
})
},
//
changeMoney(row) {
if (row.receivable !== '') {
@ -428,14 +415,10 @@ export default {
return resNum
},
getlist() {
if (this.formobj.purchaseSystemName === '') {
this.$message({ showClose: true, type: 'error', message: '请选择采购系统' })
return
}
this.listQuery.createBySid = window.sessionStorage.getItem('userSid')
this.listQuery.orgPath = window.sessionStorage.getItem('defaultOrgPath')
listAll(this.listQuery).then((res) => {
if (res.code === '200') {
if (res.success) {
this.overduereceivable_list = res.data
}
})
@ -443,25 +426,6 @@ export default {
handleFilter() {
this.getlist()
},
changePurchase(value) {
if (this.formobj.finFundsCarriedForwardVehDetailsVos.length > 0) {
for (var i = 0; i < this.formobj.finFundsCarriedForwardVehDetailsVos.length; i++) {
if (this.formobj.finFundsCarriedForwardVehDetailsVos[i].thisUseMoney === '') {
this.$message({ showClose: true, type: 'error', message: '请检查本次使用金额是否已全部填写' })
this.formobj.purchaseSystemSid = ''
return
}
}
}
if (value !== '') {
const choose = this.purchase_list.filter((item) => item.deptSid === value)
this.formobj.purchaseSystem = choose[0].purchaseSystemName
this.listQuery.purchaseSystemSid = this.formobj.purchaseSystemSid
this.getlist()
} else {
this.overduereceivable_list = []
}
},
handReset() {
this.listQuery.contractNo = ''
this.listQuery.customerName = ''
@ -472,7 +436,6 @@ export default {
this.getlist()
},
showAdd(title, sids) {
this.DataDictionary()
this.viewTitle = '【新建】款项结转'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
@ -481,18 +444,21 @@ export default {
if (res.success) {
this.formobj = res.data
this.formobj.orgSidPath = window.sessionStorage.getItem('defaultOrgPath')
if (this.formobj.purchaseSystem !== '') {
this.listQuery.purchaseSystemSid = this.formobj.purchaseSystemSid
this.getlist()
}
}
})
},
showEdit(row) {
this.DataDictionary()
this.viewTitle = '【编辑】款项结转'
this.dialogStatus = 'edit'
fetchDetails(row.sid).then(resp => {
if (resp.success) {
this.formobj = resp.data
this.formobj.instanceId = resp.data.procInsId
if (this.formobj.kxqrsImages !== null && this.formobj.kxqrsImages.length >0) {
if (this.formobj.kxqrsImages !== null && this.formobj.kxqrsImages.length > 0) {
this.formobj.kxqrsImages.forEach((e) => {
this.image_list1.push({
name: '',
@ -514,8 +480,14 @@ export default {
},
//
handAdd(row) {
if (this.formobj.collectionMoney === '') {
this.$message({ showClose: true, type: 'error', message: '请先填写收款金额' })
if (this.formobj.finFundsCarriedForwardVehDetailsVos.length > 0) {
for (var i = 0; i < this.formobj.finFundsCarriedForwardVehDetailsVos.length; i++) {
if (this.formobj.finFundsCarriedForwardVehDetailsVos[i].thisUseMoney === '') {
this.$message({ showClose: true, type: 'error', message: '请检查本次使用金额是否已全部填写' })
this.formobj.purchaseSystemSid = ''
return
}
}
} else {
var nowDate = new Date()
var date = {
@ -561,9 +533,14 @@ export default {
},
//
handleSelect() {
if (this.formobj.purchaseSystemSid === '') {
this.$message({ showClose: true, type: 'error', message: '请先选择采购系统' })
return
if (this.formobj.finFundsCarriedForwardVehDetailsVos.length > 0) {
for (var i = 0; i < this.formobj.finFundsCarriedForwardVehDetailsVos.length; i++) {
if (this.formobj.finFundsCarriedForwardVehDetailsVos[i].thisUseMoney === '') {
this.$message({ showClose: true, type: 'error', message: '请检查本次使用金额是否已全部填写' })
this.formobj.purchaseSystemSid = ''
return
}
}
}
this.viewState = 2
this.$refs['divSelect'].showData(this.formobj.yxysFinFundsCarriedForwardYXYSKXVos, this.formobj.purchaseSystemSid)

9
anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforwardInfo.vue

@ -9,7 +9,14 @@
<div class="listconadd">
<div class="titwu"><span>款项结转申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top" class="formadd">
<el-row style="border-top: 1px solid #e0e3eb">
<el-row style="border-left: 0px">
<el-col :span="24" style="border-right: 0px;text-align: right">
<el-form-item>
<span style="font-size: 16px">单据编号{{ formobj.billNo }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>申请部门</span>
</el-col>

9
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardDaiBanInfo.vue

@ -11,7 +11,14 @@
<div class="">
<div class="titwu"><span>款项结转申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top" class="formadd">
<el-row style="border-top: 1px solid #e0e3eb">
<el-row style="border-left: 0px">
<el-col :span="24" style="border-right: 0px;text-align: right">
<el-form-item>
<span style="font-size: 16px">单据编号{{ formobj.billNo }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>申请部门</span>
</el-col>

57
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardEdit.vue

@ -122,9 +122,7 @@
<el-col :span="24" style="padding: 0px">
<el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
<el-form-item label="采购系统:">
<el-select :disabled="dialogStatus == 'edit'" v-model="formobj.purchaseSystemSid" placeholder="请选择" @change="changePurchase" filterable clearable>
<el-option v-for="item in purchase_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.deptSid"/>
</el-select>
<el-input v-model="formobj.purchaseSystem" size="mini" placeholder="" clearable readonly/>
</el-form-item>
<el-form-item label="合同编号:">
<el-input v-model="listQuery.contractNo" size="mini" placeholder="" style="width: 110px" clearable/>
@ -272,7 +270,6 @@
import { saveOrUpdate, fetchDetails, submit } from '@/api/moneycarriedforward/moneycarriedforward'
import { listAll } from '@/api/anruifinmanagement/paymentConfirmation'
import amountpledged from './relation/amountpledged'
import { fetchDetailsByUseOrgSid, getOrgSidByPath } from '@/api/jichuxinxi/dictcommons'
import upload from '@/components/uploadFile/upload'
export default {
@ -291,7 +288,6 @@ export default {
overduereceivableKey: 1,
selectedreceivableKey: 2,
overduereceivable_list: [],
purchase_list: [],
image_list1: [],
accept: '.jpg,.jpeg,.png,.JPG,.JPEG',
formobj: {
@ -328,7 +324,7 @@ export default {
purchaseSystemSid: ''
},
rules: {},
submitdisabled: false,
submitdisabled: false
}
},
created() {
@ -450,25 +446,6 @@ export default {
handleFilter() {
this.getlist()
},
changePurchase(value) {
if (this.formobj.finFundsCarriedForwardVehDetailsVos.length > 0) {
for (var i = 0; i < this.formobj.finFundsCarriedForwardVehDetailsVos.length; i++) {
if (this.formobj.finFundsCarriedForwardVehDetailsVos[i].thisUseMoney === '') {
this.$message({ showClose: true, type: 'error', message: '请检查本次使用金额是否已全部填写' })
this.formobj.purchaseSystemSid = ''
return
}
}
}
if (value !== '') {
const choose = this.purchase_list.filter((item) => item.deptSid === value)
this.formobj.purchaseSystem = choose[0].purchaseSystemName
this.listQuery.purchaseSystemSid = this.formobj.purchaseSystemSid
this.getlist()
} else {
this.overduereceivable_list = []
}
},
handReset() {
this.listQuery.contractNo = ''
this.listQuery.customerName = ''
@ -485,14 +462,7 @@ export default {
if (resp.success) {
this.formobj = resp.data
this.formobj.instanceId = resp.data.procInsId
getOrgSidByPath({ orgPath: this.formobj.orgSidPath }).then((res) => {
fetchDetailsByUseOrgSid(res.data).then((resp) => {
if (resp.success) {
this.purchase_list = resp.data
}
})
})
if (this.formobj.kxqrsImages !== null && this.formobj.kxqrsImages.length >0) {
if (this.formobj.kxqrsImages !== null && this.formobj.kxqrsImages.length > 0) {
this.formobj.kxqrsImages.forEach((e) => {
this.image_list1.push({
name: '',
@ -514,8 +484,14 @@ export default {
},
//
handAdd(row) {
if (this.formobj.collectionMoney === '') {
this.$message({ showClose: true, type: 'error', message: '请先填写收款金额' })
if (this.formobj.finFundsCarriedForwardVehDetailsVos.length > 0) {
for (var i = 0; i < this.formobj.finFundsCarriedForwardVehDetailsVos.length; i++) {
if (this.formobj.finFundsCarriedForwardVehDetailsVos[i].thisUseMoney === '') {
this.$message({ showClose: true, type: 'error', message: '请检查本次使用金额是否已全部填写' })
this.formobj.purchaseSystemSid = ''
return
}
}
} else {
var nowDate = new Date()
var date = {
@ -561,9 +537,14 @@ export default {
},
//
handleSelect() {
if (this.formobj.purchaseSystemSid === '') {
this.$message({ showClose: true, type: 'error', message: '请先选择采购系统' })
return
if (this.formobj.finFundsCarriedForwardVehDetailsVos.length > 0) {
for (var i = 0; i < this.formobj.finFundsCarriedForwardVehDetailsVos.length; i++) {
if (this.formobj.finFundsCarriedForwardVehDetailsVos[i].thisUseMoney === '') {
this.$message({ showClose: true, type: 'error', message: '请检查本次使用金额是否已全部填写' })
this.formobj.purchaseSystemSid = ''
return
}
}
}
this.viewState = 2
this.$refs['divSelect'].showData(this.formobj.yxysFinFundsCarriedForwardYXYSKXVos, this.formobj.purchaseSystemSid)

9
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardYiBanInfo.vue

@ -9,7 +9,14 @@
<div class="">
<div class="titwu"><span>款项结转申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top" class="formadd">
<el-row style="border-top: 1px solid #e0e3eb">
<el-row style="border-left: 0px">
<el-col :span="24" style="border-right: 0px;text-align: right">
<el-form-item>
<span style="font-size: 16px">单据编号{{ formobj.billNo }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>申请部门</span>
</el-col>

20
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.xml

@ -70,20 +70,18 @@
<select id="selectByBusSid" resultType="java.lang.String">
select ifnull(sum(dbalance), 0) as subscriptionMoney
from (SELECT d.sid,
d.receivablesSid,
d.`collSid`,
d.auditState,
from (SELECT
cast((
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) +
COALESCE(ffa.`useMoney`, 0)) AS DECIMAL(10, 2)) AS dbalance
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) ) AS DECIMAL(10, 2)) AS dbalance
FROM fin_selected_receivables_detailed d
LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid`
left join fin_uncollected_receivables_detailed ff on ff.sid = d.receivablesSid
LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney
FROM fin_funds_carried_forward_apply fa
LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid
LEFT JOIN (
SELECT f.busSid,
f.thisUseMoney
FROM fin_funds_carried_forward_veh f
JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
WHERE fa.`nodeState` != '终止'
) f ON f.`busSid` = d.`sid`
WHERE d.auditState = 3
and ff.busVinSid = #{busVinSid}
GROUP BY d.`sid`) d

112
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@ -25,42 +25,43 @@
<select id="getPaymentDetailsList"
resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo">
SELECT distinct furd.sid,
furd.contractNo AS contractId,
furd.receivablesName AS projectName,
furd.customerPhone AS mobile,
furd.customerName AS `name`,
furd.contractNo AS contractId,
furd.receivablesName AS projectName,
furd.customerPhone AS mobile,
furd.customerName AS `name`,
furd.customerSid,
furd.useOrgSid,
cast((furd.`reveivableMoney` - COALESCE(df.dbalance, 0)) AS DECIMAL(10, 2)) AS receivable,
COALESCE(SUM(df.dbalance), 0) AS realMoney,
cast((furd.`reveivableMoney` - COALESCE(SUM(df.dbalance), 0)) AS DECIMAL(10, 2)) AS receivable,
furd.contractSid,
if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) &lt; 1,
if(furd.payTypeKey = 2, RIGHT(bv.temporaryNo, 2), bv.temporaryNo),
RIGHT(bv.linkNo, 8)) as vin,
RIGHT(bv.linkNo, 8)) as vin,
furd.busVinSid,
furd.payType,
furd.payTypeKey,
0 as subscribedOf,
furd.sid as receivablesSid,
CURRENT_DATE() as confirmDate,
0 as subscribedOf,
furd.sid as receivablesSid,
CURRENT_DATE() as confirmDate,
furd.purchaseSystemSid
FROM fin_uncollected_receivables_detailed furd
left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = furd.busVinSid
LEFT JOIN (select sum(dbalance) as dbalance, d.receivablesSid
from (SELECT d.sid,
d.receivablesSid,
d.`collSid`,
cast((
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) +
COALESCE(ffa.`useMoney`, 0)) AS DECIMAL(10, 2)) AS dbalance
FROM fin_selected_receivables_detailed d
LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid`
LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney
FROM fin_funds_carried_forward_apply fa
LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid
WHERE (d.auditState = 1 OR d.auditState = 3)
GROUP BY d.`sid`) d
group by d.receivablesSid
LEFT JOIN (
SELECT d.sid,
d.`receivablesSid`,
(
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS dbalance
FROM fin_selected_receivables_detailed d
LEFT JOIN (
SELECT f.busSid,
f.thisUseMoney
FROM fin_funds_carried_forward_veh f
JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
WHERE fa.`nodeState` != '终止'
) f ON f.`busSid` = d.`sid`
WHERE d.`auditState` = 3
or d.auditState = 1
GROUP BY d.`sid`
) df ON df.receivablesSid = furd.`sid`
<where>
${ew.sqlSegment}
@ -77,6 +78,7 @@
and length(furd.busVinSid)
>0
</where>
group by furd.sid
having receivable>0
order by furd.contractNo desc
</select>
@ -176,20 +178,17 @@
<select id="selectListByVin"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
select ifnull(sum(dbalance), 0) as subscriptionMoney
from (SELECT d.sid,
d.receivablesSid,
d.`collSid`,
d.auditState,
cast((
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) +
COALESCE(ffa.`useMoney`, 0)) AS DECIMAL(10, 2)) AS dbalance
from (SELECT cast((
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance
FROM fin_selected_receivables_detailed d
LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid`
left join fin_uncollected_receivables_detailed ff on ff.sid = d.receivablesSid
LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney
FROM fin_funds_carried_forward_apply fa
LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid
LEFT JOIN (
SELECT f.busSid,
f.thisUseMoney
FROM fin_funds_carried_forward_veh f
JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
WHERE fa.`nodeState` != '终止'
) f ON f.`busSid` = d.`sid`
WHERE d.auditState = #{state}
and ff.busVinSid = #{busVinSid}
and d.contractNo = #{contractNo}
@ -303,20 +302,18 @@
<select id="selectByVinSid" resultType="java.lang.String">
select ifnull(sum(dbalance), 0) as subscriptionMoney
from (SELECT d.sid,
d.receivablesSid,
d.`collSid`,
d.auditState,
cast((
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) +
COALESCE(ffa.`useMoney`, 0)) AS DECIMAL(10, 2)) AS dbalance
from (SELECT cast((
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance
FROM fin_selected_receivables_detailed d
LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid`
left join fin_uncollected_receivables_detailed ff on ff.sid = d.receivablesSid
LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney
FROM fin_funds_carried_forward_apply fa
LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid
LEFT JOIN (
SELECT f.busSid,
f.thisUseMoney
FROM fin_funds_carried_forward_veh f
JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
WHERE fa.`nodeState` != '终止'
) f ON f.`busSid` = d.`sid`
WHERE d.auditState = 3
and ff.busVinSid = #{busVinSid}
GROUP BY d.`sid`) d
@ -548,19 +545,18 @@
<select id="fetchByReceivablesSid"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed">
select ifnull(sum(dbalance), 0) as subscriptionMoney, d.receivablesSid
from (SELECT d.sid,
d.receivablesSid,
d.`collSid`,
d.auditState,
from (SELECT d.receivablesSid,
cast((
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) +
COALESCE(ffa.`useMoney`, 0)) AS DECIMAL(10, 2)) AS dbalance
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance
FROM fin_selected_receivables_detailed d
LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid`
LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney
FROM fin_funds_carried_forward_apply fa
LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid
LEFT JOIN (
SELECT f.busSid,
f.thisUseMoney
FROM fin_funds_carried_forward_veh f
JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
WHERE fa.`nodeState` != '终止'
) f ON f.`busSid` = d.`sid`
WHERE d.auditState = 3
GROUP BY d.`sid`) d
WHERE d.receivablesSid = #{receivablesSid}

40
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@ -58,7 +58,8 @@
furd.customerName AS `customerName`,
furd.customerSid,
furd.useOrgSid,
cast((furd.`reveivableMoney` - COALESCE(df.dbalance, 0)) AS DECIMAL(10, 2)) AS currentReceivableMoney,
COALESCE ( SUM( df.dbalance ), 0 ) AS realMoney,
cast((furd.`reveivableMoney` - COALESCE(SUM( df.dbalance ), 0)) AS DECIMAL(10, 2)) AS currentReceivableMoney,
furd.reveivableMoney,
furd.contractSid,
if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) &lt; 1,
@ -71,27 +72,28 @@
furd.sid as receivablesSid
FROM fin_uncollected_receivables_detailed furd
left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = furd.busVinSid
LEFT JOIN (select sum(dbalance) as dbalance, d.receivablesSid
from (SELECT d.sid,
d.receivablesSid,
d.`collSid`,
cast((
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) +
COALESCE(ffa.`useMoney`, 0)) AS DECIMAL(10, 2)) AS dbalance
FROM fin_selected_receivables_detailed d
LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid`
LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney
FROM fin_funds_carried_forward_apply fa
LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid
WHERE (d.auditState = 1 OR d.auditState = 3)
GROUP BY d.`sid`) d
group by d.receivablesSid
LEFT JOIN (
SELECT d.sid,
d.`receivablesSid`,
(
d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS dbalance
FROM fin_selected_receivables_detailed d
LEFT JOIN (
SELECT f.busSid,
f.thisUseMoney
FROM fin_funds_carried_forward_veh f
JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
WHERE fa.`nodeState` != '终止'
) f ON f.`busSid` = d.`sid`
WHERE d.`auditState` = 3
or d.auditState = 1
GROUP BY d.`sid`
) df ON df.receivablesSid = furd.`sid`
<where>
${ew.sqlSegment}
and length(furd.busVinSid) > 0
</where>
group by furd.sid,currentReceivableMoney,furd.contractNo
having currentReceivableMoney>0
order by furd.contractNo desc
</select>
@ -213,6 +215,8 @@
</select>
<select id="selectByBusVinSid" resultType="java.lang.String">
select sum(reveivableMoney) from fin_uncollected_receivables_detailed where busVinSid = #{busVinSid}
select sum(reveivableMoney)
from fin_uncollected_receivables_detailed
where busVinSid = #{busVinSid}
</select>
</mapper>

6
anrui-riskcenter-ui/src/views/financialpolicyreporting/financialpolicyreportingInfo.vue

@ -36,7 +36,7 @@
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item><el-image class="addinputwInfo" v-for="(item, index) in formobj.annexPaths" :key="index" :src="item" :preview-src-list="formobj.annexPaths" /></el-form-item>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.annexPaths" :key="index" :src="item" :preview-src-list="formobj.annexPaths" /></el-form-item>
</el-col>
</el-row>
<div class="title">
@ -183,5 +183,7 @@ export default {
</script>
<style scoped>
.addinputInfo {
margin-left: 60px !important;
}
</style>

5
anrui-riskcenter-ui/src/views/workFlow/jinrongzhengceFlow/financialpolicyreportingByDivisionOperateInfo.vue

@ -38,7 +38,7 @@
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item><el-image class="addinputwInfo" v-for="(item, index) in formobj.annexPaths" :key="index" :src="item" :preview-src-list="formobj.annexPaths" /></el-form-item>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.annexPaths" :key="index" :src="item" :preview-src-list="formobj.annexPaths" /></el-form-item>
</el-col>
</el-row>
<div class="title">
@ -380,4 +380,7 @@ export default {
.rowClass{
border-top: 1px solid #E0E3EB;
}
.addinputInfo {
margin-left: 60px !important;
}
</style>

5
anrui-riskcenter-ui/src/views/workFlow/jinrongzhengceFlow/financialpolicyreportingDaiBanInfo.vue

@ -38,7 +38,7 @@
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item><el-image class="addinputwInfo" v-for="(item, index) in formobj.annexPaths" :key="index" :src="item" :preview-src-list="formobj.annexPaths" /></el-form-item>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.annexPaths" :key="index" :src="item" :preview-src-list="formobj.annexPaths" /></el-form-item>
</el-col>
</el-row>
<div class="title">
@ -380,4 +380,7 @@ export default {
.rowClass{
border-top: 1px solid #E0E3EB;
}
.addinputInfo {
margin-left: 60px !important;
}
</style>

6
anrui-riskcenter-ui/src/views/workFlow/jinrongzhengceFlow/financialpolicyreportingYiBanInfo.vue

@ -36,7 +36,7 @@
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item><el-image class="addinputwInfo" v-for="(item, index) in formobj.annexPaths" :key="index" :src="item" :preview-src-list="formobj.annexPaths" /></el-form-item>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.annexPaths" :key="index" :src="item" :preview-src-list="formobj.annexPaths" /></el-form-item>
</el-col>
</el-row>
<div class="title">
@ -251,5 +251,7 @@ export default {
</script>
<style scoped>
.addinputInfo {
margin-left: 60px !important;
}
</style>

Loading…
Cancel
Save