|
@@ -145,7 +145,7 @@
|
|
|
destroy-on-close
|
|
|
:visible.sync="detailVisible"
|
|
|
>
|
|
|
- <descriptions :column="2" v-if="activeRow">
|
|
|
+ <descriptions :column="2" v-if="activeRow" class="returnDialog">
|
|
|
<descriptions-item label="老师姓名:">{{
|
|
|
activeRow.teacherName
|
|
|
}}</descriptions-item>
|
|
@@ -195,7 +195,7 @@ export default {
|
|
|
timer: [],
|
|
|
},
|
|
|
|
|
|
- visitChiose:visitChiose1,
|
|
|
+ visitChiose: visitChiose1,
|
|
|
organList: [],
|
|
|
rules: {
|
|
|
// 分页规则
|
|
@@ -217,10 +217,10 @@ export default {
|
|
|
// });
|
|
|
this.$store.dispatch("setBranchs");
|
|
|
|
|
|
- if(this.$route.query){
|
|
|
- this.searchForm.search = this.$route.query.teacher // 兼容老功能
|
|
|
- this.searchForm.search = this.$route.query.search
|
|
|
- this.searchForm.timer = this.$route.query.timer
|
|
|
+ if (this.$route.query) {
|
|
|
+ this.searchForm.search = this.$route.query.teacher; // 兼容老功能
|
|
|
+ this.searchForm.search = this.$route.query.search;
|
|
|
+ this.searchForm.timer = this.$route.query.timer;
|
|
|
}
|
|
|
this.getList();
|
|
|
},
|
|
@@ -234,7 +234,7 @@ export default {
|
|
|
},
|
|
|
search() {
|
|
|
// this.$router.replace({query:{...this.$route.query,timer:undefined,teacher:undefined}})
|
|
|
- resetQuery(this,{timer:undefined,search:undefined})
|
|
|
+ resetQuery(this, { timer: undefined, search: undefined });
|
|
|
this.rules.page = 1;
|
|
|
this.getList();
|
|
|
},
|
|
@@ -255,11 +255,12 @@ export default {
|
|
|
getList() {
|
|
|
// cleanDeep
|
|
|
let { timer, typeList, ...rest } = this.searchForm;
|
|
|
- console.log(typeList)
|
|
|
- let type,purpose=null;
|
|
|
- if( typeList.length>0){
|
|
|
- type=typeList[0]
|
|
|
- purpose= typeList[1]
|
|
|
+ console.log(typeList);
|
|
|
+ let type,
|
|
|
+ purpose = null;
|
|
|
+ if (typeList.length > 0) {
|
|
|
+ type = typeList[0];
|
|
|
+ purpose = typeList[1];
|
|
|
}
|
|
|
|
|
|
let params = {
|
|
@@ -268,7 +269,7 @@ export default {
|
|
|
rows: this.rules.limit,
|
|
|
...getTimes(timer, ["startTime", "endTime"]),
|
|
|
type,
|
|
|
- purpose
|
|
|
+ purpose,
|
|
|
};
|
|
|
getVisitList(cleanDeep(params)).then((res) => {
|
|
|
if (res.code == 200) {
|
|
@@ -310,4 +311,11 @@ export default {
|
|
|
/deep/.description-title {
|
|
|
margin-bottom: 0;
|
|
|
}
|
|
|
+.returnDialog {
|
|
|
+ /deep/.description-view {
|
|
|
+ .description-content {
|
|
|
+ white-space: normal !important;
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|
|
|
</style>
|