From c44be7a09df856ef11dcd3c977fe2a28b3fd8388 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Sat, 11 May 2024 17:55:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=A2=84=E7=BA=A6=E5=8D=95?=
=?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../preregistration/preregistration.vue | 6 +-
.../preregistration/preregistrationAdd.vue | 81 +++++++++++++------
.../preregistration/preregistrationInfo.vue | 16 ++--
3 files changed, 68 insertions(+), 35 deletions(-)
diff --git a/yxt-as-ui/src/views/operation/preregistration/preregistration.vue b/yxt-as-ui/src/views/operation/preregistration/preregistration.vue
index 8d6e5a4dbf..173f1fa8e9 100644
--- a/yxt-as-ui/src/views/operation/preregistration/preregistration.vue
+++ b/yxt-as-ui/src/views/operation/preregistration/preregistration.vue
@@ -41,10 +41,10 @@
-
-
+
+
至
-
+
diff --git a/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue b/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue
index 8f905dfae0..d54583f6de 100644
--- a/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue
+++ b/yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue
@@ -29,24 +29,24 @@
- 预约服务顾问
+ *预约服务顾问
-
+
预约设备
-
- 预约日期
+
+ *预约日期
-
+
至
-
+
@@ -94,11 +94,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -182,6 +182,7 @@ export default {
total: 0,
params: {
sitemName: '',
+ type: '0',
orgPath: ''
}
},
@@ -209,12 +210,19 @@ export default {
trackLogs: [],
createDeptSid: '',
createDept: '',
- customerOrg: ''
+ customerOrg: '',
+ userSid: ''
},
rules: {}
}
},
methods: {
+ // 限制日期不可选择截止日期之后的
+ pickerStartData(newtime) {
+ return {
+ disabledDate(time) { return time.getTime() > new Date(newtime) - 1000 * 60 * 60 * 24 }
+ }
+ },
// 限制日期不可选择开始日期之前的
pickerEndData(newtime) {
return {
@@ -237,6 +245,7 @@ export default {
this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.formobj.createByName = window.sessionStorage.getItem('name')
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
+ this.formobj.userSid = window.sessionStorage.getItem('userSid')
this.formobj.createDept = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.createDeptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
var nowDate = new Date()
@@ -360,12 +369,25 @@ export default {
}
},
saveOrUpdate() {
+ if (this.formobj.waitorName === '') {
+ this.$message({ showClose: true, type: 'error', message: '预约服务顾问不能为空' })
+ return
+ }
+ if (this.formobj.reserveStart === '' || this.formobj.reserveEnd === '') {
+ this.$message({ showClose: true, type: 'error', message: '预约时间不能为空' })
+ return
+ }
+ if (this.formobj.customerName === '') {
+ this.$message({ showClose: true, type: 'error', message: '客户信息不能为空' })
+ return
+ }
+ if (this.formobj.sitemVos.length === 0) {
+ this.$message({ showClose: true, type: 'error', message: '服务项目列表不能为空' })
+ return
+ }
this.$refs['form_obj'].validate((valid) => {
if (valid) {
- if (this.formobj.sitemVos.length === 0) {
- this.$message({ showClose: true, type: 'error', message: '服务项目列表不能为空' })
- return
- }
+
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((res) => {
if (res.success) {
@@ -381,16 +403,24 @@ export default {
})
},
toService() {
+ if (this.formobj.waitorName === '') {
+ this.$message({ showClose: true, type: 'error', message: '预约服务顾问不能为空' })
+ return
+ }
+ if (this.formobj.reserveStart === '' || this.formobj.reserveEnd === '') {
+ this.$message({ showClose: true, type: 'error', message: '预约时间不能为空' })
+ return
+ }
+ if (this.formobj.customerName === '') {
+ this.$message({ showClose: true, type: 'error', message: '客户信息不能为空' })
+ return
+ }
+ if (this.formobj.sitemVos.length === 0) {
+ this.$message({ showClose: true, type: 'error', message: '服务项目列表不能为空' })
+ return
+ }
this.$refs['form_obj'].validate((valid) => {
if (valid) {
- if (this.formobj.sitemVos.length === 0) {
- this.$message({ showClose: true, type: 'error', message: '服务项目列表不能为空' })
- return
- }
- if (this.formobj.sitemVos.length === 0) {
- this.$message({ showClose: true, type: 'error', message: '表格不能为空' })
- return
- }
this.submitdisabled = true
req.convertedRepairOrders(this.formobj).then((res) => {
if (res.success) {
@@ -458,7 +488,8 @@ export default {
trackLogs: [],
createDeptSid: '',
createDept: '',
- customerOrg: ''
+ customerOrg: '',
+ userSid: ''
}
this.submitdisabled = false
this.$emit('doback')
diff --git a/yxt-as-ui/src/views/operation/preregistration/preregistrationInfo.vue b/yxt-as-ui/src/views/operation/preregistration/preregistrationInfo.vue
index 8ed6eed384..c8ecc55c50 100644
--- a/yxt-as-ui/src/views/operation/preregistration/preregistrationInfo.vue
+++ b/yxt-as-ui/src/views/operation/preregistration/preregistrationInfo.vue
@@ -28,11 +28,11 @@
预约服务顾问
{{ formobj.waitorName }}
-
+
预约设备
{{ formobj.reserveEquip }}
-
+
预约时间
{{ formobj.reserveStart }} 至 {{ formobj.reserveEnd }}
@@ -74,9 +74,10 @@
跟踪记录
-
+
-
+
+
@@ -94,7 +95,6 @@ export default {
index: 0,
serviceKey: 0,
tableKey: 1,
- list: [],
formobj: {
sid: '',
createBySid: '',
@@ -118,7 +118,8 @@ export default {
trackLogs: [],
createDeptSid: '',
createDept: '',
- customerOrg: ''
+ customerOrg: '',
+ userSid: ''
}
}
},
@@ -162,7 +163,8 @@ export default {
trackLogs: [],
createDeptSid: '',
createDept: '',
- customerOrg: ''
+ customerOrg: '',
+ userSid: ''
}
this.$emit('doback')
}