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

src/pages/D_storeManage/D4impStor/D4edit/index.tsx

@@ -468,7 +468,9 @@ function D4edit() {
           </Button>
         ) : null}
 
-        {EXbtnFu(topInfo, [EXPORT_WORD_ENUM.SUB_PUT_IN])}
+        {EXbtnFu({ ...topInfo, sonNum: storageIdArr.find(i => i.id === topInfo.storageId)?.num }, [
+          EXPORT_WORD_ENUM.SUB_PUT_IN
+        ])}
 
         {btnFlagFu2(topInfo)['删除'] ? (
           <MyPopconfirm

src/pages/F_exhibition/F1exhibition/constants.ts

@@ -14,7 +14,7 @@ export const DEFAULT_F1exhibition_PARAMS: IF1exhibitionParams = {
 
 export const F1EXHIBITION_PARAM_ROWS: F1exhibitionSearchType[] = [
   { name: '业务编号', key: 'num', type: '输入框' },
-  { name: '展览名称', key: 'name', type: '输入框' },
+  { name: '展览名称', key: 'typeName', type: '输入框' },
   { name: '展览类型', key: 'sonTypeName', type: '下拉框', data: selectObj['展览类型'] },
   { name: '借展类型', key: 'sonType', type: '下拉框', data: selectObj['借展类型'] },
   { name: '借展单位/部门', key: 'sonUnit', type: '输入框' },
@@ -34,7 +34,7 @@ export const F1_SON_TYPE_NAME_OBJ = {
 
 export const F1EXHIBITION_TABLE_COLUMNS = [
   ['txt', '业务编号', 'num'],
-  ['txt', '展览名称', 'name'],
+  ['txt', '展览名称', 'typeName'],
   ['txtChange', '展览类型', 'sonTypeName', F1_SON_TYPE_NAME_OBJ],
   ['txtChange', '借展类型', 'sonType', F1_SON_TYPE_OBJ],
   ['txt', '借展单位/部门', 'sonUnit'],

src/pages/F_exhibition/F1exhibition/types.ts

@@ -16,7 +16,7 @@ export interface IF1exhibitionParams {
   pageSize: number
   pageNum: number
   num?: string
-  name?: string
+  typeName?: string
   sonUnit?: string
   sonType?: string
   sonTypeName?: string

src/utils/exportTemplates.ts

@@ -451,7 +451,7 @@ export const exportWordHandler = async (type: EXPORT_WORD_ENUM, data: Record<any
       if (good.sizeUnit || good.quality) {
         const arr: string[] = []
         if (good.sizeUnit) arr.push(myTableTransferSize(good))
-        if (good.quality) arr.push(good.quality + good.qualityUnit)
+        if (good.quality) arr.push('重' + good.quality + good.qualityUnit)
         good.size = arr.join('、')
       }
     }
@@ -537,9 +537,6 @@ export const exportWordHandler = async (type: EXPORT_WORD_ENUM, data: Record<any
     case EXPORT_WORD_ENUM.SUB_PUT_IN:
       temp = {
         ...temp,
-        year: date.format('YYYY'),
-        month: date.format('MM'),
-        day: date.format('DD'),
         sonSource: resJiLianFu(temp.sonSource),
         createTime: dayjs(temp.createTime).format('YYYY年MM月DD日')
       }
@@ -682,6 +679,7 @@ export const exportWordHandler = async (type: EXPORT_WORD_ENUM, data: Record<any
         pcs: temp.authUnit,
         dictAge: '核\n准\n单\n位',
         dictTorn: '说\n\n明',
+        size: temp.confirmUnit,
         dictLevel: `鉴定日期：${temp.date}\n鉴定总数${temp.goods.length}件/组，其中：\n${resultText}`
       })
 
@@ -739,7 +737,7 @@ export const exportWordHandler = async (type: EXPORT_WORD_ENUM, data: Record<any
             vertical: 'middle'
           }
         }
-        dateCell.value = '日期：' + date.format('YYYY年MM月DD日')
+        dateCell.value = '日期：' + temp.createTime.split(' ')[0]
         dateCell.style = {
           fill: {
             type: 'pattern',