From e5a17d20b1ba3688b1f3feeddb969e5a37eea828 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Wed, 8 Jan 2025 14:01:26 +0800 Subject: [PATCH 1/5] =?UTF-8?q?1.07=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/getters.js | 1 + src/store/modules/user.js | 9 + .../components/staffExternalForm.vue | 2 +- .../components/needSignSysDoc.vue | 187 ++++++++++++------ src/views/trials/trials-workbench/index.vue | 2 + 5 files changed, 138 insertions(+), 63 deletions(-) diff --git a/src/store/getters.js b/src/store/getters.js index eb877042..e843f66d 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -47,6 +47,7 @@ const getters = { language: state => state.lang.language, TotalNeedSignSystemDocCount: state => state.user.TotalNeedSignSystemDocCount, TotalNeedSignTrialDocCount: state => state.user.TotalNeedSignTrialDocCount, + IsFirstSysDocNeedSign: state => state.user.IsFirstSysDocNeedSign, TrialStatusStr: state => state.user.TrialStatusStr } export default getters diff --git a/src/store/modules/user.js b/src/store/modules/user.js index b467d3ea..51cb716c 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -18,6 +18,7 @@ const getDefaultState = () => { /* eslint-disable */ TotalNeedSignSystemDocCount: eval(process.env.VUE_APP_WORD_FOR_PERMISSION) ? null : 0, TotalNeedSignTrialDocCount: eval(process.env.VUE_APP_WORD_FOR_PERMISSION) ? null : 0, + IsFirstSysDocNeedSign: false, TrialStatusStr: null, isTestUser: false, roles: [] @@ -65,6 +66,10 @@ const mutations = { SET_ISTESTUSER: (state, isTestUser) => { state.isTestUser = eval(isTestUser) }, + SET_IS_FIRST_SYSTEM_DOC_SIGN: (state, IsFirstSysDocNeedSign) => { + zzSessionStorage.setItem('IsFirstSysDocNeedSign', IsFirstSysDocNeedSign) + state.IsFirstSysDocNeedSign = IsFirstSysDocNeedSign + }, SET_NEED_SIGN_SYSTEM_DOC_COUNT: (state, TotalNeedSignSystemDocCount) => { /* eslint-disable */ if (eval(process.env.VUE_APP_WORD_FOR_PERMISSION) && !state.isTestUser) { @@ -216,6 +221,9 @@ const actions = { setTotalNeedSignSystemDocCount({ commit }, TotalNeedSignSystemDocCount) { commit('SET_NEED_SIGN_SYSTEM_DOC_COUNT', TotalNeedSignSystemDocCount) }, + setIsFirstSysDocNeedSign({ commit }, IsFirstSysDocNeedSign) { + commit('SET_IS_FIRST_SYSTEM_DOC_SIGN', IsFirstSysDocNeedSign) + }, setTotalNeedSignTrialDocCount({ commit }, TotalNeedSignTrialDocCount) { commit('SET_NEED_SIGN_TRIALS_DOC_COUNT', TotalNeedSignTrialDocCount) }, @@ -238,6 +246,7 @@ const actions = { commit('SET_USERNAME', zzSessionStorage.getItem('userName')) commit('SET_NEED_SIGN_SYSTEM_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignSystemDocCount'))) commit('SET_NEED_SIGN_TRIALS_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignTrialDocCount'))) + commit('SET_IS_FIRST_SYSTEM_DOC_SIGN', zzSessionStorage.getItem('IsFirstSysDocNeedSign')) // console.log(zzSessionStorage.getItem('TotalNeedSignSystemDocCount')) // console.log(zzSessionStorage.getItem('TotalNeedSignTrialDocCount')) zzSessionStorage.setItem('userName', user.name) diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue index cb616a7d..d1fe8dbd 100644 --- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue +++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue @@ -172,7 +172,7 @@ :model="permission" :rules="permissionRole" ref="permissionForm" - label-width="140px" + label-width="230px" class="demo-ruleForm" > -

{{ !isSigned ? $t('trials:workbench:title:sysDocBeSigned') : $t('trials:workbench:title:sysDocSigned') }}

-
-

- - + {{ + !isSigned + ? $t('trials:workbench:title:sysDocBeSigned') + : $t('trials:workbench:title:sysDocSigned') + }} +

+
+ +

+ +

@@ -18,10 +39,10 @@ v-loading="listLoading" :data="list" :show-header="true" - v-adaptive="{bottomOffset:45}" + v-adaptive="{ bottomOffset: 45 }" height="100" @sort-change="handleSortByColumn" - :default-sort ="{prop: 'UpdateTime', order: 'descending'}" + :default-sort="{ prop: 'UpdateTime', order: 'descending' }" > - + diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue index f4ba888f..8e128252 100644 --- a/src/views/trials/trials-workbench/index.vue +++ b/src/views/trials/trials-workbench/index.vue @@ -530,7 +530,9 @@ export default { getUserTobeDoneRecord() { getUserTobeDoneRecord().then(async res => { this.tabList = res.Result + this.isSignSystemDoc = this.tabList.IsFirstSysDocNeedSign await store.dispatch('user/setTotalNeedSignSystemDocCount', this.tabList.SysWaitSignDocCount) + await store.dispatch('user/setIsFirstSysDocNeedSign', this.tabList.IsFirstSysDocNeedSign) }) } } From 9ab7afa06fa5127a7bb3d12caa4e8e70cdfae78f Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Wed, 8 Jan 2025 14:02:41 +0800 Subject: [PATCH 2/5] 1 --- src/views/trials/trials-workbench/components/needSignSysDoc.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/trials/trials-workbench/components/needSignSysDoc.vue b/src/views/trials/trials-workbench/components/needSignSysDoc.vue index f34f4973..ce8a7d16 100644 --- a/src/views/trials/trials-workbench/components/needSignSysDoc.vue +++ b/src/views/trials/trials-workbench/components/needSignSysDoc.vue @@ -77,7 +77,7 @@ icon="el-icon-edit-outline" circle v-if="!isSigned" - :disabled="IsFirstSysDocNeedSign && !~scope.row.DocTypeCode" + :disabled="IsFirstSysDocNeedSign && !!~scope.row.DocTypeCode" :title="$t('trials:needSignSysDoc:action:sign')" @click="handleSign(scope.row)" /> From 67a3c4f9269c3fc7ec8d775af7d887e90656351f Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Wed, 8 Jan 2025 14:26:45 +0800 Subject: [PATCH 3/5] =?UTF-8?q?1.07=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../attachments/attachment-management/index.vue | 16 ++++++++-------- .../attachments/self-attachment/index.vue | 10 +++++----- .../components/needSignedSysDoc.vue | 6 ++++++ static/pdfjs/web/viewer.js | 3 ++- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/views/trials/trials-panel/attachments/attachment-management/index.vue b/src/views/trials/trials-panel/attachments/attachment-management/index.vue index 45e9080a..1f4cfd33 100644 --- a/src/views/trials/trials-panel/attachments/attachment-management/index.vue +++ b/src/views/trials/trials-panel/attachments/attachment-management/index.vue @@ -76,7 +76,7 @@ style="width: 120px" > @@ -199,11 +199,11 @@ sortable="custom" > diff --git a/src/views/trials/trials-panel/attachments/self-attachment/index.vue b/src/views/trials/trials-panel/attachments/self-attachment/index.vue index 4539d256..98b3e6f2 100644 --- a/src/views/trials/trials-panel/attachments/self-attachment/index.vue +++ b/src/views/trials/trials-panel/attachments/self-attachment/index.vue @@ -25,7 +25,7 @@ -