jobdone-shared-files 1.1.6 → 1.1.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -7,12 +7,12 @@
|
|
|
7
7
|
:clear-btn="clearBtn" :opts="optsAdjust" preview-key="organName" :filter-keys="['organName']"
|
|
8
8
|
:selected-data="organPicked" placeholder="所屬公司 / 協力廠商 / 專案成員" searchPlaceholder="文字篩選"
|
|
9
9
|
@select="(v) => selectOrgan(v)" :reset-value="defaultOrgan" />
|
|
10
|
-
|
|
10
|
+
<small class="text-danger mt-1" v-if="organInvalid && !organPicked?.organId">必填</small>
|
|
11
11
|
</div>
|
|
12
12
|
<div class="user-pick-autocomplete-select-box">
|
|
13
|
-
<autocomplete-select ref="userPicker"
|
|
14
|
-
:
|
|
15
|
-
:clear-btn="clearBtn" :disabled="!organPicked?.organId"
|
|
13
|
+
<autocomplete-select ref="userPicker"
|
|
14
|
+
:trigger-class="`${userSelectClass} ${userInvalid && !userPicked?.userId ? 'is-invalid' : ''}`"
|
|
15
|
+
:opts="organPickedUsers" :clear-btn="clearBtn" :disabled="!organPicked?.organId"
|
|
16
16
|
:preview-key="userPicked.userId ? `displayName + ' ( ' + lastName +' ' + firstName + ' ) ' + '( 電話： ' + phoneNumber + ' )'` : 'displayName'"
|
|
17
17
|
:filter-keys="['displayName', 'firstName', 'lastName', 'phoneNumber']" :selected-data="userPicked"
|
|
18
18
|
:placeholder="organPicked?.organId ? '選擇受文者' : '請先選擇受文者所屬公司 / 協力廠商 / 專案成員'"
|
|
@@ -83,7 +83,7 @@ const resetSelected = () => {
|
|
|
83
83
|
const setOrganSelectFirst = () => {
|
|
84
84
|
selectOrgan(optsAdjust.value[0] || defaultOrgan)
|
|
85
85
|
}
|
|
86
|
-
const setSelected = (userId) => {
|
|
86
|
+
const setSelected = async (userId) => {
|
|
87
87
|
if (!userId) {
|
|
88
88
|
resetSelected()
|
|
89
89
|
return
|
|
@@ -94,10 +94,8 @@ const setSelected = (userId) => {
|
|
|
94
94
|
resetSelected()
|
|
95
95
|
return
|
|
96
96
|
}
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
organId: user.organization?.id,
|
|
100
|
-
})
|
|
97
|
+
|
|
98
|
+
selectOrgan(optsAdjust.value.find(i => i.organId == user.organization?.id))
|
|
101
99
|
selectUser(user, true)
|
|
102
100
|
}
|
|
103
101
|
|