- {{
- isSearchShow ? '隐藏查询条件' :
- '显示查询条件'
- }}
+
+ {{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
@@ -17,9 +15,9 @@
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
index abd9a88d63..c1a1c25abd 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
@@ -42,7 +42,7 @@
@selection-change="handleSelectionChange">
+
查看
车型配置
@@ -53,22 +53,22 @@
{{ scope.row.modelName }}
-
+
{{ scope.row.vinNo }}
-
+
{{ scope.row.engineNo }}
-
+
{{ scope.row.locationName }}
-
+
{{ scope.row.vehicleStateValue }}
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
index a1e50576b7..fd659c63b8 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
@@ -230,6 +230,7 @@ import {
import { selectListOrg } from '@/api/cheliang/basemanufacturer'
import { typeValues } from '@/api/cheliang/dictcommons'
import { setChe } from '@/utils/baocun'
+import { getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
// import { getFileType, parseDate, parseTime, ConvertMenuState } from "@/utils";
// import { findButtonByUserId } from '@/api/sys/permission'
export default {
@@ -597,9 +598,21 @@ export default {
// this.temp.modelConfigSid = e.configurationItemsSid
this.getModelConfig(this.temp.modelSid)
},
+ getPathSid() {
+ const userSid = window.sessionStorage.getItem('userSid')
+ getPathSidByUserSid({userSid:userSid}).then((res) => {
+ if (res.code === '200') {
+ this.listQuery.params.createOrgSId = res.data
+ this.useOrg = res.data
+ }
+ })
+ },
// 根据车型获取常用配置
getModelConfig(modelSid) {
- getListByVeSid({ modelSid: modelSid }).then((response) => {
+ getListByVeSid({
+ modelSid: modelSid,
+ userSid:window.sessionStorage.getItem('userSid')
+ }).then((response) => {
console.log('常用配置', response)
if (response.code === '200') {
this.modelConfig_list = response.data
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue
index 1311181244..d7c704bb87 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue
@@ -456,9 +456,6 @@ export default {
const sid = this.sids[0]
const row = this.row
this.$refs['divadd'].showEdit(sid, row)
- // this.$router.push({
- // path: `/cheliang/hegezhengtaizhangAdd/${this.sids[0]}`
- // })
} else if (this.sids.length > 1) {
this.$notify({
title: '提示',
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue
new file mode 100644
index 0000000000..1a7efc1e1e
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue
@@ -0,0 +1,361 @@
+
+
+
+
+
+
+
+
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue
new file mode 100644
index 0000000000..bbcefe2773
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue
@@ -0,0 +1,315 @@
+
+
+
+
+
+
+
+ {{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
+
+
+
+
+
+
+
+
+ 至
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+ 存放地点变更申请列表
+
+
+
+
+ 办理
+ 查看
+
+
+
+
+ 上传
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengInfo.vue
new file mode 100644
index 0000000000..058784d570
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengInfo.vue
@@ -0,0 +1,190 @@
+
+
+
+ {{ viewTitle }}
+
+ 保存
+ 返回
+
+
+
+
+
+ 现存放地点
+
+
+
+
+
+
+ 目标存放地点
+
+
+
+
+
+
+
+
+ 车架号
+
+
+
+
+
+
+
+
+ 变更原因
+
+
+
+
+
+
+ 申请费用
+
+
+
+
+
+
+ *经办人
+
+
+
+
+ 保险状态
+
+
+ 否
+ 是
+
+
+
+
+ 车辆存放地点变更申请
+
+
+
+
+
+ 申请日期：
+ {{ temp.createDate }}
+
+
+ 申请人：
+ {{ temp.staffName }}
+
+
+
+
+
+
+
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAdd.vue
new file mode 100644
index 0000000000..03bd515d89
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAdd.vue
@@ -0,0 +1,247 @@
+
+
+
+ {{ viewTitle }}
+
+ 返回
+
+
+
+
+
+ 现存放地点
+
+
+ {{temp.xian}}
+
+
+ 目标存放地点
+
+
+ {{temp.mu}}
+
+
+
+
+ 车架号
+
+
+ {{temp.vinNo}}
+
+
+
+
+ 变更原因
+
+
+ {{temp.carModel}}
+
+
+
+
+ 申请费用
+
+
+ {{temp.carModel}}
+
+
+
+
+ *经办人
+
+
+ {{temp.carModel}}
+
+
+ 保险状态
+
+
+ {{temp.isTerminal}}
+
+
+
+
+ 车辆存放地点变更申请
+
+
+
+
+
+ 申请日期：
+ {{ temp.createDate }}
+
+
+ 申请人：
+ {{ temp.staffName }}
+
+
+
+
+
+
+
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAlready.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAlready.vue
new file mode 100644
index 0000000000..2761cf6888
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAlready.vue
@@ -0,0 +1,261 @@
+
+
+
+ {{ viewTitle }}
+
+ 保存
+ 返回
+
+
+
+
+
+ 入库日期
+
+
+
+
+ 入库人
+
+
+ {{temp.person}}
+
+
+
+
+ 车架号
+
+
+ {{temp.vinNo}}
+
+
+ 库位
+
+
+
+
+
+
+
+
+ 附件
+
+
+
+
+
+
+ 车辆入库
+
+
+
+
+
+
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAwait.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAwait.vue
new file mode 100644
index 0000000000..de002f40a3
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAwait.vue
@@ -0,0 +1,274 @@
+
+
+
+
+
+
+ 待入库
+ 已入库
+
+
+
+ {{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+ 车辆列表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue
new file mode 100644
index 0000000000..9b0528036c
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue
@@ -0,0 +1,277 @@
+
+
+
+
+
+
+ 待入库
+ 已入库
+
+
+
+ {{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+ 车辆列表
+
+
+
+
+
+ 入库
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
new file mode 100644
index 0000000000..61e2ee2a6a
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
@@ -0,0 +1,276 @@
+
+
+
+
+
+
+
+ {{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+ 车辆列表
+
+
+
+
+
+ 验车
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAlready.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAlready.vue
new file mode 100644
index 0000000000..40f0ce7d10
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAlready.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue
new file mode 100644
index 0000000000..340596d5d3
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue
@@ -0,0 +1,171 @@
+
+
+
+ {{ viewTitle }}
+
+ 保存
+ 返回
+
+
+
+
+
+
+
+
+
+ 厂家验车单照片
+
+
+
+
+
+
+ 验车情况说明
+
+
+
+
+
+
+
+
+ 验车单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 验车相关照片
+
+
+ ![]()
+
+
+
+
+
+
+
diff --git a/anrui-system-ui/src/layout/components/Navbar.vue b/anrui-system-ui/src/layout/components/Navbar.vue
index 6af326535f..dde845e48b 100644
--- a/anrui-system-ui/src/layout/components/Navbar.vue
+++ b/anrui-system-ui/src/layout/components/Navbar.vue
@@ -3,7 +3,8 @@
+
+
+
+ {{ viewTitle }}
+
+ 返回
+
+
+
+
+
+ ![]()
+
+
+
+
+ 厂家验车单照片
+
+
+ ![]()
+
+
+
+
+ 验车情况说明
+
+
+ {{temp.remarks}}
+
+
+
+
+ 验车单
+
+
+
+
+ {{ temp.reason }}
+
+
+
+
+ {{ temp.money }}
+
+
+
+
+
+
+ {{ temp.money }}
+
+
+
+
+
+
+ {{ temp.money }}
+
+
+
+
+ 验车相关照片
+ 安瑞集团信息化平台
- 
返回首页
@@ -20,13 +21,16 @@ export default {
Orgname:'',
departmentName:'',
name:'',
- year:''
+ year:'',
+ pNameAndDepartmentNameAndPostName:'',
}
},
mounted(){
this.Orgname = window.sessionStorage.getItem('Orgname')
this.departmentName = window.sessionStorage.getItem('departmentName')
this.name = window.sessionStorage.getItem('name')
+ this.pNameAndDepartmentNameAndPostName = window.sessionStorage.getItem('pNameAndDepartmentNameAndPostName')
+ this.name = window.sessionStorage.getItem('name')
var nowDate = new Date()
this.year = nowDate.getFullYear()
},
From a34419ccf534187be4e01a6dc7f50431a9c4f8ac Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 16 Jun 2022 09:32:06 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E4=BB=B7?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=E9=80=89=E6=8B=A9=E8=BD=A6?=
=?UTF-8?q?=E5=9E=8B=E6=97=B6=E9=A1=B5=E9=9D=A2=E5=8A=A0=E8=BD=BD=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=92=8C?=
=?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tiaojiaguanli/chexingbyconfiguration.vue | 22 +++++++++++--------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue
index 5cfde34f2f..341e803fd4 100644
--- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue
@@ -13,11 +13,11 @@
{{ searchxianshitit }}
-
-
+
-
-
+
+
@@ -97,6 +104,7 @@ import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import cunfangdidianbiangengAdd from '@/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd'
import cunfangdidianbiangengInfo from '@/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengInfo'
+import upload from '../../../components/uploadFile/upload_chexing'
export default {
name: 'cunfangdidianbiangeng',
@@ -105,7 +113,8 @@ export default {
Pagination,
pageye,
cunfangdidianbiangengAdd,
- cunfangdidianbiangengInfo
+ cunfangdidianbiangengInfo,
+ upload
},
data() {
@@ -114,6 +123,9 @@ export default {
viewState: 1, // 1、列表 2、添加 3、修改 4、查看
isSearchShow: false,
tableLoading: false,
+ dialogImgVisible: false,
+ srcList: [],
+ imgList:[],
multipleSelection:[],
sids:[],
dataList: [],
@@ -300,8 +312,9 @@ export default {
handleUpload(){
},
- handleCheckImg(){
-
+ handleCheckImg(row){
+ this.dialogImgVisible = true
+ // this.srcList = row.vehicleModelUrls
},
// 车型名称下拉框
getModelName() {
@@ -358,4 +371,8 @@ export default {
.tab-header /deep/ .el-form-item {
margin-bottom: 10px;
}
+.upload_img {
+ display: inline-block;
+ padding-right: 10px;
+}
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue
index bbcefe2773..40b0aa8d54 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue
@@ -9,7 +9,7 @@
{{Orgname}} 欢迎, {{name}}
+ +欢迎您，{{pNameAndDepartmentNameAndPostName}} {{name}}
返回首页
@@ -20,13 +21,16 @@ export default {
Orgname:'',
departmentName:'',
name:'',
- year:''
+ year:'',
+ pNameAndDepartmentNameAndPostName:'',
}
},
mounted(){
this.Orgname = window.sessionStorage.getItem('Orgname')
this.departmentName = window.sessionStorage.getItem('departmentName')
this.name = window.sessionStorage.getItem('name')
+ this.pNameAndDepartmentNameAndPostName = window.sessionStorage.getItem('pNameAndDepartmentNameAndPostName')
+ this.name = window.sessionStorage.getItem('name')
var nowDate = new Date()
this.year = nowDate.getFullYear()
},
From a34419ccf534187be4e01a6dc7f50431a9c4f8ac Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 16 Jun 2022 09:32:06 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E4=BB=B7?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=E9=80=89=E6=8B=A9=E8=BD=A6?=
=?UTF-8?q?=E5=9E=8B=E6=97=B6=E9=A1=B5=E9=9D=A2=E5=8A=A0=E8=BD=BD=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=92=8C?=
=?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tiaojiaguanli/chexingbyconfiguration.vue | 22 +++++++++++--------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue
index 5cfde34f2f..341e803fd4 100644
--- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue
@@ -13,11 +13,11 @@
@@ -72,13 +72,15 @@ export default {
datalist: [],
number: '',
listLoading: false,
+ userOrgSid: '',
listQuery: {
current: 1,
size: 10,
params: {
- contractNo: '',
- customerName: '',
+ vehicleAlias: '',
+ configName: '',
useOrgSid: '',
+ vehicleStateValue: '库存',
sidList: []
},
total: 1
@@ -125,9 +127,10 @@ export default {
current: 1,
size: 10,
params: {
- contractNo: '',
- customerName: '',
- useOrgSid: '',
+ vehicleAlias: '',
+ configName: '',
+ useOrgSid: this.userOrgSid,
+ vehicleStateValue: '库存',
sidList: []
},
total: 0
@@ -157,6 +160,7 @@ export default {
this.listQuery.params.sidList = []
}
this.listQuery.params.useOrgSid = userOrgSid
+ this.userOrgSid = userOrgSid
this.getList()
},
// 添加修改返回
From 34657083d7b57e6e843f1683071a6473b326840c Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Thu, 16 Jun 2022 10:03:58 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=94=80?=
=?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E5=AE=8C=E5=96=84=E5=8F=8Apc?=
=?UTF-8?q?=E7=AB=AF=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../PcBaseVehicleOrderCountQuery.java | 4 +-
.../BaseVehicleModelFeign.java | 14 +++---
.../BaseVehicleModelFeignFallback.java | 6 ++-
.../biz/basevehicle/BaseVehicleService.java | 11 +++--
.../BaseVehicleModelRest.java | 24 +++++----
.../BaseVehicleModelService.java | 49 +++++++++++--------
.../BusSalesOrderModelDetailsVo.java | 4 +-
.../bussalesorder/BusSalesOrderService.java | 9 +++-
.../BusSalesOrderModelMapper.xml | 3 +-
.../BusSalesOrderModelService.java | 20 ++++++++
10 files changed, 95 insertions(+), 49 deletions(-)
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderCountQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderCountQuery.java
index 1107eecd96..9e76d2e5f3 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderCountQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderCountQuery.java
@@ -22,7 +22,7 @@ public class PcBaseVehicleOrderCountQuery implements Query {
@ApiModelProperty(value = "客户sid")
private String customerSid;
- @ApiModelProperty(value = "类型：1意向车型选择、2虚拟订单选择、3车型选择")
- private Integer type;
+/* @ApiModelProperty(value = "类型：1意向车型选择、2虚拟订单选择、3车型选择")
+ private Integer type;*/
}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java
index 65c81155c5..61876ce814 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java
@@ -1,8 +1,6 @@
package com.yxt.anrui.base.api.basevehiclemodel;
-import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixDto;
import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.FileUploadResult;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
@@ -39,7 +37,8 @@ public interface BaseVehicleModelFeign {
/**
* 分页查询
- *listPageByVehmodel
+ * listPageByVehmodel
+ *
* @param pagerQuery
* @return
*/
@@ -85,7 +84,7 @@ public interface BaseVehicleModelFeign {
@ApiOperation("删除、批量删除")
@DeleteMapping("/deleteBySids")
@ApiImplicitParam(name = "sids", value = "车型sid，若为多个sid，以逗号分隔")
- public ResultBean deleteBySids(@RequestParam("sids") String sids,@RequestParam("userSid") String userSid);
+ public ResultBean deleteBySids(@RequestParam("sids") String sids, @RequestParam("userSid") String userSid);
/**
* 详情
@@ -95,7 +94,7 @@ public interface BaseVehicleModelFeign {
*/
@ApiOperation("详情")
@GetMapping("/details/{sid}/{useOrgSid}")
- public ResultBean details(@PathVariable("sid") String sid,@PathVariable("useOrgSid") String useOrgSid);
+ public ResultBean details(@PathVariable("sid") String sid, @PathVariable("useOrgSid") String useOrgSid);
/**
* 修改回显
@@ -105,7 +104,7 @@ public interface BaseVehicleModelFeign {
*/
@ApiOperation("修改回显")
@GetMapping("/getAll/{sid}/{userSid}")
- public ResultBean getAll(@PathVariable("sid") String sid,@PathVariable("userSid") String userSid);
+ public ResultBean getAll(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid);
/**
@@ -203,4 +202,7 @@ public interface BaseVehicleModelFeign {
@PostMapping("/selectVehModelByConfigSid")
public ResultBean> selectVehModelByConfigSid(@RequestBody PagerQuery pagerQuery);
+ @ApiOperation("根据车型sid查询车型信息")
+ @GetMapping("/selectDetails/{modelSid}")
+ ResultBean selectDetails(@PathVariable(value = "modelSid") String modelSid);
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java
index 8d3202ce72..5147f90599 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java
@@ -1,7 +1,6 @@
package com.yxt.anrui.base.api.basevehiclemodel;
import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.FileUploadResult;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
@@ -111,6 +110,11 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign {
return null;
}
+ @Override
+ public ResultBean selectDetails(String modelSid) {
+ return null;
+ }
+
/*@Override
public ResultBean> selectPage(PagerQuery query) {
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
index 13b3dcea03..8f440eea0a 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@@ -466,7 +466,7 @@ public class BaseVehicleService extends MybatisBaseService> selectAppList(String modelSid, String configSid, String orgSid) {
ResultBean> rb = ResultBean.fireFail();
List orderVoList = new ArrayList<>();
- orderVoList = baseMapper.selectAppList(modelSid, configSid, orgSid,VehicleState.StockEnum.STOCK.getCode());
+ orderVoList = baseMapper.selectAppList(modelSid, configSid, orgSid, VehicleState.StockEnum.STOCK.getCode());
if (orderVoList.isEmpty()) {
return rb.setData(orderVoList);
}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java
index 646267716c..3911c638bc 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java
@@ -7,7 +7,6 @@ import com.yxt.anrui.base.api.basevehiclemodel.*;
import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendix;
import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixVo;
import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
-import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
@@ -117,7 +116,7 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
return rb.setMsg("文件为空");
}
rb = fileUploadComponent.uploadFile(file);
- FileUploadResult data = (FileUploadResult)rb.getData();
+ FileUploadResult data = (FileUploadResult) rb.getData();
BaseVehicleModelAppendix baseVehicleModelAppendix = new BaseVehicleModelAppendix();
baseVehicleModelAppendix.setModelSid(modelSid);
baseVehicleModelAppendix.setFilePath(data.getFilePath());
@@ -126,17 +125,17 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
}
@Override
- public ResultBean deleteBySids(String sids,String userSid) {
+ public ResultBean deleteBySids(String sids, String userSid) {
List sidList = Arrays.asList(sids.split(","));
for (String sid : sidList) {
int i = baseVehmodelConfigService.checkByModelSid(sid);
- if (i > 0){
+ if (i > 0) {
return ResultBean.fireFail().setMsg("该车型已有关联配置，无法删除");
}
ResultBean useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid);
String sid1 = useOrgByUserSid.getData().getSid();
int i1 = baseVehicleModelService.checkByCreateOrgAndModelSid(sid1, sid);
- if (i1 == 0){
+ if (i1 == 0) {
return ResultBean.fireFail().setMsg("该车型不属于当前分公司，无法删除");
}
int count = baseVehicleModelService.updateBySidIsDelete(sid);
@@ -153,9 +152,9 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
}
@Override
- public ResultBean details(String sid,String useOrgSid) {
+ public ResultBean details(String sid, String useOrgSid) {
ResultBean rb = ResultBean.fireFail();
- BaseVehicleModelDetailsVo vo = baseVehicleModelService.details(sid,useOrgSid);
+ BaseVehicleModelDetailsVo vo = baseVehicleModelService.details(sid, useOrgSid);
if (vo == null) {
return rb.setMsg("该车型信息不存在");
}
@@ -163,20 +162,20 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
}
@Override
- public ResultBean getAll(String sid,String userSid) {
+ public ResultBean getAll(String sid, String userSid) {
ResultBean rb = ResultBean.fireFail();
BaseVehicleModelSelectVo vo = baseVehicleModelService.getAll(sid);
if (vo == null) {
return rb.setMsg("该车型信息不存在");
}
int i3 = baseVehmodelConfigService.checkByModelSid(sid);
- if (i3 > 0){
+ if (i3 > 0) {
return rb.setMsg("该车型已有关联配置，无法修改");
}
ResultBean useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid);
String sid1 = useOrgByUserSid.getData().getSid();
int i4 = baseVehicleModelService.checkByCreateOrgAndModelSid(sid1, sid);
- if (i4 == 0){
+ if (i4 == 0) {
return rb.setMsg("该车型不属于当前分公司，无法修改");
}
return rb.success().setData(vo);
@@ -279,6 +278,11 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
return rb.success().setData(pv1);
}
+ @Override
+ public ResultBean selectDetails(String modelSid) {
+ return baseVehicleModelService.selectDetails(modelSid);
+ }
+
// @Override
// public ResultBean> selectPage(PagerQuery query) {
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java
index 4293e49b88..c8c8ce9a4a 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java
@@ -85,7 +85,7 @@ public class BaseVehicleModelService extends MybatisBaseService qw = new QueryWrapper<>();
if (pagerQuery != null) {
qw.eq("bvm.isDelete", "0");
- qw.like("bvb.useOrg",pagerQuery.getCreateOrgSId());
+ qw.like("bvb.useOrg", pagerQuery.getCreateOrgSId());
if (StringUtils.isNotBlank(pagerQuery.getModelSid())) {//车型sid
qw.eq("bvm.sid", pagerQuery.getModelSid());
}
@@ -141,7 +141,7 @@ public class BaseVehicleModelService extends MybatisBaseService baseModelConfigVos = new ArrayList<>();
- List baseVehmodelConfigVos = baseVehmodelConfigService.getVehModByModelSid(sid,useOrgSid);
- if (baseVehmodelConfigVos.size() > 0){
+ List baseVehmodelConfigVos = baseVehmodelConfigService.getVehModByModelSid(sid, useOrgSid);
+ if (baseVehmodelConfigVos.size() > 0) {
for (BaseVehmodelConfigVo baseVehmodelConfigVo : baseVehmodelConfigVos) {
BaseModelConfigVo baseModelConfigVo = new BaseModelConfigVo();
String configurationItemsSid = baseVehmodelConfigVo.getConfigurationItemsSid();
@@ -278,9 +278,9 @@ public class BaseVehicleModelService extends MybatisBaseService> getListByVeSid(String vehicleSid,String userSid) {
+ public List> getListByVeSid(String vehicleSid, String userSid) {
ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
- return baseMapper.getListByVeSid(vehicleSid,resultBean.getData());
+ return baseMapper.getListByVeSid(vehicleSid, resultBean.getData());
}
public BaseVehicleModelSelectVo getAll(String sid) {
@@ -329,7 +329,7 @@ public class BaseVehicleModelService extends MybatisBaseService> selectDownPlusByModelName(String modelName) {
QueryWrapper> qw = new QueryWrapper<>();
- qw.eq("bvm.isDelete",0);
+ qw.eq("bvm.isDelete", 0);
if (StringUtils.isNotBlank(modelName)) {
qw.like("bvm.modelName", modelName);
}
@@ -502,11 +502,11 @@ public class BaseVehicleModelService extends MybatisBaseService 0){
+ if (i > 0) {
return rb.setMsg("该车型信息已存在");
}
entity.setCreateOrg(sid2);
@@ -532,11 +532,11 @@ public class BaseVehicleModelService extends MybatisBaseService 0){
+ int i = baseMapper.checkUpdateByModelName(modelName, sid);
+ if (i > 0) {
return rb.setMsg("该车型信息已存在");
}
int i2 = updateBySid(dto.toMap(), sid);
@@ -573,22 +573,22 @@ public class BaseVehicleModelService extends MybatisBaseService wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper qw = new QueryWrapper<>();
- qw.eq("bvm.carBrand",query.getBrandSid());
- if (StringUtils.isNotBlank(query.getModelName())){
- qw.like("bvm.modelName",query.getModelName());
+ qw.eq("bvm.carBrand", query.getBrandSid());
+ if (StringUtils.isNotBlank(query.getModelName())) {
+ qw.like("bvm.modelName", query.getModelName());
}
- if (StringUtils.isNotBlank(query.getConfigName())){
- qw.like("bmc.configName",query.getConfigName());
+ if (StringUtils.isNotBlank(query.getConfigName())) {
+ qw.like("bmc.configName", query.getConfigName());
}
return qw;
}
public IPage selectVehModelByConfigSid(PagerQuery pagerQuery) {
List baseVehicleModelVos = new ArrayList<>();
- IPage baseVehicleModelVo = new Page<>();
+ IPage baseVehicleModelVo = new Page<>();
BaseVehicleModelQuery params = pagerQuery.getParams();
IPage page = PagerUtil.queryToPage(pagerQuery);
- List baseVehmodelConfigVos = baseVehmodelConfigService.getListByConfigSidAndUseOrgSid(params.getConfigSid(),params.getCreateOrgSId());
+ List baseVehmodelConfigVos = baseVehmodelConfigService.getListByConfigSidAndUseOrgSid(params.getConfigSid(), params.getCreateOrgSId());
for (BaseVehmodelConfigVo baseVehmodelConfigVo : baseVehmodelConfigVos) {
String modelSid = baseVehmodelConfigVo.getModelSid();
params.setModelSid(modelSid);
@@ -610,6 +610,15 @@ public class BaseVehicleModelService extends MybatisBaseService selectDetails(String modelSid) {
+ ResultBean rb = ResultBean.fireFail();
+ BaseVehicleModel baseVehicleModel = fetchBySid(modelSid);
+ if (baseVehicleModel == null) {
+ return rb.setData(new BaseVehicleModel());
+ }
+ return rb.success().setData(baseVehicleModel);
}
}
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java
index 1376cbf241..ab1e2051a5 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java
@@ -50,9 +50,7 @@ import lombok.Data;
@ApiModel(value = "销售订单-主车车型 视图数据详情", description = "销售订单-主车车型 视图数据详情")
public class BusSalesOrderModelDetailsVo implements Vo {
- @ApiModelProperty(value = "类型")
- private Integer type;
-
+ private static final long serialVersionUID = -6137096646061858887L;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("配置sid")
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index 6eb8bac883..fb70be45ef 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -290,6 +290,13 @@ public class BusSalesOrderService extends MybatisBaseService imageList = Arrays.asList(busSalesOrderMakeupDetailsVo.getContractPath().split(","));
+ if (!imageList.isEmpty()) {
+ busSalesOrderMakeupDetailsVo.setContractPath(imageList.get(0));
+ }
+
+ }
vo.setBusSalesOrderMakeup(busSalesOrderMakeupDetailsVo);
}
}
@@ -1048,7 +1055,7 @@ public class BusSalesOrderService extends MybatisBaseService
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
index f4862831d2..ab9de4a7b5 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
@@ -26,6 +26,8 @@
package com.yxt.anrui.buscenter.biz.bussalesordermodel;
import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
+import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppOrderInfoVo;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo;
@@ -78,6 +80,8 @@ public class BusSalesOrderModelService extends MybatisBaseService resultBean = baseVehicleModelFeign.selectDetails(dto.getOrderInfo().getModelSid());
+ if (resultBean.getSuccess()) {
+ brandSid = resultBean.getData().getCarBrand();
+ brandName = resultBean.getData().getBrandName();
+ modelAlias = resultBean.getData().getModelName();
+ }
//根据销售订单查询车型信息
BusSalesOrderModel busSalesOrderModel = baseMapper.selectBySalesSid(salesOrderSid);
if (busSalesOrderModel == null) {
@@ -149,11 +163,17 @@ public class BusSalesOrderModelService extends MybatisBaseService
Date: Thu, 16 Jun 2022 10:59:16 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=94=80?=
=?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E5=92=8Cpc=E7=AB=AF=E9=94=80?=
=?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E7=9B=B8=E4=BA=92=E8=B0=83=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/basevehmodelconfig/BaseVehmodelVo.java | 3 +++
.../BaseDiscountpackageService.java | 1 +
.../BaseVehmodelConfigMapper.xml | 2 +-
.../api/bussalesorder/BusSalesOrderAllDto.java | 4 ++--
.../bussalesordermodel/BusSalesOrderModel.java | 2 --
.../BusSalesOrderModelDto.java | 3 ---
.../BusSalesOrderPriceMapper.xml | 16 ++++++++--------
.../crmvehicledemand/CrmVehicledemandMapper.xml | 1 -
.../CrmVehicledemandService.java | 4 +++-
9 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java
index bdb929c4c5..c8d4909c48 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java
@@ -24,4 +24,7 @@ public class BaseVehmodelVo implements Vo {
@ApiModelProperty(value = "品牌sid")
private String brandSid;
+
+ @ApiModelProperty(value = "配置")
+ private String configName;
}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java
index 3ffb1a6106..ac311a9972 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java
@@ -318,6 +318,7 @@ public class BaseDiscountpackageService extends MybatisBaseService
@@ -31,8 +25,7 @@
label-position="right"
label-width="100%"
class="formadd"
- :rules="rules"
- >
+ :rules="rules">
+
+
出库申请
@@ -56,8 +49,7 @@
是否为终端客户：
+ >是否为终端客户：
diff --git a/anrui-scm/anrui-scm-ui/src/views/redirect/index.vue b/anrui-scm/anrui-scm-ui/src/views/redirect/index.vue
new file mode 100644
index 0000000000..db4c1d66d1
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/views/redirect/index.vue
@@ -0,0 +1,12 @@
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue
index 1a7efc1e1e..7154f3ce04 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue
@@ -61,9 +61,12 @@
+
- 上传
+ 查看
@@ -84,6 +87,10 @@
+
+
车辆存放地点变更申请
-
@@ -77,8 +77,10 @@
保险状态
- 否
- 是
+
+ 否
+ 是
+
diff --git a/anrui-system-ui/src/layout/components/TagsView/index.vue b/anrui-system-ui/src/layout/components/TagsView/index.vue
index 373543fa77..5c3d53e259 100644
--- a/anrui-system-ui/src/layout/components/TagsView/index.vue
+++ b/anrui-system-ui/src/layout/components/TagsView/index.vue
@@ -140,8 +140,7 @@ export default {
const { fullPath } = view
this.$nextTick(() => {
this.$router.replace({
- path: fullPath
- // path: '/redirect' + fullPath
+ path: '/redirect' + fullPath
})
})
})
diff --git a/anrui-system-ui/src/router/index.js b/anrui-system-ui/src/router/index.js
index 340fc97943..fd7a16d144 100644
--- a/anrui-system-ui/src/router/index.js
+++ b/anrui-system-ui/src/router/index.js
@@ -1,14 +1,23 @@
import Vue from 'vue'
import Router from 'vue-router'
+/* Layout */
+import Layout from '@/layout'
Vue.use(Router)
-/* Layout */
-import Layout from '@/layout'
/* 所有角色可以访问/没有权限要求的基页 */
export const constantRoutes = [
+ {
+ path: '/redirect',
+ component: Layout,
+ hidden: true,
+ children: [{
+ path: '/redirect/:path(.*)',
+ component: () => import('@/views/redirect/index.vue')
+ }]
+ },
{
path: '/',
redirect: 'login'
diff --git a/anrui-system-ui/src/views/redirect/index.vue b/anrui-system-ui/src/views/redirect/index.vue
new file mode 100644
index 0000000000..db4c1d66d1
--- /dev/null
+++ b/anrui-system-ui/src/views/redirect/index.vue
@@ -0,0 +1,12 @@
+
From fd20a4bf1261457aabd4688c88f57bf5d23bec3b Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 16 Jun 2022 11:30:00 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E4=B8=AD=E7=9A=84?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/router/modules/codemenu.js | 78 ++++++++-----------
1 file changed, 34 insertions(+), 44 deletions(-)
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 95cf5090d6..ba1a710368 100644
--- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
+++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
@@ -12,7 +12,7 @@ const codemenu = [
path: '/scminbound/index',
component: () => import('@/views/anruiscm/scminbound/scminbound.vue'),
name: 'ScmInboundIndex',
- meta: { title: '销售入库单' }
+ meta: { title: '销售入库单', noCache: true }
}]
},
{
@@ -26,7 +26,7 @@ const codemenu = [
path: '/scmotherinbound/index',
component: () => import('@/views/anruiscm/scmotherinbound/scmotherinbound.vue'),
name: 'ScmOtherInboundIndex',
- meta: { title: '其他入库单' }
+ meta: { title: '其他入库单', noCache: true }
}]
},
{
@@ -40,7 +40,7 @@ const codemenu = [
path: '/scmotheroutbound/index',
component: () => import('@/views/anruiscm/scmotheroutbound/scmotheroutbound.vue'),
name: 'ScmOtherOutboundIndex',
- meta: { title: '其他出库单' }
+ meta: { title: '其他出库单', noCache: true }
}]
},
{
@@ -54,7 +54,7 @@ const codemenu = [
path: '/scmoutbound/index',
component: () => import('@/views/anruiscm/scmoutbound/scmoutbound.vue'),
name: 'ScmOutboundIndex',
- meta: { title: '销售出库单' }
+ meta: { title: '销售出库单', noCache: true }
}]
},
{
@@ -68,7 +68,7 @@ const codemenu = [
path: '/scmrealtimeinventory/index',
component: () => import('@/views/anruiscm/scmrealtimeinventory/scmrealtimeinventory.vue'),
name: 'ScmRealTimeInventoryIndex',
- meta: { title: '即时库存表' }
+ meta: { title: '即时库存表', noCache: true }
}]
},
{
@@ -82,7 +82,7 @@ const codemenu = [
path: '/scmrejected/index',
component: () => import('@/views/anruiscm/scmrejected/scmrejected.vue'),
name: 'ScmRejectedIndex',
- meta: { title: '采购退料单' }
+ meta: { title: '采购退料单', noCache: true }
}]
},
{
@@ -96,7 +96,7 @@ const codemenu = [
path: '/scmreturn/index',
component: () => import('@/views/anruiscm/scmreturn/scmreturn.vue'),
name: 'ScmReturnIndex',
- meta: { title: '销售退货单' }
+ meta: { title: '销售退货单', noCache: true }
}]
},
@@ -111,7 +111,7 @@ const codemenu = [
path: '/scmmaterial/index',
component: () => import('@/views/anruiscm/scmmaterial/scmmaterial.vue'),
name: 'ScmMaterialIndex',
- meta: { title: '物料管理' }
+ meta: { title: '物料管理', noCache: true }
}]
},
// 存放地点
@@ -126,7 +126,7 @@ const codemenu = [
path: '/scmwarehouse/index',
component: () => import('@/views/anruiscm/scmwarehouse/scmwarehouse.vue'),
name: 'ScmWarehouseIndex',
- meta: { title: '存放地点' }
+ meta: { title: '存放地点', noCache: true }
}]
},
{
@@ -140,13 +140,13 @@ const codemenu = [
path: '/shangzhuang/shangzhuangguanli',
component: () => import('@/views/shangzhuang/shangzhuangguanli/shangzhuangguanli.vue'),
name: 'ShangZhuangGuanLi',
- meta: { title: '上装管理' }
+ meta: { title: '上装管理', noCache: true }
},
{
path: '/shangzhuang/shangzhuangjiansuo',
component: () => import('@/views/shangzhuang/shangzhuangjiansuo/shangzhuangjiansuoguanli.vue'),
name: 'ShangZhuangJianSuoGuanLi',
- meta: { title: '上装管理' }
+ meta: { title: '上装管理', noCache: true }
}]
},
// 合格证台账
@@ -161,7 +161,7 @@ const codemenu = [
path: '/hegezheng/hegezhengtaizhang',
component: () => import('@/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue'),
name: 'hegezhengtaizhang',
- meta: { title: '合格证台账' }
+ meta: { title: '合格证台账', noCache: true }
}]
},
@@ -177,7 +177,7 @@ const codemenu = [
path: '/caigoudingdan/index',
component: () => import('@/views/cheliang/cheliangcaigou/cheliangcaigou.vue'),
name: 'cheliangcaigou',
- meta: { title: '采购订单管理' }
+ meta: { title: '采购订单管理', noCache: true }
}]
},
@@ -192,13 +192,13 @@ const codemenu = [
path: '/guache/guacheguanli',
component: () => import('@/views/guache/guacheguanli/guacheguanli.vue'),
name: 'GuaCheJianSuoGuanLi',
- meta: { title: '挂车管理' }
+ meta: { title: '挂车管理', noCache: true }
},
{
path: '/guache/guachejiansuo',
component: () => import('@/views/guache/guachejiansuo/guachejiansuoguanli.vue'),
name: 'guachejiansuoguanli',
- meta: { title: '挂车管理' }
+ meta: { title: '挂车管理', noCache: true }
}
]
},
@@ -217,18 +217,14 @@ const codemenu = [
component: () =>
import('@/views/cheliang/chexing/chexing.vue'),
name: 'chexing',
- meta: {
- title: '车型管理'
- }
+ meta: { title: '车型管理', noCache: true }
},
{
path: '/cheliang/changyongpeizhi',
component: () =>
import('@/views/cheliang/chexingpeizhi/changyongpeizhi.vue'),
name: 'chexingpeizhi',
- meta: {
- title: '常用配置管理'
- }
+ meta: { title: '常用配置管理', noCache: true }
},
// 车辆台账
{
@@ -236,18 +232,14 @@ const codemenu = [
component: () =>
import('@/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue'),
name: 'cheliangtaizhang',
- meta: {
- title: '车辆台账'
- }
+ meta: { title: '车辆台账', noCache: true }
},
{
path: '/cheliang/chexingbaojia',
component: () =>
import('@/views/cheliang/chexingbaojia/daibaojiaguanli/daibaojia.vue'),
name: 'daibaojia',
- meta: {
- title: '车型报价'
- }
+ meta: { title: '车型报价', noCache: true }
},
// 车辆信息
@@ -256,9 +248,7 @@ const codemenu = [
component: () =>
import('@/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue'),
name: 'CheliangtaizhangInfo',
- meta: {
- title: '车辆信息'
- }
+ meta: { title: '车辆信息', noCache: true }
}
]
},
@@ -274,7 +264,7 @@ const codemenu = [
path: '/caigoutuiku/index',
component: () => import('@/views/supplychain/caigoutuiku/caigoutuiku.vue'),
name: 'caigoutuiku',
- meta: { title: '采购退库' }
+ meta: { title: '采购退库', noCache: true }
}]
},
{
@@ -289,7 +279,7 @@ const codemenu = [
path: '/vehicle/cheliangpaichan',
component: () => import('@/views/supplychain/cheliangpaichan/cheliangpaichan.vue'),
name: 'cheliangpaichan',
- meta: { title: '车辆排产管理' }
+ meta: { title: '车辆排产管理', noCache: true }
}
]
},
@@ -305,7 +295,7 @@ const codemenu = [
path: '/supplychain/changjiaxitong',
component: () => import('@/views/supplychain/changjiaxitong/manufacturers.vue'),
name: 'changjiaxitongrenkuan',
- meta: { title: '厂家系统认款' }
+ meta: { title: '厂家系统认款', noCache: true }
}
]
},
@@ -321,7 +311,7 @@ const codemenu = [
path: '/supplychain/cheliangneigou',
component: () => import('@/views/supplychain/cheliangneigou/cheliangneigouguanli.vue'),
name: 'cheliangneigouguanli',
- meta: { title: '内购申请管理' }
+ meta: { title: '内购申请管理', noCache: true }
}
]
},
@@ -337,7 +327,7 @@ const codemenu = [
path: '/baseoutsourcingapplication/index',
component: () => import('@/views/baseoutsourcingapplication/baseoutsourcingapplication.vue'),
name: 'baseoutsourcingapplication',
- meta: { title: '车辆外采' }
+ meta: { title: '车辆外采', noCache: true }
}
]
},
@@ -353,7 +343,7 @@ const codemenu = [
path: '/examine/chukushenhe',
component: () => import('@/views/examinePage/chukushenhe/chukushenhe.vue'),
name: 'chukushenhe',
- meta: { title: '出库审核' }
+ meta: { title: '出库审核', noCache: true }
}
]
},
@@ -369,31 +359,31 @@ const codemenu = [
path: '/kucunguanli/tiaojiaguanli',
component: () => import('@/views/kucunguanli/tiaojiaguanli/priceguanli.vue'),
name: 'priceguanli',
- meta: { title: '调价申请管理' }
+ meta: { title: '调价申请管理', noCache: true }
},
{
path: '/kucunguanli/panku',
component: () => import('@/views/kucunguanli/panku/pankuguanli.vue'),
name: 'pankuguanli',
- meta: { title: '盘库管理' }
+ meta: { title: '盘库管理', noCache: true }
},
{
path: '/kucunguanli/cheliangweihu/richangxunjian',
component: () => import('@/views/kucunguanli/cheliangweihu/richangxunjian/cheliangxunjian.vue'),
name: 'cheliangxunjianjiluchaxun',
- meta: { title: '日常巡检' }
+ meta: { title: '日常巡检', noCache: true }
},
{
path: '/kucunguanli/yancheguanli',
component: () => import('@/views/supplychain/yancheguanli/yancheguanli.vue'),
name: 'yancheguanli',
- meta: { title: '验车管理' }
+ meta: { title: '验车管理', noCache: true }
},
{
path: '/kucunguanli/rukuguanli',
component: () => import('@/views/supplychain/rukuguanli/rukuguanliAwait.vue'),
name: 'rukuguanliawait',
- meta: { title: '入库车辆管理' }
+ meta: { title: '入库车辆管理', noCache: true }
}
]
},
@@ -409,7 +399,7 @@ const codemenu = [
path: '/ruzhang/ruzhangguanli',
component: () => import('@/views/ruzhang/ruzhangguanli/ruzhangguanli.vue'),
name: 'ruzhangguanli',
- meta: { title: '入账管理' }
+ meta: { title: '入账管理', noCache: true }
}]
},
// 未售买断管理
@@ -424,7 +414,7 @@ const codemenu = [
path: '/weishoumaiduan/weishoumaiduanguanli',
component: () => import('@/views/weishoumaiduan/weishoumaiduanguanli/unsoldguanli.vue'),
name: 'unsoldguanli',
- meta: { title: '未售买断申请管理' }
+ meta: { title: '未售买断申请管理', noCache: true }
}]
},
// 验车管理
@@ -469,7 +459,7 @@ const codemenu = [
path: '/cunfangdidianbiangengguanli/cunfangdidianbiangeng',
component: () => import('@/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue'),
name: 'cunfangdidianbiangeng',
- meta: { title: '存放地点变更申请管理' }
+ meta: { title: '存放地点变更申请管理', noCache: true }
}]
},
// 流程审批
From 35e1c3af5d60990738f1ce91dc30ed98ca87a2dc Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 16 Jun 2022 11:31:41 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=B7=A1=E6=A3=80?=
=?UTF-8?q?=E5=8D=95=E4=B8=AD=E4=B8=8A=E4=BC=A0=E7=9B=B8=E5=85=B3=E7=85=A7?=
=?UTF-8?q?=E7=89=87=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../anrui-scm-ui/src/api/portal/Upload.js | 6 +-
.../src/components/uploadFile/FaImages.vue | 266 +++++++++++-------
.../richangxunjian/xunjiandan.vue | 9 +-
3 files changed, 182 insertions(+), 99 deletions(-)
diff --git a/anrui-scm/anrui-scm-ui/src/api/portal/Upload.js b/anrui-scm/anrui-scm-ui/src/api/portal/Upload.js
index 906d19d80c..0dc738ccf5 100644
--- a/anrui-scm/anrui-scm-ui/src/api/portal/Upload.js
+++ b/anrui-scm/anrui-scm-ui/src/api/portal/Upload.js
@@ -1,10 +1,8 @@
import request from '@/utils/request'
import qs from 'qs'
-// 统一请求路径前缀
-const base = process.env.VUE_APP_URL
-// 文件上传接口
-export const uploadFile = '/api/portal/file/upload'
+// 文件上传接口
+export const uploadFile = '/api/base/file/upload'
// 上传图片
// export function imageUpload(data) {
diff --git a/anrui-scm/anrui-scm-ui/src/components/uploadFile/FaImages.vue b/anrui-scm/anrui-scm-ui/src/components/uploadFile/FaImages.vue
index e47d3a9c87..a213321665 100644
--- a/anrui-scm/anrui-scm-ui/src/components/uploadFile/FaImages.vue
+++ b/anrui-scm/anrui-scm-ui/src/components/uploadFile/FaImages.vue
@@ -1,53 +1,92 @@
{{ formobj.vinNo }}
+
+
@@ -67,9 +69,13 @@
-
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjiandan.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjiandan.vue
index 4eac58f4f8..38e6f9a29a 100644
--- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjiandan.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjiandan.vue
@@ -55,7 +55,9 @@
-
-
-
-
- 相关照片
-