diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js new file mode 100644 index 0000000000..314817d8ef --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js @@ -0,0 +1,120 @@ +import request from '@/utils/request' +import qs from 'querystring' + +// 收款确认管理和出纳款项管理分页列表条件查询 +export function listPage(data) { + return request({ + url: '/fin/fincollectionconfirmation/listPage', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} +// 应收未收款项明细分页列表查询 +export function listAll(data) { + return request({ + url: '/fin/finuncollectedreceivablesdetailed/listAll', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 收款确认管理h和出纳款项确认管理--回显、详情 +export function fetchBySid(data) { + return request({ + url: '/fin/fincollectionconfirmation/fetchBySid/' + data, + method: 'get', + }) +} + +// 收款确认管理保存 +export function save(data) { + return request({ + url: '/fin/fincollectionconfirmation/save', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 收款确认管理详情 +export function details(data) { + return request({ + url: '/fin/fincollectionconfirmation/fetchBySid/' + data, + method: 'get' + }) +} + +// 出纳款项管理--确认 +export function cashierConfirm(data) { + return request({ + url: '/fin/fincollectionconfirmation/cashierConfirm', + method: 'post', + params: data, + headers: { + 'Content-Type': 'application/x-www-form-urlencoded' + } + }) +} + +// 出纳款项管理--驳回 +export function cashierReject(data) { + return request({ + url: '/fin/fincollectionconfirmation/cashierReject', + method: 'post', + params: data, + headers: { + 'Content-Type': 'application/x-www-form-urlencoded' + } + }) +} + +// 客户账单汇总 +export function customerBillListPage(data) { + return request({ + url: '/fin/finuncollectedreceivablesdetailed/customerBillListPage', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 客户账单明细 +export function customerBillDetailedListPage(data) { + return request({ + url: '/fin/finuncollectedreceivablesdetailed/customerBillDetailedListPage', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 数据字典 +export function dataDictionary(data) { + return request({ + url: '/portal/v1/dictcommons/typeValues', + method: 'get', + params: data + }) +} +// 上传文件 +export function upload(data) { + return request({ + url: '/fin/file/upload',data, + method: 'post', + headers: { + 'Content-Type': 'multipart/form-data' + } + }) +} diff --git a/anrui-buscenter/anrui-finmanage-ui/src/components/uploadFile/filesUpload.vue b/anrui-buscenter/anrui-finmanage-ui/src/components/uploadFile/filesUpload.vue new file mode 100644 index 0000000000..4f1124a3e7 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/components/uploadFile/filesUpload.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js b/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js index f4336fa41b..43fd0e31c7 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js @@ -1,7 +1,7 @@ import Layout from '@/layout' const codemenu = [ - //第一项:开票管理 + // 第一项:开票管理 { path: '/finginvoiceapply', component: Layout, @@ -14,26 +14,61 @@ const codemenu = [ path: '/anruifinmanagement/finginvoiceapply', component: () => import('@/views/anruifinmanagement/finginvoiceapply/finwaitinvoiceapply/fingwaitinvoiceapply.vue'), name: 'finginvoiceapply', - meta: { title: '公司开票申请管理',noCache:false } - }, + meta: { title: '公司开票申请管理', noCache: false } + } ] }, - //第二项:款项确认 + // 第二项:款项确认 { path: '/finreceipt', component: Layout, redirect: '/finreceipt', meta: { - title: '款项确认管理' + title: '款项确认管理(旧)' }, children: [{ path: '/anruifinmanagement/finreceipt', component: () => import('@/views/anruifinmanagement/finreceipt/finreceipt.vue'), name: 'finreceipt', - meta: { title: '款项确认管理',noCache:false } + meta: { title: '款项确认管理(旧)', noCache: false } }] }, - //第四项:物料信息管理 + // 第二项:款项确认 + { + path: '/anruifinmanagement', + component: Layout, + redirect: '/anruifinmanagement', + meta: { + title: '款项确认管理' + }, + children: [ + { + path: '/anruifinmanagement/customerBillingSummary', + component: () => import('@/views/anruifinmanagement/paymentConfirmation/customerBillingSummary.vue'), + name: 'kehuzhangdanhuizong', + meta: { title: '客户账单汇总', noCache: false } + }, + { + path: '/anruifinmanagement/customerBillingDetails', + component: () => import('@/views/anruifinmanagement/paymentConfirmation/customerBillingDetails.vue'), + name: 'kehuzhangdanmingxi', + meta: { title: '客户账单明细', noCache: false } + }, + { + path: '/anruifinmanagement/paymentConfirmation', + component: () => import('@/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue'), + name: 'shoukuanquerenguanli', + meta: { title: '款项确认管理', noCache: false } + }, + { + path: '/anruifinmanagement/cashierConfirmation', + component: () => import('@/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue'), + name: 'chunakuanxiangquerenguanli', + meta: { title: '出纳款项确认管理', noCache: false } + } + ] + }, + // 第四项:物料信息管理 // { // path: '/finmaterial', // component: Layout, @@ -48,7 +83,7 @@ const codemenu = [ // meta: { title: '物料信息管理',noCache:false } // }] // }, - //第五项:费用项目管理 + // 第五项:费用项目管理 { path: '/finitem', component: Layout, @@ -60,9 +95,9 @@ const codemenu = [ path: '/anruifinmanagement/finitem', component: () => import('@/views/anruifinmanagement/finitem/finitem.vue'), name: 'finitem', - meta: { title: '收费项目管理',noCache:false } + meta: { title: '收费项目管理', noCache: false } }] - }, + } ] export default codemenu diff --git a/anrui-buscenter/anrui-finmanage-ui/src/styles/index.scss b/anrui-buscenter/anrui-finmanage-ui/src/styles/index.scss index 7a22947e18..82ca3fd71d 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/styles/index.scss +++ b/anrui-buscenter/anrui-finmanage-ui/src/styles/index.scss @@ -147,6 +147,8 @@ div:focus { overflow-x: hidden; } +.webcon{height: calc(100vh - 220px);overflow-y: auto;overflow-x: hidden;} + // 搜索的 .webtop { // position: fixed;top: 110px;width: calc(100% - 240px);z-index: 6000; @@ -420,7 +422,7 @@ div:focus { .btntopblueline:hover { background-color: #34a1db !important; } - +.searchbtns{margin: 10px 0;text-align: center;} .btntophui { background-color: #cccccc !important; } diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue new file mode 100644 index 0000000000..ccbd845e5e --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue @@ -0,0 +1,284 @@ + + + + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue new file mode 100644 index 0000000000..9da3daf793 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue @@ -0,0 +1,631 @@ + + + + + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue new file mode 100644 index 0000000000..b80de1af43 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue @@ -0,0 +1,238 @@ + + + + + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue new file mode 100644 index 0000000000..42f03402d7 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue @@ -0,0 +1,276 @@ + + + + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue new file mode 100644 index 0000000000..06aa2e6a51 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue @@ -0,0 +1,269 @@ + + + + + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/customerBillingDetails.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/customerBillingDetails.vue new file mode 100644 index 0000000000..570bd2ba13 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/customerBillingDetails.vue @@ -0,0 +1,227 @@ + + + + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/customerBillingSummary.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/customerBillingSummary.vue new file mode 100644 index 0000000000..d6f3f38f49 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/customerBillingSummary.vue @@ -0,0 +1,259 @@ + + + +