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

src/pages/A_workbench/A3flow/data.ts

@@ -59,7 +59,7 @@ export const BUSINESS_DETAIL_PATH_MAP: Record<string, string> = {
   // 藏品入藏
   RC: 'enterTibet_edit',
   // 藏品登记
-  DJ: 'register',
+  DJ: 'register_edit',
   // 藏品编辑
   BJ: 'goodEdit_edit',
   // 藏品删除
@@ -84,8 +84,8 @@ export const BUSINESS_DETAIL_PATH_MAP: Record<string, string> = {
   XZ: 'actuality_edit',
   // 文物修复
   XF: 'repair_edit',
-  // 展览申请
-  ZL: '',
+  // 借展管理
+  ZL: 'exhibition_edit',
   // 藏品总登记号
   ZDJ: ''
 }

src/pages/F_exhibition/F1exhibition/F1edit/index.tsx

@@ -248,10 +248,6 @@ function F1edit() {
       MessageFu.warning('借展部门不能为空')
       return true
     }
-    if (!snaps.length) {
-      MessageFu.warning('请选择藏品')
-      return true
-    }
 
     const tableInputVals = tableRef.current?.form.getFieldsValue()
     if (!areAllCheckersFilled('lendDate', tableInputVals)) {
@@ -260,7 +256,7 @@ function F1edit() {
     }
 
     return false
-  }, [snaps.length, topInfo.sonUnit, topInfo.typeName])
+  }, [topInfo.sonUnit, topInfo.typeName])
 
   // 新增的底部按钮点击
   const btnClickFu = useCallback(
@@ -268,12 +264,8 @@ function F1edit() {
       if (checkDataFu()) return
 
       if (val !== '草稿') {
-        if (!topInfo.goods || (topInfo.goods && topInfo.goods.length === 0)) {
-          return MessageFu.warning('请添加藏品')
-        } else {
-          if (topInfo.goods.some(v => !v.siteStr || !v.siteId)) {
-            return MessageFu.warning('请选择存放位置')
-          }
+        if (!snaps.length) {
+          return MessageFu.warning('请选择藏品')
         }
       }
 

src/pages/F_exhibition/F1exhibition/constants.ts

@@ -45,8 +45,8 @@ export const F1EXHIBITION_TABLE_COLUMNS = [
 
 export const F1_GOOD_COLUMNS = [
   ['txt', '编号类型', 'numName'],
-  ['txt', '藏品编号', 'goodsNum'],
-  ['txt', '藏品名称', 'goodsName'],
+  ['txt', '藏品编号', 'num'],
+  ['txt', '藏品名称', 'name'],
   ['ping', '数量', 'pcs', 'pcsUnit'],
   ['datePicker', '借出日期 *', 'lendDate'],
   [

src/utils/exportWordTemplates.ts

@@ -246,5 +246,5 @@ export const exportWordHandler = async (type: EXPORT_WORD_ENUM, data: Record<any
       break
   }
 
-  exportWordDocx(`/templates/${item.templateName}`, temp, item.fileName)
+  exportWordDocx(`./templates/${item.templateName}`, temp, item.fileName)
 }

src/utils/history.ts

@@ -348,16 +348,20 @@ export const cascaderObjFu = (): any => {
 }
 
 // --------------生成A标签下载--------------------
-export const downFileFu = (url: string, back?: () => void) => {
-  // 动态创建 a 标签
-  const link = document.createElement('a')
-  link.href = baseURL + url
-  link.target = '_blank'
-  link.style.display = 'none'
-  // 插入 DOM 并触发点击
-  document.body.appendChild(link)
-  link.click()
-  // 清理
-  document.body.removeChild(link)
-  if (back) back()
+export const downFileFu = async (url: string, back?: () => void) => {
+  try {
+    const response = await fetch(baseURL + url)
+    const blob = await response.blob()
+    const blobUrl = URL.createObjectURL(blob)
+
+    const link = document.createElement('a')
+    link.href = blobUrl
+    link.download = url.split('/').pop() || 'download'
+    link.click()
+
+    setTimeout(() => URL.revokeObjectURL(blobUrl), 100)
+    if (back) back()
+  } catch (error) {
+    console.error('Download failed:', error)
+  }
 }

src/utils/select.ts

@@ -95,7 +95,7 @@ export const selectObj = {
     { value: 'RC', label: '藏品入藏' },
     { value: 'DJ', label: '藏品登记' },
     { value: 'BJ', label: '藏品编辑' },
-    { value: 'SC', label: '藏品删除' },
+    // { value: 'SC', label: '藏品删除' },
     { value: 'RK', label: '藏品入库' },
     { value: 'YK', label: '藏品移库' },
     { value: 'CK', label: '藏品出库' },
@@ -106,8 +106,8 @@ export const selectObj = {
     { value: 'CS', label: '残损登记' },
     { value: 'XZ', label: '现状登记' },
     { value: 'XF', label: '文物修复' },
-    { value: 'ZL', label: '展览申请' },
-    { value: 'ZDJ', label: '藏品总登记号' }
+    { value: 'ZL', label: '借展管理' }
+    // { value: 'ZDJ', label: '藏品总登记号' }
   ],
   入库人员类型: [
     { value: SON_TYPE_NAME.IN, label: '内部人员' },