From 6a1e72ed9a352db9084180262fd111ea7a6f6a88 Mon Sep 17 00:00:00 2001 From: djz236 Date: Thu, 28 Apr 2022 11:44:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=A6=E8=BE=86=E5=A4=96?= =?UTF-8?q?=E9=87=87=E7=9A=84=E5=89=8D=E7=AB=AF=E5=8A=9F=E8=83=BD=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseoutsourcingapplication.js | 2 +- .../src/api/chexingchaxun/modelinquire.js | 88 +++ .../src/router/modules/codemenu.js | 35 +- anrui-scm/anrui-scm-ui/src/utils/auth.js | 2 +- .../baseoutsourcingapplication.vue | 5 +- .../baseoutsourcingapplicationAdd.vue | 185 +++--- .../modelinquire/modellibrary.vue | 396 +++++++++++++ .../modelstandardconfiguration.vue | 447 +++++++++++++++ .../productionschedulingorder.vue | 265 +++++++++ .../chexingchaxun/modelinquire/vehiclecar.vue | 225 ++++++++ .../modelinquire/vehiclecarInfo.vue | 541 ++++++++++++++++++ .../vehiclelibraryconfiguration.vue | 521 +++++++++++++++++ 12 files changed, 2597 insertions(+), 115 deletions(-) create mode 100644 anrui-scm/anrui-scm-ui/src/api/chexingchaxun/modelinquire.js create mode 100644 anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/modellibrary.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/modelstandardconfiguration.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/productionschedulingorder.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/vehiclecar.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/vehiclecarInfo.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue diff --git a/anrui-scm/anrui-scm-ui/src/api/baseoutsourcingapplication/baseoutsourcingapplication.js b/anrui-scm/anrui-scm-ui/src/api/baseoutsourcingapplication/baseoutsourcingapplication.js index c62dd122e1..ff5100ec06 100644 --- a/anrui-scm/anrui-scm-ui/src/api/baseoutsourcingapplication/baseoutsourcingapplication.js +++ b/anrui-scm/anrui-scm-ui/src/api/baseoutsourcingapplication/baseoutsourcingapplication.js @@ -13,7 +13,7 @@ export default { // 保存新增记录 saveOrUpdate: function(params) { return request({ - url: '/base/baseoutsourcingapplication/save', + url: '/base/baseoutsourcingapplication/saveOrUpdate', method: 'post', data: params }) diff --git a/anrui-scm/anrui-scm-ui/src/api/chexingchaxun/modelinquire.js b/anrui-scm/anrui-scm-ui/src/api/chexingchaxun/modelinquire.js new file mode 100644 index 0000000000..0bb3d18e2b --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/api/chexingchaxun/modelinquire.js @@ -0,0 +1,88 @@ +import request from '@/utils/request' + +// 根据条件分页查询数据的列表(车型) +export function modelPageList(data) { + return request({ + url: '/base/v1/basevehiclemodel/modelPageList', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 根据条件分页查询数据的列表(车型配置) +export function configPageList(data) { + return request({ + url: '/base/v1/basemodelconfig/configPageList', + 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 brandDown(data) { + return request({ + url: '/base/v1/basevehiclebrand/namesDown', + method: 'get', + params: data + }) +} +// 车型配置详细信息 +export function selectExiCarConfig(data) { + return request({ + url: '/base/v1/basevehicle/selectExiCarConfig/' + data.modelSid + '/' + data.configSid + '/' + data.userSid, + method: 'get' + }) +} +// 现车车辆的分页列表 +export function selExistingCarPageList(data) { + return request({ + url: '/base/v1/basevehicle/selExistingCarPageList', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} +// 排产订单的分页列表 +export function selectPage(data) { + return request({ + url: '/base/v1/busvehicleorder/selectPage', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} +// 更多配置(非本公司旗下车型,配置) +export function notTheCompanyModelPageList(data) { + return request({ + url: '/base/v1/basevehiclemodel/notTheCompanyModelPageList', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} +// 现车车辆详情 +export function getPurchaseDetails(data) { + return request({ + url: '/base/v1/basevehicle/getPurchaseDetails/' + data, + method: 'get' + }) +} diff --git a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js index 2477bb2310..e63ba9be21 100644 --- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js +++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js @@ -279,23 +279,22 @@ const codemenu = [ ] }, { -<<<<<<< Updated upstream - path: '/baseoutsourcingapplication', - component: Layout, - // redirect: '/baseoutsourcingapplication/index', - meta: { - title: '车辆外采' - }, - children: [ - { + path: '/baseoutsourcingapplication', + component: Layout, + // redirect: '/baseoutsourcingapplication/index', + meta: { + title: '车辆外采' + }, + children: [ + { path: '/baseoutsourcingapplication/index', component: () => import('@/views/baseoutsourcingapplication/baseoutsourcingapplication.vue'), - name: 'baseoutsourcingapplication', - meta: {title: '车辆外采'} - } - ] + name: 'baseoutsourcingapplication', + meta: {title: '车辆外采'} + } + ] }, -======= + { path: '/examine', component: Layout, redirect: '/examine/chukushenhe', @@ -311,9 +310,6 @@ const codemenu = [ } ] }, - ->>>>>>> Stashed changes - // 流程审批 // 采购退库驳回到发起人办理编辑页面 { @@ -335,6 +331,11 @@ const codemenu = [ component: () => import('@/views/workFlow/caigoutuikuFlow/caigoutuiku'), name: 'caigoutuikuMain' + }, + { + path: '/chexingchaxun/modelinquire/modellibrary', + component: () => import('@/views/chexingchaxun/modelinquire/modellibrary'), + name: 'modellibrary' } ] diff --git a/anrui-scm/anrui-scm-ui/src/utils/auth.js b/anrui-scm/anrui-scm-ui/src/utils/auth.js index 70d67063ad..5e54fb125a 100644 --- a/anrui-scm/anrui-scm-ui/src/utils/auth.js +++ b/anrui-scm/anrui-scm-ui/src/utils/auth.js @@ -17,7 +17,7 @@ export function removeToken() { export function getStorage() { //return sessionStorage.getItem('token') - return 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI0MjdhMmZiMC02MGM1LTQwOWYtYmVhNC00ZWI0NDEwNDFhZTYiLCJpc3MiOiJXQksiLCJleHAiOjE2NTA1MDUyNzB9.vkA5nfMxjlvU683jUiOFeC9_rQbfCrcwDqROdsE_6GU' + return 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiIwZDhkODExOS1kNDc2LTQ3Y2UtODljMi0wNzVjZDgwOWRkYTYiLCJpc3MiOiJXQksiLCJleHAiOjE2NTExMzYzNzh9.UR9ANiR71DMDHd_ly-jrHEj4fTo6tsTrc40A3vOQrsI' } export function setStorage(session) { diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue index 7c2f2ebb64..e05e214593 100644 --- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue @@ -36,7 +36,7 @@
- + @@ -75,7 +75,8 @@ - + +
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue index 3b0fe01c40..3a1a7efeee 100644 --- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue @@ -1,5 +1,6 @@ - + diff --git a/anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/modelstandardconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/modelstandardconfiguration.vue new file mode 100644 index 0000000000..14c231e8fc --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/modelstandardconfiguration.vue @@ -0,0 +1,447 @@ + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/productionschedulingorder.vue b/anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/productionschedulingorder.vue new file mode 100644 index 0000000000..21474a80ee --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/productionschedulingorder.vue @@ -0,0 +1,265 @@ + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/vehiclecar.vue b/anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/vehiclecar.vue new file mode 100644 index 0000000000..0162912aea --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/vehiclecar.vue @@ -0,0 +1,225 @@ + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/vehiclecarInfo.vue b/anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/vehiclecarInfo.vue new file mode 100644 index 0000000000..34156c1143 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/vehiclecarInfo.vue @@ -0,0 +1,541 @@ + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue new file mode 100644 index 0000000000..8807de75c0 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue @@ -0,0 +1,521 @@ + + + +