|
@@ -260,7 +260,7 @@
|
|
|
handleAppoint(row) {
|
|
handleAppoint(row) {
|
|
|
const token = getToken();
|
|
const token = getToken();
|
|
|
if (!token) {
|
|
if (!token) {
|
|
|
- return this.$router.push("/login");
|
|
|
|
|
|
|
+ return this.$router.push("/login?redirect=/appointment/equipment");
|
|
|
}
|
|
}
|
|
|
this.$refs.appointRef.openDialog(row);
|
|
this.$refs.appointRef.openDialog(row);
|
|
|
},
|
|
},
|
|
@@ -288,6 +288,9 @@
|
|
|
async getInstrData() {
|
|
async getInstrData() {
|
|
|
Loading.service(this.loadingOption);
|
|
Loading.service(this.loadingOption);
|
|
|
const [err, res] = await to(getInstrList(this.searchForm));
|
|
const [err, res] = await to(getInstrList(this.searchForm));
|
|
|
|
|
+ setTimeout(() => {
|
|
|
|
|
+ Loading.service(this.loadingOption).close();
|
|
|
|
|
+ });
|
|
|
if (err) return;
|
|
if (err) return;
|
|
|
if (res.code == 200) {
|
|
if (res.code == 200) {
|
|
|
this.instrDataList = res.data.list;
|
|
this.instrDataList = res.data.list;
|
|
@@ -300,9 +303,6 @@
|
|
|
);
|
|
);
|
|
|
this.getInstNameEnCountData();
|
|
this.getInstNameEnCountData();
|
|
|
}
|
|
}
|
|
|
- setTimeout(() => {
|
|
|
|
|
- Loading.service(this.loadingOption).close();
|
|
|
|
|
- });
|
|
|
|
|
},
|
|
},
|
|
|
// 对象转数组
|
|
// 对象转数组
|
|
|
objTransforArr(obj) {
|
|
objTransforArr(obj) {
|