Merge branch 'test' of http://139.224.139.2:9091/yuzhenWang/yd-csf-front into test

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

@@ -1406,6 +1406,18 @@ const handleFormValues = source => {
 
 
           //处理表单数据
           //处理表单数据
           for (const key1 in form.value) {
           for (const key1 in form.value) {
+            if (key1 == 'nameCn' && submitObj[key1]) {
+              if (submitObj[key1].length < 2) {
+                errorFields.value.push({
+                  message: `${tipName}-名字至少为2个字符`
+                })
+              }
+              if (submitObj[key1].length > 6) {
+                errorFields.value.push({
+                  message: `${tipName}-名字长度不能超过6个字符`
+                })
+              }
+            }
             for (const key2 in saveKey.value) {
             for (const key2 in saveKey.value) {
               //要判断drawerType
               //要判断drawerType
               switch (saveKey.value[key2].objType) {
               switch (saveKey.value[key2].objType) {

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

@@ -57,13 +57,13 @@
                 @click="handleUpdate(scope.row)"
                 @click="handleUpdate(scope.row)"
                 >查看</el-button
                 >查看</el-button
               >
               >
-              <el-button
+              <!-- <el-button
                 v-if="props.pageSource !== 'policyList'"
                 v-if="props.pageSource !== 'policyList'"
                 type="danger"
                 type="danger"
                 link
                 link
                 @click="handleDetele(scope.row)"
                 @click="handleDetele(scope.row)"
                 >删除</el-button
                 >删除</el-button
-              >
+              > -->
             </template>
             </template>
           </el-table-column>
           </el-table-column>
         </el-table>
         </el-table>
@@ -85,7 +85,7 @@
           <div class="fileUploadBox">
           <div class="fileUploadBox">
             <el-upload
             <el-upload
               :action="uploadImgUrl"
               :action="uploadImgUrl"
-              :data="{'projectBizId':userStore.projectInfo.projectBizId}"
+              :data="{ projectBizId: userStore.projectInfo.projectBizId }"
               :headers="headers"
               :headers="headers"
               multiple
               multiple
               :limit="limit"
               :limit="limit"
@@ -399,7 +399,7 @@ const uploadSuccess = (res, file, fileList) => {
 // 删除已上传的文件（仅从列表移除，不调用后端删除）
 // 删除已上传的文件（仅从列表移除，不调用后端删除）
 const removeUploadedFile = (file, index) => {
 const removeUploadedFile = (file, index) => {
   try {
   try {
-    delUploadFile(file.fileBizId,userStore.projectInfo.projectBizId).then(response => {
+    delUploadFile(file.fileBizId, userStore.projectInfo.projectBizId).then(response => {
       uploadedFiles.value.splice(index, 1)
       uploadedFiles.value.splice(index, 1)
     })
     })
   } catch (error) {
   } catch (error) {

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

@@ -38,7 +38,7 @@
                                 :type="child.inputType"
                                 :type="child.inputType"
                                 v-model="form[father.key][child.key]"
                                 v-model="form[father.key][child.key]"
                                 :placeholder="child.placeholder"
                                 :placeholder="child.placeholder"
-                               :maxlength="child.maxlength|| 50"
+                                :maxlength="child.maxlength || 50"
                                 :disabled="editStatus"
                                 :disabled="editStatus"
                                 :style="{ width: child.inputWidth ? child.inputWidth : '100%' }"
                                 :style="{ width: child.inputWidth ? child.inputWidth : '100%' }"
                                 @input="val => handleInputChange(val, child, father)"
                                 @input="val => handleInputChange(val, child, father)"
@@ -522,9 +522,16 @@ const searchSelectList = async (query, fieldKey) => {
         projectBizId: userStore.projectInfo.projectBizId,
         projectBizId: userStore.projectInfo.projectBizId,
         tenantBizId: userStore.projectInfo.tenantBizId,
         tenantBizId: userStore.projectInfo.tenantBizId,
         fieldBizId: 'field_olk1qZe81qHHKXbw',
         fieldBizId: 'field_olk1qZe81qHHKXbw',
-        fieldValueBizId:fieldKey === 'productLaunchName'? 'field_value_yXzTigvgUdRMFpoR' : 'field_value_uOfJH5ucA2YwJpbn',
-        categoryCodeList:[form.value.apiProductPlanMainInfoDto.insuranceTypeCode || ''],
-        insuranceCompanyBizIdList:[form.value.apiProductPlanMainInfoDto.companyId || '']
+        fieldValueBizId:
+          fieldKey === 'productLaunchName'
+            ? 'field_value_yXzTigvgUdRMFpoR'
+            : 'field_value_uOfJH5ucA2YwJpbn',
+        categoryCodeList: form.value.apiProductPlanMainInfoDto.insuranceTypeCode
+          ? [form.value.apiProductPlanMainInfoDto.insuranceTypeCode]
+          : [],
+        insuranceCompanyBizIdList: form.value.apiProductPlanMainInfoDto.companyId
+          ? [form.value.apiProductPlanMainInfoDto.companyId]
+          : []
       }
       }
       const response = await secondAdditonalList(params)
       const response = await secondAdditonalList(params)
       if (response.code == 200) {
       if (response.code == 200) {