Merge branch 'test' into 'prod'

Test

See merge request !52

src/formJson/productPlan.js

@@ -334,7 +334,7 @@ const productPlan = [
         label: '供款期数',
         label: '供款期数',
         key: 'issueNumber',
         key: 'issueNumber',
         value: '',
         value: '',
-        domType: 'Select',
+        domType: 'Input',
         required: false,
         required: false,
         disabled: false,
         disabled: false,
         placeholder: '请选择',
         placeholder: '请选择',

src/formJson/secondHolder.js

@@ -28,7 +28,7 @@ const secondHolder = [
   //受益人
   //受益人
   {
   {
     showMoudle: false, //模块是否展示
     showMoudle: false, //模块是否展示
-    fatherTitle: '受益人',
+    fatherTitle: '第二持有人',
     keyType: 'Object', //用于表单收集值时，判断是数组还是对象
     keyType: 'Object', //用于表单收集值时，判断是数组还是对象
     key: 'apiSecondHolderInfoDto',
     key: 'apiSecondHolderInfoDto',
     anchorKey: 'apiSecondHolderInfoDto',
     anchorKey: 'apiSecondHolderInfoDto',

src/views/sign/appointment/components/productPlan.vue

@@ -407,53 +407,53 @@ const handleSearchSelectChange = (father, key) => {
           dialogForm.value['productLaunchName'] = item1.label
           dialogForm.value['productLaunchName'] = item1.label
           dialogForm.value['productLaunchBizId'] = item1.value
           dialogForm.value['productLaunchBizId'] = item1.value
         }
         }
-        item1.apiAttributeSettingDtoList.forEach(item2 => {
-          if (item2.fieldBizId == 'field_eWCnuwS3WPKog5kZ' && item.key == 'issueNumber') {
-            if (item2.value) {
-              item.options = item2.value
-                .split(/[，,;；\s]+/)
-                .map(item => item.trim())
-                .filter(item => item !== '')
-                .map(item => {
-                  return { label: item, value: item }
-                })
+        // item1.apiAttributeSettingDtoList.forEach(item2 => {
+        //   if (item2.fieldBizId == 'field_eWCnuwS3WPKog5kZ' && item.key == 'issueNumber') {
+        //     if (item2.value) {
+        //       item.options = item2.value
+        //         .split(/[，,;；\s]+/)
+        //         .map(item => item.trim())
+        //         .filter(item => item !== '')
+        //         .map(item => {
+        //           return { label: item, value: item }
+        //         })
 
 
-              if (item.options.length > 0) dialogForm.value[item.key] = item.options[0].value
-            }
-          }
-        })
+        //       if (item.options.length > 0) dialogForm.value[item.key] = item.options[0].value
+        //     }
+        //   }
+        // })
       })
       })
     })
     })
   }
   }
   // 有些产品会没有供款年期，所以这段逻辑先注释掉后续在加
   // 有些产品会没有供款年期，所以这段逻辑先注释掉后续在加
-  // if (key == 'productLaunchMainName') {
-  //   father.data.forEach(item => {
-  //     searchOptions.value['productLaunchMainName'].forEach(item1 => {
-  //       if (item1.value == form.value[father.key][key]) {
-  //         // form.value[father.key][key] = item1.label
-  //         // form.value[father.key]['productLaunchBizId'] = item1.value
-  //         console.log('item1.apiAttributeSettingDtoList', item1.apiAttributeSettingDtoList)
-  //         item1.apiAttributeSettingDtoList.forEach(item2 => {
-  //           if (item2.fieldBizId == 'field_eWCnuwS3WPKog5kZ' && item.key == 'issueNumber') {
-  //             if (item2.value) {
-  //               item.options = item2.value
-  //                 .split(/[，,;；\s]+/)
-  //                 .map(item => item.trim())
-  //                 .filter(item => item !== '')
-  //                 .map(item => {
-  //                   return { label: item, value: item }
-  //                 })
+  if (key == 'productLaunchMainName') {
+    father.data.forEach(item => {
+      searchOptions.value['productLaunchMainName'].forEach(item1 => {
+        if (item1.value == form.value[father.key][key]) {
+          form.value[father.key][key] = item1.label
+          form.value[father.key]['productLaunchBizId'] = item1.value
+          console.log('item1.apiAttributeSettingDtoList', item1.apiAttributeSettingDtoList)
+          // item1.apiAttributeSettingDtoList.forEach(item2 => {
+          //   if (item2.fieldBizId == 'field_eWCnuwS3WPKog5kZ' && item.key == 'issueNumber') {
+          //     if (item2.value) {
+          //       item.options = item2.value
+          //         .split(/[，,;；\s]+/)
+          //         .map(item => item.trim())
+          //         .filter(item => item !== '')
+          //         .map(item => {
+          //           return { label: item, value: item }
+          //         })
 
 
-  //               if (item.options.length > 0)
-  //                 form.value[father.key]['issueNumber'] = item.options[0].value
-  //             }
-  //             console.log(item.options, item, '1111')
-  //           }
-  //         })
-  //       }
-  //     })
-  //   })
-  // }
+          //       if (item.options.length > 0)
+          //         form.value[father.key]['issueNumber'] = item.options[0].value
+          //     }
+          //     console.log(item.options, item, '1111')
+          //   }
+          // })
+        }
+      })
+    })
+  }
   if (key == 'insuranceTypeName') {
   if (key == 'insuranceTypeName') {
     searchOptions.value['insuranceTypeName'].forEach(item => {
     searchOptions.value['insuranceTypeName'].forEach(item => {
       if (item.value == form.value['apiProductPlanMainInfoDto']['insuranceTypeName']) {
       if (item.value == form.value['apiProductPlanMainInfoDto']['insuranceTypeName']) {