Merge branch 'wyz' into 'test'

Wyz

See merge request !158

src/views/financialCenter/financialSalary.vue

@@ -384,11 +384,11 @@ const searchConfig = ref([
     }
     }
   },
   },
   {
   {
-    type: 'daterange',
+    type: 'monthrange',
     prop: 'payoutDate',
     prop: 'payoutDate',
-    label: '出账日（实）',
-    startPlaceholder: '开始时间',
-    endPlaceholder: '结束时间'
+    label: '出账月（实）',
+    startPlaceholder: '开始',
+    endPlaceholder: '结束'
   },
   },
   {
   {
     type: 'select',
     type: 'select',
@@ -818,6 +818,7 @@ const getList = async (searchParams = {}) => {
       pageSize: pageSize.value,
       pageSize: pageSize.value,
       statusList: searchParams.statusList || ['6']
       statusList: searchParams.statusList || ['6']
     }
     }
+
     const response = await getReferrerFortuneList(params)
     const response = await getReferrerFortuneList(params)
 
 
     if (response.data.page) {
     if (response.data.page) {

src/views/sign/policyReceipts/premiumRecon.vue

@@ -850,10 +850,15 @@ const handleUploadSuccess = (prop, Model) => {
         ;((item.fileName = newObj.originalName), //文件名
         ;((item.fileName = newObj.originalName), //文件名
           (item.fileType = newObj.fileType), //文件类型
           (item.fileType = newObj.fileType), //文件类型
           (item.fileUrl = newObj.url), //文件URL,
           (item.fileUrl = newObj.url), //文件URL,
-          (item.url = newObj.url))
+          (item.url = newObj.url),
+          (item.creatorName = newObj.creatorName),
+          (item.createTime = newObj.createTime))
       }
       }
     })
     })
     tempOtherFileList.value = list
     tempOtherFileList.value = list
+    console.log('====================================')
+    console.log('tempOtherFileList.value', tempOtherFileList.value)
+    console.log('====================================')
   }
   }
 }
 }
 // 下拉框改变
 // 下拉框改变