diff --git a/yxt-as-ui/src/api/Common/dictcommons.js b/yxt-as-ui/src/api/Common/dictcommons.js index 8f7d1c29bb..d23f26f1ee 100644 --- a/yxt-as-ui/src/api/Common/dictcommons.js +++ b/yxt-as-ui/src/api/Common/dictcommons.js @@ -60,6 +60,15 @@ export function getListDeptByOrgSid(data) { }) } +// 获取所有岗位 +export function postName(data) { + return request({ + url: '/portal/v1/syspost/selectList', + method: 'get', + params: data + }) +} + // 根据当前登录用户sid获取本分公司下的销售部门和销售专员 export function selectOrgList(data) { return request({ diff --git a/yxt-as-ui/src/api/basicinformation/sparePartsCommission.js b/yxt-as-ui/src/api/basicinformation/sparePartsCommission.js new file mode 100644 index 0000000000..d58d3446fe --- /dev/null +++ b/yxt-as-ui/src/api/basicinformation/sparePartsCommission.js @@ -0,0 +1,36 @@ +import request from '@/utils/request' + +export default { + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/as/v1/asserviceaccomm/listPage', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + fetchBySid: function(data) { + return request({ + url: '/as/v1/asserviceaccomm/fetchDetailsBySid/' + data, + method: 'get' + }) + }, + saveOrUpdate: function(data) { + return request({ + url: '/as/v1/asserviceaccomm/save', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + deleteBySids: function(data) { + return request({ + url: '/as/v1/asserviceaccomm/delBySids', + method: 'DELETE', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + } +} + diff --git a/yxt-as-ui/src/api/basicinformation/sparePartsCommissionFiling.js b/yxt-as-ui/src/api/basicinformation/sparePartsCommissionFiling.js new file mode 100644 index 0000000000..9dfe0b072e --- /dev/null +++ b/yxt-as-ui/src/api/basicinformation/sparePartsCommissionFiling.js @@ -0,0 +1,106 @@ +import request from '@/utils/request' + +export default { + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/as/v1/asserviceaccommapply/listPage', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 回显 + fetchDetailsBySid: function(data) { + return request({ + url: '/as/v1/asserviceaccommapply/fetchDetailsBySid/' + data, + method: 'get' + }) + }, + saveOrUpdate: function(data) { + return request({ + url: '/as/v1/asserviceaccommapply/save', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + deleteBySids: function(data) { + return request({ + url: '/as/v1/asserviceaccommapply/delBySids', + method: 'DELETE', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 提交流程 + submit: function(params) { + return request({ + url: '/as/v1/asserviceaccommapply/submitApply', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批(同意) + complete: function(params) { + return request({ + url: '/as/v1/asserviceaccommapply/complete', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批(加签) + delegate: function(params) { + return request({ + url: '/as/v1/asserviceaccommapply/delegate', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批(驳回) + reject: function(params) { + return request({ + url: '/as/v1/asserviceaccommapply/reject', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批(终止) + breakProcess: function(params) { + return request({ + url: '/as/v1/asserviceaccommapply/breakProcess', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批(撤回) + revokeProcess: function(params) { + return request({ + url: '/as/v1/asserviceaccommapply/revokeProcess', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 审批流程(同意)获取下一环节 + getNextNodesForSubmit: function(data) { + return request({ + url: '/as/v1/asserviceaccommapply/getNextNodesForSubmit', + method: 'get', + params: data + }) + }, + // 审批流程(驳回)获取上一环节 + getPreviousNodesForReject: function(data) { + return request({ + url: '/as/v1/asserviceaccommapply/getPreviousNodesForReject', + method: 'get', + params: data + }) + } +} diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js index a94e7cf66c..e526a5f0b5 100644 --- a/yxt-as-ui/src/router/index.js +++ b/yxt-as-ui/src/router/index.js @@ -863,6 +863,24 @@ export const constantRoutes = [{ title: '维修技师职称备案管理', noCache: true } + }, + { + path: '/sparePartsCommission/sparePartsCommission', + component: () => import('@/views/basicinformation/sparePartsCommission/sparePartsCommission.vue'), + name: 'SparePartsCommission', + meta: { + title: '配件销售提成管理', + noCache: true + } + }, + { + path: '/sparePartsCommissionFiling/sparePartsCommissionFiling', + component: () => import('@/views/basicinformation/sparePartsCommissionFiling/sparePartsCommissionFiling.vue'), + name: 'SparePartsCommissionFiling', + meta: { + title: '配件销售提成备案管理', + noCache: true + } } ] }, @@ -1162,6 +1180,27 @@ export const constantRoutes = [{ import('@/views/workFlow/jiesuanFlow/settleAccountsYiBan.vue'), name: 'SettleAccountsYiBan' }, + // 配件销售提成备案 -- 编辑 + { + path: '/peijianbeianFlow/sparePartsCommissionFilingEdit', + component: () => + import('@/views/workFlow/peijianbeianFlow/sparePartsCommissionFilingEdit.vue'), + name: 'SparePartsCommissionFilingEdit' + }, + // 配件销售提成备案 -- 待办 + { + path: '/peijianbeianFlow/sparePartsCommissionFilingDaiBan', + component: () => + import('@/views/workFlow/peijianbeianFlow/sparePartsCommissionFilingDaiBan.vue'), + name: 'SparePartsCommissionFilingDaiBan' + }, + // 配件销售提成备案 -- 已办 + { + path: '/peijianbeianFlow/sparePartsCommissionFilingYiBan', + component: () => + import('@/views/workFlow/peijianbeianFlow/sparePartsCommissionFilingYiBan.vue'), + name: 'SparePartsCommissionFilingYiBan' + }, // 404 page must be placed at the end !!! // { path: '*', redirect: '/404', hidden: true } ] diff --git a/yxt-as-ui/src/views/basicinformation/sparePartsCommission/sparePartsCommission.vue b/yxt-as-ui/src/views/basicinformation/sparePartsCommission/sparePartsCommission.vue new file mode 100644 index 0000000000..62f41b5e72 --- /dev/null +++ b/yxt-as-ui/src/views/basicinformation/sparePartsCommission/sparePartsCommission.vue @@ -0,0 +1,422 @@ + + + + diff --git a/yxt-as-ui/src/views/basicinformation/sparePartsCommissionFiling/sparePartsCommissionFiling.vue b/yxt-as-ui/src/views/basicinformation/sparePartsCommissionFiling/sparePartsCommissionFiling.vue new file mode 100644 index 0000000000..9b1e6b919c --- /dev/null +++ b/yxt-as-ui/src/views/basicinformation/sparePartsCommissionFiling/sparePartsCommissionFiling.vue @@ -0,0 +1,326 @@ + + + + diff --git a/yxt-as-ui/src/views/basicinformation/sparePartsCommissionFiling/sparePartsCommissionFilingAdd.vue b/yxt-as-ui/src/views/basicinformation/sparePartsCommissionFiling/sparePartsCommissionFilingAdd.vue new file mode 100644 index 0000000000..ccc992866e --- /dev/null +++ b/yxt-as-ui/src/views/basicinformation/sparePartsCommissionFiling/sparePartsCommissionFilingAdd.vue @@ -0,0 +1,236 @@ + + + + + diff --git a/yxt-as-ui/src/views/basicinformation/sparePartsCommissionFiling/sparePartsCommissionFilingInfo.vue b/yxt-as-ui/src/views/basicinformation/sparePartsCommissionFiling/sparePartsCommissionFilingInfo.vue new file mode 100644 index 0000000000..67742655cc --- /dev/null +++ b/yxt-as-ui/src/views/basicinformation/sparePartsCommissionFiling/sparePartsCommissionFilingInfo.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue b/yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue index fa8185e6ed..e698ba4d6f 100644 --- a/yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue +++ b/yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue @@ -605,7 +605,7 @@ export default { }, commodityAdd() { this.formobj.goodsVos.push({ - goodSpuSid: '', + goodsSpuSid: '', goodsSkuSid: '', goodsSpuName: '', // 商品名称 goodsSkuCode: '', // 商品编码(图号) @@ -653,7 +653,7 @@ export default { }) }, commodityCurrentChange(value, row) { - row.goodSpuSid = value.goodSpuSid + row.goodsSpuSid = value.goodsSpuSid row.goodsSkuSid = value.goodsSkuSid row.goodsSpuName = value.goodsSpuName row.goodsSkuCode = value.goodsSkuCode diff --git a/yxt-as-ui/src/views/workFlow/peijianbeianFlow/sparePartsCommissionFilingDaiBan.vue b/yxt-as-ui/src/views/workFlow/peijianbeianFlow/sparePartsCommissionFilingDaiBan.vue new file mode 100644 index 0000000000..e7c943dae4 --- /dev/null +++ b/yxt-as-ui/src/views/workFlow/peijianbeianFlow/sparePartsCommissionFilingDaiBan.vue @@ -0,0 +1,401 @@ + + + + + diff --git a/yxt-as-ui/src/views/workFlow/peijianbeianFlow/sparePartsCommissionFilingEdit.vue b/yxt-as-ui/src/views/workFlow/peijianbeianFlow/sparePartsCommissionFilingEdit.vue new file mode 100644 index 0000000000..44076a14a5 --- /dev/null +++ b/yxt-as-ui/src/views/workFlow/peijianbeianFlow/sparePartsCommissionFilingEdit.vue @@ -0,0 +1,201 @@ + + + + + diff --git a/yxt-as-ui/src/views/workFlow/peijianbeianFlow/sparePartsCommissionFilingYiBan.vue b/yxt-as-ui/src/views/workFlow/peijianbeianFlow/sparePartsCommissionFilingYiBan.vue new file mode 100644 index 0000000000..cd25ed7b85 --- /dev/null +++ b/yxt-as-ui/src/views/workFlow/peijianbeianFlow/sparePartsCommissionFilingYiBan.vue @@ -0,0 +1,187 @@ + + + + +