From 3b131aec4dd948af1a7c936d967bdcf5a178ce19 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 27 Oct 2021 10:44:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=EF=BC=8C=E5=88=A0?=
=?UTF-8?q?=E9=99=A4=E5=86=97=E4=BD=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/setting.js | 4 +--
src/views/course/AddCurriculum.vue | 32 ++++++++---------
src/views/customer/AddCustomer.vue | 6 ----
src/views/order/AddOrder.vue | 56 ++++++++++++++++++++----------
src/views/serve/projectList.vue | 7 ++--
src/views/user/AddUser.vue | 8 +++--
6 files changed, 61 insertions(+), 52 deletions(-)
diff --git a/src/setting.js b/src/setting.js
index 280e21b..c2daea4 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -12,8 +12,8 @@ if (isDev) {
// jumpPath = "http://39.108.250.202/judgmentPoint/";
jumpPath = "http://192.168.31.154:8087/"; // 本地调试-需要启动本地判分点系统
- // host = "http://39.108.250.202:9000";
- host = 'http://192.168.31.151:9000'// 榕
+ host = "http://39.108.250.202:9000";
+ // host = 'http://192.168.31.151:9000'// 榕
// host = 'http://192.168.31.125:9000'// 坤
// host = 'http://192.168.31.137:9000'// 赓
} else if (isTest) {
diff --git a/src/views/course/AddCurriculum.vue b/src/views/course/AddCurriculum.vue
index 1374831..bfb56a1 100644
--- a/src/views/course/AddCurriculum.vue
+++ b/src/views/course/AddCurriculum.vue
@@ -366,24 +366,22 @@ export default {
},
getInfoData() {
this.$post(`${this.api.curriculumDetail}?cid=${this.form.cid}`).then(res => {
- if (res.status === 200) {
- let { data } = res;
- if (data.categoryId) {
- this.$get(this.api.courseProfessionalClass, { disciplineId: data.categoryId }).then(res => {
- this.ProfessionalClassList = res.list;
- }).catch(res => {});
- }
- if (data.professionalCategoryId) {
- this.$get(this.api.courseProfessional, { professionalClassId: data.professionalCategoryId }).then(res => {
- this.ProfessionalList = res.list;
- }).catch(res => {});
- }
- this.$nextTick(() => {
- this.form = data;
- this.practiceData = data.practiceConfig;
- this.assessmentData = data.assessmentConfig;
- });
+ let { data } = res;
+ if (data.categoryId) {
+ this.$get(this.api.courseProfessionalClass, { disciplineId: data.categoryId }).then(res => {
+ this.ProfessionalClassList = res.list;
+ }).catch(res => {});
}
+ if (data.professionalCategoryId) {
+ this.$get(this.api.courseProfessional, { professionalClassId: data.professionalCategoryId }).then(res => {
+ this.ProfessionalList = res.list;
+ }).catch(res => {});
+ }
+ this.$nextTick(() => {
+ this.form = data;
+ this.practiceData = data.practiceConfig;
+ this.assessmentData = data.assessmentConfig;
+ });
}).catch(err => {
});
},
diff --git a/src/views/customer/AddCustomer.vue b/src/views/customer/AddCustomer.vue
index f995822..b8ced8a 100644
--- a/src/views/customer/AddCustomer.vue
+++ b/src/views/customer/AddCustomer.vue
@@ -508,9 +508,6 @@ export default {
this.$post(url).then(res => {
if (res.status === 200) {
this.phoneRepeat = false;
- } else {
- this.$message.warning("该手机号已存在")
- this.phoneRepeat = true;
}
}).catch(err => {
this.phoneRepeat = true;
@@ -529,9 +526,6 @@ export default {
this.$post(url).then(res => {
if (res.status === 200) {
this.emailRepeat = false;
- } else {
- this.$message.warning("该邮箱已存在")
- this.emailRepeat = true;
}
}).catch(err => {
this.emailRepeat = true;
diff --git a/src/views/order/AddOrder.vue b/src/views/order/AddOrder.vue
index a5546be..8029362 100644
--- a/src/views/order/AddOrder.vue
+++ b/src/views/order/AddOrder.vue
@@ -741,6 +741,7 @@ export default {
// 处理添加状态
if (this.$route.query.isAdd) {
this.isAdd = true;
+ this.getCityData();// 取得城市
}
// 处于查看状态
@@ -758,7 +759,6 @@ export default {
this.renewDisabled = true;
await this.getDetail(this.$route.query.renew);
}
- this.getCityData();// 取得城市
},
methods: {
@@ -789,6 +789,32 @@ export default {
return e;
});// 俩列表
+ if (this.renewDisabled) { // 续费状态下，清空上个订单合同信息
+ this.contract = {
+ contractName: "",
+ contractFile: "",
+ contractMoney: "",
+ contractNumber: "",
+ startTime: "",
+ endTime: ""
+ };
+ } else {
+ this.contract = {
+ contractName: contract.contractName,
+ contractMoney: contract.contractMoney,
+ contractNumber: contract.contractNumber,
+ startTime: contract.startTime ? contract.startTime : "",
+ endTime: contract.endTime ? contract.endTime : "",
+ contractId: contract.contractId,
+ uploadList: {
+ name: contract.contractFile ? contract.contractFile.split("/").pop() : "",
+ url: contract.contractFile
+ }
+ };
+ if (contract.startTime && contract.endTime) {
+ this.contractTime = [contract.startTime, contract.endTime];
+ }
+ }
this.form = {
orderNumber: form.orderNumber,
@@ -804,24 +830,16 @@ export default {
orderAmount: form.orderAmount,
orderId: form.orderId
};
- this.contract = {
- contractName: contract.contractName,
- contractMoney: contract.contractMoney,
- contractNumber: contract.contractNumber,
- startTime: contract.startTime ? contract.startTime : "",
- endTime: contract.endTime ? contract.endTime : "",
- contractId: contract.contractId,
- uploadList: {
- name: contract.contractFile ? contract.contractFile.split("/").pop() : "",
- url: contract.contractFile
- }
- };
- if (contract.startTime && contract.endTime) {
- this.contractTime = [contract.startTime, contract.endTime];
- }
+
this.coursePermissions = list.filter(i => i.authority === 1);
this.dataPlatformPermissions = list.filter(i => i.authority === 0);
+
+ this.$nextTick(() => {
+ if(this.form.provinceId){
+ this.getCityData()
+ }
+ });
});
},
// 新增订单
@@ -1302,9 +1320,9 @@ export default {
},
// 清除省份
clearprovince() {
- this.form.cityId = "",
- this.form.customerId = "",
- this.form.orderContact = "";
+ this.form.cityId = "";
+ this.form.customerId = "";
+ this.form.orderContact = "";
this.form.phone = "";
this.form.email = "";
},
diff --git a/src/views/serve/projectList.vue b/src/views/serve/projectList.vue
index 675b9fa..3c2aec6 100644
--- a/src/views/serve/projectList.vue
+++ b/src/views/serve/projectList.vue
@@ -237,11 +237,8 @@ export default {
systemId: this.systemId
};
this.$post(this.api.queryProjectManage, data).then(res => {
- let { status, data } = res;
- if (status === 200 && data) {
- this.listData = data.records;
- this.total = data.total;
- }
+ this.listData = res.data.records;
+ this.total = res.data.total;
}).catch(err => {
console.log(err);
});
diff --git a/src/views/user/AddUser.vue b/src/views/user/AddUser.vue
index d0ce199..e7c94d8 100644
--- a/src/views/user/AddUser.vue
+++ b/src/views/user/AddUser.vue
@@ -308,7 +308,9 @@
-
+
+
+ 暂无数据
@@ -624,7 +626,7 @@ export default {
if(this.form.provinceId){
this.getCityData(1)
}
- if(this.archivesList.length != 0){
+ if(this.archivesList.length){
this.archivesList.forEach((e,k) =>{
this.$set(e, 'subjectList', this.subjectList);
this.$set(e, 'disciplineId', e.disciplineId ? e.disciplineId : '');
@@ -652,7 +654,7 @@ export default {
}
})
}else{
- this.concatArch(1)
+ // this.concatArch(1)
}
});