yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
ligaode 3 months ago
parent
23036b2dfd 99dba28400
commit
20f2390cc1
21 changed files with 1779 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/financingClosingPayment.js
  2. 15
      anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js
  3. 520
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/financingClosingPayment/financingClosingPayment.vue
  4. 2
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentInformation/paymentInformation.vue
  5. 6
      anrui-gateway/src/main/resources/application.yml
  6. 25
      yxt-as-ui/src/api/statement/monthlyReport/claimFormRate.js
  7. 17
      yxt-as-ui/src/api/statement/monthlyReport/essentialDetails.js
  8. 25
      yxt-as-ui/src/api/statement/monthlyReport/oneTimeRate.js
  9. 205
      yxt-as-ui/src/views/statement/monthlyReport/claimFormRate/claimFormRate.vue
  10. 91
      yxt-as-ui/src/views/statement/monthlyReport/claimFormRate/claimFormRateDetail.vue
  11. 223
      yxt-as-ui/src/views/statement/monthlyReport/essentialDetails/essentialDetails.vue
  12. 6
      yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagement.vue
  13. 88
      yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagementDetail.vue
  14. 205
      yxt-as-ui/src/views/statement/monthlyReport/oneTimeRate/oneTimeRate.vue
  15. 218
      yxt-as-ui/src/views/statement/monthlyReport/oneTimeRate/oneTimeRateDetail.vue
  16. 16
      yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java
  17. 7
      yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaMendApplyRest.java
  18. 50
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java
  19. 4
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyVo.java
  20. 5
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/flowable/NodeQuery.java
  21. 41
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java

38
anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/financingClosingPayment.js
View File

@ -0,0 +1,38 @@
import request from '@/utils/request'
export default {
// 查询分页列表
listPage: function(params) {
return request({
url: '/fin/v1/finpaymentapplydetailsbeloweve/listPage',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 保存修改记录
saveOrUpdate: function(params) {
return request({
url: '/fin/v1/finpaymentapplydetailsbeloweve/save',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 通过sid查询一条记录
fetchBySid: function(sid) {
return request({
url: '/fin/v1/finpaymentapplydetailsbeloweve/fetchDetailsBySid/' + sid,
method: 'get'
})
},
// 通过sid删除一条或多条记录
delBySids: function(data) {
return request({
url: '/fin/v1/finpaymentapplydetailsbeloweve/delBySids',
method: 'DELETE',
data: data,
headers: { 'Content-Type': 'application/json' }
})
}
}

15
anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js
View File

@ -139,6 +139,21 @@ const codemenu = [
meta: { title: '付款信息管理', noCache: true }
}]
},
// 付款单位信息管理
{
path: '/anruifinmanagement',
component: Layout,
redirect: '/anruifinmanagement',
meta: {
title: '融资平仓付款管理'
},
children: [{
path: '/anruifinmanagement/financingClosingPayment',
component: () => import('@/views/anruifinmanagement/financingClosingPayment/financingClosingPayment.vue'),
name: 'FinancingClosingPayment',
meta: { title: '融资平仓付款管理', noCache: true }
}]
},
{
path: '/anruifinmanagement',
component: Layout,

520
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/financingClosingPayment/financingClosingPayment.vue
View File

@ -0,0 +1,520 @@
<template>
<div class="app-container">
<!--列表页面-->
<div v-show="viewState == 1">
<button-bar view-title="融资平仓付款管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<!--Start查询列表部分-->
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="付款单位">
<el-input v-model="listQuery.params.payCompany" placeholder="" clearable/>
</el-form-item>
<el-form-item label="款项名称">
<el-input v-model="listQuery.params.costTitleValue" placeholder="" clearable/>
</el-form-item>
<el-form-item label="收款单位">
<el-input v-model="listQuery.params.receiveCompany" placeholder="" clearable/>
</el-form-item>
<el-form-item label="期数">
<el-input v-model="listQuery.params.period" placeholder="" clearable/>
</el-form-item>
<el-form-item label="开通日期">
<el-date-picker v-model="listQuery.params.openStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="listQuery.params.openEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="付款日期">
<el-date-picker v-model="listQuery.params.exePayStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="listQuery.params.exePayEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
</div>
</div>
</div>
<!--End查询列表部分-->
<div class="listtop">
<div class="tit">融资平仓款列表</div>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<!--Start 主页面主要部分 -->
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" align="center" width="50" />
<el-table-column fixed label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" width="180" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button>
</template>
</el-table-column>
<el-table-column prop="costTitleValue" label="款项名称" align="center" width="140" />
<el-table-column prop="openDate" label="融资付款开通日期" align="center" width="160" />
<el-table-column prop="period" label="期数" align="center" width="100" />
<el-table-column prop="payCompany" label="付款单位" align="center" width="140" />
<el-table-column prop="receiveCompany" label="收款单位名称" align="center" width="140" />
<el-table-column prop="bank" label="开户行" align="center" width="140" />
<el-table-column prop="receivingAccount" label="银行账号" align="center" width="140" />
<el-table-column prop="exePayDate" label="平仓付款日期" align="center" width="140" />
<el-table-column prop="exePayPrice" label="平仓付款金额" align="center" width="140" />
<el-table-column prop="remarks" label="备注" align="center" min-width="200" />
</el-table>
</div>
<!--End 主页面主要部分-->
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<!--End查询列表部分-->
</div>
</div>
<el-dialog center :visible.sync="dialogVisible" width="70%">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="12">
<div class="span-sty">款项名称</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.costTitleValue" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">融资付款开通日期</div>
<el-form-item><el-date-picker class="addinputInfo" v-model="formobj.openDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">期数</div>
<el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.period = getNumber(formobj.period, 0)" v-model="formobj.period" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">付款单位</div>
<el-form-item>
<el-select class="addinputInfo" v-model="formobj.payCompany" placeholder="请选择" @change="changePayCompany" filterable clearable>
<el-option v-for="item in payCompany_list" :key="item.companyInvoicingSid" :label="item.companyInvoicingName" :value="item.companyInvoicingName"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">收款单位</div>
<el-form-item>
<el-select class="addinputInfo" v-model="formobj.receiveCompany" placeholder="请选择" @change="receiveCompanyChange" clearable filterable>
<el-option v-for="item in receiveCompany_list" :key="item.sid" :label="item.companyName" :value="item.companyName"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">银行账号</div>
<el-form-item><span class="addinputInfo">{{ formobj.receivingAccount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">开户行</div>
<el-form-item><span class="addinputInfo">{{ formobj.bank }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">平仓付款日期</div>
<el-form-item><el-date-picker class="addinputInfo" v-model="formobj.exePayDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期" /></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">平仓付款金额</div>
<el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.exePayPrice = getNumber(formobj.exePayPrice, 2)" v-model="formobj.exePayPrice" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button type="primary" size="small" @click="handleConfirm">确定</el-button>
<el-button size="small" @click="handleClose">取消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/anruifinmanagement/financingClosingPayment'
import payment from '@/api/anruifinmanagement/payment'
import { getOrgSidByPath, getInvoicingList, fetchBySid } from '@/api/jichuxinxi/dictcommons'
export default {
name: 'FinancingClosingPayment',
components: {
Pagination,
pageye,
ButtonBar
},
data() {
return {
dialogVisible: false,
payCompany_list: [],
receiveCompany_list: [],
formobj: {
sid: '', // sid
remarks: '',
costTitleValue: '', // 款项名称
costTypeKey: '',
costTypeValue: '',
detailSid: '', // 付款申请明细的明细sid
openDate: '', // 融资付款开通日期
period: '', // 期数
payCompanySid: '', // 付款单位sid
payCompany: '', // 付款单位名称
receiveCompany: '', // 收款单位名称
receiveCompanySid: '', // 收款单位sid
receivingAccount: '', // 收款银行账号
bank: '', // 开户行
exePayDate: '',
exePayPrice: '',
deptSid: '', // 申请部门sid
deptName: '', // 申请部门名称
createOrgSid: '', // 创建组织
createOrgName: '',
useOrgSid: '', // 使用组织
useOrgName: '',
createBySid: '', // 创建人
createByName: ''
},
rules: {},
btndisabled: false,
btnList: [
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
tableKey: 0,
list: [],
sids: [], // 用于导出的时候保存已选择的SIDs
listLoading: false,
// 翻页
listQuery: {
current: 1,
size: 5,
total: 0,
params: {
payCompany: '',
openStartDate: '',
openEndDate: '',
costTitleValue: '',
receiveCompany: '',
exePayStartDate: '',
exePayEndDate: '',
period: '',
remarks: '',
state: '',
orgPath: '',
userSid: '',
menuUrl: ''
}
}
}
},
created() {
// 初始化变量
this.init()
this.getList()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
init() {
getInvoicingList({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.payCompany_list = res.data
}
})
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
if (resp.success) {
this.formobj.createOrgSid = resp.data
this.formobj.useOrgSid = resp.data
fetchBySid({ useOrgSid: resp.data }).then((respsone) => {
if (respsone.success) {
this.formobj.createOrgName = respsone.data.name
this.formobj.useOrgName = respsone.data.name
}
})
payment.selectByUseOrgSid({ useOrgSid: resp.data }).then((res) => {
if (res.success) {
this.receiveCompany_list = res.data
}
})
}
})
},
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') // 保留数字
val = val.replace(/^00/, '0.') // 开头不能有两个0
val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点
/^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str)
if (limit === 0) {
// 不需要小数点
val = val.replace(reg, '$1')
} else {
// 通过正则保留小数点后指定的位数
val = val.replace(reg, '$1.$2')
}
return val
},
// 搜索条件效果
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'toAdd':
this.toAdd()
break
case 'doDel':
this.doDel()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
// 信息条数 获取点击时当前的sid
handleSelectionChange(row) {
const aa = []
row.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
// 表中序号
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
// 查询列表信息
getList() {
this.listLoading = true
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.menuUrl = this.$route.path
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
req.listPage(this.listQuery).then(response => {
this.listLoading = false
if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
this.list = []
this.listQuery.total = 0
}
})
},
// 查询按钮
handleFilter() {
this.listQuery.current = 1
this.getList()
},
// 点击重置
handleReset() {
this.listQuery = {
current: 1,
size: 5,
total: 0,
params: {
payCompany: '',
openStartDate: '',
openEndDate: '',
costTitleValue: '',
receiveCompany: '',
exePayStartDate: '',
exePayEndDate: '',
period: '',
remarks: '',
state: '',
orgPath: '',
userSid: '',
menuUrl: ''
}
}
this.getList()
},
toAdd() {
this.dialogVisible = true
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
},
toEdit(row) {
this.dialogVisible = true
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchBySid(row.sid).then((res) => {
if (res.success) {
this.formobj = res.data
}
})
},
changePayCompany(value) {
const choose = this.payCompany_list.filter((item) => item.companyInvoicingName === value)
if (choose.length > 0 && choose !== null) {
this.formobj.payCompanySid = choose[0].companyInvoicingSid
} else {
this.formobj.payCompanySid = ''
}
},
receiveCompanyChange(value) {
const choose = this.receiveCompany_list.filter((item) => item.companyName === value)
if (choose !== null && choose.length > 0) {
this.formobj.receiveCompanySid = choose[0].sid
this.formobj.receivingAccount = choose[0].receivingAccount
this.formobj.bank = choose[0].bank
} else {
this.formobj.receiveCompanySid = ''
this.formobj.receivingAccount = ''
this.formobj.bank = ''
}
},
handleConfirm() {
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.formobj.name = window.sessionStorage.getItem('name')
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
this.$refs['form_obj'].validate((valid) => {
if (valid) {
req.saveOrUpdate(this.formobj).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.getList()
this.handleClose()
}
})
}
})
},
handleClose() {
this.dialogVisible = false
this.$refs['form_obj'].resetFields()
this.formobj = {
sid: '', // sid
remarks: '',
costTitleValue: '', // 款项名称
costTypeKey: '',
costTypeValue: '',
detailSid: '', // 付款申请明细的明细sid
openDate: '', // 融资付款开通日期
period: '', // 期数
payCompanySid: '', // 付款单位sid
payCompany: '', // 付款单位名称
receiveCompany: '', // 收款单位名称
receiveCompanySid: '', // 收款单位sid
receivingAccount: '', // 收款银行账号
bank: '', // 开户行
exePayDate: '',
exePayPrice: '',
deptSid: '', // 申请部门sid
deptName: '', // 申请部门名称
createOrgSid: '', // 创建组织
createOrgName: '',
useOrgSid: '', // 使用组织
useOrgName: '',
createBySid: '', // 创建人
createByName: ''
}
},
// 删除
doDel() {
if (this.sids.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
return
}
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.delBySids(this.sids).then(resp => {
if (resp.success) {
this.$message({ type: 'success', message: resp.msg, showClose: true })
}
this.getList()
loading.close()
}).catch(e => {
loading.close()
})
}).catch(() => {
})
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
.span-sty {
width: 140px !important;
}
.addinputInfo {
margin-left: 135px !important;
}
/deep/ .el-form-item__error {
margin-left: 135px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 135px !important;
width: calc(100% - 130px);
}
</style>

2
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentInformation/paymentInformation.vue
View File

@ -300,10 +300,10 @@ export default {
},
handleConfirm() {
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.formobj.useOrgSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
this.formobj.useOrgSid = res.data
this.$refs['form_obj'].validate((valid) => {
if (valid) {
req.saveOrUpdate(this.formobj).then((resp) => {

6
anrui-gateway/src/main/resources/application.yml
View File

@ -133,6 +133,12 @@ spring:
uri: lb://yxt-vehfleet
filters:
- StripPrefix=1
- id: yxt-vehfleet
predicates:
- Path= /oa/**
uri: lb://yxt-oa
filters:
- StripPrefix=1
ignore:
whites:

25
yxt-as-ui/src/api/statement/monthlyReport/claimFormRate.js
View File

@ -0,0 +1,25 @@
import request from '@/utils/request'
// 月度报表 三包索赔单生效率统计表
export default {
// 查询分页列表
listPage: function(params) {
return request({
baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/as/v1/claimFormRate/listPage',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 查询详情
getDetail: function(params) {
return request({
baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/as/v1/claimFormRate/getDetail/' + params,
method: 'get',
})
}
}

17
yxt-as-ui/src/api/statement/monthlyReport/essentialDetails.js
View File

@ -0,0 +1,17 @@
import request from '@/utils/request'
// 月度报表 必备件明细
export default {
// 查询分页列表
listPage: function(params) {
return request({
baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/as/v1/essentialDetails/listPage',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
}

25
yxt-as-ui/src/api/statement/monthlyReport/oneTimeRate.js
View File

@ -0,0 +1,25 @@
import request from '@/utils/request'
// 月度报表 配件库房一次性满足率统计表
export default {
// 查询分页列表
listPage: function(params) {
return request({
baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/as/v1/oneTimeRate/listPage',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 查询详情
getDetail: function(params) {
return request({
baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/as/v1/oneTimeRate/getDetail/' + params,
method: 'get',
})
}
}

205
yxt-as-ui/src/views/statement/monthlyReport/claimFormRate/claimFormRate.vue
View File

@ -1,8 +1,207 @@
<template>
<div class="app-container">
<!--列表页面-->
<div v-show="viewState == 1">
<button-bar view-title="月度三包索赔单生效率统计表" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<!--Start查询列表部分-->
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
<el-form-item label="选择月份">
<el-date-picker v-model="listQuery.params.createStartTime" value-format="yyyy-MM" format="yyyy-MM"
type="month" placeholder="开始月份"></el-date-picker>
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="listQuery.params.createEndTime" value-format="yyyy-MM" format="yyyy-MM"
type="month" placeholder="结束月份"></el-date-picker>
</el-form-item>
<el-form-item label="服务站">
<el-input v-model="listQuery.params.deptName" placeholder="" clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
</div>
</div>
</div>
<!--End查询列表部分-->
<div class="listtop">
<div class="tit">服务站列表</div>
</div>
<!--Start 主页面主要部分 -->
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;"
@row-click="handle">
<!-- <el-table-column fixed type="selection" align="center" width="50" /> -->
<el-table-column fixed label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column prop="createTime" label="年月" align="center" width="150" />
<el-table-column prop="deptName" label="服务站" align="center" />
</el-table>
</div>
<!--End 主页面主要部分-->
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div>
</div>
</div>
<!--End查询列表部分-->
<!-- 新增修改部分组件 -->
<divinfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="getList" />
</div>
</template>
<script>
</script>
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/statement/monthlyReport/claimFormRate'
import divinfo from './claimFormRateDetail.vue'
export default {
name: 'claimFormRate',
components: {
Pagination,
pageye,
ButtonBar,
divinfo
},
data() {
return {
btndisabled: false,
btnList: [{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
tableKey: 0,
list: [],
sids: [], // 用于导出的时候保存已选择的SIDs
listLoading: false,
// 翻页
listQuery: {
current: 1,
size: 10,
total: 0,
params: {
createStartTime: '',
createEndTime: '',
deptName: '',
userSid: '',
orgPath: '',
menuUrl: ''
}
}
}
},
created() {
// 初始化变量
this.getList()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
handle(row) {
console.log('handle ' + row.sid)
<style>
</style>
this.viewState = 4
this.$refs['divinfo'].showAdd(row)
},
resetState() {
this.viewState = 1
this.getList()
},
// 搜索条件效果
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'doClose':
this.doClose()
break
default:
break
}
},
// 信息条数 获取点击时当前的sid
handleSelectionChange(row) {
const aa = []
row.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
// 表中序号
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
// 查询列表信息
getList() {
this.listLoading = true
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.listQuery.params.menuUrl = this.$route.path
req.listPage(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
this.list = []
this.listQuery.total = 0
}
})
},
// 查询按钮
handleFilter() {
this.listQuery.current = 1
this.getList()
},
// 点击重置
handleReset() {
this.listQuery = {
current: 1,
size: 10,
total: 0,
params: {
createStartTime: '',
createEndTime: '',
deptName: '',
userSid: '',
orgPath: '',
menuUrl: ''
}
}
this.getList()
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

91
yxt-as-ui/src/views/statement/monthlyReport/claimFormRate/claimFormRateDetail.vue
View File

@ -0,0 +1,91 @@
<template>
<div>
<div class="tab-header webtop">
<!-- 标题 -->
<div style="margin: 0 auto;">{{title}}</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 详情按钮 -->
</div>
<div style="margin-top: 10px; height: 100%;">
<el-table :key="tableKey" v-loading="listLoading" height="650px" :data="list" border
style="width: 100%;margin-bottom: 50px;">
<el-table-column fixed label="序号" type="index" width="80" :index="index+1" align="center" />
<el-table-column prop="stationEntryDate" label="进站日期" width="100" align="center" />
<el-table-column prop="completionMonth" label="竣工月份" width="100" align="center" />
<el-table-column prop="completionDate" label="竣工日期" width="100" align="center" />
<el-table-column prop="settlementDate" label="结算日期" width="100" align="center" />
<el-table-column prop="repairOrderNo" label="维修单号" width="100" align="center" />
<el-table-column prop="vehMark" label="车牌号" width="100" align="center" />
<el-table-column prop="serviceItem" label="维修项目" width="100" align="center" />
<el-table-column prop="goodsAmount1" label="材料费" width="100" align="center" />
<el-table-column prop="claimHourAmount1" label="工时费" width="100" align="center" />
<el-table-column prop="declarationDate" label="报单日期" width="100" align="center" />
<el-table-column prop="claimBillNo" label="索赔单号" width="100" align="center" />
<el-table-column prop="claimHourAmount2" label="工时费" width="100" align="center" />
<el-table-column prop="goodsAmount2" label="材料费" width="100" align="center" />
<el-table-column prop="outwardAmount" label="外出费用" width="100" align="center" />
<el-table-column prop="otherAmount" label="其他费用" width="100" align="center" />
<el-table-column prop="totalAmount" label="费用合计" width="100" align="center" />
<el-table-column prop="businessClass" label="保内业务分类" width="200" align="center" />
<el-table-column prop="claimManufacturer" label="索赔厂家" width="100" align="center" />
<el-table-column prop="reportSubmitDate" label="让渡报告提报时间" width="200" align="center" />
<el-table-column prop="reportApproveDate" label="让渡报告审批通过时间" width="200" align="center" />
<el-table-column prop="auditStatus" label="审核状态" width="100" align="center" />
<el-table-column prop="effectiveStatus" label="生效状态" width="100" align="center" />
<el-table-column prop="effectiveDate" label="生效时间" width="100" align="center" />
</el-table>
</div>
</div>
</template>
<script>
import req from '@/api/statement/monthlyReport/claimFormRate'
export default {
data() {
return {
index: 0,
tableKey: 0,
listLoading: false,
list: [],
title: "",
}
},
methods: {
showAdd(row) {
this.title = "安瑞集团" + row.deptName + row.createTime + "三包索赔单生效率统计表"
req.getDetail(row.sid)
.then(resp => {
if (resp.success) {
this.list = resp.data
}
})
.catch(e => {
this.$emit('doback')
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
}
this.$emit('doback')
}
}
}
</script>
<style scoped>
</style>

223
yxt-as-ui/src/views/statement/monthlyReport/essentialDetails/essentialDetails.vue
View File

@ -1,8 +1,225 @@
<template>
<div class="app-container">
<!--列表页面-->
<div v-show="viewState == 1">
<button-bar view-title="必备件明细统计表" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<!--Start查询列表部分-->
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
<el-form-item label="分公司">
<el-input v-model="listQuery.params.createOrgName" placeholder="" clearable />
</el-form-item>
<el-form-item label="服务站">
<el-input v-model="listQuery.params.deptName" placeholder="" clearable />
</el-form-item>
<el-form-item label="配件名称">
<el-input v-model="listQuery.params.accessoryName" placeholder="" clearable />
</el-form-item>
<el-form-item label="图号">
<el-input v-model="listQuery.params.goodsCode" placeholder="" clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
</div>
</div>
</div>
<!--End查询列表部分-->
<div class="listtop">
<div class="tit">必备件明细</div>
</div>
<!--Start 主页面主要部分 -->
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;"
@row-click="handle">
<!-- <el-table-column fixed type="selection" align="center" width="50" /> -->
<el-table-column fixed label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
<el-table-column prop="deptName" label="服务站" align="center" />
<el-table-column prop="goodsID" label="商品ID" align="center" />
<el-table-column prop="accessoryName" label="配件名称" align="center" />
<el-table-column prop="goodsCode" label="图号" align="center" />
<el-table-column prop="price" label="单价" align="center" />
<el-table-column prop="num" label="数量" align="center" />
<el-table-column prop="amount" label="金额" align="center" />
<el-table-column prop="stockAge" label="库龄(天）" align="center" />
<el-table-column prop="purchaseGoodsDate" label="进货时间" align="center" />
<el-table-column prop="repairOrderNo" label="维修单号" align="center" />
<el-table-column prop="claimBillNo" label="索赔单号" align="center" />
<el-table-column prop="isWarranty" label="截止目前12个月内是否曾保修使用" align="center" />
</el-table>
</div>
<!--End 主页面主要部分-->
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div>
</div>
</div>
<!--End查询列表部分-->
<!-- 新增修改部分组件 -->
</div>
</template>
<script>
</script>
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/statement/monthlyReport/essentialDetails'
export default {
name: 'essentialDetails',
components: {
Pagination,
pageye,
ButtonBar,
},
data() {
return {
btndisabled: false,
btnList: [{
type: 'success',
size: 'small',
icon: '',
btnKey: 'doExport',
btnLabel: '导出'
}, {
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
tableKey: 0,
list: [],
sids: [], // 用于导出的时候保存已选择的SIDs
listLoading: false,
// 翻页
listQuery: {
current: 1,
size: 10,
total: 0,
params: {
"createOrgName": "",
"deptName": "",
"accessoryName": "",
"goodsCode": "",
"userSid": "",
"orgPath": "",
"menuUrl": ""
}
}
}
},
created() {
// 初始化变量
this.getList()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
handle(row) {
console.log('handle ' + row.sid)
<style>
</style>
this.viewState = 4
this.$refs['divinfo'].showAdd(row)
},
resetState() {
this.viewState = 1
this.getList()
},
// 搜索条件效果
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'doClose':
this.doClose()
break
default:
break
}
},
// 信息条数 获取点击时当前的sid
handleSelectionChange(row) {
const aa = []
row.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
// 表中序号
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
// 查询列表信息
getList() {
this.listLoading = true
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.listQuery.params.menuUrl = this.$route.path
req.listPage(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
this.list = []
this.listQuery.total = 0
}
})
},
// 查询按钮
handleFilter() {
this.listQuery.current = 1
this.getList()
},
// 点击重置
handleReset() {
this.listQuery = {
current: 1,
size: 10,
total: 0,
params: {
"createOrgName": "",
"deptName": "",
"accessoryName": "",
"goodsCode": "",
"userSid": "",
"orgPath": "",
"menuUrl": ""
}
}
this.getList()
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

6
yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagement.vue
View File

@ -11,10 +11,10 @@
<el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
<el-form-item label="选择月份">
<el-date-picker v-model="listQuery.params.createStartTime" value-format="yyyy-MM" format="yyyy-MM"
type="date" placeholder="开始月份"></el-date-picker>
type="month" placeholder="开始月份"></el-date-picker>
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="listQuery.params.createEndTime" value-format="yyyy-MM" format="yyyy-MM"
type="date" placeholder="结束月份"></el-date-picker>
type="month" placeholder="结束月份"></el-date-picker>
</el-form-item>
<el-form-item label="服务站">
<el-input v-model="listQuery.params.deptName" placeholder="" clearable />
@ -28,7 +28,7 @@
</div>
<!--End查询列表部分-->
<div class="listtop">
<div class="tit">指标完成情况</div>
<div class="tit">服务站列表</div>
</div>
<!--Start 主页面主要部分 -->
<div class="">

88
yxt-as-ui/src/views/statement/monthlyReport/inventoryManagement/inventoryManagementDetail.vue
View File

@ -153,8 +153,8 @@
list: [],
title: "",
mergeObj: {}, // 用来记录需要合并行的下标
// mergeArr: ['品牌', '服务站名称', '软件系统', '品名', '库存当量出库金额', '库存当量出库占比', '库存当量入库金额', '库存当量入库占比'], // 表格中的列名
mergeArr: ['品牌', '服务站名称', '软件系统', '品名'], // 表格中的列名
mergeArr: ['品牌', '服务站名称', '软件系统', '品名', '库存当量出库金额', '库存当量出库占比', '库存当量入库金额', '库存当量入库占比'], // 表格中的列名
// mergeArr: ['品牌', '服务站名称', '软件系统', '品名'], // 表格中的列名
}
},
@ -178,7 +178,6 @@
}
}
// 判断列的属性
if (this.mergeArr.indexOf(column.property) !== -1) {
// 判断其值是不是为0
@ -190,6 +189,43 @@
}
}
// var columnIndex1 = 1
// var columnIndex2 = 1
// var columnIndex3 = 1
// for (var i = 0; i < this.list.length; i++) {
// for (var j = 0; j < this.list.length; j++) {
// if (this.list[i].品牌 == this.list[j].品牌) {
// columnIndex1 += 1
// }
// if (this.list[i].服务站名称 == this.list[j].服务站名称) {
// columnIndex2 += 1
// }
// if (this.list[i].软件系统 == this.list[j].软件系统) {
// columnIndex3 += 1
// }
// }
// }
// console.log('>>>>>>>>>1', columnIndex1)
// console.log('>>>>>>>>>2', columnIndex2)
// console.log('>>>>>>>>>3', columnIndex3)
// if (columnIndex === 1) {
// //定位到6行4列的ID，告诉该单元格合并1行2列
// return [columnIndex1, 1]
// }
// if (columnIndex === 2) {
// //定位到6行4列的ID，告诉该单元格合并1行2列
// return [columnIndex2, 1]
// }
// if (columnIndex === 3) {
// //定位到6行4列的ID，告诉该单元格合并1行2列
// return [columnIndex3, 1]
// }
},
@ -218,19 +254,51 @@
if (index === 0) {
this.mergeObj[key].push(1);
} else {
console.log('>>>>>>>>>commodityCurrentChange', item)
console.log('>>>>>>>>>commodityCurrentChange', key)
console.log('>>>>>>>>>commodityCurrentChange', item[key])
console.log('>>>>>>>>>commodityCurrentChange', data[index - 1][key])
// console.log('>>>>>>>>>commodityCurrentChange', item)
// console.log('>>>>>>>>>commodityCurrentChange', key)
// console.log('>>>>>>>>>commodityCurrentChange', item[key])
// console.log('>>>>>>>>>commodityCurrentChange', data[index - 1][key])
// 判断当前行是否与上一行其值相等 如果相等 在 count 记录的位置其值 +1 表示当前行需要合并 并push 一个 0 作为占位
if (item[key] === data[index - 1][key]) {
this.mergeObj[key][count] += 1;
this.mergeObj[key].push(0);
if (item.品牌 == data[index - 1].品牌) {
if (item.服务站名称 == data[index - 1].服务站名称) {
if (item.软件系统 == data[index - 1].软件系统) {
if (item.品名 == data[index - 1].品名) {
if (item[key] === data[index - 1][key]) {
this.mergeObj[key][count] += 1;
this.mergeObj[key].push(0);
} else {
// 如果当前行和上一行其值不相等
count = index; // 记录当前位置
this.mergeObj[key].push(1); // 重新push 一个 1
}
} else {
// 如果当前行和上一行其值不相等
count = index; // 记录当前位置
this.mergeObj[key].push(1); // 重新push 一个 1
}
} else {
// 如果当前行和上一行其值不相等
count = index; // 记录当前位置
this.mergeObj[key].push(1); // 重新push 一个 1
}
} else {
// 如果当前行和上一行其值不相等
count = index; // 记录当前位置
this.mergeObj[key].push(1); // 重新push 一个 1
}
} else {
// 如果当前行和上一行其值不相等
count = index; // 记录当前位置
this.mergeObj[key].push(1); // 重新push 一个 1
}
}
})
})

205
yxt-as-ui/src/views/statement/monthlyReport/oneTimeRate/oneTimeRate.vue
View File

@ -1,8 +1,207 @@
<template>
<div class="app-container">
<!--列表页面-->
<div v-show="viewState == 1">
<button-bar view-title="配件库房一次性满足率统计表" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<!--Start查询列表部分-->
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
<el-form-item label="选择月份">
<el-date-picker v-model="listQuery.params.createStartTime" value-format="yyyy-MM" format="yyyy-MM"
type="month" placeholder="开始月份"></el-date-picker>
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="listQuery.params.createEndTime" value-format="yyyy-MM" format="yyyy-MM"
type="month" placeholder="结束月份"></el-date-picker>
</el-form-item>
<el-form-item label="服务站">
<el-input v-model="listQuery.params.deptName" placeholder="" clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
</div>
</div>
</div>
<!--End查询列表部分-->
<div class="listtop">
<div class="tit">服务站列表</div>
</div>
<!--Start 主页面主要部分 -->
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;"
@row-click="handle">
<!-- <el-table-column fixed type="selection" align="center" width="50" /> -->
<el-table-column fixed label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column prop="createTime" label="年月" align="center" width="150" />
<el-table-column prop="deptName" label="服务站" align="center" />
</el-table>
</div>
<!--End 主页面主要部分-->
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div>
</div>
</div>
<!--End查询列表部分-->
<!-- 新增修改部分组件 -->
<divinfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="getList" />
</div>
</template>
<script>
</script>
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/statement/monthlyReport/oneTimeRate'
import divinfo from './oneTimeRateDetail.vue'
export default {
name: 'oneTimeRate',
components: {
Pagination,
pageye,
ButtonBar,
divinfo
},
data() {
return {
btndisabled: false,
btnList: [{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
tableKey: 0,
list: [],
sids: [], // 用于导出的时候保存已选择的SIDs
listLoading: false,
// 翻页
listQuery: {
current: 1,
size: 10,
total: 0,
params: {
createStartTime: '',
createEndTime: '',
deptName: '',
userSid: '',
orgPath: '',
menuUrl: ''
}
}
}
},
created() {
// 初始化变量
this.getList()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
handle(row) {
console.log('handle ' + row.sid)
<style>
</style>
this.viewState = 4
this.$refs['divinfo'].showAdd(row)
},
resetState() {
this.viewState = 1
this.getList()
},
// 搜索条件效果
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'doClose':
this.doClose()
break
default:
break
}
},
// 信息条数 获取点击时当前的sid
handleSelectionChange(row) {
const aa = []
row.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
// 表中序号
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
// 查询列表信息
getList() {
this.listLoading = true
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.listQuery.params.menuUrl = this.$route.path
req.listPage(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
this.list = []
this.listQuery.total = 0
}
})
},
// 查询按钮
handleFilter() {
this.listQuery.current = 1
this.getList()
},
// 点击重置
handleReset() {
this.listQuery = {
current: 1,
size: 10,
total: 0,
params: {
createStartTime: '',
createEndTime: '',
deptName: '',
userSid: '',
orgPath: '',
menuUrl: ''
}
}
this.getList()
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

218
yxt-as-ui/src/views/statement/monthlyReport/oneTimeRate/oneTimeRateDetail.vue
View File

@ -0,0 +1,218 @@
<template>
<div>
<div class="tab-header webtop">
<!-- 标题 -->
<div style="margin: 0 auto;">{{title}}</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 详情按钮 -->
</div>
<div style="margin-top: 10px; height: 100%;">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;"
:span-method="objectSpanMethods" show-summary :summary-method="getSummaries">
<el-table-column fixed label="序号" type="index" width="80" :index="index+1" align="center" />
<el-table-column prop="completionMonth" label="竣工月份" align="center" width="150" />
<el-table-column prop="completionDate" label="竣工日期" align="center" width="150" />
<el-table-column prop="settlementDate" label="结算日期" align="center" width="150" />
<el-table-column prop="repairOrderNo" label="维修单号" align="center" width="150" />
<el-table-column prop="vehMark" label="车牌号" align="center" width="150" />
<el-table-column prop="serviceItem" label="维修项目" align="center" width="150" />
<el-table-column prop="accessoryName" label="所需配件名称" align="center" width="150" />
<el-table-column prop="goodsCode" label="图号" align="center" width="150" />
<el-table-column prop="num" label="所需数量" align="center" width="150" />
<el-table-column prop="disposableNum" label="库房一次性提供数量" align="center" width="150" />
<el-table-column label="库房未能一次性提供的解决方案" align="center">
<el-table-column prop="outsourceNum" label="外购数量" align="center" width="120" />
<el-table-column prop="emergencyNum" label="订应急数量" align="center" width="120" />
<el-table-column prop="otherNum" label="其它数量" align="center" width="120" />
</el-table-column>
<el-table-column prop="goodsArrivedDate" label="配件到货日期（最后入库日期）" align="center" width="150" />
<el-table-column prop="goodsDistributionDate" label="配件装配日期（最后出库日期）" align="center" width="150" />
<el-table-column prop="OneRate" label="配件一次性满足率" align="center" width="150" />
<el-table-column prop="outsourceRate" label="外购率" align="center" width="150" />
<el-table-column prop="emergencyRate" label="订应急率" align="center" width="150" />
</el-table>
</div>
</div>
</template>
<script>
import req from '@/api/statement/monthlyReport/oneTimeRate'
export default {
data() {
return {
index: 0,
tableKey: 0,
listLoading: false,
list: [],
title: "",
mergeObj: {}, // 用来记录需要合并行的下标
mergeArr: ['completionMonth', 'completionDate', 'settlementDate', 'repairOrderNo', 'vehMark'], // 表格中的列名
// mergeArr: ['品牌', '服务站名称', '软件系统', '品名'], // 表格中的列名
}
},
methods: {
// 合计
getSummaries(param) {
const {
columns,
data
} = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计：'
return
}
const values = data.map(item => Number(item[column.property]))
if (column.property === 'num') { // 所需数量
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
console.log('>>>>>>>>>commodityCurrentChange', prev)
console.log('>>>>>>>>>commodityCurrentChange', value)
if (!isNaN(value)) {
return (Number(prev) + Number(curr))
} else {
return Number(prev)
}
}, 0)
sums[index] += ''
} else if (column.property === 'disposableNum') { // 库房一次性提供数量
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return (Number(prev) + Number(curr))
} else {
return Number(prev)
}
}, 0)
sums[index] += ''
} else if (column.property === 'outsourceNum') { // 外购数量
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return (Number(prev) + Number(curr))
} else {
return Number(prev)
}
}, 0)
sums[index] += ''
} else if (column.property === 'emergencyNum') { //订应急数量
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return (Number(prev) + Number(curr))
} else {
return Number(prev)
}
}, 0)
sums[index] += ''
} else if (column.property === 'otherNum') { //其它数量
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return (Number(prev) + Number(curr))
} else {
return Number(prev)
}
}, 0)
sums[index] += ''
}
})
return sums
},
objectSpanMethods({
row, //当前行、
column, //当前列、
rowIndex, //当前行索引
columnIndex //当前列索引
}) {
// if (row.项目 == '总计') {
// if (columnIndex === 4) {
// //定位到6行4列的ID，告诉该单元格合并1行2列
// return [1, 2]
// }
// if (columnIndex === 5) {
// //定位到6行4列的ID，告诉该单元格合并1行2列
// return [0, 0]
// }
// }
// 判断列的属性
if (this.mergeArr.indexOf(column.property) !== -1) {
// 判断其值是不是为0
if (this.mergeObj[column.property][rowIndex]) {
return [this.mergeObj[column.property][rowIndex], 1]
} else {
// 如果为0则为需要合并的行
return [0, 0];
}
}
},
showAdd(row) {
this.title = "安瑞集团" + row.deptName + row.createTime + "配件库房一次性满足率统计表"
req.getDetail(row.sid)
.then(resp => {
if (resp.success) {
this.list = resp.data
this.getSpanArr(this.list)
}
})
.catch(e => {
this.$emit('doback')
})
},
// getSpanArr方法
getSpanArr(data) {
this.mergeArr.forEach((key, index1) => {
let count = 0; // 用来记录需要合并行的起始位置
this.mergeObj[key] = []; // 记录每一列的合并信息
data.forEach((item, index) => {
// index == 0表示数据为第一行，直接 push 一个 1
if (index === 0) {
this.mergeObj[key].push(1);
} else {
// console.log('>>>>>>>>>commodityCurrentChange', data[index - 1][key])
// 判断当前行是否与上一行其值相等 如果相等 在 count 记录的位置其值 +1 表示当前行需要合并 并push 一个 0 作为占位
if (item[key] === data[index - 1][key]) {
this.mergeObj[key][count] += 1;
this.mergeObj[key].push(0);
} else {
// 如果当前行和上一行其值不相等
count = index; // 记录当前位置
this.mergeObj[key].push(1); // 重新push 一个 1
}
}
})
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
}
this.$emit('doback')
}
}
}
</script>
<style scoped>
</style>

16
yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java
View File

@ -3,10 +3,13 @@ package com.yxt.anrui.oa.api;
import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyDto;
import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyService;
import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyVo;
import com.yxt.anrui.oa.biz.oaform.flowable.CompleteDto;
import com.yxt.anrui.oa.biz.oaform.flowable.NodeQuery;
import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@ -53,4 +56,17 @@ public class HrHireApplyRest {
return hrHireApplyService.reject(dto);
}
@ApiOperation(value = "办理（同意）")
@PostMapping("/complete")
public ResultBean complete(@Valid @RequestBody CompleteDto dto) {
return hrHireApplyService.complete(dto);
}
@ApiOperation("获取流程操作标题")
@GetMapping("/getFlowOperateTitle")
@ResponseBody
ResultBean<String> getFlowOperateTitle(@SpringQueryMap NodeQuery query) {
return hrHireApplyService.getFlowOperateTitle(query);
}
}

7
yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaMendApplyRest.java
View File

@ -122,4 +122,11 @@ public class OaMendApplyRest {
public ResultBean<List<NodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap NodeQuery query) {
return oaMendApplyService.getNextNodesForSubmit(query);
}
@ApiOperation("移动端获取上一环节获取下一环节")
@GetMapping("/getFlowOperateTitle")
@ResponseBody
ResultBean<String> getFlowOperateTitle(@SpringQueryMap NodeQuery query) {
return oaMendApplyService.getFlowOperateTitle(query);
}
}

50
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyService.java
View File

@ -9,8 +9,7 @@ import com.yxt.anrui.oa.biz.oaform.FormCommon;
import com.yxt.anrui.oa.biz.oaform.OaForm;
import com.yxt.anrui.oa.biz.oaform.OaFormRuleEnum;
import com.yxt.anrui.oa.biz.oaform.OaFormService;
import com.yxt.anrui.oa.biz.oaform.flowable.SubmitDto;
import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto;
import com.yxt.anrui.oa.biz.oaform.flowable.*;
import com.yxt.anrui.oa.feign.flowable.flow.ProcDefEnum;
import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationVo;
@ -58,6 +57,8 @@ public class HrHireApplyService extends MybatisBaseService<HrHireApplyMapper, Hr
return rb.setMsg("该申请不存在");
}
OaForm oaForm = oaFormService.fetchBySid(sid);
hrHireApplyVo.setTaskId(oaForm.getTaskId());
hrHireApplyVo.setProcInsId(oaForm.getProcInstId());
//根据部门sid获取orgPath并赋值
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(oaForm.getDeptSid()).getData();
String orgSidPath = organizationVo.getOrgSidPath();
@ -155,6 +156,51 @@ public class HrHireApplyService extends MybatisBaseService<HrHireApplyMapper, Hr
return oaFormService.reject(dto);
}
/**
* 办理（同意）
*
* @param dto
* @return
*/
public ResultBean complete(CompleteDto dto) {
Map<String, Object> formVariables = dto.getFormVariables();
formVariables = getMap(formVariables, dto.getBusinessSid());
dto.setFormVariables(formVariables);
BusinessVariablesDto businessVariablesDto = new BusinessVariablesDto();
BeanUtil.copyProperties(dto, businessVariablesDto);
return oaFormService.complete(businessVariablesDto);
}
public ResultBean<String> getFlowOperateTitle(NodeQuery query) {
ResultBean<String> rb = ResultBean.fireFail();
//0 上一环节 1下一环节
int next = query.getNext();
Map<String, Object> formVariables = query.getFormVariables();
formVariables = getMap(formVariables, query.getBusinessSid());
query.setFormVariables(formVariables);
String data = "";
if (next == 0) {
ResultBean<List<NodeVo>> resultBean = oaFormService.getPreviousNodesForReject(query);
if (resultBean.getSuccess()) {
resultBean.getData().removeAll(Collections.singleton(null));
data = resultBean.getData().get(0).getName();
} else {
return rb.setMsg(resultBean.getMsg());
}
} else if (next == 1) {
ResultBean<List<NodeVo>> resultBean = oaFormService.getNextNodesForSubmit(query);
if (resultBean.getSuccess()) {
resultBean.getData().removeAll(Collections.singleton(null));
data = resultBean.getData().get(0).getName();
} else {
return rb.setMsg(resultBean.getMsg());
}
} else {
return rb.setMsg("参数错误：next");
}
return rb.success().setData(data);
}
public Map<String, Object> getMap(Map<String, Object> formVariables, String sid) {
Map<String, Object> appMap = new HashMap<>();

4
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/hrhireapply/HrHireApplyVo.java
View File

@ -25,4 +25,8 @@ public class HrHireApplyVo {
private String isFinanceValue;
private List<HrHireDetailsVo> list = new ArrayList<>();
private String taskId;
@ApiModelProperty("流程实例id")
private String procInsId;
}

5
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/flowable/NodeQuery.java
View File

@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.HashMap;
import java.util.Map;
@ -22,4 +23,8 @@ public class NodeQuery {
private String businessSid;
private Map<String, Object> formVariables = new HashMap<>();
@ApiModelProperty(value = "0 上一环节 1下一环节")
@NotNull(message = "参数错误：next")
private Integer next;
}

41
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java
View File

@ -158,15 +158,15 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
baseMapper.updateById(entity);
}
// 处理附件
saveFiles(sid, files, OaFileEnum.OAMENDAPPLY.getAttachType(),"图片");
saveFiles(sid, files, OaFileEnum.OAMENDAPPLY.getAttachType(), "图片");
return rb.success().setData(sid);
}
// 保存文件
private void saveFiles(String sid, List<String> files, String attachType,String fileType) {
private void saveFiles(String sid, List<String> files, String attachType, String fileType) {
files.removeAll(Collections.singleton(null));
oaAppendixService.saveFile(sid, files, attachType,fileType);
oaAppendixService.saveFile(sid, files, attachType, fileType);
}
public OaMendApplyVo fetchDetailsVoBySid(String sid) {
@ -294,6 +294,41 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
return oaFormService.getPreviousNodesForReject(query);
}
public ResultBean<String> getFlowOperateTitle(NodeQuery query) {
ResultBean<String> rb = ResultBean.fireFail();
//0 上一环节 1下一环节
int next = query.getNext();
Map<String, Object> formVariables = query.getFormVariables();
//添加网关
// formVariables.put("", "");
//若有移动端，则需和移动端沟通具体参数，若没有删去即可。
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", query.getBusinessSid());
formVariables.put("app", appMap);
query.setFormVariables(formVariables);
String data = "";
if (next == 0) {
ResultBean<List<NodeVo>> resultBean = oaFormService.getPreviousNodesForReject(query);
if (resultBean.getSuccess()) {
resultBean.getData().removeAll(Collections.singleton(null));
data = resultBean.getData().get(0).getName();
} else {
return rb.setMsg(resultBean.getMsg());
}
} else if (next == 1) {
ResultBean<List<NodeVo>> resultBean = oaFormService.getNextNodesForSubmit(query);
if (resultBean.getSuccess()) {
resultBean.getData().removeAll(Collections.singleton(null));
data = resultBean.getData().get(0).getName();
} else {
return rb.setMsg(resultBean.getMsg());
}
} else {
return rb.setMsg("参数错误：next");
}
return rb.success().setData(data);
}
/**
* 具体申请设置网关参数的统一方法
*/

Write Preview
Loading…
Cancel
Save