-
+
-
-
-
+
+
-
- {{ ra.label }}
+
+ {{ ra.label }}
-
- {{ ra.label }}
+
+ {{ ra.label }}
-
- {{ ch.label }}
+
+ {{ ch.label }}
-
+
-
+
-
+
+
+
-
+
-
+
- {{ item.label }}
+ {{ item.label }}
@@ -76,47 +154,45 @@ export default {
props: {
that: {
type: Object,
- default: this
+ default: this,
},
isHandle: {
type: Boolean,
- default: true
+ default: true,
},
labelWidth: {
type: String,
- default: ''
+ default: "",
},
size: {
type: String,
- default: 'mini'
+ default: "mini",
},
searchForm: {
type: Array,
- default: () => []
+ default: () => [],
},
searchHandle: {
type: Array,
- default: () => []
+ default: () => [],
},
searchData: {
type: Object,
- default: () => {}
- }
+ default: () => {},
+ },
},
methods: {
handleClick(emitKey) {
// emit事件
- this.$emit(`${emitKey}`)
- }
- }
-
-}
-
+ this.$emit(`${emitKey}`);
+ },
+ },
+};
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index ea30dbe..c54888e 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -3,14 +3,14 @@
-
+
-
+
{
await setfolder(item);
}
} catch (err) {
+ flag = false;
console.log(err);
}
};
@@ -81,7 +82,7 @@ const setfolder = async (item) => {
zipObj = null;
});
})
- .catch((reason) => { });
+ .catch((reason) => { flag = false; });
};
const handleBatchDown = async (item, zip) => {
return new Promise((resolve) => {
diff --git a/src/views/recompose/index.vue b/src/views/recompose/index.vue
index c4d1bcc..6b04452 100644
--- a/src/views/recompose/index.vue
+++ b/src/views/recompose/index.vue
@@ -175,6 +175,7 @@ export default {
NewUserName: this.password.NewUserName,
NewPassWord: md5(this.password.NewPassWord),
OldPassWord: md5(this.password.OldPassWord),
+ CheckCode: this.password.CheckCode,
};
this.loading = true;
modifyPassword(param)
diff --git a/src/views/system/hospital/index.vue b/src/views/system/hospital/index.vue
index 1958cd7..18dc553 100644
--- a/src/views/system/hospital/index.vue
+++ b/src/views/system/hospital/index.vue
@@ -13,7 +13,10 @@
-
+
@@ -38,7 +41,7 @@
@@ -53,7 +56,7 @@
>
-
+
{
Asc: true,
RealName: "",
SortField: "",
+ CreateTimeArr: [],
+ BeginCreateTime: null,
+ EndCreateTime: null,
};
};
export default {
@@ -162,10 +165,17 @@ export default {
sortable: "custom",
showOverflowTooltip: true,
},
+ {
+ prop: "CreateTime",
+ label: this.$t("system:userlist:table:createTime"),
+ minWidth: 200,
+ sortable: "custom",
+ showOverflowTooltip: true,
+ },
{
type: "operate",
label: this.$t("common:action:action"),
- minWidth: 200,
+ minWidth: 100,
operates: [
{
name: this.$t("common:button:edit"),
@@ -257,6 +267,13 @@ export default {
props: { label: "UserType", value: "Id" }, // 下拉选项配置信息,必填
placeholder: "",
},
+ {
+ type: "Daterange",
+ label: this.$t("system:userlist:label:CreateTime"),
+ prop: "CreateTimeArr",
+ width: "100px",
+ placeholder: "",
+ },
],
searchHandle: [
{
@@ -289,6 +306,18 @@ export default {
// 获取用户信息
getList() {
this.loading = true;
+ if (
+ this.searchData.CreateTimeArr[0] &&
+ this.searchData.CreateTimeArr[1]
+ ) {
+ this.searchData.BeginCreateTime =
+ this.searchData.CreateTimeArr[0].toISOString();
+ this.searchData.EndCreateTime =
+ this.searchData.CreateTimeArr[1].toISOString();
+ } else {
+ this.searchData.BeginCreateTime = null;
+ this.searchData.EndCreateTime = null;
+ }
getUserList(this.searchData)
.then((res) => {
this.loading = false;
diff --git a/src/views/trials/trials-list/index.vue b/src/views/trials/trials-list/index.vue
index 893740e..166196f 100644
--- a/src/views/trials/trials-list/index.vue
+++ b/src/views/trials/trials-list/index.vue
@@ -208,7 +208,7 @@
sortable="custom"
/>
-
-
+ -->