fix: --

public/index.html

@@ -12,8 +12,8 @@
 
     <script>
       // 域名地址
-      // const baseUrlTempOne = 'https://sit-yiwubwg.4dage.com'
-      const baseUrlTempOne = 'http://192.168.20.61:8096'
+      const baseUrlTempOne = 'https://sit-yiwubwg.4dage.com'
+      // const baseUrlTempOne = 'http://192.168.20.61:8096'
 
       // 钉钉模式
       const isDingTemp = false

src/pages/D_storeManage/D3staff/D3edit/index.tsx

@@ -63,7 +63,7 @@ function C21edit() {
     if (res.code === 0) {
       setTopInfo({
         ...res.data,
-        date: dayjs().format('YYYY-MM-DD')
+        date: dayjs().format('YYYY-MM-DD HH:mm:ss')
       })
     }
   }, [])
@@ -324,11 +324,12 @@ function C21edit() {
             </div>
             <div className='D4rowrr'>
               <DatePicker
+                showTime
                 disabled={pageDisabled}
                 defaultValue={dayjs(topInfo.date)}
                 style={{ width: '300px' }}
                 onChange={e => {
-                  setTopInfo({ ...topInfo, date: e.format('YYYY-MM-DD') })
+                  setTopInfo({ ...topInfo, date: e.format('YYYY-MM-DD HH:mm:ss') })
                 }}
               />
             </div>

src/pages/D_storeManage/D3staff/constants.ts

@@ -11,7 +11,7 @@ export const D3STAFF_PARAM_ROWS2: D3StaffSearchType[] = [
 
 export const D3STAFF_TABLE_COLUMNS = [
   ['txt', '业务编号', 'num'],
-  ['txt', '入库时间', 'name'],
+  ['dateRes', '入库时间', 'date'],
   ['txtChange', '入库人员', 'sonTypeName', sonTypeNameObj],
   ['txt', '入库事由', 'reason'],
   ['txt', '相关库房', 'storageName'],

src/pages/D_storeManage/D3staff/index.tsx

@@ -256,7 +256,7 @@ function D3staff() {
 
   return (
     <div className={styles.D3staff}>
-      <div className='pageTitle'>资源使用</div>
+      <div className='pageTitle'>人员出入库</div>
 
       {/* 第一行 */}
       <div className='C1top'>

src/utils/exportTemplates.ts

@@ -494,9 +494,7 @@ export const exportWordHandler = async (type: EXPORT_WORD_ENUM, data: Record<any
     case EXPORT_WORD_ENUM.COLLECTION_INVENTORY:
       temp = {
         ...temp,
-        year: date.format('YYYY'),
-        month: date.format('MM'),
-        day: date.format('DD')
+        sonNum2: dayjs(temp.date).format('YYYY') + temp.num
       }
       temp.goods.forEach((i: any) => {
         i.checker = i.cusForm[`${i.id}-checker`]
@@ -538,7 +536,8 @@ export const exportWordHandler = async (type: EXPORT_WORD_ENUM, data: Record<any
       temp = {
         ...temp,
         sonSource: resJiLianFu(temp.sonSource),
-        createTime: dayjs(temp.createTime).format('YYYY年MM月DD日')
+        sonNum2: dayjs(temp.date).format('YYYY') + temp.num,
+        date: dayjs(temp.date).format('YYYY年MM月DD日')
       }
       break
     case EXPORT_WORD_ENUM.COLLECTION_RELOCATION: