From 61c8d1cb27a1499c1174c6b94a31ae506cdb9e4c Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 11 Jun 2024 11:54:18 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=A2=E6=88=B7?=
=?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../customermanagement/customermanagement.vue | 2 +-
.../customermanagementAdd.vue | 10 +++---
.../relation/vehicleAdd.vue | 33 ++++++++++---------
.../relation/vehicleInfo.vue | 20 +++++------
4 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/yxt-as-ui/src/views/client/customermanagement/customermanagement.vue b/yxt-as-ui/src/views/client/customermanagement/customermanagement.vue
index a9e78cf34d..dac18fd162 100644
--- a/yxt-as-ui/src/views/client/customermanagement/customermanagement.vue
+++ b/yxt-as-ui/src/views/client/customermanagement/customermanagement.vue
@@ -27,7 +27,7 @@
- 至
+ 至
diff --git a/yxt-as-ui/src/views/client/customermanagement/customermanagementAdd.vue b/yxt-as-ui/src/views/client/customermanagement/customermanagementAdd.vue
index 8cc7f85c25..9c119fc7e3 100644
--- a/yxt-as-ui/src/views/client/customermanagement/customermanagementAdd.vue
+++ b/yxt-as-ui/src/views/client/customermanagement/customermanagementAdd.vue
@@ -12,8 +12,8 @@
- *客户名称
-
+ *客户名称
+
客户类型
@@ -22,7 +22,7 @@
- *联系电话
+ *联系电话
@@ -34,7 +34,7 @@
公司名称
-
+
@@ -110,7 +110,7 @@
证件号码
-
+
diff --git a/yxt-as-ui/src/views/client/customermanagement/relation/vehicleAdd.vue b/yxt-as-ui/src/views/client/customermanagement/relation/vehicleAdd.vue
index fbc2a7f87a..fa1e4f0648 100644
--- a/yxt-as-ui/src/views/client/customermanagement/relation/vehicleAdd.vue
+++ b/yxt-as-ui/src/views/client/customermanagement/relation/vehicleAdd.vue
@@ -13,12 +13,12 @@
车辆信息
- 车牌号
-
+ *车牌号
+
- 车架号
-
+ *车架号
+
@@ -37,13 +37,13 @@
- 行驶里程
+ 行驶里程(Km)
- 上次保养里程
+ 上次保养里程(Km)
@@ -70,17 +70,17 @@
保养到期明细
- 行驶里程
+ 行驶里程(Km)
- 每月公里
+ 每月公里(Km)
- 滤芯到期公里
+ 滤芯到期公里(Km)
@@ -90,7 +90,7 @@
- 机油到期公里
+ 机油到期公里(Km)
@@ -100,7 +100,7 @@
- 齿轮油到期公里
+ 齿轮油到期公里(Km)
@@ -110,7 +110,7 @@
- 宝轮到期公里
+ 宝轮到期公里(Km)
@@ -120,7 +120,7 @@
- 风扇皮带到期公里
+ 风扇皮带到期公里(Km)
@@ -130,7 +130,7 @@
- 刹车片带到期公里
+ 刹车片带到期公里(Km)
@@ -189,7 +189,10 @@ export default {
brakepads_km: '',
brakepads_date: ''
},
- rules: {}
+ rules: {
+ vehMark: [{ required: true, message: '车牌号不能为空', trigger: 'blur' }],
+ vinNo: [{ required: true, message: '车架号不能为空', trigger: 'blur' }]
+ }
}
},
methods: {
diff --git a/yxt-as-ui/src/views/client/customermanagement/relation/vehicleInfo.vue b/yxt-as-ui/src/views/client/customermanagement/relation/vehicleInfo.vue
index 7557342566..083856d156 100644
--- a/yxt-as-ui/src/views/client/customermanagement/relation/vehicleInfo.vue
+++ b/yxt-as-ui/src/views/client/customermanagement/relation/vehicleInfo.vue
@@ -36,13 +36,13 @@
{{ formobj.buyDate }}
- 行驶里程
+ 行驶里程(Km)
{{ formobj.mileage }}
- 上次保养里程
+ 上次保养里程(Km)
{{ formobj.lastMileage }}
@@ -69,17 +69,17 @@
保养到期明细
- 行驶里程
+ 行驶里程(Km)
{{ formobj.currentMileage }}
- 每月公里
+ 每月公里(Km)
{{ formobj.monthKm }}
- 滤芯到期公里
+ 滤芯到期公里(Km)
{{ formobj.filter_km }}
@@ -89,7 +89,7 @@
- 机油到期公里
+ 机油到期公里(Km)
{{ formobj.engineoil_km }}
@@ -99,7 +99,7 @@
- 齿轮油到期公里
+ 齿轮油到期公里(Km)
{{ formobj.gearoil_km }}
@@ -109,7 +109,7 @@
- 宝轮到期公里
+ 宝轮到期公里(Km)
{{ formobj.treasurewheel_km }}
@@ -119,7 +119,7 @@
- 风扇皮带到期公里
+ 风扇皮带到期公里(Km)
{{ formobj.fanbelt_km }}
@@ -129,7 +129,7 @@
- 刹车片带到期公里
+ 刹车片带到期公里(Km)
{{ formobj.brakepads_km }}
From a18b072ffc23e8d706758004564c3b2a74392f6e Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 11 Jun 2024 14:27:41 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=A2=E6=88=B7?=
=?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../customermanagement/relation/vehicleAdd.vue | 12 ++++++++----
.../customermanagement/relation/vehicleInfo.vue | 12 ++++++++----
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/yxt-as-ui/src/views/client/customermanagement/relation/vehicleAdd.vue b/yxt-as-ui/src/views/client/customermanagement/relation/vehicleAdd.vue
index fa1e4f0648..26e3f28614 100644
--- a/yxt-as-ui/src/views/client/customermanagement/relation/vehicleAdd.vue
+++ b/yxt-as-ui/src/views/client/customermanagement/relation/vehicleAdd.vue
@@ -64,7 +64,7 @@
备注
-
+
保养到期明细
@@ -141,7 +141,7 @@
备注
-
+
@@ -187,7 +187,9 @@ export default {
fanbelt_km: '',
fanbelt_date: '',
brakepads_km: '',
- brakepads_date: ''
+ brakepads_date: '',
+ carRemarks: '',
+ byRemarks: ''
},
rules: {
vehMark: [{ required: true, message: '车牌号不能为空', trigger: 'blur' }],
@@ -279,7 +281,9 @@ export default {
fanbelt_km: '',
fanbelt_date: '',
brakepads_km: '',
- brakepads_date: ''
+ brakepads_date: '',
+ carRemarks: '',
+ byRemarks: ''
}
this.submitdisabled = false
this.$emit('doback')
diff --git a/yxt-as-ui/src/views/client/customermanagement/relation/vehicleInfo.vue b/yxt-as-ui/src/views/client/customermanagement/relation/vehicleInfo.vue
index 083856d156..b84da781c6 100644
--- a/yxt-as-ui/src/views/client/customermanagement/relation/vehicleInfo.vue
+++ b/yxt-as-ui/src/views/client/customermanagement/relation/vehicleInfo.vue
@@ -63,7 +63,7 @@
备注
- {{ formobj.remarks }}
+ {{ formobj.carRemarks }}
保养到期明细
@@ -140,7 +140,7 @@
备注
- {{ formobj.remarks }}
+ {{ formobj.byRemarks }}
@@ -185,7 +185,9 @@ export default {
fanbelt_km: '',
fanbelt_date: '',
brakepads_km: '',
- brakepads_date: ''
+ brakepads_date: '',
+ carRemarks: '',
+ byRemarks: ''
},
rules: {}
}
@@ -227,7 +229,9 @@ export default {
fanbelt_km: '',
fanbelt_date: '',
brakepads_km: '',
- brakepads_date: ''
+ brakepads_date: '',
+ carRemarks: '',
+ byRemarks: ''
}
this.$emit('doback')
}
From 8f7804a20e69dd8e1446c5c82fec433c6e929d1d Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 11 Jun 2024 14:45:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AD=98=E6=94=BE?=
=?UTF-8?q?=E5=9C=B0=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../anruiscm/scmwarehouse/scmwarehouse.vue | 166 +++++++++---------
1 file changed, 83 insertions(+), 83 deletions(-)
diff --git a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue
index 75802f8382..b0fcb2a22b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue
@@ -15,13 +15,13 @@
-
+
-
+
-
+
@@ -44,18 +44,18 @@
-
-
-
-
+
+
+
+
{{ scope.row.warehouseName }}
-
-
-
-
+
+
+
+
@@ -68,9 +68,9 @@
-
+
-
+
@@ -106,7 +106,6 @@ export default {
size: 10,
total: 0,
params: {
- sids: [], // 用于导出的时候保存已选择SID
useOrgSid: '', // 使用组织sid
warehouseName: '', // 名称
warehouseAttribute: '', // 存放地点属性
@@ -178,86 +177,38 @@ export default {
break
}
},
- toAdd(row) {
- this.viewState = 2
- this.$refs['divadd'].showAdd()
- },
- toEdit() {
- if (this.multipleSelection.length === 0) {
- this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' })
- return
- }
- if (this.multipleSelection.length > 1) {
- this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' })
- return
- }
- this.viewState = 3
- const row = this.multipleSelection[0]
- this.$refs['divadd'].showEdit(row)
- },
- doDel(row) {
- if (this.multipleSelection.length === 0) {
- this.$message({showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作'})
- return
- }
- const sids = []
- this.multipleSelection.forEach(row => {
- sids.push(row.sid)
- })
- const tip = '请确认是否删除所选 ' + this.multipleSelection.length + ' 条记录?'
- this.$confirm(tip, '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning'
- }).then(() => {
- const loading = this.$loading({
- lock: true,
- text: 'Loading',
- spinner: 'el-icon-loading',
- background: 'rgba(0, 0, 0, 0.7)'
- })
- req.delBySids(sids).then(resp => {
- loading.close()
- this.$message({ type: 'success', message: resp.msg, showClose: true })
- this.loadList()
- }).catch(e => {
- loading.close()
- })
- }).catch(() => {
- })
- },
- toInfo(row) {
- this.$refs['divinfo'].showInfo(row)
- console.log('详情回显', row)
- this.viewState = 4
- },
dosearch() {
this.queryParams.current = 1
this.loadList()
},
resetQuery() {
- this.queryParams.params = {
- sids: [], // 用于导出的时候保存已选择SID
- useOrgSid: '',
- warehouseName: '', // 名称
- warehouseAttribute: '', // 存放地点属性
- warehouseContract: '', // 存放地点负责人
- warehouseGroup: '' // 分组
+ this.queryParams = {
+ current: 1,
+ size: 10,
+ total: 0,
+ params: {
+ useOrgSid: '', // 使用组织sid
+ warehouseName: '', // 名称
+ warehouseAttribute: '', // 存放地点属性
+ warehouseContract: '', // 存放地点负责人
+ warehouseGroup: '' // 分组
+ }
}
- this.queryParams.params.sid = '' // sid
- this.queryParams.params.name = '' // 登录名
this.dosearch()
},
loadList() {
- const _this = this
this.tableLoading = true
- req.listPage(this.queryParams).then(resp => {
- _this.tableLoading = false
- const data = resp.data
- _this.queryParams.total = data.total
- _this.dataList = data.records
+ req.listPage(this.queryParams).then((resp) => {
+ this.tableLoading = false
+ if (resp.success) {
+ this.queryParams.total = resp.data.total
+ this.dataList = resp.data.records
+ } else {
+ this.queryParams.total = 0
+ this.dataList = []
+ }
}).catch(() => {
- _this.tableLoading = false
+ this.tableLoading = false
})
},
handleSelectionChange(val) {
@@ -294,6 +245,55 @@ export default {
var pageindex = index + 1 + pagestart
return pageindex
},
+ toAdd() {
+ this.viewState = 2
+ this.$refs['divAdd'].showAdd()
+ },
+ toEdit() {
+ if (this.multipleSelection.length === 1) {
+ this.viewState = 3
+ this.$refs['divAdd'].showEdit(this.multipleSelection[0])
+ } else {
+ this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' })
+ }
+ },
+ doDel() {
+ if (this.multipleSelection.length === 0) {
+ this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
+ return
+ }
+ const sids = []
+ this.multipleSelection.forEach(row => {
+ sids.push(row.sid)
+ })
+ const tip = '请确认是否删除所选 ' + this.multipleSelection.length + ' 条记录?'
+ this.$confirm(tip, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ const loading = this.$loading({
+ lock: true,
+ text: 'Loading',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+ req.delBySids(sids).then((resp) => {
+ loading.close()
+ if (resp.success) {
+ this.$message({ type: 'success', message: resp.msg, showClose: true })
+ this.loadList()
+ }
+ }).catch(e => {
+ loading.close()
+ })
+ }).catch(() => {
+ })
+ },
+ toInfo(row) {
+ this.viewState = 4
+ this.$refs['divInfo'].showInfo(row)
+ },
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)