feat: 职工福利优化3

src/main/resources/views/platform/zhgh/welfare/select/optionSelect.js

@@ -162,24 +162,22 @@ const optionSelect = {
                                     <span>超出江浙沪不包邮，超出部分自理，具体金额联系供应商。</span>
                                 </div>
                             </div>
+                            <el-form-item v-if="deliveryMethod === 'mail'" prop="receiveAddress"
+                                          label="收货地址"
+                                          :rules="[{ required: true, message: '请选择收货地址', trigger: 'change' }]">
+                                <div class="confirm-address-row">
+                                    <el-select v-model="contactForm.receiveAddress" placeholder="请选择收货地址"
+                                               @change="onAddressChange">
+                                        <el-option v-for="item in addressOptions"
+                                                   :key="item.id"
+                                                   :label="item.province+ item.city+ item.county+ item.addressDetail"
+                                                   :value="item.province + item.city + item.county + item.addressDetail">
+                                        </el-option>
+                                    </el-select>
+                                    <el-button @click="openAddress" type="primary">添加地址</el-button>
+                                </div>
+                            </el-form-item>
                             <el-row :gutter="10">
-                                <el-col :span="20" v-if="deliveryMethod === 'mail'">
-                                    <el-form-item prop="receiveAddress"
-                                                  label="收货地址"
-                                                  :rules="[{ required: true, message: '请选择收货地址', trigger: 'change' }]">
-                                        <el-select v-model="contactForm.receiveAddress" placeholder="请选择收货地址"
-                                                   style="width: 100%" @change="onAddressChange">
-                                            <el-option v-for="item in addressOptions"
-                                                       :key="item.id"
-                                                       :label="item.province+ item.city+ item.county+ item.addressDetail"
-                                                       :value="item.province + item.city + item.county + item.addressDetail">
-                                            </el-option>
-                                        </el-select>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="4" v-if="deliveryMethod === 'mail'">
-                                    <el-button @click="openAddress" type="primary" size="small">添加地址</el-button>
-                                </el-col>
                                 <el-col :span="24" v-if="deliveryMethod === 'mail'">
                                     <el-form-item prop="userName" label="收货人">
                                         <el-input

src/main/resources/views/platform/zhgh/welfare/select/optionSelectDialog.css

@@ -86,3 +86,15 @@
     flex: none;
     color: #e87516;
 }
+
+.welfare-confirm-dialog .confirm-address-row {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    line-height: normal;
+}
+
+.welfare-confirm-dialog .confirm-address-row .el-select {
+    flex: 1;
+    min-width: 0;
+}

src/main/resources/views/platform/zhghh5/welfare/select/index.html

@@ -1514,7 +1514,10 @@ layout("/layouts/platform_h5.html"){
                 <div class="confirm-content-scroll">
                     <div class="confirm-card" v-if="hasDeliveryOptions">
                         <div class="confirm-card-header">
-                            <div class="confirm-card-title"><van-icon name="apps-o"></van-icon>{{ projectInfo.provideMode === 5 ? '领取方式 · 邮寄到家' : '领取方式' }}</div>
+                            <div class="confirm-card-title">
+                                <van-icon name="apps-o"></van-icon>
+                                <span>领取方式<span v-if="deliveryMethod"> · {{ deliveryMethod === 'pickup' ? '实物发放' : '邮寄到家' }}</span></span>
+                            </div>
                         </div>
                         <van-radio-group v-if="projectInfo.provideMode === 3" v-model="deliveryMethod" class="welfare-delivery-options">
                             <van-radio name="pickup" :class="{'welfare-delivery-selected': deliveryMethod === 'pickup'}">