From ef224cfcf9ddab1be2bbad31efc0296fd3896cbb Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 21 Jun 2022 08:59:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BB=98=E6=AC=BE=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E7=AE=A1=E7=90=86=E5=92=8C=E8=B4=B9=E7=94=A8=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E7=AE=A1=E7=90=86=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/anruifinmanagement/expense.js | 100 ++++++ .../src/api/anruifinmanagement/payment.js | 100 ++++++ .../src/api/jichuxinxi/dictcommons.js | 35 +- .../src/router/modules/codemenu.js | 44 ++- .../anrui-finmanage-ui/src/styles/index.scss | 85 ++++- .../feiyongshenqing/expense.vue | 310 +++++++++++++++++ .../feiyongshenqing/expenseAdd.vue | 276 +++++++++++++++ .../feiyongshenqing/expenseInfo.vue | 110 ++++++ .../fukuanshenqing/payment.vue | 322 ++++++++++++++++++ .../fukuanshenqing/paymentAdd.vue | 277 +++++++++++++++ .../fukuanshenqing/paymentInfo.vue | 114 +++++++ 11 files changed, 1752 insertions(+), 21 deletions(-) create mode 100644 anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/expense.js create mode 100644 anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/payment.js create mode 100644 anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/feiyongshenqing/expense.vue create mode 100644 anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/feiyongshenqing/expenseAdd.vue create mode 100644 anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/feiyongshenqing/expenseInfo.vue create mode 100644 anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/payment.vue create mode 100644 anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue create mode 100644 anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/expense.js b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/expense.js new file mode 100644 index 0000000000..0fc4b07b87 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/expense.js @@ -0,0 +1,100 @@ +import request from '@/utils/request' + +export default { + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/base/v1/baseinternalpurchase/listPage', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 选择车辆信息--查询分页列表 + pageList: function(params) { + return request({ + url: '/base/basevehmodelconfig/selVehModelByUseOrgSidAndModelSidAndConfigSid', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 保存修改记录 + saveOrUpdate: function(params) { + return request({ + url: '/base/v1/baseinternalpurchase/save', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 提交流程 + submitVehicleApply: function(params) { + return request({ + url: '/base/v1/basevehicleactualsales/submitVehicleSales', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 通过sid查询一条记录 + fetchBySid: function(sid) { + return request({ + url: '/base/v1/baseinternalpurchase/fetchDetailsBySid/' + sid, + method: 'get' + }) + }, + // 通过sid删除一条或多条记录 + delBySids: function(data) { + return request({ + url: '/base/v1/baseinternalpurchase/delBySids', + method: 'DELETE', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 代办任务同意办理 + businessAgree: function(params) { + return request({ + url: '/scm/v1/scmapplyinbound/complete', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 代办任务驳回任务 + rejectTask: function(params) { + return request({ + url: '/scm/v1/scmapplyinbound/reject/' + params.businessSid, + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 代办任务终止任务 + breakTask: function(params) { + return request({ + url: '/base/v1/basevehicleactualsales/breakProcess/' + params.businessSid, + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 代办任务撤回任务 + revokeTask: function(params) { + return request({ + url: '/scm/v1/scmapplyinbound/revokeProcess/' + params.userSid + '/' + params.businessSid, + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + } +} diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/payment.js b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/payment.js new file mode 100644 index 0000000000..0fc4b07b87 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/payment.js @@ -0,0 +1,100 @@ +import request from '@/utils/request' + +export default { + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/base/v1/baseinternalpurchase/listPage', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 选择车辆信息--查询分页列表 + pageList: function(params) { + return request({ + url: '/base/basevehmodelconfig/selVehModelByUseOrgSidAndModelSidAndConfigSid', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 保存修改记录 + saveOrUpdate: function(params) { + return request({ + url: '/base/v1/baseinternalpurchase/save', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 提交流程 + submitVehicleApply: function(params) { + return request({ + url: '/base/v1/basevehicleactualsales/submitVehicleSales', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 通过sid查询一条记录 + fetchBySid: function(sid) { + return request({ + url: '/base/v1/baseinternalpurchase/fetchDetailsBySid/' + sid, + method: 'get' + }) + }, + // 通过sid删除一条或多条记录 + delBySids: function(data) { + return request({ + url: '/base/v1/baseinternalpurchase/delBySids', + method: 'DELETE', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 代办任务同意办理 + businessAgree: function(params) { + return request({ + url: '/scm/v1/scmapplyinbound/complete', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 代办任务驳回任务 + rejectTask: function(params) { + return request({ + url: '/scm/v1/scmapplyinbound/reject/' + params.businessSid, + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 代办任务终止任务 + breakTask: function(params) { + return request({ + url: '/base/v1/basevehicleactualsales/breakProcess/' + params.businessSid, + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 代办任务撤回任务 + revokeTask: function(params) { + return request({ + url: '/scm/v1/scmapplyinbound/revokeProcess/' + params.userSid + '/' + params.businessSid, + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + } +} diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js b/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js index d818042835..8cb8dd4788 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js @@ -1,5 +1,4 @@ import request from '@/utils/request' -import qs from 'qs'; export function typeValues(data) { return request({ @@ -7,4 +6,36 @@ export function typeValues(data) { method: 'get', params: data }) -} \ No newline at end of file +} + +// 获取分公司 +export function getListOrg(data) { + return request({ + url: '/portal/v1/sysorganization/getListOrg', + method: 'get', + params: data + }) +} +// 根据登陆人sid查询分公司sid +export function getPathSidByUserSid(data) { + return request({ + url: '/portal/v1/sysstafforg/getPathSidByUserSid', + method: 'get', + params: data + }) +} +// 根据分公司sid查询分公司名称 +export function fetchBySid(sid) { + return request({ + url: 'portal/v1/sysorganization/fetchBySid/' + sid, + method: 'get' + }) +} +// 获取厂商可搜索下拉列表 +export function changShang(data) { + return request({ + url: '/base/v1/basemanufacturer/namesDown', + method: 'get', + params: data + }) +} 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 7c7a60a17c..fd907c8496 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js @@ -14,7 +14,7 @@ const codemenu = [ path: '/anruifinmanagement/finginvoiceapply', component: () => import('@/views/anruifinmanagement/finginvoiceapply/finwaitinvoiceapply/fingwaitinvoiceapply.vue'), name: 'finginvoiceapply', - meta: { title: '公司开票申请管理', noCache: false } + meta: { title: '公司开票申请管理', noCache: true } } ] }, @@ -30,7 +30,7 @@ const codemenu = [ path: '/anruifinmanagement/finreceipt', component: () => import('@/views/anruifinmanagement/finreceipt/finreceipt.vue'), name: 'finreceipt', - meta: { title: '款项确认管理(旧)', noCache: false } + meta: { title: '款项确认管理(旧)', noCache: true } }] }, // 第二项:款项确认 @@ -46,25 +46,25 @@ const codemenu = [ path: '/anruifinmanagement/customerBillingSummary', component: () => import('@/views/anruifinmanagement/paymentConfirmation/customerBillingSummary.vue'), name: 'kehuzhangdanhuizong', - meta: { title: '客户账单汇总', noCache: false } + meta: { title: '客户账单汇总', noCache: true } }, { path: '/anruifinmanagement/customerBillingDetails', component: () => import('@/views/anruifinmanagement/paymentConfirmation/customerBillingDetails.vue'), name: 'kehuzhangdanmingxi', - meta: { title: '客户账单明细', noCache: false } + meta: { title: '客户账单明细', noCache: true } }, { path: '/anruifinmanagement/paymentConfirmation', component: () => import('@/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue'), name: 'shoukuanquerenguanli', - meta: { title: '款项确认管理', noCache: false } + meta: { title: '款项确认管理', noCache: true } }, { path: '/anruifinmanagement/cashierConfirmation', component: () => import('@/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue'), name: 'chunakuanxiangquerenguanli', - meta: { title: '出纳款项确认管理', noCache: false } + meta: { title: '出纳款项确认管理', noCache: true } } ] }, @@ -95,7 +95,35 @@ const codemenu = [ path: '/anruifinmanagement/finitem', component: () => import('@/views/anruifinmanagement/finitem/finitem.vue'), name: 'finitem', - meta: { title: '收费项目管理', noCache: false } + meta: { title: '收费项目管理', noCache: true } + }] + }, + { + path: '/anruifinmanagement', + component: Layout, + redirect: '/anruifinmanagement', + meta: { + title: '付款申请管理' + }, + children: [{ + path: '/anruifinmanagement/fukuanshenqing', + component: () => import('@/views/anruifinmanagement/fukuanshenqing/payment.vue'), + name: 'fukuanshenqingguaili', + meta: { title: '财务管理', noCache: true } + }] + }, + { + path: '/anruifinmanagement', + component: Layout, + redirect: '/anruifinmanagement', + meta: { + title: '费用申请管理' + }, + children: [{ + path: '/anruifinmanagement/feiyongshenqing', + component: () => import('@/views/anruifinmanagement/feiyongshenqing/expense.vue'), + name: 'feiyongshenqingguaili', + meta: { title: '财务管理', noCache: true } }] }, // 第二项:款项确认 @@ -110,7 +138,7 @@ const codemenu = [ path: '/chunafukuan/chunafukuanguanli', component: () => import('@/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue'), name: 'cashier', - meta: { title: '财务管理', noCache: false } + meta: { title: '财务管理', noCache: true } }] } diff --git a/anrui-buscenter/anrui-finmanage-ui/src/styles/index.scss b/anrui-buscenter/anrui-finmanage-ui/src/styles/index.scss index 4437381eef..cad75e0da1 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/styles/index.scss +++ b/anrui-buscenter/anrui-finmanage-ui/src/styles/index.scss @@ -211,10 +211,10 @@ div:focus { border-radius: 10px !important; } -.el-form-item .el-form-item__content { - display: inline-block; - vertical-align: middle !important; -} +//.el-form-item .el-form-item__content { +// display: inline-block; +// vertical-align: middle !important; +//} .formadd { .el-form-item .el-form-item__label { @@ -223,9 +223,9 @@ div:focus { } -.tab-header .el-form-item { - padding: 0 22px; -} +//.tab-header .el-form-item { +// padding: 0 22px; +//} .el-divider--horizontal { display: block; @@ -341,6 +341,67 @@ div:focus { } } +.formaddcopy02 { + padding: 20px 0; + // height: calc(100vh - 200px);overflow-y: auto; + .title { + padding: 10px; + font-weight: bold; + font-size: 20px; + background-color: $header-bg; + text-align: center; + color: #ffffff; + } + + .el-row { + display: flex; + flex-wrap: wrap; + border-left: 1px solid $table-border-color; + + .el-col { + border-right: 1px solid $table-border-color; + border-bottom: 1px solid $table-border-color; + min-height: 48px; + position: relative; + .span-sty { + position: absolute; + top: 0; + bottom: 0; + left: 0; + line-height: 48px; + text-align: right; + font-size: 14px; + color: #606266; + font-weight: 600; + width: 70px; + padding-right: 5px; + border-right: 1px solid #e0e3eb; + } + + .el-form-item { + margin-bottom: 0; + + .addinputw { + padding: 5px 0; + width: 65%; + margin-left: 80px; + } + + .addinputInfo { + margin-left: 80px; + line-height: 48px; + } + + } + } + + } + + .footer { + margin: 20px; + } +} + .el-form-item__error { z-index: 100; } @@ -380,17 +441,19 @@ div:focus { .searchcon { margin: 0 0 10px 0; - line-height: 45px; + //line-height: 45px; } .searchcon .searchbtn { margin: 10px 0; + border: #2cab69 1px solid; + color: #2cab69; } -.search .el-form-item__label { - width: auto !important; -} +//.search .el-form-item__label { +// width: auto !important; +//} // 弹出窗口按钮 diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/feiyongshenqing/expense.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/feiyongshenqing/expense.vue new file mode 100644 index 0000000000..a59289f3ad --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/feiyongshenqing/expense.vue @@ -0,0 +1,310 @@ + + + + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/feiyongshenqing/expenseAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/feiyongshenqing/expenseAdd.vue new file mode 100644 index 0000000000..c2aacfd1f1 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/feiyongshenqing/expenseAdd.vue @@ -0,0 +1,276 @@ + + + + + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/feiyongshenqing/expenseInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/feiyongshenqing/expenseInfo.vue new file mode 100644 index 0000000000..3658f6e2af --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/feiyongshenqing/expenseInfo.vue @@ -0,0 +1,110 @@ + + + + + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/payment.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/payment.vue new file mode 100644 index 0000000000..23b33f927a --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/payment.vue @@ -0,0 +1,322 @@ + + + + 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 new file mode 100644 index 0000000000..a7e095dcf6 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue @@ -0,0 +1,277 @@ + + + + + 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 new file mode 100644 index 0000000000..8fb7df1956 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue @@ -0,0 +1,114 @@ + + + + +