Merge remote-tracking branch 'origin/main'

src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareSelectionSituationServiceImpl.java

@@ -122,6 +122,7 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl<Welfar
                   t1.welfareUnitName,
                   GROUP_CONCAT(DISTINCT t3.optionName,'（',t2.selectNum,'份）') AS selectedOptions,
                   GROUP_CONCAT(DISTINCT t2.mobile) AS mobile,
+                  GROUP_CONCAT(DISTINCT t2.userName) AS userName2,
                   GROUP_CONCAT(DISTINCT t2.receiveAddress) AS receiveAddress,
                   t4.username AS userName,
                   t4.loginname AS loginName,
@@ -182,6 +183,7 @@ public class WelfareSelectionSituationServiceImpl extends BaseServiceImpl<Welfar
         entities.add(new ExcelExportEntity("所属单位", "welfareUnitName", 20));
         entities.add(new ExcelExportEntity("所属工会", "welfareUnionName", 20));
         entities.add(new ExcelExportEntity("所选福利", "selectedOptions", 20));
+        entities.add(new ExcelExportEntity("收货人", "userName2", 20));
         entities.add(new ExcelExportEntity("联系电话", "mobile", 20));
 
         if(project.getProvideMode() == 3){

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

@@ -368,11 +368,10 @@ const optionSelect = {
                 );
                 if (selectedAddress) {
                     // 自动填充收货人和电话
-                    this.contactForm.userName = selectedAddress.userName;
+                    this.$set(this.contactForm, "userName", selectedAddress.userName)
-                    this.contactForm.mobile = selectedAddress.tel;
+                    this.$set(this.contactForm, "mobile", selectedAddress.tel)
-                    // const data = selectedAddress.province + selectedAddress.city + selectedAddress.county + selectedAddress.addressDetail
+                    // this.contactForm.userName = selectedAddress.userName;
-                    // debugger
+                    // this.contactForm.mobile = selectedAddress.tel;
-                    // this.$set(this.contactForm, "receiveAddress", data)
                 }
             }
         },
@@ -455,8 +454,10 @@ const optionSelect = {
                     if (this.projectInfo.provideMode === 3) {
                         if (this.userSelection.length > 0 && this.userSelection[0].receiveAddress) {
                             this.contactForm.receiveAddress = this.userSelection[0].receiveAddress
-                            this.contactForm.userName = this.userSelection[0].userName;
+                            // this.contactForm.userName = this.userSelection[0].userName;
-                            this.contactForm.mobile = this.userSelection[0].mobile;
+                            // this.contactForm.mobile = this.userSelection[0].mobile;
+                            this.$set(this.contactForm, "userName", this.userSelection[0].userName)
+                            this.$set(this.contactForm, "mobile", this.userSelection[0].mobile)
                         }
                     }
 
@@ -508,6 +509,7 @@ const optionSelect = {
                                 selectNum: 1,
                                 mobile: this.contactForm.mobile,
                                 userName: this.contactForm.userName,
+                                userSign: this.contactForm.userSign,
                                 receiveAddress: this.contactForm.receiveAddress
                             }
                         ]
@@ -520,6 +522,7 @@ const optionSelect = {
                         selectNum: option.selectNum,
                         mobile: this.contactForm.mobile,
                         userName: this.contactForm.userName,
+                        userSign: this.contactForm.userSign,
                         receiveAddress: this.contactForm.receiveAddress
                     }))
                 }