diff --git a/anrui-scm/anrui-scm-ui/src/api/shangzhuang/shangzhuang.js b/anrui-scm/anrui-scm-ui/src/api/shangzhuang/shangzhuang.js
index f3876aa2f9..83b27bc812 100644
--- a/anrui-scm/anrui-scm-ui/src/api/shangzhuang/shangzhuang.js
+++ b/anrui-scm/anrui-scm-ui/src/api/shangzhuang/shangzhuang.js
@@ -1,72 +1,73 @@
import request from '@/utils/request'
-import qs from 'qs'
+
// 物料信息
export default {
- // 查询分页列表
+ // 查询分页列表(上装配置管理、上装配置检索)
listPage: function(data) {
return request({
- url: '/base/v1/basemodelszconfig/listPage',
+ url: '/base/v1/basevehinstallmodel/listPage',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
- // 保存新增记录
- saveAdd: function(data) {
+ // 保存新增记录(上装配置管理)
+ saveOrUpdate: function(data) {
return request({
- url: '/base/v1/basemodelszconfig/save',
+ url: '/base/v1/basevehinstallmodel/save',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
- // 保存修改记录
- saveEdit: function(data, sid) {
- return request({
- url: '/base/v1/basemodelszconfig/update/' + sid,
- method: 'post',
- data: data,
- headers: { 'Content-Type': 'application/json' }
- })
- },
- // 通过sid删除一条或多条记录
+ // 通过sid删除一条或多条记录(上装配置管理)
delBySids: function(data) {
return request({
- url: '/base/v1/basemodelszconfig/delBySids',
+ url: '/base/v1/basevehinstallmodel/delBySids',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
- // 通过sid查询一条记录
+ // 通过sid查询一条记录(上装配置管理)
fetchBySid: function(sid) {
return request({
- url: '/base/v1/basemodelszconfig/fetchBySid/' + sid
+ url: '/base/v1/basevehinstallmodel/fetchDetailsBySid/' + sid,
+ method: 'get'
})
},
- // 导入
- importExcel: function(params) {
+ // 查询分页列表(上装台账管理)
+ pagelist: function(data) {
return request({
- url: '/anruiscm/v1/scmmaterial/importExcel',
+ url: '/base/v1/basevehinstall/listPage',
method: 'post',
- data: params
+ data: data,
+ headers: { 'Content-Type': 'application/json' }
})
},
- // 导出
- exportExcel: function(params) {
+ // 保存新增记录(上装台账管理)
+ save: function(data) {
return request({
- url: '/anruiscm/v1/scmmaterial/exportExcel',
+ url: '/base/v1/basevehinstall/save',
method: 'post',
- data: params
+ data: data,
+ headers: { 'Content-Type': 'application/json' }
})
},
-
- pullDown: function(data) {
+ // 通过sid查询一条记录(上装配置管理)
+ fetchDetailsBySid: function(sid) {
return request({
- url: '/portal/v1/dictcommons/typeValues',
- method: 'get',
- params: data
+ url: '/base/v1/basevehinstall/fetchDetailsBySid/' + sid,
+ method: 'get'
})
},
+ // 通过sid查询一条记录(上装配置管理)
+ selExistingCar: function(data) {
+ return request({
+ url: '/base/v1/basevehicle/selExistingCar',
+ method: 'post',
+ params: data
+ })
+ }
}
diff --git a/anrui-scm/anrui-scm-ui/src/api/shangzhuang/shangzhuangdaibaojia.js b/anrui-scm/anrui-scm-ui/src/api/shangzhuang/shangzhuangdaibaojia.js
deleted file mode 100644
index bebd273d00..0000000000
--- a/anrui-scm/anrui-scm-ui/src/api/shangzhuang/shangzhuangdaibaojia.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import request from '@/utils/request'
-import qs from 'qs'
-// 物料信息
-export default {
-
- // 查询分页列表
- listPage: function(data) {
- return request({
- url: '/base/v1/basemodelszconfig/searchPage',
- method: 'post',
- data: data,
- headers: { 'Content-Type': 'application/json' }
- })
- },
- // 保存新增记录
- saveAdd: function(data) {
- return request({
- url: '/base/v1/basemodelszconfig/save',
- method: 'post',
- data: data,
- headers: { 'Content-Type': 'application/json' }
- })
- },
- // 保存修改记录
- saveEdit: function(data, sid) {
- return request({
- url: '/base/v1/basemodelszconfig/update/' + sid,
- method: 'post',
- data: data,
- headers: { 'Content-Type': 'application/json' }
- })
- },
- // 通过sid删除一条或多条记录
- delBySids: function(data) {
- return request({
- url: '/base/v1/basemodelszconfig/delBySids',
- method: 'post',
- data: data,
- headers: { 'Content-Type': 'application/json' }
- })
- },
- // 通过sid查询一条记录
- fetchBySid: function(sid) {
- return request({
- url: '/base/v1/basemodelszconfig/fetchBySid/' + sid
- })
- },
- // 导入
- importExcel: function(params) {
- return request({
- url: '/anruiscm/v1/scmmaterial/importExcel',
- method: 'post',
- data: params
- })
- },
- // 导出
- exportExcel: function(params) {
- return request({
- url: '/anruiscm/v1/scmmaterial/exportExcel',
- method: 'post',
- data: params
- })
- },
-
- pullDown: function(data) {
- return request({
- url: '/portal/v1/dictcommons/typeValues',
- method: 'get',
- params: data
- })
- },
-}
diff --git a/anrui-scm/anrui-scm-ui/src/api/shangzhuang/shangzhuangjiansuo.js b/anrui-scm/anrui-scm-ui/src/api/shangzhuang/shangzhuangjiansuo.js
deleted file mode 100644
index bebd273d00..0000000000
--- a/anrui-scm/anrui-scm-ui/src/api/shangzhuang/shangzhuangjiansuo.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import request from '@/utils/request'
-import qs from 'qs'
-// 物料信息
-export default {
-
- // 查询分页列表
- listPage: function(data) {
- return request({
- url: '/base/v1/basemodelszconfig/searchPage',
- method: 'post',
- data: data,
- headers: { 'Content-Type': 'application/json' }
- })
- },
- // 保存新增记录
- saveAdd: function(data) {
- return request({
- url: '/base/v1/basemodelszconfig/save',
- method: 'post',
- data: data,
- headers: { 'Content-Type': 'application/json' }
- })
- },
- // 保存修改记录
- saveEdit: function(data, sid) {
- return request({
- url: '/base/v1/basemodelszconfig/update/' + sid,
- method: 'post',
- data: data,
- headers: { 'Content-Type': 'application/json' }
- })
- },
- // 通过sid删除一条或多条记录
- delBySids: function(data) {
- return request({
- url: '/base/v1/basemodelszconfig/delBySids',
- method: 'post',
- data: data,
- headers: { 'Content-Type': 'application/json' }
- })
- },
- // 通过sid查询一条记录
- fetchBySid: function(sid) {
- return request({
- url: '/base/v1/basemodelszconfig/fetchBySid/' + sid
- })
- },
- // 导入
- importExcel: function(params) {
- return request({
- url: '/anruiscm/v1/scmmaterial/importExcel',
- method: 'post',
- data: params
- })
- },
- // 导出
- exportExcel: function(params) {
- return request({
- url: '/anruiscm/v1/scmmaterial/exportExcel',
- method: 'post',
- data: params
- })
- },
-
- pullDown: function(data) {
- return request({
- url: '/portal/v1/dictcommons/typeValues',
- method: 'get',
- params: data
- })
- },
-}
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 ea88de57e6..c7fce826ee 100644
--- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
+++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
@@ -437,7 +437,7 @@ const codemenu = [
path: '/chuku/chukuguanli',
component: () => import('@/views/chuku/chukuguanli/chukuguanli.vue'),
name: 'chukuguanli',
- meta: { title: '出库申请管理', noCache: true }
+ meta: { title: '出库管理', noCache: true }
}]
},
// 验车管理
diff --git a/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangguanli/shangzhuangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangguanli/shangzhuangAdd.vue
index 32a2c8cff4..98e6b95267 100644
--- a/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangguanli/shangzhuangAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangguanli/shangzhuangAdd.vue
@@ -3,7 +3,7 @@
-
+
@@ -107,6 +116,7 @@ import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import shangzhuangtaizhangAdd from './shangzhuangtaizhangAdd'
import shangzhangtaizhangInfo from './shangzhangtaizhangInfo'
+import {getPathSidByUserSid, typeValues} from "@/api/cheliang/dictcommons";
export default {
name: 'shangzhuangtaizhangguanli',
@@ -147,20 +157,25 @@ export default {
isSearchShow: false,
tableLoading: false,
dataList: [],
- topName_list: [],
- vehicleFunction_list: [],
+ installName_list: [],
+ vehicleType_list: [],
+ refitMethod_list: [],
+ color_list: [],
+ plateMaterial_list: [],
queryParams: {
current: 1,
size: 10,
total: 10,
params: {
- vehicleFunction: '',
- vehicleFunctionKey: '',
- refitMethod: '',
+ vehicleTypeKey: '',
+ installNameKey: '',
+ refitMethodKey: '',
refitFactory: '',
- topName: '',
- topNameKey: '',
- overallDimension: ''
+ colorKey: '',
+ plateMaterial: '',
+ createOrgSid: '',
+ vinNo: '',
+ noticeModel: ''
}
},
multipleSelection: []
@@ -170,49 +185,46 @@ export default {
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
- this.loadList()
- this.DataDictionary()
+ this.init()
},
methods: {
+ init() {
+ getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+ if (res.success) {
+ this.queryParams.params.createOrgSid = res.data
+ this.loadList()
+ }
+ })
+ this.DataDictionary()
+ },
DataDictionary() {
// 上装名称
- req.pullDown({ type: 'topName' }).then((res) => {
+ typeValues({ type: 'topName' }).then((res) => {
if (res.success) {
- this.topName_list = res.data
+ this.installName_list = res.data
}
})
// 车辆功能
- req.pullDown({ type: 'vehicleFunction' }).then((res) => {
+ typeValues({ type: 'vehicleFunction' }).then((res) => {
if (res.success) {
- this.vehicleFunction_list = res.data
+ this.vehicleType_list = res.data
}
})
- },
- changeTopName(value) {
- let bb = null
- this.topName_list.forEach((e) => {
- if (e.dictKey === value) {
- bb = {
- name: e.dictValue,
- value: e.dictKey
- }
+ typeValues({ type: 'bodyColor' }).then((res) => {
+ if (res.success) {
+ this.color_list = res.data
}
})
- this.queryParams.params.topName = bb.name
- this.queryParams.params.topNameKey = bb.value
- },
- changeVehicleFunction(value) {
- let bb = null
- this.vehicleFunction_list.forEach((e) => {
- if (e.dictKey === value) {
- bb = {
- name: e.dictValue,
- value: e.dictKey
- }
+ typeValues({ type: 'refitMethod' }).then((res) => {
+ if (res.success) {
+ this.refitMethod_list = res.data
+ }
+ })
+ typeValues({ type: 'plateMaterial' }).then((res) => {
+ if (res.success) {
+ this.plateMaterial_list = res.data
}
})
- this.queryParams.params.vehicleFunction = bb.name
- this.queryParams.params.vehicleFunctionKey = bb.value
},
resetState() {
this.viewState = 1
@@ -229,19 +241,22 @@ export default {
case 'doDel':
this.doDel()
break
+ case 'doClose':
+ this.doClose()
+ break
default:
break
}
},
- toAdd(row) {
+ toAdd() {
this.viewState = 2
- this.$refs['divAdd'].showAdd()
+ this.$refs['divAdd'].showAdd(this.queryParams.params.createOrgSid)
},
toEdit(row) {
this.viewState = 3
this.$refs['divAdd'].showEdit(row)
},
- doDel(row) {
+ doDel() {
if (this.multipleSelection.length === 0) {
this.$message({
showClose: true,
@@ -274,7 +289,7 @@ export default {
message: resp.msg,
showClose: true
})
- _this.loadList()
+ _this.init()
}).catch((e) => {
loading.close()
})
@@ -283,7 +298,7 @@ export default {
},
dosearch() {
this.queryParams.current = 1
- this.loadList()
+ this.init()
},
resetQuery() {
this.queryParams = {
@@ -291,21 +306,23 @@ export default {
size: 10,
total: 0,
params: {
- vehicleFunction: '',
- vehicleFunctionKey: '',
- refitMethod: '',
+ vehicleTypeKey: '',
+ installNameKey: '',
+ refitMethodKey: '',
refitFactory: '',
- topName: '',
- topNameKey: '',
- overallDimension: ''
+ colorKey: '',
+ plateMaterial: '',
+ createOrgSid: '',
+ vinNo: '',
+ noticeModel: ''
}
}
- this.loadList()
+ this.init()
},
loadList() {
const _this = this
this.tableLoading = true
- req.listPage(this.queryParams).then((resp) => {
+ req.pagelist(this.queryParams).then((resp) => {
_this.tableLoading = false
const data = resp.data
_this.queryParams.total = data.total
@@ -327,6 +344,10 @@ export default {
toInfo(row) {
this.$refs['divinfo'].showInfo(row)
this.viewState = 4
+ },
+ doClose() {
+ this.$store.dispatch('tagsView/delView', this.$route)
+ this.$router.go(-1)
}
}
}