Merge branch 'master' of http://192.168.0.115:3000/shaogen1995/YW_Goods into master

src/pages/A_workbench/A3flow/index.tsx

@@ -66,6 +66,7 @@ function A3flow() {
               <RangePicker
                 format='YYYY-MM-DD'
                 allowClear={true}
+                showTime
                 // @ts-ignore
                 value={formData[item.key]}
                 onChange={e => setFormData({ ...formData, [item.key]: e })}
@@ -125,9 +126,9 @@ function A3flow() {
     const { date, ...rest } = formDataRef.current
     if (Array.isArray(date) && date.length) {
       // @ts-ignore
-      rest.startTime = dayjs(date[0]).format('YYYY-MM-DD')
+      rest.startTime = dayjs(date[0]).format('YYYY-MM-DD HH:mm:ss')
       // @ts-ignore
-      rest.endTime = dayjs(date[1]).format('YYYY-MM-DD')
+      rest.endTime = dayjs(date[1]).format('YYYY-MM-DD HH:mm:ss')
     }
     dispatch(A3_APIList(filterEmptyStrings(rest)))
   }, [dispatch])

src/pages/A_workbench/A4voucher/index.tsx

@@ -66,6 +66,7 @@ function A4voucher() {
               <RangePicker
                 format='YYYY-MM-DD'
                 allowClear={true}
+                showTime
                 value={formData[item.key] as undefined}
                 onChange={e => setFormData({ ...formData, [item.key]: e })}
               />
@@ -111,9 +112,9 @@ function A4voucher() {
     const { date, ...rest } = formDataRef.current
     if (Array.isArray(date) && date.length) {
       // @ts-ignore
-      rest.startTime = dayjs(date[0]).format('YYYY-MM-DD')
+      rest.startTime = dayjs(date[0]).format('YYYY-MM-DD HH:mm:ss')
       // @ts-ignore
-      rest.endTime = dayjs(date[1]).format('YYYY-MM-DD')
+      rest.endTime = dayjs(date[1]).format('YYYY-MM-DD HH:mm:ss')
     }
     dispatch(A4_APIList(filterEmptyStrings(rest)))
   }, [dispatch])

src/pages/C_goodsManage/C21wealth/constants.ts

@@ -6,7 +6,7 @@ export const C21WEALTH_PARAM_ROWS: C21WealthSearchType[] = [
   { name: '业务编号', key: 'num', type: '输入框' },
   { name: '申请名称', key: 'name', type: '输入框' },
   { name: '发起部门', key: 'deptName', type: '输入框' },
-  { name: '发起人', key: 'creatorName', type: '输入框' },
+  { name: '发起人', key: 'userName', type: '输入框' },
   { name: '发起日期范围', key: 'date', type: '日期选择' },
   { name: '申请状态', key: 'status', type: '下拉框', data: selectObj['流程申请状态'] },
   { name: '选择角色', key: 'userType', type: '下拉框', data: selectObj['角色'] }
@@ -52,7 +52,7 @@ export const DEFAULT_C21WEALTH_PARAMS: IC21WealthParams = {
   pageNum: 1,
   pageSize: 10,
   num: '',
-  creatorName: '',
+  userName: '',
   deptName: '',
   name: '',
   status: '',

src/pages/C_goodsManage/C21wealth/index.tsx

@@ -63,6 +63,7 @@ function C21wealth() {
             ) : item.type === '日期选择' ? (
               <RangePicker
                 format='YYYY-MM-DD'
+                showTime
                 allowClear={true}
                 value={formData[item.key] as undefined}
                 onChange={e => setFormData({ ...formData, [item.key]: e })}
@@ -122,9 +123,9 @@ function C21wealth() {
     const { date, ...rest } = formDataRef.current
     if (Array.isArray(date) && date.length) {
       // @ts-ignore
-      rest.startTime = dayjs(date[0]).format('YYYY-MM-DD')
+      rest.startTime = dayjs(date[0]).format('YYYY-MM-DD HH:mm:ss')
       // @ts-ignore
-      rest.endTime = dayjs(date[1]).format('YYYY-MM-DD')
+      rest.endTime = dayjs(date[1]).format('YYYY-MM-DD HH:mm:ss')
     }
     formDataOldRef.current = rest
     dispatch(C21_APIList(rest))

src/pages/C_goodsManage/C21wealth/types.ts

@@ -18,7 +18,7 @@ export interface IC21WealthParams {
   pageNum: number
   num: string
   date?: string[]
-  creatorName: string
+  userName: string
   deptName: string
   name: string
   status: string

src/pages/D_storeManage/D3staff/index.tsx

@@ -81,6 +81,7 @@ function D3staff() {
             ) : item.type === '日期选择' ? (
               <RangePicker
                 format='YYYY-MM-DD'
+                showTime
                 allowClear={true}
                 onChange={(e, dateStrings) => setFormData({ ...formData, [item.key]: dateStrings })}
               />
@@ -139,9 +140,9 @@ function D3staff() {
     const { date, ...rest } = formDataRef.current
     if (Array.isArray(date) && date.length) {
       // @ts-ignore
-      rest.startTime = date[0]
+      rest.startTime = dayjs(date[0]).format('YYYY-MM-DD HH:mm:ss')
       // @ts-ignore
-      rest.endTime = date[1]
+      rest.endTime = dayjs(date[1]).format('YYYY-MM-DD HH:mm:ss')
     }
     formDataOldRef.current = rest
     dispatch(D3_APIList(filterEmptyStrings(rest)))

src/pages/D_storeManage/D7check/index.tsx

@@ -58,6 +58,7 @@ function D7check() {
               />
             ) : item.type === '日期选择' ? (
               <RangePicker
+                showTime
                 format='YYYY-MM-DD'
                 allowClear={true}
                 onChange={(e, dateStrings) => setFormData({ ...formData, [item.key]: dateStrings })}
@@ -117,9 +118,9 @@ function D7check() {
     const { date, ...rest } = formDataRef.current
     if (Array.isArray(date) && date.length) {
       // @ts-ignore
-      rest.startTime = date[0]
+      rest.startTime = dayjs(date[0]).format('YYYY-MM-DD HH:mm:ss')
       // @ts-ignore
-      rest.endTime = date[1]
+      rest.endTime = dayjs(date[1]).format('YYYY-MM-DD HH:mm:ss')
     }
     formDataOldRef.current = rest
     dispatch(D7_APIList(filterEmptyStrings(rest)))

src/pages/F_exhibition/F1exhibition/constants.ts

@@ -14,13 +14,13 @@ export const DEFAULT_F1exhibition_PARAMS: IF1exhibitionParams = {
 
 export const F1EXHIBITION_PARAM_ROWS: F1exhibitionSearchType[] = [
   { name: '业务编号', key: 'num', type: '输入框' },
-  { name: '展览名称', key: 'typeName', type: '输入框' },
+  { name: '展览名称', key: 'name', type: '输入框' },
   { name: '展览类型', key: 'sonTypeName', type: '下拉框', data: selectObj['展览类型'] },
   { name: '借展类型', key: 'sonType', type: '下拉框', data: selectObj['借展类型'] },
   { name: '借展单位/部门', key: 'sonUnit', type: '输入框' },
-  { name: '发起人', key: 'creatorName', type: '输入框' },
+  { name: '发起人', key: 'userName', type: '输入框' },
   { name: '发起日期范围', key: 'date', type: '日期选择' },
-  { name: '申请状态', key: 'num', type: '下拉框', data: selectObj['流程申请状态'] }
+  { name: '申请状态', key: 'status', type: '下拉框', data: selectObj['申请状态'] }
 ]
 
 export const F1_SON_TYPE_OBJ = {

src/pages/F_exhibition/F1exhibition/index.tsx

@@ -65,6 +65,7 @@ function F1exhibition() {
             ) : item.type === '日期选择' ? (
               <RangePicker
                 format='YYYY-MM-DD'
+                showTime
                 allowClear={true}
                 value={formData[item.key] as undefined}
                 onChange={e => setFormData({ ...formData, [item.key]: e })}
@@ -123,11 +124,11 @@ function F1exhibition() {
   const getListFu = useCallback(() => {
     const { date, ...rest } = formDataRef.current
     if (Array.isArray(date) && date.length) {
-          // @ts-ignore
-          rest.startTime = dayjs(date[0]).format('YYYY-MM-DD')
-          // @ts-ignore
-          rest.endTime = dayjs(date[1]).format('YYYY-MM-DD')
-        }
+      // @ts-ignore
+      rest.startTime = dayjs(date[0]).format('YYYY-MM-DD HH:mm:ss')
+      // @ts-ignore
+      rest.endTime = dayjs(date[1]).format('YYYY-MM-DD HH:mm:ss')
+    }
     formDataOldRef.current = rest
     dispatch(F1_APIList(rest))
   }, [dispatch])

src/pages/F_exhibition/F1exhibition/types.ts

@@ -16,11 +16,12 @@ export interface IF1exhibitionParams {
   pageSize: number
   pageNum: number
   num?: string
-  typeName?: string
+  name?: string
   sonUnit?: string
   sonType?: string
   sonTypeName?: string
-  creatorName?: string
+  userName?: string
+  status?: string
   date?: string[]
 }
 

src/utils/exportTemplates.ts

@@ -542,23 +542,21 @@ export const exportWordHandler = async (type: EXPORT_WORD_ENUM, data: Record<any
       temp = {
         ...temp,
         year: date.format('YYYY'),
-        rtf: removeHtmlTags(JSON.parse(temp.rtf).txtArr[0].txt),
+        rtf: temp.rtf ? removeHtmlTags(JSON.parse(temp.rtf).txtArr[0].txt) : '',
         authInfoRtf: removeHtmlTags(JSON.parse(temp.authInfoRtf).txtArr[0].txt),
         authResultRtf: removeHtmlTags(JSON.parse(temp.authResultRtf).txtArr[0].txt)
       }
       break
+    case EXPORT_WORD_ENUM.COLLECTION_ARCHIVES:
     case EXPORT_WORD_ENUM.COLLECTION_CARD:
+      console.log(temp)
       temp = {
         ...temp,
         year: date.format('YYYY'),
         month: date.format('MM'),
         day: date.format('DD'),
-        pcs: temp.pcs + temp.pcsUnit,
-        source: resJiLianFu(temp.source),
         size: myTableTransferSize(temp),
-        quality: temp.quality + temp.qualityUnit,
-        dictTexture3: resJiLianFu(temp.dictTexture3),
-        rtf: removeHtmlTags(JSON.parse(temp.rtf).txtArr[0].txt),
+        quality: temp?.qualityDictScope ? resJiLianFu(temp.qualityDictScope) : '',
         deptName: (temp.records || []).length ? temp.records[0].deptName : '',
         recordDate: (temp.records || []).length ? temp.records[0].createTime : '',
         records: (temp.records || []).map(
@@ -566,9 +564,10 @@ export const exportWordHandler = async (type: EXPORT_WORD_ENUM, data: Record<any
             `[${temp.dictLevel}]，[${item.createTime}][${item.deptName}][${item.creatorName}]意见。`
         )
       }
-      break
-    case EXPORT_WORD_ENUM.COLLECTION_ARCHIVES:
-      temp.imagePages = await arrangeImages(temp.imagePages)
+
+      if (type === EXPORT_WORD_ENUM.COLLECTION_ARCHIVES) {
+        temp.imagePages = await arrangeImages(temp.imagePages)
+      }
       break
     case EXPORT_WORD_ENUM.OUTSIDER_FORM:
       const memberss = JSON.parse(temp.memberIds)

src/utils/exportWordUtils.ts

@@ -65,6 +65,8 @@ export const getImageDimensions = (url: string): Promise<{ width: number; height
  * 将一维数组根据图片宽高比转成三维数组
  */
 export const arrangeImages = async (images: { thumb: string }[]) => {
+  if (!Array.isArray(images)) return []
+
   const MAX_WALL_WIDTH = 520
   const MAX_WALL_HEIGHT = 750
   const MAX_ROWS_PER_WALL = 3