diff --git a/anrui-riskcenter-ui/src/views/deduct/deductAdd.vue b/anrui-riskcenter-ui/src/views/deduct/deductAdd.vue index 683c83db53..09f1e64c03 100644 --- a/anrui-riskcenter-ui/src/views/deduct/deductAdd.vue +++ b/anrui-riskcenter-ui/src/views/deduct/deductAdd.vue @@ -57,11 +57,11 @@ - - - + + + + + diff --git a/anrui-riskcenter-ui/src/views/deduct/deductInfo.vue b/anrui-riskcenter-ui/src/views/deduct/deductInfo.vue index 6d7393c1b0..f96d5d21ec 100644 --- a/anrui-riskcenter-ui/src/views/deduct/deductInfo.vue +++ b/anrui-riskcenter-ui/src/views/deduct/deductInfo.vue @@ -56,11 +56,11 @@ - - - + + + + + diff --git a/anrui-riskcenter-ui/src/views/repaymentschedule/repaymentscheduleAdd.vue b/anrui-riskcenter-ui/src/views/repaymentschedule/repaymentscheduleAdd.vue index 28a356bf28..26bbf414aa 100644 --- a/anrui-riskcenter-ui/src/views/repaymentschedule/repaymentscheduleAdd.vue +++ b/anrui-riskcenter-ui/src/views/repaymentschedule/repaymentscheduleAdd.vue @@ -365,22 +365,29 @@ export default { } }, saveOrUpdate() { - this.$refs['form_obj'].validate((valid) => { - if (valid) { - this.submitdisabled = true - this.formobj.userSid = window.sessionStorage.getItem('userSid') - req.loanCreateSchedulePdf(this.formobj).then((res) => { - if (res.success) { - this.$message({ showClose: true, type: 'success', message: '生成成功' }) - this.handleReturn('true') - } - else { + const tip = '请再次确认填写信息是否正确，确定后数据会传送到财务系统中。' + this.$confirm(tip, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.$refs['form_obj'].validate((valid) => { + if (valid) { + this.submitdisabled = true + this.formobj.userSid = window.sessionStorage.getItem('userSid') + req.loanCreateSchedulePdf(this.formobj).then((res) => { + if (res.success) { + this.$message({ showClose: true, type: 'success', message: '生成成功' }) + this.handleReturn('true') + } + else { + this.submitdisabled = false + } + }).catch(() => { this.submitdisabled = false - } - }).catch(() => { - this.submitdisabled = false - }) - } + }) + } + }) }) }, lookJR() { diff --git a/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductDaiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductDaiBan.vue index 1058d9c99d..5737b36a87 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductDaiBan.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductDaiBan.vue @@ -58,11 +58,11 @@ - - - + + + + + diff --git a/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductEdit.vue index 13ce6fa938..cf24439eb8 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductEdit.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductEdit.vue @@ -56,11 +56,11 @@ - - - + + + + + diff --git a/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductYiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductYiBan.vue index 762cbab5d2..1129360c1c 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductYiBan.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/huakouFlow/deductYiBan.vue @@ -56,11 +56,11 @@ - - - + + + + + diff --git a/yxt-as-ui/src/api/Common/dictcommons.js b/yxt-as-ui/src/api/Common/dictcommons.js index 6615db3fdd..7ee224fe5e 100644 --- a/yxt-as-ui/src/api/Common/dictcommons.js +++ b/yxt-as-ui/src/api/Common/dictcommons.js @@ -26,15 +26,6 @@ export function selectOrgSidList(data) { }) } -// 获取分公司 -export function getListOrg(data) { - return request({ - url: '/portal/v1/sysorganization/getListOrg', - method: 'get', - params: data - }) -} - // 根据当前登录人orgSidPath(全路径sid)查询分公司 export function getOrgSidByPath(data) { return request({ @@ -79,6 +70,15 @@ export function selFianceByOrgSidPath(data) { }) } +// 根据当前登录用户部门sid获取本部门下角色为维修技师的人员 +export function getUserByDeptSid(data) { + return request({ + url: '/portal/v1/sysuser/getUserByDeptSid', + method: 'get', + params: data + }) +} + // 当前用户创建申请时判断该用户是否有该菜单的操作权限 export function selectHaveMessage(data) { return request({ diff --git a/yxt-as-ui/src/api/basicinformation/technicalTitle.js b/yxt-as-ui/src/api/basicinformation/technicalTitle.js new file mode 100644 index 0000000000..260f1db2cf --- /dev/null +++ b/yxt-as-ui/src/api/basicinformation/technicalTitle.js @@ -0,0 +1,36 @@ +import request from '@/utils/request' + +export default { + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/as/v1/astechtitle/listPage', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + fetchBySid: function(data) { + return request({ + url: '/as/v1/astechtitle/fetchDetailsBySid/' + data, + method: 'get' + }) + }, + saveOrUpdate: function(data) { + return request({ + url: '/as/v1/astechtitle/save', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + deleteBySids: function(data) { + return request({ + url: '/as/v1/astechtitle/delBySids', + method: 'DELETE', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + } +} + diff --git a/yxt-as-ui/src/api/basicinformation/technicalTitleFiling.js b/yxt-as-ui/src/api/basicinformation/technicalTitleFiling.js new file mode 100644 index 0000000000..b7952f53d0 --- /dev/null +++ b/yxt-as-ui/src/api/basicinformation/technicalTitleFiling.js @@ -0,0 +1,115 @@ +import request from '@/utils/request' + +export default { + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/as/v1/astechtitleapply/listPage', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 初始化 + init: function(data) { + return request({ + url: '/as/v1/astechtitleapply/init', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 回显 + fetchDetailsBySid: function(data) { + return request({ + url: '/as/v1/astechtitleapply/fetchDetailsBySid/' + data, + method: 'get' + }) + }, + saveOrUpdate: function(data) { + return request({ + url: '/as/v1/astechtitleapply/save', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + deleteBySids: function(data) { + return request({ + url: '/as/v1/astechtitleapply/delBySids', + method: 'DELETE', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 提交流程 + submit: function(params) { + return request({ + url: '/as/v1/astechtitleapply/submitApply', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（同意） + complete: function(params) { + return request({ + url: '/as/v1/astechtitleapply/complete', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（加签） + delegate: function(params) { + return request({ + url: '/as/v1/astechtitleapply/delegate', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（驳回） + reject: function(params) { + return request({ + url: '/as/v1/astechtitleapply/reject', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（终止） + breakProcess: function(params) { + return request({ + url: '/as/v1/astechtitleapply/breakProcess', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（撤回） + revokeProcess: function(params) { + return request({ + url: '/as/v1/astechtitleapply/revokeProcess', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 审批流程（同意）获取下一环节 + getNextNodesForSubmit: function(data) { + return request({ + url: '/as/v1/astechtitleapply/getNextNodesForSubmit', + method: 'get', + params: data + }) + }, + // 审批流程（驳回）获取上一环节 + getPreviousNodesForReject: function(data) { + return request({ + url: '/as/v1/astechtitleapply/getPreviousNodesForReject', + method: 'get', + params: data + }) + } +} diff --git a/yxt-as-ui/src/api/client/customermanagement.js b/yxt-as-ui/src/api/client/customermanagement.js index bccfdfcfb1..c0c6fbffa2 100644 --- a/yxt-as-ui/src/api/client/customermanagement.js +++ b/yxt-as-ui/src/api/client/customermanagement.js @@ -44,7 +44,7 @@ export default { // 定点企业禁用 disableState: function(data) { return request({ - url: '/crm/v1/crmcustomerorg/disableState', + url: '/crm/v1/crmcustomertemp/disableState', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } @@ -53,7 +53,7 @@ export default { // 定点企业启用 enable: function(data) { return request({ - url: '/crm/v1/crmcustomerorg/enable', + url: '/crm/v1/crmcustomertemp/enable', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } @@ -91,6 +91,24 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, + // 禁用车辆信息 + disableStateByCar: function(data) { + return request({ + url: '/as/v1/ascustomervehicle/disableState', + method: 'DELETE', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 启用车辆信息 + enableByCar: function(data) { + return request({ + url: '/as/v1/ascustomervehicle/enable', + method: 'DELETE', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, // 删除车辆信息 delBySids: function(data) { return request({ @@ -103,15 +121,33 @@ export default { // 对接人列表 personList: function(params) { return request({ - url: '/as/v1/ascustomerperson/personList', + url: '/crm/v1/crmmaintenanceenterpriseperson/personList', method: 'get', params: params }) }, + // 禁用对接人信息 + disableStateByPerson: function(data) { + return request({ + url: '/crm/v1/crmdockingpeople/disableState', + method: 'DELETE', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 启用对接人信息 + enableByPerson: function(data) { + return request({ + url: '/crm/v1/crmdockingpeople/enable', + method: 'DELETE', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, // 删除对接人信息 delPersonBySids: function(data) { return request({ - url: '/as/v1/ascustomerperson/delBySids', + url: '/crm/v1/crmmaintenanceenterpriseperson/delBySids', method: 'DELETE', data: data, headers: { 'Content-Type': 'application/json' } diff --git a/yxt-as-ui/src/api/client/maintenanceEnterprise.js b/yxt-as-ui/src/api/client/maintenanceEnterprise.js new file mode 100644 index 0000000000..55d042d909 --- /dev/null +++ b/yxt-as-ui/src/api/client/maintenanceEnterprise.js @@ -0,0 +1,114 @@ +import request from '@/utils/request' + +export default { + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/crm/v1/maintenanceEnterprise/listPage', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 初始化 + init(data) { + return request({ + url: '/crm/v1/maintenanceEnterprise/init', + method: 'get', + params: data + }) + }, + // 编辑回显 + fetchDetailsBySid: function(data) { + return request({ + url: '/crm/v1/maintenanceEnterprise/fetchDetailsBySid/' + data, + method: 'get' + }) + }, + saveOrUpdate: function(data) { + return request({ + url: '/crm/v1/maintenanceEnterprise/save', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + deleteBySids: function(data) { + return request({ + url: '/crm/v1/maintenanceEnterprise/delBySids', + method: 'DELETE', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 提交流程 + submit: function(params) { + return request({ + url: '/crm/v1/maintenanceEnterprise/submit', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（同意） + complete: function(params) { + return request({ + url: '/crm/v1/maintenanceEnterprise/complete', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（加签） + delegate: function(params) { + return request({ + url: '/crm/v1/maintenanceEnterprise/delegate', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（驳回） + reject: function(params) { + return request({ + url: '/crm/v1/maintenanceEnterprise/reject', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（终止） + breakProcess: function(params) { + return request({ + url: '/crm/v1/maintenanceEnterprise/breakProcess', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批（撤回） + revokeProcess: function(params) { + return request({ + url: '/crm/v1/maintenanceEnterprise/revokeProcess', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 审批流程（同意）获取下一环节 + getNextNodesForSubmit: function(data) { + return request({ + url: '/crm/v1/maintenanceEnterprise/getNextNodesForSubmit', + method: 'get', + params: data + }) + }, + // 审批流程（驳回）获取上一环节 + getPreviousNodesForReject: function(data) { + return request({ + url: '/crm/v1/maintenanceEnterprise/getPreviousNodesForReject', + method: 'get', + params: data + }) + } +} diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js index 0492665998..f4bca1f898 100644 --- a/yxt-as-ui/src/router/index.js +++ b/yxt-as-ui/src/router/index.js @@ -431,6 +431,12 @@ export const constantRoutes = [{ name: 'CustomerManagement', meta: { title: '客户管理', noCache: true } }, + { + path: '/filing/maintenanceEnterprise', + component: () => import('@/views/client/filing/maintenanceEnterprise.vue'), + name: 'MaintenanceEnterprise', + meta: { title: '定点企业备案', noCache: true } + }, { path: '/customerunit/customerunit', component: () => import('@/views/client/customerunit/customerunit.vue'), @@ -580,6 +586,18 @@ export const constantRoutes = [{ component: () => import('@/views/basicinformation/claimantManufacturer/claimantManufacturer.vue'), name: 'ClaimantManufacturer', meta: { title: '索赔厂家管理', noCache: true } + }, + { + path: '/technicalTitle/technicalTitle', + component: () => import('@/views/basicinformation/technicalTitle/technicalTitle.vue'), + name: 'TechnicalTitle', + meta: { title: '维修技师职称管理', noCache: true } + }, + { + path: '/technicalTitleFiling/technicalTitleFiling', + component: () => import('@/views/basicinformation/technicalTitleFiling/technicalTitleFiling.vue'), + name: 'TechnicalTitleFiling', + meta: { title: '维修技师职称备案管理', noCache: true } } ] }, @@ -837,6 +855,27 @@ export const constantRoutes = [{ import('@/views/workFlow/weixiubeianFlow/maintenanceProjectRecordYiBan.vue'), name: 'MaintenanceProjectRecordYiBan' }, + // 维修技师职称备案 -- 编辑 + { + path: '/jishizhichengFlow/technicalTitleFilingEdit', + component: () => + import('@/views/workFlow/jishizhichengFlow/technicalTitleFilingEdit.vue'), + name: 'TechnicalTitleFilingEdit' + }, + // 维修技师职称备案 -- 待办 + { + path: '/jishizhichengFlow/technicalTitleFilingDaiBan', + component: () => + import('@/views/workFlow/jishizhichengFlow/technicalTitleFilingDaiBan.vue'), + name: 'TechnicalTitleFilingDaiBan' + }, + // 维修技师职称备案 -- 已办 + { + path: '/jishizhichengFlow/technicalTitleFilingYiBan', + component: () => + import('@/views/workFlow/jishizhichengFlow/technicalTitleFilingYiBan.vue'), + name: 'TechnicalTitleFilingYiBan' + }, // 404 page must be placed at the end !!! // { path: '*', redirect: '/404', hidden: true } ] diff --git a/yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue b/yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue index 362e3410d6..eaba1bfecc 100644 --- a/yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue +++ b/yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue @@ -35,7 +35,7 @@ - + @@ -59,7 +59,7 @@ -
拼音缩写
+
项目编码
{{ formobj.aitemCode }} @@ -83,6 +83,11 @@ + + + 注：附加项目销售价填写时应为不含税价格。 + +
确定 @@ -125,7 +130,7 @@ export default { aitemName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }], price: [{ required: true, message: '销售价不能为空', trigger: 'blur' }], sortNo: [{ required: true, message: '排序不能为空', trigger: 'blur' }], - cost: [{ required: true, message: '成本不能为空', trigger: 'blur' }], + cost: [{ required: true, message: '成本不能为空', trigger: 'blur' }] }, btndisabled: false, btnList: [ @@ -161,7 +166,7 @@ export default { // 翻页 listQuery: { current: 1, - size: 10, + size: 5, total: 0, params: { aitemName: '', @@ -245,7 +250,7 @@ export default { handleReset() { this.listQuery = { current: 1, - size: 10, + size: 5, total: 0, params: { aitemName: '', diff --git a/yxt-as-ui/src/views/basicinformation/claimantManufacturer/claimantManufacturer.vue b/yxt-as-ui/src/views/basicinformation/claimantManufacturer/claimantManufacturer.vue index 8268b177e6..b67b520382 100644 --- a/yxt-as-ui/src/views/basicinformation/claimantManufacturer/claimantManufacturer.vue +++ b/yxt-as-ui/src/views/basicinformation/claimantManufacturer/claimantManufacturer.vue @@ -31,9 +31,9 @@ - + - +
diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue index 5fbab88084..2870b8d280 100644 --- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue +++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitem.vue @@ -61,9 +61,8 @@ {{ scope.row.isEnable == '0' ? '禁用' : scope.row.isEnable == '1' ? '启用' : '' }} - - + diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue index 01b7fe942b..f72ca4f618 100644 --- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue +++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue @@ -16,7 +16,7 @@ -
拼音缩写
+
项目编码
{{ formobj.sitemCode }} @@ -111,6 +111,11 @@ + + + 注：维修项目涉及的价格填写时均应为不含税价格。 + + diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue index 466366049a..a8d3906690 100644 --- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue +++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue @@ -15,7 +15,7 @@ {{ formobj.sitemName }} -
拼音缩写
+
项目编码
{{ formobj.sitemCode }} @@ -79,6 +79,11 @@ {{ formobj.sortNo }} + + + 注：维修项目涉及的价格填写时均应为不含税价格。 + + diff --git a/yxt-as-ui/src/views/basicinformation/team/team.vue b/yxt-as-ui/src/views/basicinformation/team/team.vue index cf691f6668..437645d381 100644 --- a/yxt-as-ui/src/views/basicinformation/team/team.vue +++ b/yxt-as-ui/src/views/basicinformation/team/team.vue @@ -30,9 +30,9 @@ - - + + diff --git a/yxt-as-ui/src/views/basicinformation/technicalTitle/technicalTitle.vue b/yxt-as-ui/src/views/basicinformation/technicalTitle/technicalTitle.vue new file mode 100644 index 0000000000..a2ac5cafb1 --- /dev/null +++ b/yxt-as-ui/src/views/basicinformation/technicalTitle/technicalTitle.vue @@ -0,0 +1,420 @@ + + + + diff --git a/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFiling.vue b/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFiling.vue new file mode 100644 index 0000000000..83334b8849 --- /dev/null +++ b/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFiling.vue @@ -0,0 +1,326 @@ + + + + diff --git a/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingAdd.vue b/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingAdd.vue new file mode 100644 index 0000000000..1b8459cab8 --- /dev/null +++ b/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingAdd.vue @@ -0,0 +1,261 @@ + + + + + diff --git a/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingInfo.vue b/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingInfo.vue new file mode 100644 index 0000000000..a36b7a3279 --- /dev/null +++ b/yxt-as-ui/src/views/basicinformation/technicalTitleFiling/technicalTitleFilingInfo.vue @@ -0,0 +1,143 @@ + + + + + diff --git a/yxt-as-ui/src/views/client/customermanagement/customermanagement.vue b/yxt-as-ui/src/views/client/customermanagement/customermanagement.vue index 0b6b4d2748..260995d218 100644 --- a/yxt-as-ui/src/views/client/customermanagement/customermanagement.vue +++ b/yxt-as-ui/src/views/client/customermanagement/customermanagement.vue @@ -58,6 +58,22 @@ + + + + + + + + + +