Merge branch 'wyz' into 'test'

优化5

See merge request !149

src/components/SearchForm/SearchForm.vue

@@ -306,29 +306,7 @@ function previewFile(file, item) {
     name: file.name
   })
 }
-// 预览文件（页面内弹窗，不打开新窗口）
-// function previewFile(file, item) {
-//   const url = file.url || file.response?.data?.url
-//   if (!url) {
-//     ElMessage.warning('文件地址不存在')
-//     return
-//   }
-//   const ext = (file.name || '').split('.').pop().toLowerCase()
-//   previewUrl.value = url
-//   previewFileName.value = file.name || '文件'
-
-//   if (['jpg', 'jpeg', 'png', 'webp', 'gif', 'bmp', 'svg'].includes(ext)) {
-//     previewFileType.value = 'image'
-//     previewDialogVisible.value = true
-//   } else if (ext === 'pdf') {
-//     previewFileType.value = 'pdf'
-//     previewDialogVisible.value = true
-//   } else {
-//     // 不支持预览的文件类型，弹窗显示提示
-//     previewFileType.value = 'unsupported'
-//     previewDialogVisible.value = true
-//   }
-// }
+
 
 // 删除文件（复用原有删除逻辑）
 function removeFile(file, item) {

src/views/financialCenter/financialBilling.vue

@@ -1124,18 +1124,21 @@ const addCheckRecordConfig = [
   //   label: '出账币种',
   //   dictType: 'bx_currency_type'
   // },
-  {
-    type: 'input',
-    prop: 'fortuneName',
-    label: '出账项目名称',
-    rules: [{ required: true, message: '出账项目名称必填', trigger: 'blur' }]
-  },
+  // {
+  //   type: 'input',
+  //   prop: 'fortuneName',
+  //   label: '出账项目名称',
+  //   rules: [{ required: true, message: '出账项目名称必填', trigger: 'blur' }]
+  // },
   {
     type: 'select',
     prop: 'fortuneType',
     label: '出账项目类型',
     dictType: 'csf_fortune_type',
-    rules: [{ required: true, message: '出账项目类型必填', trigger: 'blur' }]
+    rules: [{ required: true, message: '出账项目类型必填', trigger: 'blur' }],
+    onChangeExtraFields: {
+      fortuneName: 'itemLabel'
+    }
   },
   {
     type: 'select',

src/views/financialCenter/payables.vue

@@ -797,16 +797,19 @@ const updatePayRecordFormConfig = [
     placeholder: '请选择',
     maxDate: 'today'
   },
-  {
-    type: 'input',
-    prop: 'fortuneName',
-    label: '出账项目'
-  },
+  // {
+  //   type: 'input',
+  //   prop: 'fortuneName',
+  //   label: '出账项目'
+  // },
   {
     type: 'select',
     prop: 'fortuneType',
     label: '出账项目类型',
-    dictType: 'csf_fortune_type'
+    dictType: 'csf_fortune_type',
+    onChangeExtraFields: {
+      fortuneName: 'itemLabel'
+    }
   },
   {
     type: 'input',
@@ -870,7 +873,7 @@ const updatePayRecordFormConfig = [
     transform: res => {
       return res?.data.records || []
     },
-    rules: [{ required: true, message: '所属团队必填', trigger: 'blur' }]
+    rules: [{ required: false, message: '所属团队必填', trigger: 'blur' }]
   },
   {
     type: 'select',
@@ -1149,18 +1152,21 @@ const addPayRecordFormConfig = [
     prop: 'statusDesc',
     label: '修改理由'
   },
-  {
-    type: 'input',
-    prop: 'fortuneName',
-    label: '出账项目名称',
-    rules: [{ required: true, message: '出账项目名称必填', trigger: 'blur' }]
-  },
+  // {
+  //   type: 'input',
+  //   prop: 'fortuneName',
+  //   label: '出账项目名称',
+  //   rules: [{ required: true, message: '出账项目名称必填', trigger: 'blur' }]
+  // },
   {
     type: 'select',
     prop: 'fortuneType',
     label: '出账项目类型',
     dictType: 'csf_fortune_type',
-    rules: [{ required: true, message: '出账项目类型必填', trigger: 'blur' }]
+    rules: [{ required: true, message: '出账项目类型必填', trigger: 'blur' }],
+    onChangeExtraFields: {
+      fortuneName: 'itemLabel'
+    }
   },
   {
     type: 'input',
@@ -1570,6 +1576,7 @@ const handleConfirmUpdatePayRecord = async () => {
 
       loadPayRecordTableData(selectedRow.value.expectedFortuneBizId)
       expectedFortuneListData()
+      loadTableData()
     } catch (error) {
       if (error.message && error.message.includes('Validation')) {
         ElMessage.error('必填项不能为空')
@@ -1748,7 +1755,7 @@ const handleCurrentChange = val => {
 
 // 加载表格数据
 const loadTableData = async () => {
-  const searchParams = searchFormRef.value.getFormData() || {}
+  const searchParams = (await searchFormRef.value.getFormData()) || {}
   loading.value = true
   if (searchParams.payoutDate.length > 0) {
     searchParams.payoutDateStart = `${searchParams.payoutDate[0]}-01`

src/views/sign/policyReceipts/premiumRecon.vue

@@ -274,16 +274,19 @@
         </div>
       </el-scrollbar>
     </CommonDialog>
-    <filePreviewDialog
+    <!-- <filePreviewDialog
       v-model="previewVisible"
       :file-url="currentOtherFile.fileUrl"
       :file-name="currentOtherFile.fileName"
       ref="filePreviewDialogRef"
-    />
+    /> -->
+    <!-- 文件预览弹窗 -->
+    <FilePreview ref="filePreviewRef" />
   </div>
 </template>
 
 <script setup>
+import FilePreview from '@/components/Preview/filePreview.vue'
 import { validateEnglish2 } from '@/utils/validate'
 import { ref, reactive, watch } from 'vue'
 import CommonPage from '@/components/commonPage'
@@ -316,6 +319,7 @@ import useUserStore from '@/store/modules/user'
 import { loadDicts, getDictLabel } from '@/utils/useDict'
 import { getToken } from '@/utils/auth'
 import { getNowTime, formatToDate, formatToDateTime } from '@/utils/date'
+const filePreviewRef = ref(null)
 let tempPolicyNo = ref('')
 const previewVisible = ref(false)
 const currentFileUrl = ref('')
@@ -458,8 +462,12 @@ const viewFile = row => {
   console.log('====================================')
   console.log('其他附件', row)
   console.log('====================================')
-  previewVisible.value = true
-  currentOtherFile.value = JSON.parse(JSON.stringify(row))
+  // previewVisible.value = true
+  // currentOtherFile.value = JSON.parse(JSON.stringify(row))
+  filePreviewRef.value?.open({
+    url: row.url,
+    name: row.fileName
+  })
 }
 //获取远程搜索下拉框数据，回显数据用
 const getSelectOptions = async () => {