Move country selection location and make it mandatory

https://dev.wormwood.com.sg/zentao/task-view-145.html

Strides-Admin/src/views/voucher/detail.vue

@@ -34,43 +34,31 @@
         </div>
         <div class="flexcr">
           <el-form-item
-            label="Description:"
-            prop="voucherDesc"
+            label="Redemption Method:"
+            prop="redemptionMethod"
+            class="flex1">
+            <el-select
+              class="add-text"
+              v-model="form.redemptionMethod">
+              <el-option
+                v-for="(item, index) in options.redemp"
+                :key="index"
+                :label="item"
+                :value="item"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="Quantity:"
+            prop="voucherQuantity"
             class="flex1">
             <el-input
               class="add-text"
-              v-model="form.voucherDesc"
-              type="textarea"
-              maxlength="500"
-              :autosize="autoSize"/>
+              v-model="form.voucherQuantity"
+              type="number"
+              min="1"
+              max="999999"
+              maxlength="6"/>
           </el-form-item>
-          <div class="flex1">
-            <el-form-item
-              label="Quantity:"
-              prop="voucherQuantity">
-              <el-input
-                class="add-text"
-                v-model="form.voucherQuantity"
-                type="number"
-                min="1"
-                max="999999"
-                maxlength="6"/>
-            </el-form-item>
-            <el-form-item
-              label="Redemption Method:"
-              prop="redemptionMethod"
-              class="flex1">
-              <el-select
-                class="add-text"
-                v-model="form.redemptionMethod">
-                <el-option
-                  v-for="(item, index) in options.redemp"
-                  :key="index"
-                  :label="item"
-                  :value="item"/>
-              </el-select>
-            </el-form-item>
-          </div>
         </div>
         <div class="flexcr">
           <el-form-item
@@ -101,6 +89,33 @@
               maxlength="6"/>
           </el-form-item>
         </div>
+        <div class="flexr">
+          <el-form-item
+            label="Country:"
+            prop="countryCode"
+            class="flex1">
+            <el-select
+              class="add-text"
+              v-model="form.countryCode">
+              <el-option
+                v-for="item in options.country"
+                :key="item.value"
+                :label="item.name"
+                :value="item.value"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="Description:"
+            prop="voucherDesc"
+            class="flex1">
+            <el-input
+              class="add-text"
+              v-model="form.voucherDesc"
+              type="textarea"
+              maxlength="500"
+              :autosize="autoSize"/>
+          </el-form-item>
+        </div>
       </div>
       <div class="content" v-if="form.voucherType !== 'Free Charging'">
         <div class="section-title">VOUCHER CONFIGURATION</div>
@@ -138,26 +153,12 @@
       <div class="content">
         <div class="section-title">VOUCHER CONDITIONS</div>
         <div class="flexcr">
-          <el-form-item
-            label="Country:"
-            prop="countryCode"
-            class="flex1">
-            <el-select
-              class="add-text"
-              v-model="form.countryCode">
-              <el-option
-                v-for="item in options.country"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
           <el-form-item
             label="Specific Sites:"
             prop="sitePks"
             class="flex1">
             <el-select
-              class="add-text"
+              style="width: 100%;"
               v-model="form.sitePks"
               filterable
               remote
@@ -360,6 +361,11 @@ export default {
           trigger: "change",
           message: "Please click the refresh button on the right to generate code",
         },
+        countryCode: {
+          required: true,
+          trigger: "change",
+          message: "Please select country"
+        },
         sitePks: {
           required: true,
           trigger: "change",