diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue index 1605836..636b58c 100644 --- a/src/layout/components/ivr/ivrBar.vue +++ b/src/layout/components/ivr/ivrBar.vue @@ -506,7 +506,7 @@ const data = { callid: object.callid, number: object.number, - dialStartStamp: getToday('yyyy-MM-dd hh:mm:ss') + dialStartStamp: getToday('yyyy-MM-dd HH:mm:ss') } this.currentNumber = object.number console.log(data) diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue index 1605836..636b58c 100644 --- a/src/layout/components/ivr/ivrBar.vue +++ b/src/layout/components/ivr/ivrBar.vue @@ -506,7 +506,7 @@ const data = { callid: object.callid, number: object.number, - dialStartStamp: getToday('yyyy-MM-dd hh:mm:ss') + dialStartStamp: getToday('yyyy-MM-dd HH:mm:ss') } this.currentNumber = object.number console.log(data) diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 92f521d..3278abb 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -5,11 +5,11 @@ return new Date(nowTimeDate) } -export function getToday(fmt = 'yyyy-MM-dd hh:mm:ss') { // 默认显示今天 +export function getToday(fmt = 'yyyy-MM-dd HH:mm:ss') { // 默认显示今天 return new Date().Format(fmt) } -export function getTodayZero(fmt = 'yyyy-MM-dd hh:mm:ss') { // 获取当天的0点 +export function getTodayZero(fmt = 'yyyy-MM-dd HH:mm:ss') { // 获取当天的0点 const nowTimeDate = new Date() nowTimeDate.setHours(0, 0, 0, 0) return nowTimeDate.Format(fmt) @@ -60,7 +60,7 @@ // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符， // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字) // 例子： -// (new Date()).Format("yyyy-MM-dd hh:mm:ss.S") ==> 2006-07-02 08:09:04.423 +// (new Date()).Format("yyyy-MM-dd HH:mm:ss.S") ==> 2006-07-02 08:09:04.423 // (new Date()).Format("yyyy-M-d h:m:s.S") ==> 2006-7-2 8:9:4.18 Date.prototype.Format = function(fmt) { // author: meizz var o = { diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue index 1605836..636b58c 100644 --- a/src/layout/components/ivr/ivrBar.vue +++ b/src/layout/components/ivr/ivrBar.vue @@ -506,7 +506,7 @@ const data = { callid: object.callid, number: object.number, - dialStartStamp: getToday('yyyy-MM-dd hh:mm:ss') + dialStartStamp: getToday('yyyy-MM-dd HH:mm:ss') } this.currentNumber = object.number console.log(data) diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 92f521d..3278abb 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -5,11 +5,11 @@ return new Date(nowTimeDate) } -export function getToday(fmt = 'yyyy-MM-dd hh:mm:ss') { // 默认显示今天 +export function getToday(fmt = 'yyyy-MM-dd HH:mm:ss') { // 默认显示今天 return new Date().Format(fmt) } -export function getTodayZero(fmt = 'yyyy-MM-dd hh:mm:ss') { // 获取当天的0点 +export function getTodayZero(fmt = 'yyyy-MM-dd HH:mm:ss') { // 获取当天的0点 const nowTimeDate = new Date() nowTimeDate.setHours(0, 0, 0, 0) return nowTimeDate.Format(fmt) @@ -60,7 +60,7 @@ // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符， // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字) // 例子： -// (new Date()).Format("yyyy-MM-dd hh:mm:ss.S") ==> 2006-07-02 08:09:04.423 +// (new Date()).Format("yyyy-MM-dd HH:mm:ss.S") ==> 2006-07-02 08:09:04.423 // (new Date()).Format("yyyy-M-d h:m:s.S") ==> 2006-7-2 8:9:4.18 Date.prototype.Format = function(fmt) { // author: meizz var o = { diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fa64852..03d3b49 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -32,7 +32,7 @@ - 添加到通讯录 + 添加到通讯录 @@ -73,7 +73,7 @@ @@ -229,7 +229,8 @@ processDept: '', // 处理单位 processUser: '' // 处理人 }, - allowAdd: true,// 允许新增联系人 + allowAdd: true, // 允许新增联系人 + addLoading: false, // 添加允许等待 reportersList: [], // 联系人选择列表 eorcList: [], // 案卷类别 caseTypeList: [], // 案卷类别二级 @@ -247,14 +248,14 @@ caseId: [{ required: true, message: '事件编号不能为空', trigger: ['blur'] }], sound: [{ required: true, message: '来电录音编号不能为空', trigger: ['blur'] }], callTime: [{ required: true, message: '来电时间不能为空', trigger: ['blur'] }], - reporterName: [{ required: true, message: '联系人姓名不能为空', trigger: ['blur'] }], + reporterName: [{ required: false, message: '联系人姓名不能为空', trigger: ['blur'] }], reporterPhone: [{ required: true, message: '联系电话不能为空', trigger: ['blur'] }], areaCode: [{ required: true, message: '事件辖区必选', trigger: ['blur'] }], source: [{ required: true, message: '事件来源必选', trigger: ['blur', 'change'] }], caseLevel: [{ required: true, message: '紧急程度必选', trigger: ['blur', 'change'] }], type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }], caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }], - description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }], + description: [{ required: false, message: '事件内容不能为空', trigger: ['blur'] }], title: [{ required: true, message: '事件标题不能为空', trigger: ['blur', 'change'] }], address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }], processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }] @@ -387,23 +388,33 @@ } }, // 将客户添加到通讯录 - addToCustomerList(){ + addToCustomerList() { + this.addLoading = true const customerForm = { name: this.form.reporterName, // 姓名 - tel1: this.form.reporterPhone, // 联系方式1 + tel1: this.form.reporterPhone // 联系方式1 } - // 如果信息完整 - if(this.allowAdd && customerForm.tel1 && customerForm.name){ - addCustomer(customerForm).then(response => { - if (response.code === 200) { - this.$message.success('新增成功') - this.allowAdd = false - // this.dialogFormVisible = false + // 如果信息完整, 添加到通讯录 + if (this.allowAdd && customerForm.tel1 && customerForm.name) { + this.$confirm( + '确定要将该客户添加到客户列表吗？', + '确认操作', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' } - }).catch(_ => { // 异常情况，loading置为false - // this.btnLoading = false + ).then(() => { + addCustomer(customerForm).then(response => { + if (response.code === 200) { + this.$message.success('添加成功') + this.allowAdd = false + } + }).catch(_ => { // 异常情况，loading置为false + this.addLoading = false + }) }) - }else{ + } else { this.$message.warning('请确保联系人姓名和电话完整性') } }, diff --git a/src/layout/components/ivr/ivrBar.vue b/src/layout/components/ivr/ivrBar.vue index 1605836..636b58c 100644 --- a/src/layout/components/ivr/ivrBar.vue +++ b/src/layout/components/ivr/ivrBar.vue @@ -506,7 +506,7 @@ const data = { callid: object.callid, number: object.number, - dialStartStamp: getToday('yyyy-MM-dd hh:mm:ss') + dialStartStamp: getToday('yyyy-MM-dd HH:mm:ss') } this.currentNumber = object.number console.log(data) diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 92f521d..3278abb 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -5,11 +5,11 @@ return new Date(nowTimeDate) } -export function getToday(fmt = 'yyyy-MM-dd hh:mm:ss') { // 默认显示今天 +export function getToday(fmt = 'yyyy-MM-dd HH:mm:ss') { // 默认显示今天 return new Date().Format(fmt) } -export function getTodayZero(fmt = 'yyyy-MM-dd hh:mm:ss') { // 获取当天的0点 +export function getTodayZero(fmt = 'yyyy-MM-dd HH:mm:ss') { // 获取当天的0点 const nowTimeDate = new Date() nowTimeDate.setHours(0, 0, 0, 0) return nowTimeDate.Format(fmt) @@ -60,7 +60,7 @@ // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符， // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字) // 例子： -// (new Date()).Format("yyyy-MM-dd hh:mm:ss.S") ==> 2006-07-02 08:09:04.423 +// (new Date()).Format("yyyy-MM-dd HH:mm:ss.S") ==> 2006-07-02 08:09:04.423 // (new Date()).Format("yyyy-M-d h:m:s.S") ==> 2006-7-2 8:9:4.18 Date.prototype.Format = function(fmt) { // author: meizz var o = { diff --git a/src/views/caseManage/createCase.vue b/src/views/caseManage/createCase.vue index fa64852..03d3b49 100644 --- a/src/views/caseManage/createCase.vue +++ b/src/views/caseManage/createCase.vue @@ -32,7 +32,7 @@ - 添加到通讯录 + 添加到通讯录 @@ -73,7 +73,7 @@ @@ -229,7 +229,8 @@ processDept: '', // 处理单位 processUser: '' // 处理人 }, - allowAdd: true,// 允许新增联系人 + allowAdd: true, // 允许新增联系人 + addLoading: false, // 添加允许等待 reportersList: [], // 联系人选择列表 eorcList: [], // 案卷类别 caseTypeList: [], // 案卷类别二级 @@ -247,14 +248,14 @@ caseId: [{ required: true, message: '事件编号不能为空', trigger: ['blur'] }], sound: [{ required: true, message: '来电录音编号不能为空', trigger: ['blur'] }], callTime: [{ required: true, message: '来电时间不能为空', trigger: ['blur'] }], - reporterName: [{ required: true, message: '联系人姓名不能为空', trigger: ['blur'] }], + reporterName: [{ required: false, message: '联系人姓名不能为空', trigger: ['blur'] }], reporterPhone: [{ required: true, message: '联系电话不能为空', trigger: ['blur'] }], areaCode: [{ required: true, message: '事件辖区必选', trigger: ['blur'] }], source: [{ required: true, message: '事件来源必选', trigger: ['blur', 'change'] }], caseLevel: [{ required: true, message: '紧急程度必选', trigger: ['blur', 'change'] }], type: [{ required: true, message: '事件类型必选', trigger: ['blur'], validator: validateType }], caseDetailTypeCode: [{ required: true, message: '事件类型必选', trigger: ['blur'] }], - description: [{ required: true, message: '事件内容不能为空', trigger: ['blur'] }], + description: [{ required: false, message: '事件内容不能为空', trigger: ['blur'] }], title: [{ required: true, message: '事件标题不能为空', trigger: ['blur', 'change'] }], address: [{ required: true, message: '地址需填写完整', trigger: ['blur'], validator: validateAddress }], processWay: [{ required: true, message: '处理方式必选', trigger: ['blur', 'change'] }] @@ -387,23 +388,33 @@ } }, // 将客户添加到通讯录 - addToCustomerList(){ + addToCustomerList() { + this.addLoading = true const customerForm = { name: this.form.reporterName, // 姓名 - tel1: this.form.reporterPhone, // 联系方式1 + tel1: this.form.reporterPhone // 联系方式1 } - // 如果信息完整 - if(this.allowAdd && customerForm.tel1 && customerForm.name){ - addCustomer(customerForm).then(response => { - if (response.code === 200) { - this.$message.success('新增成功') - this.allowAdd = false - // this.dialogFormVisible = false + // 如果信息完整, 添加到通讯录 + if (this.allowAdd && customerForm.tel1 && customerForm.name) { + this.$confirm( + '确定要将该客户添加到客户列表吗？', + '确认操作', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' } - }).catch(_ => { // 异常情况，loading置为false - // this.btnLoading = false + ).then(() => { + addCustomer(customerForm).then(response => { + if (response.code === 200) { + this.$message.success('添加成功') + this.allowAdd = false + } + }).catch(_ => { // 异常情况，loading置为false + this.addLoading = false + }) }) - }else{ + } else { this.$message.warning('请确保联系人姓名和电话完整性') } }, diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue index 3fcea2c..a7818bc 100644 --- a/src/views/caseManage/waitForCreate.vue +++ b/src/views/caseManage/waitForCreate.vue @@ -27,6 +27,7 @@