diff --git a/src/components/BaseForm/search-form.vue b/src/components/BaseForm/search-form.vue
index 7e637eb..0761f9f 100644
--- a/src/components/BaseForm/search-form.vue
+++ b/src/components/BaseForm/search-form.vue
@@ -124,10 +124,11 @@
diff --git a/src/components/visitSelect/index.vue b/src/components/visitSelect/index.vue
index 2bf2203..49fbb9b 100644
--- a/src/components/visitSelect/index.vue
+++ b/src/components/visitSelect/index.vue
@@ -123,14 +123,19 @@ export default {
type: "warning",
showCancelButton: false,
}
- ).then(() => {
- this.$emit("update:modelData", this.visit);
- let data = {
- StudyId: this.studyData.StudyId || this.studyData.SCPStudyId,
- VisitId: this.visit,
- };
- this.$emit("putVisit", data);
- });
+ )
+ .then(() => {
+ this.$emit("update:modelData", this.visit);
+ let data = {
+ StudyId: this.studyData.StudyId || this.studyData.SCPStudyId,
+ VisitId: this.visit,
+ };
+ this.$emit("putVisit", data);
+ })
+ .catch((err) => {
+ this.visit = this.modelData;
+ });
+ return false;
}
return true;
} catch (err) {
diff --git a/src/permission.js b/src/permission.js
index e68f7d2..1ae0024 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -6,6 +6,7 @@ import 'nprogress/nprogress.css'
import { getToken } from '@/utils/auth'
import Vue from 'vue'
import { OSSclient } from './utils/oss'
+import moment from "moment";
// import getPageTitle from '@/utils/get-page-title'
NProgress.configure({ showSpinner: false })
@@ -19,6 +20,8 @@ Vue.prototype.$setOpenWindow = (openWindow) => {
}
Vue.prototype.$openWindow = openWindow;
}
+// 时间格式化
+Vue.prototype.$moment = moment;
router.beforeEach(async (to, from, next) => {
NProgress.start()
Vue.prototype.$setOpenWindow();
diff --git a/src/views/system/hospital/index.vue b/src/views/system/hospital/index.vue
index 15ae884..0ed5799 100644
--- a/src/views/system/hospital/index.vue
+++ b/src/views/system/hospital/index.vue
@@ -10,39 +10,53 @@
>
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index 544e441..dcc847b 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -24,20 +24,20 @@
class="my_new_pwd"
prop="UserName"
>
-
+
-
+
-
+
-
+
-
+
@@ -135,13 +137,13 @@
:label="$t('system:userlist:table:Department')"
prop="DepartmentName"
>
-
+
-
+
diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue
index 35d4a5f..3b820ab 100644
--- a/src/views/system/user/list/index.vue
+++ b/src/views/system/user/list/index.vue
@@ -223,7 +223,7 @@ export default {
type: "Select",
label: this.$t("system:userlist:label:InternalOrExternal"),
prop: "IsZhiZhun",
- width: "100px",
+ width: "150px",
options: [
{
label: this.$t(
@@ -246,7 +246,7 @@ export default {
type: "Select",
label: this.$t("system:userlist:label:Status"),
prop: "UserState",
- width: "100px",
+ width: "150px",
options: [
{ label: this.$t("system:userlist:label:Status:Enable"), value: 1 },
{
@@ -262,7 +262,7 @@ export default {
type: "Select",
label: this.$t("system:userlist:label:UserType"),
prop: "UserType",
- width: "100px",
+ width: "150px",
options: [], // 下拉选项
props: { label: "UserType", value: "Id" }, // 下拉选项配置信息，必填
placeholder: "",
@@ -271,7 +271,7 @@ export default {
type: "Daterange",
label: this.$t("system:userlist:label:CreateTime"),
prop: "CreateTimeArr",
- width: "100px",
+ width: "400px",
placeholder: "",
},
],
@@ -311,9 +311,9 @@ export default {
this.searchData.CreateTimeArr[1]
) {
this.searchData.BeginCreateTime =
- this.searchData.CreateTimeArr[0].toISOString();
+ this.searchData.CreateTimeArr[0];
this.searchData.EndCreateTime =
- this.searchData.CreateTimeArr[1].toISOString();
+ this.searchData.CreateTimeArr[1];
} else {
this.searchData.BeginCreateTime = null;
this.searchData.EndCreateTime = null;
diff --git a/src/views/trials/trials-inspection/components/add-trials-list.vue b/src/views/trials/trials-inspection/components/add-trials-list.vue
index 978bfd4..5bc8612 100644
--- a/src/views/trials/trials-inspection/components/add-trials-list.vue
+++ b/src/views/trials/trials-inspection/components/add-trials-list.vue
@@ -43,6 +43,7 @@
@@ -131,7 +132,7 @@
clearable
@input="
addSubjectForm.SubjectCode = addSubjectForm.SubjectCode.replace(
- /[^0-9]/g,
+ /[^0-9a-zA-Z]/g,
''
)
"
@@ -223,6 +224,22 @@ export default {
message: this.$t("trials:subject:format:notSubject"),
trigger: ["blur", "change"],
},
+ {
+ validator: (rule, value, callback) => {
+ let flag = this.subjectIdList.some(
+ (item) => item.SubjectCode === value
+ );
+ if (flag) {
+ callback(
+ new Error(this.$t("trials:addSubject:format:hasSubject"))
+ );
+ } else {
+ callback();
+ }
+ },
+ message: this.$t("trials:addSubject:format:hasSubject"),
+ trigger: ["blur", "change"],
+ },
],
},
};
@@ -271,13 +288,6 @@ export default {
try {
let validate = await this.$refs.addSubjectForm.validate();
if (!validate) return;
- let flag = this.subjectIdList.some(
- (item) => item.SubjectCode === this.addSubjectForm.SubjectCode
- );
- if (flag)
- return this.$message.warning(
- this.$t("trials:addSubject:format:hasSubject")
- );
let subject = {
SubjectCode: this.addSubjectForm.SubjectCode,
SubejctId: this.addSubjectForm.SubjectCode,
diff --git a/src/views/trials/trials-inspection/components/confirm-visit-list.vue b/src/views/trials/trials-inspection/components/confirm-visit-list.vue
index 201edb4..07a4158 100644
--- a/src/views/trials/trials-inspection/components/confirm-visit-list.vue
+++ b/src/views/trials/trials-inspection/components/confirm-visit-list.vue
@@ -8,7 +8,7 @@
-
+
-
+ /> -->