Merge branch 'dev' into swhotfix

src/formJson/customer.js

@@ -69,7 +69,7 @@ const customer = [
         timeType: 'daterange',
         timeType: 'daterange',
         custom: true,
         custom: true,
         placeholder: '请选择证件有效期',
         placeholder: '请选择证件有效期',
-        required: true,
+        // required: true,
         width:300
         width:300
       }
       }
     ],
     ],

src/views/sign/FnaList/components/customer.vue

@@ -261,6 +261,7 @@
                               @change="
                               @change="
                                 handleIsPermanentChange(father, scope.row, column.prop, $event)
                                 handleIsPermanentChange(father, scope.row, column.prop, $event)
                               "
                               "
+                              :disabled="editStatus"
                             >
                             >
                               <el-radio value="1" size="large">是</el-radio>
                               <el-radio value="1" size="large">是</el-radio>
                               <el-radio value="0" size="large">否</el-radio>
                               <el-radio value="0" size="large">否</el-radio>
@@ -1446,16 +1447,16 @@ const handleFormValues = source => {
           processedData.forEach(item => {
           processedData.forEach(item => {
             if (item.key == 'apiCertificateDtoList' && item.data.length > 0) {
             if (item.key == 'apiCertificateDtoList' && item.data.length > 0) {
               item.data.forEach((item1, index) => {
               item.data.forEach((item1, index) => {
-                if (!item1.isPermanent || item1.isPermanent == '0') {
-                  if (!item1.certificateStartDate) {
-                    obj1.certificateStartDate = '证件开始时间'
-                  }
-                  if (!item1.certificateEndDate) {
-                    obj1.certificateEndDate = '证件结束时间'
-                  }
-                } else if (item1.isPermanent == '1' && !item1.certificateStartDate) {
-                  obj1.certificateStartDate = '证件有效时间'
-                }
+                // if (!item1.isPermanent || item1.isPermanent == '0') {
+                //   if (!item1.certificateStartDate) {
+                //     obj1.certificateStartDate = '证件开始时间'
+                //   }
+                //   if (!item1.certificateEndDate) {
+                //     obj1.certificateEndDate = '证件结束时间'
+                //   }
+                // } else if (item1.isPermanent == '1' && !item1.certificateStartDate) {
+                //   obj1.certificateStartDate = '证件有效时间'
+                // }
                 for (const key in obj1) {
                 for (const key in obj1) {
                   if (!item1[key]) {
                   if (!item1[key]) {
                     errorFields.value.push({
                     errorFields.value.push({

src/views/sign/FnaList/components/fanForm.vue

@@ -423,6 +423,7 @@ const handleRemoteSelectChange = async (row, column, father) => {
     //如果险种选择了重疾险，则显示重疾险的输入框
     //如果险种选择了重疾险，则显示重疾险的输入框
     row.insuranceTypeOption.forEach(item => {
     row.insuranceTypeOption.forEach(item => {
       if (item.value == row.insuranceType) {
       if (item.value == row.insuranceType) {
+        row.sumInsured = ''
         if (item.code == 'CATEGORY5934890141') {
         if (item.code == 'CATEGORY5934890141') {
           row.showSumInsured = true
           row.showSumInsured = true
         } else {
         } else {