修复bug,删除冗余

dev
yujialong 3 years ago
parent 150911139b
commit 3b131aec4d
  1. 4
      src/setting.js
  2. 32
      src/views/course/AddCurriculum.vue
  3. 6
      src/views/customer/AddCustomer.vue
  4. 56
      src/views/order/AddOrder.vue
  5. 7
      src/views/serve/projectList.vue
  6. 8
      src/views/user/AddUser.vue

@ -12,8 +12,8 @@ if (isDev) {
// jumpPath = "http://39.108.250.202/judgmentPoint/"; // jumpPath = "http://39.108.250.202/judgmentPoint/";
jumpPath = "http://192.168.31.154:8087/"; // 本地调试-需要启动本地判分点系统 jumpPath = "http://192.168.31.154:8087/"; // 本地调试-需要启动本地判分点系统
// host = "http://39.108.250.202:9000"; host = "http://39.108.250.202:9000";
host = 'http://192.168.31.151:9000'// 榕 // host = 'http://192.168.31.151:9000'// 榕
// host = 'http://192.168.31.125:9000'// 坤 // host = 'http://192.168.31.125:9000'// 坤
// host = 'http://192.168.31.137:9000'// 赓 // host = 'http://192.168.31.137:9000'// 赓
} else if (isTest) { } else if (isTest) {

@ -366,24 +366,22 @@ export default {
}, },
getInfoData() { getInfoData() {
this.$post(`${this.api.curriculumDetail}?cid=${this.form.cid}`).then(res => { this.$post(`${this.api.curriculumDetail}?cid=${this.form.cid}`).then(res => {
if (res.status === 200) { let { data } = res;
let { data } = res; if (data.categoryId) {
if (data.categoryId) { this.$get(this.api.courseProfessionalClass, { disciplineId: data.categoryId }).then(res => {
this.$get(this.api.courseProfessionalClass, { disciplineId: data.categoryId }).then(res => { this.ProfessionalClassList = res.list;
this.ProfessionalClassList = res.list; }).catch(res => {});
}).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;
});
} }
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 => { }).catch(err => {
}); });
}, },

@ -508,9 +508,6 @@ export default {
this.$post(url).then(res => { this.$post(url).then(res => {
if (res.status === 200) { if (res.status === 200) {
this.phoneRepeat = false; this.phoneRepeat = false;
} else {
this.$message.warning("该手机号已存在")
this.phoneRepeat = true;
} }
}).catch(err => { }).catch(err => {
this.phoneRepeat = true; this.phoneRepeat = true;
@ -529,9 +526,6 @@ export default {
this.$post(url).then(res => { this.$post(url).then(res => {
if (res.status === 200) { if (res.status === 200) {
this.emailRepeat = false; this.emailRepeat = false;
} else {
this.$message.warning("该邮箱已存在")
this.emailRepeat = true;
} }
}).catch(err => { }).catch(err => {
this.emailRepeat = true; this.emailRepeat = true;

@ -741,6 +741,7 @@ export default {
// //
if (this.$route.query.isAdd) { if (this.$route.query.isAdd) {
this.isAdd = true; this.isAdd = true;
this.getCityData();//
} }
// //
@ -758,7 +759,6 @@ export default {
this.renewDisabled = true; this.renewDisabled = true;
await this.getDetail(this.$route.query.renew); await this.getDetail(this.$route.query.renew);
} }
this.getCityData();//
}, },
methods: { methods: {
@ -789,6 +789,32 @@ export default {
return e; 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 = { this.form = {
orderNumber: form.orderNumber, orderNumber: form.orderNumber,
@ -804,24 +830,16 @@ export default {
orderAmount: form.orderAmount, orderAmount: form.orderAmount,
orderId: form.orderId 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.coursePermissions = list.filter(i => i.authority === 1);
this.dataPlatformPermissions = list.filter(i => i.authority === 0); this.dataPlatformPermissions = list.filter(i => i.authority === 0);
this.$nextTick(() => {
if(this.form.provinceId){
this.getCityData()
}
});
}); });
}, },
// //
@ -1302,9 +1320,9 @@ export default {
}, },
// //
clearprovince() { clearprovince() {
this.form.cityId = "", this.form.cityId = "";
this.form.customerId = "", this.form.customerId = "";
this.form.orderContact = ""; this.form.orderContact = "";
this.form.phone = ""; this.form.phone = "";
this.form.email = ""; this.form.email = "";
}, },

@ -237,11 +237,8 @@ export default {
systemId: this.systemId systemId: this.systemId
}; };
this.$post(this.api.queryProjectManage, data).then(res => { this.$post(this.api.queryProjectManage, data).then(res => {
let { status, data } = res; this.listData = res.data.records;
if (status === 200 && data) { this.total = res.data.total;
this.listData = data.records;
this.total = data.total;
}
}).catch(err => { }).catch(err => {
console.log(err); console.log(err);
}); });

@ -308,7 +308,9 @@
<div class="fold" v-if="archivesList.length > 1"> <div class="fold" v-if="archivesList.length > 1">
<img :class="{ 'arrowTransform': showArch, 'arrowTransformReturn': !showArch}" style="width: 21px;height: 17px;" src="../../assets/img/person/open.png" alt="" @click="foldArch"> <img :class="{ 'arrowTransform': showArch, 'arrowTransformReturn': !showArch}" style="width: 21px;height: 17px;" src="../../assets/img/person/open.png" alt="" @click="foldArch">
</div> </div>
<div v-if="!archivesList.length" style="line-height: 60px; color: #909399; text-align: center;">暂无数据</div>
</div> </div>
</el-card> </el-card>
@ -624,7 +626,7 @@ export default {
if(this.form.provinceId){ if(this.form.provinceId){
this.getCityData(1) this.getCityData(1)
} }
if(this.archivesList.length != 0){ if(this.archivesList.length){
this.archivesList.forEach((e,k) =>{ this.archivesList.forEach((e,k) =>{
this.$set(e, 'subjectList', this.subjectList); this.$set(e, 'subjectList', this.subjectList);
this.$set(e, 'disciplineId', e.disciplineId ? e.disciplineId : ''); this.$set(e, 'disciplineId', e.disciplineId ? e.disciplineId : '');
@ -652,7 +654,7 @@ export default {
} }
}) })
}else{ }else{
this.concatArch(1) // this.concatArch(1)
} }
}); });

Loading…
Cancel
Save