+
@@ -76,7 +78,7 @@ export default {
fileList: [],
btnDisabled: false,
dialogVisible: false,
- dialogImageUrl: ''
+ dialogImageUrl: "",
};
},
watch: {
@@ -184,8 +186,10 @@ export default {
this.dialogVisible = true;
},
handleRemove(file) {
+ console.log(1111111111);
this.fileList = [];
- }
+ this.$emit("update:path", null);
+ },
},
};
diff --git a/src/views/system/notice/components/from.vue b/src/views/system/notice/components/from.vue
index f9a328a..ed040d6 100644
--- a/src/views/system/notice/components/from.vue
+++ b/src/views/system/notice/components/from.vue
@@ -86,10 +86,22 @@
:label="$t('system:notice:label:StartDate')"
prop="StartDate"
>
-
+
-
+
@@ -388,7 +389,7 @@ export default {
data.patientIdList = [this.Patient.PatientId];
}
- if (this.dateValue[0] && this.dateValue[1]) {
+ if (this.dateValue && this.dateValue[0] && this.dateValue[1]) {
data.earliestStudyTime = this.$moment(this.dateValue[0]).format(
"YYYY-MM-DD HH:mm:ss"
);
@@ -404,7 +405,6 @@ export default {
this.loading = true;
let res = await getVisitPatientStudyList(data);
this.loading = false;
- console.log(res);
if (res.IsSuccess) {
this.list = res.Result;
// this.total = res.Result.TotalCount;
@@ -426,7 +426,7 @@ export default {
},
// 查询
handleSearch() {
- this.searchData.PageIndex = 1;
+ // this.searchData.PageIndex = 1;
this.getList();
},
// 重置
diff --git a/src/views/trials/trials-inspection/components/view-study-list.vue b/src/views/trials/trials-inspection/components/view-study-list.vue
index 7f9ccb9..27bd217 100644
--- a/src/views/trials/trials-inspection/components/view-study-list.vue
+++ b/src/views/trials/trials-inspection/components/view-study-list.vue
@@ -37,6 +37,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
+ :default-time="['00:00:00', '23:59:59']"
>
@@ -251,9 +252,13 @@ export default {
data[key] = this.searchData[key];
});
data.PatientId = this.Patient.PatientId;
- if (this.dateValue[0] && this.dateValue[1]) {
- data.EarliestStudyTime = this.dateValue[0];
- data.LatestStudyTime = this.dateValue[1];
+ if (this.dateValue && this.dateValue[0] && this.dateValue[1]) {
+ data.EarliestStudyTime = this.$moment(this.dateValue[0]).format(
+ "YYYY-MM-DD HH:mm:ss"
+ );
+ data.LatestStudyTime = this.$moment(this.dateValue[1]).format(
+ "YYYY-MM-DD HH:mm:ss"
+ );
} else {
data.EarliestStudyTime = null;
data.LatestStudyTime = null;
diff --git a/src/views/trials/trials-inspection/index.vue b/src/views/trials/trials-inspection/index.vue
index b341ed7..8bc9600 100644
--- a/src/views/trials/trials-inspection/index.vue
+++ b/src/views/trials/trials-inspection/index.vue
@@ -73,6 +73,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
+ :default-time="['00:00:00', '23:59:59']"
clearable
>
@@ -396,9 +397,13 @@ export default {
Object.keys(this.searchData).forEach((key) => {
data[key] = this.searchData[key];
});
- if (this.dateValue[0] && this.dateValue[1]) {
- data.BeginPushTime = this.dateValue[0];
- data.EndPushTime = this.dateValue[1];
+ if (this.dateValue && this.dateValue[0] && this.dateValue[1]) {
+ data.BeginPushTime = this.$moment(this.dateValue[0]).format(
+ "YYYY-MM-DD HH:mm:ss"
+ );
+ data.EndPushTime = this.$moment(this.dateValue[1]).format(
+ "YYYY-MM-DD HH:mm:ss"
+ );
} else {
data.BeginPushTime = null;
data.EndPushTime = null;
diff --git a/src/views/trials/trials-list/components/activate-page.vue b/src/views/trials/trials-list/components/activate-page.vue
index 969d68c..4e4d950 100644
--- a/src/views/trials/trials-list/components/activate-page.vue
+++ b/src/views/trials/trials-list/components/activate-page.vue
@@ -7,7 +7,7 @@
style="width: 500px; padding: 30px 0 0 30px"
>
-
授权申请信息
+
{{ $t("trials:trials-list:activate:message:authorizationMsg") }}
@@ -44,7 +44,7 @@
{{ data.PurchaseDuration }}
- 生成激活码信息
+ {{ $t("trials:trials-list:activate:message:activateMsg") }}
{{ data.HospitalName }}
@@ -66,7 +66,10 @@
-
+
-
+
@@ -86,14 +89,14 @@
type="primary"
@click.stop="getTrialActivationCode"
>
- 生成
+ {{ $t("trials:trials-list:activate:button:create") }}
- 复制
+ {{ $t("trials:trials-list:activate:button:copy") }}
- 下载
+ {{ $t("trials:trials-list:activate:button:downLoad") }}
diff --git a/src/views/trials/trials-myinfo/account.vue b/src/views/trials/trials-myinfo/account.vue
index 1fd6abe..d395083 100644
--- a/src/views/trials/trials-myinfo/account.vue
+++ b/src/views/trials/trials-myinfo/account.vue
@@ -144,6 +144,7 @@ import {
setNewUserName,
SetNewCheckCode,
} from "@/api/system/user.js";
+import { removeToken } from "@/utils/auth";
import password from "./password.vue";
var timer = "";
var countdown = 60;
@@ -197,15 +198,33 @@ export default {
}
);
},
- setNewUserName() {
- setNewUserName(this.userForm.UserName).then(() => {
- this.userForm.UserName = "";
- this.$message.success(
- this.$t("trials:trials-myinfo:message:updateSuccessfully")
- );
- this.$emit("getUserInfo");
- this.logout();
- });
+ async setNewUserName() {
+ try {
+ let res = await setNewUserName(this.userForm.UserName);
+ if (res.IsSuccess) {
+ this.userForm.UserName = "";
+ this.$message.success(
+ this.$t("trials:trials-myinfo:message:updateSuccessfully")
+ );
+ this.$emit("getUserInfo");
+ removeToken();
+ let confirm = await this.$confirm(
+ this.$t("trials:trials-myInfo:confirmMessage:updateUserName"),
+ {
+ type: "warning",
+ showClose: false,
+ showCancelButton: false,
+ distinguishCancelAndClose: true,
+ confirmButtonText: this.$t("common:button:confirm"),
+ cancelButtonText: this.$t("common:button:cancel"),
+ }
+ );
+ if (confirm !== "confirm") return;
+ this.logout();
+ }
+ } catch (err) {
+ console.log(err);
+ }
},
setNewPhone() {
setNewPhone(this.userForm.Phone).then(() => {
diff --git a/src/views/trials/trials-myinfo/password.vue b/src/views/trials/trials-myinfo/password.vue
index bb5acfb..a840d0b 100644
--- a/src/views/trials/trials-myinfo/password.vue
+++ b/src/views/trials/trials-myinfo/password.vue
@@ -60,6 +60,7 @@
import md5 from "js-md5";
import { mapGetters, mapMutations } from "vuex";
import { modifyPassword } from "@/api/admin.js";
+import { removeToken } from "@/utils/auth";
export default {
name: "password",
data() {
@@ -105,31 +106,43 @@ export default {
},
methods: {
...mapMutations({ setLanguage: "lang/setLanguage" }),
- save() {
- this.$refs.passwordForm.validate((valid) => {
- if (valid) {
- if (this.password.NewPassWord !== this.password.ConfirmPassWord) {
- this.$alert(this.$t("passwordReset:formRule:passwordsDiffer"));
- return;
- }
- const param = {
- UserId: this.userId,
- NewPassWord: md5(this.password.NewPassWord),
- OldPassWord: md5(this.password.OldPassWord),
- };
- modifyPassword(param).then((res) => {
- if (res.IsSuccess) {
- // 修改成功,请重新登录账号
- this.$message.success(
- this.$t("trials:trials-myinfo:message:modifyPWSuccessfully")
- );
- setTimeout(() => {
- this.logout();
- }, 1000);
- }
- });
+ async save() {
+ try {
+ let validate = await this.$refs.passwordForm.validate();
+ if (!validate) return;
+ if (this.password.NewPassWord !== this.password.ConfirmPassWord) {
+ this.$alert(this.$t("passwordReset:formRule:passwordsDiffer"));
+ return;
}
- });
+ const param = {
+ UserId: this.userId,
+ NewPassWord: md5(this.password.NewPassWord),
+ OldPassWord: md5(this.password.OldPassWord),
+ };
+ let res = await modifyPassword(param);
+ if (res.IsSuccess) {
+ // 修改成功,请重新登录账号
+ this.$message.success(
+ this.$t("trials:trials-myinfo:message:modifyPWSuccessfully")
+ );
+ removeToken();
+ let confirm = await this.$confirm(
+ this.$t("trials:trials-myInfo:confirmMessage:updatePassWord"),
+ {
+ type: "warning",
+ showClose: false,
+ showCancelButton: false,
+ distinguishCancelAndClose: true,
+ confirmButtonText: this.$t("common:button:confirm"),
+ cancelButtonText: this.$t("common:button:cancel"),
+ }
+ );
+ if (confirm !== "confirm") return;
+ this.logout();
+ }
+ } catch (err) {
+ console.log(err);
+ }
},
async logout() {
/* eslint-disable */
diff --git a/src/views/trials/trials-notice/index.vue b/src/views/trials/trials-notice/index.vue
index b71a197..bdbb54b 100644
--- a/src/views/trials/trials-notice/index.vue
+++ b/src/views/trials/trials-notice/index.vue
@@ -6,10 +6,10 @@