fixed reactive issue

bcgov · Nov 22, 2024 · 4b8d614 · 4b8d614
1 parent fbed336
commit 4b8d614
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/frontend/src/components/Batch/Forms/DistrunUserForm.vue b/frontend/src/components/Batch/Forms/DistrunUserForm.vue
@@ -306,9 +306,11 @@ export default {
     });
 
     watch(group, (newValue) => {
+      batchRequestFormStore.who = newValue;
       if (newValue == "Ministry of Advanced Education") {
-        batchRequestFormStore.who = newValue;
         batchRequestFormStore.distribution = "User";
+      } else {
+        batchRequestFormStore.distribution = "BC Mail";
       }
     });
 

diff --git a/frontend/src/components/Batch/Forms/FormInputs/DistributionInput.vue b/frontend/src/components/Batch/Forms/FormInputs/DistributionInput.vue
@@ -10,32 +10,32 @@
           required
           variant="outlined"
         ></v-text-field>
-      </v-col> </v-row
-    ><v-row>
+      </v-col>
+    </v-row>
+    <v-row v-if="getDistribution !== 'User'">
       <v-col sm="2"><strong>Where</strong></v-col>
       <v-col sm="10" md="4">
         <v-select
-          v-model="distribution"
-          :items="[
-            'BC Mail',
-            'Download',
-            { title: 'User: ' + userFullName, value: 'User' },
-          ]"
+          v-model="getDistribution"
+          :items="['BC Mail', 'Download']"
           item-title="title"
           item-value="value"
           label="Where"
           variant="outlined"
           require
           hide-details
-          :disabled="distribution === 'User'"
         ></v-select>
       </v-col>
 
       <v-col>
         <template #bottom></template>
       </v-col>
     </v-row>
-    <v-card v-if="distribution === 'User'" class="mt-4" title="Mailing Address">
+    <v-card
+      v-if="getDistribution === 'User'"
+      class="mt-4"
+      title="Mailing Address"
+    >
       <v-card-text>
         <strong>{{ userFullName }}</strong
         ><br />
@@ -126,6 +126,7 @@ export default {
       "getBatchRunTime",
       "getBatchRunCustomDate",
       "getbatchRunCustomTime",
+      "getDistribution",
       "getGroup",
       "getUserDistributionAddress",
     ]),