Merge remote-tracking branch 'origin/main'

src/main/resources/static/components/condolence/Info.vue

@@ -19,7 +19,8 @@
                 <th>联系电话</th>
                 <td>{{ viewData.mobile || '-' }}</td>
               </tr>
-              <tr>
+              <!-- 结婚、退休离岗慰问不涉及收款信息，查看及审核时不展示对应字段。 -->
+              <tr v-if="showPayeeFields">
                 <th>收款人</th>
                 <td>{{ viewData.payee_username }}</td>
                 <th>收款人银行卡</th>
@@ -380,6 +381,12 @@ module.exports = {
       loading: true,
     }
   },
+  computed: {
+    showPayeeFields() {
+      const hiddenTypeNames = ['会员结婚慰问', '会员退休离岗慰问']
+      return !hiddenTypeNames.includes(this.viewData.typename)
+    },
+  },
   components: {
     'file-upload': httpVueLoader('/components/plugins/FileUpload.vue'),
   },

src/main/resources/views/platform/zgfw/condolence/index.html

@@ -492,7 +492,7 @@ layout("/layouts/platform.html"){
             'guava': httpVueLoader('/components/plugins/Guava.vue'),
             'file-upload': httpVueLoader('/components/plugins/FileUpload.vue'),
             'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'),
-            'info': httpVueLoader('/components/condolence/Info.vue?v=1.0.1'),
+            'info': httpVueLoader('/components/condolence/Info.vue?v=1.0.2'),
         },
         methods: {
             async payeeChange() {

src/main/resources/views/platform/zgfw/condolence/read.html

@@ -218,7 +218,7 @@ layout("/layouts/platform.html"){
             'guava': httpVueLoader('/components/plugins/Guava.vue'),
             'file-upload': httpVueLoader('/components/plugins/FileUpload.vue'),
             'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'),
-            'info': httpVueLoader('/components/condolence/Info.vue?v=1.0.1'),
+            'info': httpVueLoader('/components/condolence/Info.vue?v=1.0.2'),
         },
         methods: {
             dropdownCommand(command) {

src/main/resources/views/platform/zgfw/condolence/ucr.html

@@ -256,7 +256,7 @@ layout("/layouts/platform.html"){
             'guava': httpVueLoader('/components/plugins/Guava.vue'),
             'file-upload': httpVueLoader('/components/plugins/FileUpload.vue'),
             'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'),
-            'info': httpVueLoader('/components/condolence/Info.vue?v=1.0.1'),
+            'info': httpVueLoader('/components/condolence/Info.vue?v=1.0.2'),
         },
         methods: {
             dropdownCommand(command) {

src/main/resources/views/platform/zgfw/condolence/vcr.html

@@ -237,7 +237,7 @@ layout("/layouts/platform.html"){
             'guava': httpVueLoader('/components/plugins/Guava.vue'),
             'file-upload': httpVueLoader('/components/plugins/FileUpload.vue'),
             'sign': httpVueLoader('/components/sign/sign.vue?v=2.0.0'),
-            'info': httpVueLoader('/components/condolence/Info.vue?v=1.0.1'),
+            'info': httpVueLoader('/components/condolence/Info.vue?v=1.0.2'),
         },
         methods: {
             dropdownCommand(command) {