@@ -54,52 +79,34 @@
查看
-
+
待提交
{{ scope.row.nodeState }}
-
+
+
+
+
+
+
+
+
+
+
- {{ scope.row.busSid }}
+ {{ scope.row.isVeh == '1' ? '是' : '否' }}
-
-
- {{ scope.row.costTypeValue }}
-
-
-
-
- {{ scope.row.costTitleValue }}
-
-
-
-
- {{ scope.row.receiveCompany }}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
{{ scope.row.state }}
-
-
- {{ scope.row.remarks }}
-
-
@@ -121,13 +128,13 @@ import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/anruifinmanagement/payment'
-import {typeValues, getOrgSidByPath, selectByOrgSid, selectHaveMessage } from '@/api/jichuxinxi/dictcommons'
+import { typeValues, getOrgSidByPath, selectByOrgSid, selectHaveMessage, brandDown } from '@/api/jichuxinxi/dictcommons'
import paymentAdd from './paymentAdd'
import paymentInfo from './paymentInfo'
import { getStorage } from '@/utils/auth'
export default {
- name: 'fukuanshenqingguaili',
+ name: 'Payment',
components: {
Pagination,
pageye,
@@ -167,16 +174,27 @@ export default {
receiveCompany_list: [],
state_list: [
{
- dictKey: 1,
+ dictKey: '1',
dictValue: '未付款'
},
{
- dictKey: 2,
+ dictKey: '2',
dictValue: '已付款'
}
],
+ isVeh_list: [
+ {
+ dictKey: '0',
+ dictValue: '否'
+ },
+ {
+ dictKey: '1',
+ dictValue: '是'
+ }
+ ],
+ carBrand_list: [],
costType_list: [],
- costTitle_list: [],
+ costRange_list: [],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 1,
@@ -188,13 +206,21 @@ export default {
listLoading: false,
listQuery: {
params: {
- applyEndDate: '',
+ useOrgName: '',
+ deptName: '',
+ name: '',
+ billNo: '',
applyStartDate: '',
- costTitleKey: '',
- costTypeKey: '',
- receiveCompany: '',
+ applyEndDate: '',
+ finishStartTime: '',
+ finishEndTime: '',
+ carBrandSid: '',
+ costRangeKey: '',
+ isVeh: '',
+ payCompany: '',
state: '',
userSid: '',
+ menuUrl: '',
orgPath: ''
},
current: 1,
@@ -245,6 +271,11 @@ export default {
init() {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((response) => {
if (response.success) {
+ brandDown({ useOrg: response.data }).then((res) => {
+ if (res.success) {
+ this.carBrand_list = res.data
+ }
+ })
selectByOrgSid({ orgSid: response.data }).then((resp) => {
if (resp.success) {
this.receiveCompany_list = resp.data
@@ -252,14 +283,14 @@ export default {
})
}
})
- typeValues({ type: 'payCostType' }).then((res) => {
+ typeValues({ type: 'paymentCategory' }).then((res) => {
if (res.success) {
this.costType_list = res.data
}
})
- typeValues({ type: 'payCostTitle' }).then((res) => {
+ typeValues({ type: 'paymentScope' }).then((res) => {
if (res.success) {
- this.costTitle_list = res.data
+ this.costRange_list = res.data
}
})
this.getList()
@@ -309,14 +340,10 @@ export default {
this.listLoading = true
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+ this.listQuery.params.menuUrl = this.$route.path
req.listPage(this.listQuery).then((response) => {
- console.log('列表查询结果：', response)
this.listLoading = false
- if (
- response.success &&
- response.data &&
- response.data.total > 0
- ) {
+ if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
@@ -333,13 +360,21 @@ export default {
handleReset() {
this.listQuery = {
params: {
- applyEndDate: '',
+ useOrgName: '',
+ deptName: '',
+ name: '',
+ billNo: '',
applyStartDate: '',
- costTitleKey: '',
- costTypeKey: '',
- receiveCompany: '',
+ applyEndDate: '',
+ finishStartTime: '',
+ finishEndTime: '',
+ carBrandSid: '',
+ costRangeKey: '',
+ isVeh: '',
+ payCompany: '',
state: '',
userSid: '',
+ menuUrl: '',
orgPath: ''
},
current: 1,
@@ -404,5 +439,6 @@ export default {
}
}
+
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue
index 554d54890f..98d2a62430 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue
@@ -11,187 +11,193 @@
付款申请
-
+
-
- 申请日期
-
- {{ formobj.createTime }}
+ 申请部门
+ {{ formobj.deptName }}
-
- 申请人
+
+ 申请人
+ {{ formobj.name }}
- {{ formobj.name }}
+ 申请日期
+ {{ formobj.createTime }}
-
- 款项类别
-
-
+
+ 品牌
-
-
+
+
-
- 款项名称
-
-
+
+ 款项范围
-
-
+
+
-
-
-
- 业务编号
-
-
+
+ 款项类别
-
-
-
-
-
-
-
-
-
-
- 付款单位名称
-
-
-
-
-
+
+
-
- 收款单位名称
-
-
+
+ *是否涉及车辆
-
-
-
+
+ 是
+ 否
+
-
- 付款备注
-
-
+
+ 付款单位
-
+
+
+
-
-
-
- 品牌
-
+ 付款申请备注
-
-
-
+
-
- *是否涉及车辆
-
+ *是否事业部领导审批
- 是
- 否
+
+ 是
+ 否
+
-
+
-
-
+
+
- 删除
-
+ 删除
+ 新增付款信息
-
+
-
-
+
+
-
+
-
-
+
+
-
+
- {{ scope.row.bank }}
+
+
+
-
+
+
+
+
- {{ scope.row.receivingAccount }}
+
-
+
-
+
-
+
-
+ 查看
+
-
-
+
+
车辆列表
-
-
选择
+
+
+ *是否已销售：
+
+ 是
+ 否
+
+
+
+ *款项是否已交清：
+
+ 是
+ 否
+
+
+
选择
@@ -200,95 +206,149 @@
-
+
+
+
+
+
+
+
+
+
+
+ 删除
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.isPay == '1' ? '是' : '否' }}
+
+
+
+
+
+ 保存
+ 关闭
+
+
+
+
+
+
+
+
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue
index 1067ab1748..f78216795a 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue
@@ -1,179 +1,270 @@
-