Merge branch 'test' into sw

src/api/sign/policy.js

@@ -54,6 +54,14 @@ export function addPremiumReconciliation(data) {
     data: data
   })
 }
+//编辑提交保费对账
+export function editPremiumReconciliation(data) {
+  return request({
+    url: '/csf/api/premiumReconciliation/edit',
+    method: 'put',
+    data: data
+  })
+}
 //保费对账编辑单个汇款记录
 export function editPremiumRemittance(data) {
   return request({
@@ -100,3 +108,34 @@ export function getPremiumRemittanceListApi(data) {
     data: data
   })
 }
+//检查保单号是否已经提交过保费对账
+export function getCheckPolicyNoApi(policyNo) {
+  return request({
+    url: `/csf/api/premiumReconciliation/check/reconciliation/complete?policyNo=${policyNo}`,
+    method: 'get'
+  })
+}
+// 保费对账认定结果计算待付金额
+export function getRemainingUnpaidAmount(data) {
+  return request({
+    url: '/csf/api/premiumReconciliation/calculate/remainingUnpaidAmount',
+    method: 'post',
+    data: data
+  })
+}
+//提交保费对账认定结果
+export function submitResult(data) {
+  return request({
+    url: '/csf/api/premiumReconciliation/edit/result',
+    method: 'put',
+    data: data
+  })
+}
+//单个新增保费对账汇款记录
+export function addSinglePremiumRemittance(data) {
+  return request({
+    url: '/csf/api/premiumRemittance/add',
+    method: 'post',
+    data: data
+  })
+}

src/components/SearchForm/SearchForm.vue

@@ -129,8 +129,17 @@
             :on-error="(err, file, fileList) => handleUploadError(err, file, fileList, item)"
             :on-remove="(file, fileList) => handleUploadRemove(file, fileList, item)"
           >
-            <el-button size="small" type="primary" :link="item.link" :disabled="item.disabled">
-              {{ item.uploadType === 'image' ? '点击上传图片' : '点击上传文件' }}
+            <el-icon class="iconStyle" :size="20" v-if="item.uploadType === 'image'"
+              ><Upload
+            /></el-icon>
+            <el-button
+              v-else
+              size="small"
+              type="primary"
+              :link="item.link"
+              :disabled="item.disabled"
+            >
+              {{ '点击上传文件' }}
             </el-button>
             <template #tip v-if="item.maxSize || item.accept">
               <div class="el-upload__tip">
@@ -206,6 +215,8 @@ function handleUploadSuccess(response, file, fileList, item) {
   // 触发 model 更新
   handleModelChange([...fileList], item)
   ElMessage.success(`文件 ${file.name} 上传成功`)
+
+  console.log('上传成功', item)
 }
 function handleExceed(files, fileList) {
   ElMessage.warning('超出文件数量限制')
@@ -298,7 +309,7 @@ const props = defineProps({
   isSearch: { type: Boolean, default: false }
 })
 
-const emit = defineEmits(['update:modelValue', 'update'])
+const emit = defineEmits(['update:modelValue', 'update', 'selectChange', 'uploadSuccess'])
 
 // ==================== Refs ====================
 const formRef = ref(null)
@@ -507,6 +518,12 @@ function handleModelChange(value, item) {
       console.log('🚫 跳过 emit：认为相等')
     }
   })
+  if (item.type === 'select') {
+    emit('selectChange', item.prop, value, item)
+  } else if (item.type == 'upload') {
+    // 传给父组件最新的上传值newModel
+    emit('uploadSuccess', item.prop, newModel)
+  }
   console.groupEnd()
 }
 // 辅助函数：浅比较两个对象
@@ -803,7 +820,13 @@ defineExpose({
 </script>
 
 <style scoped>
+.formBox {
+  box-sizing: border-box;
+}
 .search-form-item {
   margin-bottom: 20px;
 }
+.iconStyle {
+  color: #409eff;
+}
 </style>

src/components/commonDialog/index.vue

@@ -124,6 +124,7 @@ watch(
 }
 .content {
   padding: 0 15px;
+  box-sizing: border-box;
 }
 .dialog-footer {
   width: 100%;

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

@@ -407,10 +407,7 @@ const handleSearchSelectChange = (father, key) => {
           dialogForm.value['productLaunchBizId'] = item1.value
         }
         item1.apiAttributeSettingDtoList.forEach(item2 => {
-          if (
-            item2.attributeSettingBizId == 'attribute_setting_okpcuc8tlXRfVIAy' &&
-            item.key == 'issueNumber'
-          ) {
+          if (item2.fieldBizId == 'field_eWCnuwS3WPKog5kZ' && item.key == 'issueNumber') {
             if (item2.value) {
               item.options = item2.value
                 .split(/[，,;；\s]+/)
@@ -435,10 +432,7 @@ const handleSearchSelectChange = (father, key) => {
           form.value[father.key]['productLaunchBizId'] = item1.value
         }
         item1.apiAttributeSettingDtoList.forEach(item2 => {
-          if (
-            item2.attributeSettingBizId == 'attribute_setting_okpcuc8tlXRfVIAy' &&
-            item.key == 'issueNumber'
-          ) {
+          if (item2.fieldBizId == 'field_eWCnuwS3WPKog5kZ' && item.key == 'issueNumber') {
             if (item2.value) {
               item.options = item2.value
                 .split(/[，,;；\s]+/)