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

src/pages/A_workbench/A3flow/index.tsx

@@ -66,7 +66,6 @@ function A3flow() {
               <RangePicker
                 format='YYYY-MM-DD'
                 allowClear={true}
-                showTime
                 // @ts-ignore
                 value={formData[item.key]}
                 onChange={e => setFormData({ ...formData, [item.key]: e })}
@@ -126,9 +125,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 HH:mm:ss')
+      rest.startTime = dayjs(date[0]).format('YYYY-MM-DD') + ' 00:00:00'
       // @ts-ignore
-      rest.endTime = dayjs(date[1]).format('YYYY-MM-DD HH:mm:ss')
+      rest.endTime = dayjs(date[1]).format('YYYY-MM-DD') + ' 23:59:59'
     }
     dispatch(A3_APIList(filterEmptyStrings(rest)))
   }, [dispatch])

src/pages/A_workbench/A4voucher/index.tsx

@@ -66,7 +66,6 @@ function A4voucher() {
               <RangePicker
                 format='YYYY-MM-DD'
                 allowClear={true}
-                showTime
                 value={formData[item.key] as undefined}
                 onChange={e => setFormData({ ...formData, [item.key]: e })}
               />
@@ -112,9 +111,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 HH:mm:ss')
+      rest.startTime = dayjs(date[0]).format('YYYY-MM-DD') + ' 00:00:00'
       // @ts-ignore
-      rest.endTime = dayjs(date[1]).format('YYYY-MM-DD HH:mm:ss')
+      rest.endTime = dayjs(date[1]).format('YYYY-MM-DD') + ' 23:59:59'
     }
     dispatch(A4_APIList(filterEmptyStrings(rest)))
   }, [dispatch])

src/pages/C_goodsManage/C1register/C1look/index.tsx

@@ -255,7 +255,7 @@ function C1look() {
               </Button>
             ) : null}
 
-            {EXbtnFu(topInfo, [
+            {EXbtnFu(info, [
               EXPORT_WORD_ENUM.COLLECTION_CARD,
               EXPORT_WORD_ENUM.COLLECTION_ARCHIVES
             ])}

src/pages/C_goodsManage/C21wealth/index.tsx

@@ -63,7 +63,6 @@ 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 })}
@@ -123,9 +122,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 HH:mm:ss')
+      rest.startTime = dayjs(date[0]).format('YYYY-MM-DD') + ' 00:00:00'
       // @ts-ignore
-      rest.endTime = dayjs(date[1]).format('YYYY-MM-DD HH:mm:ss')
+      rest.endTime = dayjs(date[1]).format('YYYY-MM-DD') + ' 23:59:59'
     }
     formDataOldRef.current = rest
     dispatch(C21_APIList(rest))

src/pages/D_storeManage/D3staff/index.tsx

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

src/pages/D_storeManage/D7check/index.tsx

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

src/pages/F_exhibition/F1exhibition/constants.ts

@@ -34,7 +34,7 @@ export const F1_SON_TYPE_NAME_OBJ = {
 
 export const F1EXHIBITION_TABLE_COLUMNS = [
   ['txt', '业务编号', 'num'],
-  ['txt', '展览名称', 'typeName'],
+  ['txt', '展览名称', 'name'],
   ['txtChange', '展览类型', 'sonTypeName', F1_SON_TYPE_NAME_OBJ],
   ['txtChange', '借展类型', 'sonType', F1_SON_TYPE_OBJ],
   ['txt', '借展单位/部门', 'sonUnit'],

src/pages/F_exhibition/F1exhibition/index.tsx

@@ -65,7 +65,6 @@ 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 })}
@@ -125,9 +124,9 @@ function F1exhibition() {
     const { date, ...rest } = formDataRef.current
     if (Array.isArray(date) && date.length) {
       // @ts-ignore
-      rest.startTime = dayjs(date[0]).format('YYYY-MM-DD HH:mm:ss')
+      rest.startTime = dayjs(date[0]).format('YYYY-MM-DD') + ' 00:00:00'
       // @ts-ignore
-      rest.endTime = dayjs(date[1]).format('YYYY-MM-DD HH:mm:ss')
+      rest.endTime = dayjs(date[1]).format('YYYY-MM-DD') + ' 23:59:59'
     }
     formDataOldRef.current = rest
     dispatch(F1_APIList(rest))