Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 2 years ago
parent
commit
dc63f3e18d
  1. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java
  2. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
  3. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  4. 32
      anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js
  5. 10
      anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js
  6. 72
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfund.vue
  7. 70
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue
  8. 170
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue
  9. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java
  10. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java
  11. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java
  12. 23
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
  13. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java
  14. 69
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  15. 15
      anrui-scm/anrui-scm-ui/src/views/purchasereceipt/purchasereceipt.vue
  16. 30
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
  17. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordAndCommentVo.java
  18. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordVo.java
  19. 6
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java

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

@ -73,7 +73,7 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
* @param qw
* @return
*/
IPage<AppBusSalesOrderVo> getSaleOrders(IPage<BusSalesOrder> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrder> qw, @Param("name") String name);
IPage<AppBusSalesOrderVo> getSaleOrders(IPage<BusSalesOrder> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrder> qw, @Param("name") String name,@Param("typeState")String typeState);
/**
* 根据销售订单sid查询车型信息

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

@ -73,6 +73,9 @@
, #{name}
, '%')
</if>
<if test="typeState != null and typeState != ''">
and LENGTH(bo.nodeState)>0
</if>
</where>
order by bo.id desc
</select>

7
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@ -1460,7 +1460,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
public PagerVo<AppBusSalesOrderVo> getSaleOrders(PagerQuery<AppBusSalesOrderQuery> pq) {
QueryWrapper<BusSalesOrder> qw = appCreateQueryWrapper(pq.getParams());
IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq);
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName());
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(),"");
for (AppBusSalesOrderVo record : pagging.getRecords()) {
ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(record.getSaleOrderSid());
if(commonContractVoResultBean.getData() != null){
@ -3721,8 +3721,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
String orgSid = sysStaffOrgFeign.getOrgSidByPath(orgSidPath).getData();
qw.eq("bo.useOrgSid", orgSid);
}
qw.eq("bo.nodeState", "已办结");
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName());
// qw.eq("bo.nodeState", "已办结");
String typeState = "getSaleOrdersByOrgPath";//查询接口的标识
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(),typeState);
for (AppBusSalesOrderVo record : pagging.getRecords()) {
record.setShowStopBtn(false);
record.setShowContractBtn(false);

32
anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js

@ -11,6 +11,19 @@ export function listPage(data) {
}
})
}
// 代收款申请
export function listPagess(data) {
return request({
url: '/fin/fincollectionconfirmation/listPagess',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
})
}
// 应收未收款项明细分页列表查询
export function listAll(data) {
return request({
@ -118,3 +131,22 @@ export function upload(data) {
}
})
}
// 代收款申请、收款款项确认、出纳款项确认--下载
export function createPdf(data) {
return request({
url: '/fin/fincollectionconfirmation/createPdf',
method: 'post',
params: data
})
}
// 收款款项确认
export function ctskd(data) {
return request({
url: '/fin/fincollectionconfirmation/ctskd',
method: 'post',
params: data,
headers: { 'Content-Type': 'application/json' }
})
}

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

@ -153,3 +153,13 @@ export function selectOrgList(data) {
params: data
})
}
// 根据当前登录用户的角色获取菜单分页列表页面右上角按钮的隐藏
export function getButtonPermissions(data) {
return request({
url: '/portal/v1/sysfunction/getButtonPermissions',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
}

72
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfund.vue

@ -38,8 +38,9 @@
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed label="操作" align="center" width="80">
<el-table-column fixed label="操作" align="center" width="180">
<template slot-scope="scope">
<el-button v-show="scope.row.auditState == 3" type="primary" size="mini" @click="handleDownLoad(scope.row)">下载</el-button>
<el-button type="primary" size="mini" @click="handLook(scope.row)">查看</el-button>
</template>
</el-table-column>
@ -122,19 +123,41 @@
</div>
</div>
</div>
<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>
<agencyfundAdd v-show="viewState == 2" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
<agencyfundInfo v-show="viewState == 3" ref="divInfo" @doback="resetState"/>
</div>
</template>
<script>
import { listPage } from '@/api/anruifinmanagement/paymentConfirmation.js'
import { listPagess, createPdf } from '@/api/anruifinmanagement/paymentConfirmation.js'
import Pagination from '@/components/pagination'
import ButtonBar from '@/components/ButtonBar'
import pageye from '@/components/pagination/pageye'
import { typeValues } from '@/api/jichuxinxi/dictcommons'
import agencyfundAdd from './agencyfundAdd.vue'
import agencyfundInfo from './agencyfundInfo.vue'
import { getStorage } from '@/utils/auth'
export default {
name: 'DaiShouKuan',
@ -149,6 +172,10 @@ export default {
return {
btndisabled: false,
isSearchShow: false,
dialogVisible: false,
visibleDisabled: false,
printSid: '',
print: '',
searchxianshitit: '隐藏查询条件',
viewState: 1,
tableKey: 0,
@ -246,7 +273,7 @@ export default {
this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.listQuery.params.state = 0
listPage(this.listQuery).then((response) => {
listPagess(this.listQuery).then((response) => {
this.listLoading = false
if (response.code === '200') {
this.listQuery.total = response.data.total
@ -286,6 +313,45 @@ export default {
this.viewState = 2
this.$refs['divAdd'].showEdit(row)
},
handleDownLoad(row) {
this.printSid = row.sid
this.print = ''
this.dialogVisible = true
},
handleConfirm() {
this.visibleDisabled = true
createPdf({ skdSid: this.printSid, printerType: this.print }).then((resp) => {
if (resp.success && resp.data.pdfPath !== '') {
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data.pdfPath + '&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
} else {
this.visibleDisabled = false
}
}).catch(() => {
this.visibleDisabled = false
})
},
handLook(row) {
this.viewState = 3
this.$refs['divInfo'].showInfo(row)

70
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue

@ -38,8 +38,9 @@
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed label="操作" align="center" width="80">
<el-table-column fixed label="操作" align="center" width="180">
<template slot-scope="scope">
<el-button v-show="scope.row.auditState == 3" type="primary" size="mini" @click="handleDownLoad(scope.row)">下载</el-button>
<el-button type="primary" size="mini" @click="handLook(scope.row)">查看</el-button>
</template>
</el-table-column>
@ -122,19 +123,41 @@
</div>
</div>
</div>
<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>
<acknowledgementReceiptAdd v-show="viewState == 2" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
<acknowledgementReceiptInfo v-show="viewState == 3" ref="divInfo" @doback="resetState"/>
</div>
</template>
<script>
import { listPage } from '@/api/anruifinmanagement/paymentConfirmation.js'
import {createPdf, listPage} from '@/api/anruifinmanagement/paymentConfirmation.js'
import Pagination from '@/components/pagination'
import ButtonBar from '@/components/ButtonBar'
import pageye from '@/components/pagination/pageye'
import { typeValues } from '@/api/jichuxinxi/dictcommons'
import acknowledgementReceiptAdd from './acknowledgementReceiptAdd.vue'
import acknowledgementReceiptInfo from './acknowledgementReceiptInfo.vue'
import { getStorage } from '@/utils/auth'
export default {
name: 'shoukuanquerenguanli',
@ -147,6 +170,10 @@ export default {
},
data() {
return {
dialogVisible: false,
visibleDisabled: false,
printSid: '',
print: '',
btndisabled: false,
isSearchShow: false,
searchxianshitit: '隐藏查询条件',
@ -286,6 +313,45 @@ export default {
this.viewState = 2
this.$refs['divAdd'].showEdit(row)
},
handleDownLoad(row) {
this.printSid = row.sid
this.print = ''
this.dialogVisible = true
},
handleConfirm() {
this.visibleDisabled = true
createPdf({ skdSid: this.printSid, printerType: this.print }).then((resp) => {
if (resp.success && resp.data.pdfPath !== '') {
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data.pdfPath + '&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
} else {
this.visibleDisabled = false
}
}).catch(() => {
this.visibleDisabled = false
})
},
handLook(row) {
this.viewState = 3
this.$refs['divInfo'].showInfo(row)

170
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue

@ -1,12 +1,7 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>出纳款项确认管理</div>
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<button-bar view-title="出纳款项确认管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
@ -48,11 +43,13 @@
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column width="50" type="selection" align="center"/>
<el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" align="center" width="180">
<el-table-column label="操作" align="center" width="200">
<template slot-scope="scope">
<el-button :disabled="scope.row.auditState !== 1" type="primary" size="small" @click="handUpdate(scope.row)">办理</el-button>
<el-button v-show="scope.row.auditState == 3" type="primary" size="mini" @click="handleDownLoad(scope.row)">下载</el-button>
<el-button type="primary" size="small" @click="handLook(scope.row)">查看</el-button>
</template>
</el-table-column>
@ -76,12 +73,12 @@
<span>{{ scope.row.createByName }}</span>
</template>
</el-table-column>
<el-table-column label="申请日期" align="center" width="90">
<el-table-column label="申请日期" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.createDate }}</span>
</template>
</el-table-column>
<el-table-column label="收款日期" align="center" width="90">
<el-table-column label="收款日期" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.collectionDate }}</span>
</template>
@ -125,33 +122,79 @@
</div>
</div>
</div>
<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>
<cashierConfirmationInfo v-show="viewState == 2 || viewState == 3" ref="divInfo" @doback="resetState" @reloadlist="getList"/>
</div>
</template>
<script>
import { listPage } from '@/api/anruifinmanagement/paymentConfirmation.js'
import { createPdf, listPage, ctskd } from '@/api/anruifinmanagement/paymentConfirmation.js'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import { typeValues } from '@/api/jichuxinxi/dictcommons'
import ButtonBar from '@/components/ButtonBar'
import { typeValues, getButtonPermissions } from '@/api/jichuxinxi/dictcommons'
import cashierConfirmationInfo from './cashierConfirmationInfo.vue'
import { getStorage } from '@/utils/auth'
export default {
name: 'chunakuanxiangquerenguanli',
components: {
Pagination,
pageye,
ButtonBar,
cashierConfirmationInfo
},
data() {
return {
dialogVisible: false,
visibleDisabled: false,
printSid: '',
print: '',
btndisabled: false,
isSearchShow: false,
searchxianshitit: '隐藏查询条件',
viewState: 1,
tableKey: 0,
list: [],
sids: [],
receiptBank_list: [],
collectionType_list: [],
btnList: [
{
type: 'primary',
size: 'small',
icon: '',
btnKey: 'toRepush',
btnLabel: '重推'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
subscriptionState_list: [
{
dictKey: 1,
@ -186,6 +229,20 @@ export default {
}
}
},
mounted() {
getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: this.$route.path, type: 0 }).then((res) => {
if (res.success) {
for (var i = 0; i < res.data.length; i++) {
for (var k = 0; k < this.btnList.length; k++) {
if (res.data[i].buttonId === this.btnList[k].btnKey) {
this.btnList.splice(k, 1)
}
}
}
this.$refs['btnbar'].setButtonList(this.btnList)
}
})
},
created() {
this.getList()
this.DataDictionary()
@ -203,6 +260,19 @@ export default {
}
})
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'toRepush':
this.toRepush()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
@ -219,6 +289,14 @@ export default {
var pageindex = index + 1 + pagestart
return pageindex
},
handleSelectionChange(row) {
const aa = []
row.forEach((element) => {
aa.push(element.sid)
})
this.sids = aa
console.log('sids', this.sids)
},
//
getList() {
this.listLoading = true
@ -260,13 +338,79 @@ export default {
this.viewState = 2
this.$refs['divInfo'].showInfo(row, this.viewState)
},
handleDownLoad(row) {
this.printSid = row.sid
this.print = ''
this.dialogVisible = true
},
handleConfirm() {
this.visibleDisabled = true
createPdf({ skdSid: this.printSid, printerType: this.print }).then((resp) => {
if (resp.success && resp.data.pdfPath !== '') {
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data.pdfPath + '&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
} else {
this.visibleDisabled = false
}
}).catch(() => {
this.visibleDisabled = false
})
},
handLook(row) {
this.viewState = 3
this.$refs['divInfo'].showInfo(row, this.viewState)
},
toRepush() {
if (this.sids.length === 1) {
const loading = this.$loading({
lock: true,
text: '数据推送中',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
ctskd({ skdSid: this.sids[0] }).then((resp) => {
if (resp.success) {
loading.close()
this.$message({ showClose: true, type: 'success', message: '推送成功' })
this.getList()
} else {
loading.close()
}
}).catch(() => {
loading.close()
})
} else {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行重推操作' })
return
}
},
resetState() {
this.viewState = 1
this.handReset()
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@ -65,6 +65,10 @@ public interface FinCollectionConfirmationFeign {
@PostMapping("/listPage")
public ResultBean<PagerVo<FinCollectionConfirmationVo>> listPage(@RequestBody PagerQuery<FinCollectionConfirmationQuery> pq);
@ApiOperation("销售内勤查看收款申请以及代办理列表")
@PostMapping("/listPagess")
public ResultBean<PagerVo<FinCollectionConfirmationVo>> listPagess(@RequestBody PagerQuery<FinCollectionConfirmationQuery> pq);
@ApiOperation("提交新增保存")
@PostMapping("/save")
public ResultBean save(@RequestBody FinCollectionConfirmationDto dto);

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java

@ -57,6 +57,11 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
return rb.setMsg("接口anrui-fin/fincollectionconfirmation/listPage无法访问");
}
@Override
public ResultBean<PagerVo<FinCollectionConfirmationVo>> listPagess(PagerQuery<FinCollectionConfirmationQuery> pq) {
return null;
}
@Override
public ResultBean save(FinCollectionConfirmationDto dto) {
return ResultBean.fireFail().setMsg("接口anrui-fin/fincollectionconfirmation/save无法访问");

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java

@ -57,6 +57,7 @@ import java.util.List;
public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectionConfirmation> {
IPage<FinCollectionConfirmationVo> selectPageVo(IPage<FinCollectionConfirmation> page, @Param(Constants.WRAPPER) Wrapper<FinCollectionConfirmation> qw);
IPage<FinCollectionConfirmationVo> selectPageVoss(IPage<FinCollectionConfirmation> page, @Param(Constants.WRAPPER) Wrapper<FinCollectionConfirmation> qw,@Param("createBySid") String createBySid);
List<FinCollectionConfirmationVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinCollectionConfirmation> qw);

23
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@ -12,6 +12,29 @@
</where>
</select>
<select id="selectPageVoss"
resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo">
SELECT *
FROM fin_collection_confirmation
<where>
${ew.sqlSegment}
<if test="createBySid != null and createBySid != ''">
and createBySid =#{createBySid}
</if>
</where>
union all
SELECT *
FROM fin_collection_confirmation
<where>
${ew.sqlSegment}
<if test="createBySid != null and createBySid != ''">
and createBySid &lt;&gt; #{createBySid}
</if>
and auditState = '3'
</where>
order by id desc
</select>
<select id="selectListAllVo"
resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo">
SELECT *

7
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java

@ -72,6 +72,13 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
return rb.success().setData(pv);
}
@Override
public ResultBean<PagerVo<FinCollectionConfirmationVo>> listPagess(PagerQuery<FinCollectionConfirmationQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<FinCollectionConfirmationVo> pv = finCollectionConfirmationService.listPageVoss(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("提交新增保存")
@PostMapping("/save")

69
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@ -183,6 +183,37 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return qw;
}
private QueryWrapper<FinCollectionConfirmation> createQueryWrapperss(FinCollectionConfirmationQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<FinCollectionConfirmation> qw = new QueryWrapper<>();
qw.eq("useOrgSid", query.getUseOrgSid());
String collectionStartDate = query.getCollectionStartDate();
String collectionEndDate = query.getCollectionEndDate();
qw.apply(StringUtils.isNotEmpty(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
);
if (StringUtils.isNotBlank(query.getCollectionBank())) {
qw.eq("collectionBankKey", query.getCollectionBank());
}
if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
qw.eq("collectionTypeKey", query.getCollectionTypeKey());
}
if (StringUtils.isNotBlank(query.getSubscriptionState())) {
qw.eq("paymentState", query.getSubscriptionState());
}
//0是申请管理的,1是出纳款项管理
if (StringUtils.isNotBlank(query.getState())) {
if ("0".equals(query.getState())) {
qw.eq("pushMessgae", 0);
if (StringUtils.isNotBlank(query.getCreateBySid())) {
qw.eq("createBySid", query.getCreateBySid());
}
}
}
return qw;
}
public PagerVo<FinCollectionConfirmationVo> listPageVo(PagerQuery<FinCollectionConfirmationQuery> pq) {
FinCollectionConfirmationQuery query = pq.getParams();
if (StringUtils.isNotBlank(query.getOrgPath())) {
@ -246,6 +277,44 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return p;
}
public PagerVo<FinCollectionConfirmationVo> listPageVoss(PagerQuery<FinCollectionConfirmationQuery> pq) {
FinCollectionConfirmationQuery query = pq.getParams();
if (StringUtils.isNotBlank(query.getOrgPath())) {
String userOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
query.setUseOrgSid(userOrgSid);
} else {
//根据用户sid查询分公司sid
String createBySid = query.getCreateBySid();
String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(createBySid).getData();
query.setUseOrgSid(userOrgSid);
}
QueryWrapper<FinCollectionConfirmation> qw = createQueryWrapperss(query);
IPage<FinCollectionConfirmation> page = PagerUtil.queryToPage(pq);
IPage<FinCollectionConfirmationVo> pagging = baseMapper.selectPageVoss(page, qw,query.getCreateBySid());
List<FinCollectionConfirmationVo> records = pagging.getRecords();
for (FinCollectionConfirmationVo record : records) {
//是否有余额
if (StringUtils.isNotBlank(record.getBalance())) {
//余额是0
if (new BigDecimal(record.getBalance()).compareTo(BigDecimal.ZERO) == 0) {
record.setShowHandle(false);
} else {
//是否是待审核状态或已驳回状态
if (record.getAuditState() == 1 || record.getAuditState() == 2) {
record.setShowHandle(false);
} else {
record.setShowHandle(true);
}
}
} else {
record.setShowHandle(false);
}
}
PagerVo<FinCollectionConfirmationVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public String getApplyCode(String useOrgSid) {
ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(useOrgSid);
String orgCode = resultBean1.getData().getOrgCode();

15
anrui-scm/anrui-scm-ui/src/views/purchasereceipt/purchasereceipt.vue

@ -137,7 +137,7 @@
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import { typeValues, getOrgSidByPath, getListDeptByOrgSid, getGysByOrgSid } from '@/api/cheliang/dictcommons'
import { typeValues, getOrgSidByPath, getListDeptByOrgSid, getGysByOrgSid, getButtonPermissions } from '@/api/cheliang/dictcommons'
import req from '@/api/purchasereceipt/purchasereceipt'
import { getStorage } from '@/utils/auth'
import purchasereceiptInfo from './purchasereceiptInfo'
@ -207,7 +207,18 @@ export default {
this.init()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: this.$route.path, type: 0 }).then((res) => {
if (res.success) {
for (var i = 0; i < res.data.length; i++) {
for (var k = 0; k < this.btnList.length; k++) {
if (res.data[i].buttonId === this.btnList[k].btnKey) {
this.btnList.splice(k, 1)
}
}
}
this.$refs['btnbar'].setButtonList(this.btnList)
}
})
},
methods: {
//

30
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<div v-show="isCheck">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
@ -28,7 +28,7 @@
<el-row>
<el-col :span="12" class="yancheAdd-bor">
<el-form-item prop="model" label="车型:">
<span>{{ temp.model }}</span>
<span class="bluezi" @click="handleLook()">{{ temp.model }}</span>
</el-form-item>
</el-col>
<el-col :span="12" class="yancheAdd-bor">
@ -98,7 +98,9 @@
</el-form>
</div>
</div>
<vehiclechecklist ref="divchecklist" v-show="!isCheck" @doback="resetState"/>
<vehiclechecklist ref="divchecklist" v-show="viewState == 2" @doback="resetState"/>
<!-- 车型配置标准页面 -->
<vehicleconfiguration v-show="viewState == 3" ref="divPeizhi" @doback="resetState"/>
</div>
</template>
@ -107,17 +109,19 @@ import { getOrgSidByPath } from '@/api/cheliang/dictcommons.js'
import { getCarInspectedInfo, saveCarInspectedInfo, submitCarInspectedInfo } from '@/api/supplychain/yancheguanli'
import Upload from '@/components/uploadFile/uploadImg.vue'
import vehiclechecklist from '@/views/supplychain/yancheguanli/vehiclechecklist'
import vehicleconfiguration from '@/views/cheliang/cheliangcaigou/relation/vehicleconfiguration'
export default {
name: 'yancheguanliAdd',
components: {
Upload,
vehiclechecklist
vehiclechecklist,
vehicleconfiguration
},
data() {
return {
viewTitle: '',
isCheck: true,
viewState: 1,
btndisabled: false,
// ---------
sid: '',
@ -136,6 +140,7 @@ export default {
engineNo: '',
orgPath: ''
},
vehicleConfiguration: {},
dialogStatus: '', //
vehiclePhoto: [],
rules: {
@ -176,6 +181,12 @@ export default {
inspectedSid: row.inspectedSid,
userSid: window.sessionStorage.getItem('userSid')
}
this.vehicleConfiguration = {
modelSid: row.modelSid,
configSid: row.configSid,
vehModelConfigSid: row.modelSidAndConfig,
guidedPrice: row.guidedPrice
}
getCarInspectedInfo(data).then((res) => {
if (res.success) {
this.temp = res.data
@ -207,12 +218,16 @@ export default {
}
})
},
handleLook() {
this.viewState = 3
this.$refs['divPeizhi'].showInfo(this.vehicleConfiguration)
},
handleChecklist() {
this.isCheck = false
this.viewState = 2
this.$refs['divchecklist'].showCheck(this.temp.inspectedSid)
},
resetState() {
this.isCheck = true
this.viewState = 1
},
getPathSid() {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
@ -263,6 +278,7 @@ export default {
this.btndisabled = false
this.imgList01 = []
this.imgList02 = []
this.vehicleConfiguration = {}
this.$emit('doback')
},
//

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordAndCommentVo.java

@ -1,8 +1,7 @@
package com.yxt.anrui.terminal.api.app.flowable;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.terminal.api.app.flowable.AppFlowableRecordVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -22,6 +21,7 @@ public class AppFlowableRecordAndCommentVo implements Vo {
private String state;
@ApiModelProperty(value = "时间")
@JsonProperty("time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date time;
@ApiModelProperty(value = "审批记录")
@JsonProperty("flowableRecordVo")

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordVo.java

@ -29,12 +29,12 @@ public class AppFlowableRecordVo implements Vo {
private String stateValue;
@ApiModelProperty("接收时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("办理时间")
@JsonProperty("time")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date finishTime;
@ApiModelProperty("流程结束时间")

6
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java

@ -2,7 +2,6 @@ package com.yxt.anrui.terminal.biz.app;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
import com.yxt.anrui.flowable.api.flowtask.FlowRecordVo;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@ -12,10 +11,8 @@ import com.yxt.anrui.terminal.api.app.flowable.*;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.result.ResultBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@ -81,6 +78,7 @@ public class AppService {
AppFlowableRecordAndCommentVo a=new AppFlowableRecordAndCommentVo();
a.setTime(f.getFinishTime()==null?new Date():f.getFinishTime());
// a.setTime(f.getCreateTime());
a.setFlowableRecordVo(f);
a.setState(0+"");
list.add(a);
@ -108,7 +106,7 @@ public class AppService {
ProcessCommentVo processCommentVo = new ProcessCommentVo();
BeanUtil.copyProperties(f,processCommentVo);
processCommentVo.setCreateTime(f.getTime());
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String format = sdf.format(f.getTime());
processCommentVo.setTime(format);
list.add(processCommentVo);

Loading…
Cancel
Save