总账-数据导入-导入zip图片

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
@@ -38,7 +38,7 @@
     <script>
       try {
         const config = {
-          bid: '替换为你自己的bid',
+          bid: 'YWBWGGCXT_zzdpro',
           signkey: '1234567890abcdef',
           gateway: 'https://wpkgate-emas.ding.zj.gov.cn'
         }

src/components/ZmaiDian.ts

@@ -1,7 +1,9 @@
 import tabLeftArr, { routerSon } from '@/pages/Layout/data'
 import { getTokenInfo } from '@/utils/storage'
 
-function setMd(page_id: string, page_name: string, page_url: string, _user_id: string) {
+const userInfo = getTokenInfo().user || {}
+
+function setMd(page_id: string, page_name: string, page_url: string) {
   // 用户信息埋点----------------------------------------
   // 单页应用 或 “单个页面”需异步补充PV日志参数还需进行如下埋点 ------
   aplus_queue.push({
@@ -16,8 +18,8 @@ function setMd(page_id: string, page_name: string, page_url: string, _user_id: s
       },
       {
         // 当前你的应用信息，此两行按应用实际参数修改，不可自定义。
-        sapp_id: '替换为-业主给你的sapp_id',
-        sapp_name: '替换为-业主给你的sapp_name',
+        sapp_id: '51395',
+        sapp_name: 'YWBWGGCXT',
         page_id: page_id, // 可以用this.$route.meta.pagePath代替
         page_name: page_name, // 可以用this.$route.meta.name代替
         page_url: page_url // 可以用this.$route.meta.pagePath代替
@@ -28,10 +30,16 @@ function setMd(page_id: string, page_name: string, page_url: string, _user_id: s
     action: 'aplus.setMetaInfo',
     arguments: ['_hold', 'BLOCK']
   })
+  // 设置会员昵称
+  aplus_queue.push({
+    action: 'aplus.setMetaInfo',
+    arguments: ['_user_nick', userInfo.realName || userInfo.userName || '匿名']
+  })
+
   // 设置会员ID
   aplus_queue.push({
     action: 'aplus.setMetaInfo',
-    arguments: ['_user_id', _user_id] // 当前登录的浙政钉用户id，传参示例：uni.getStorageSync('userInfo').employeeCode)
+    arguments: ['_user_id', userInfo.accountId || '888708'] // 当前登录的浙政钉用户id，传参示例：uni.getStorageSync('userInfo').employeeCode)
   })
 
   // 如采集用户信息是异步行为，需要先设置完用户信息后再执行这个START埋点
@@ -64,7 +72,5 @@ export const maiDianFu = (page_id: string) => {
     } else page_name = '数据统计'
   }
 
-  const _user_id = (getTokenInfo().user || {}).accountId || '888708'
-
-  setMd(page_id, page_name, page_id, _user_id)
+  setMd(page_id, page_name, page_id)
 }

src/pages/A3_ledger/ComPage/C4import/C4imgModal/index.module.scss

@@ -0,0 +1,31 @@
+.C4imgModal {
+  :global {
+    .ant-modal-close {
+      display: none;
+    }
+    .ant-modal {
+      width: 1000px !important;
+    }
+    .B1XLmain {
+      border-top: 1px solid #999999;
+      padding-top: 15px;
+      width: 100%;
+      .B1XLtop {
+        margin-bottom: 15px;
+        .ant-btn {
+          margin-right: 15px;
+        }
+      }
+
+      .ant-table-cell {
+        padding: 8px !important;
+        text-align: center !important;
+      }
+
+      .B1XLbtn {
+        margin-top: 20px;
+        text-align: center;
+      }
+    }
+  }
+}

src/pages/A3_ledger/ComPage/C4import/C4imgModal/index.tsx

@@ -0,0 +1,109 @@
+import React, { useCallback, useState } from 'react'
+import styles from './index.module.scss'
+import { Button, Modal } from 'antd'
+import { C4zipType } from '../data'
+import MyTable from '@/components/MyTable'
+import MyPopconfirm from '@/components/MyPopconfirm'
+import { A3m_APIaddZip, A3m_APIaddZip_2 } from '@/store/action/A3machineReg'
+import { MessageFu } from '@/utils/message'
+
+type Props = {
+  info: C4zipType
+  closeFu: () => void
+  againUpFu: () => void
+  succFu: () => void
+}
+
+function C4imgModal({ info, closeFu, againUpFu, succFu }: Props) {
+  const [btnAc, setBtnAc] = useState('成功')
+
+  // 点击导入当前数据
+  const btnOk = useCallback(async () => {
+    const obj = {
+      fileName: info.file?.fileName,
+      filePath: info.file?.filePath,
+      pcsError: info.err.length,
+      pcsSuccess: info.succ.length,
+      pcsTotal: info.err.length + info.succ.length,
+      type: '3'
+    }
+
+    const res1 = await A3m_APIaddZip(obj)
+    if (res1.code === 0) {
+      const obj2 = [...info.succ, ...info.err].map(v => ({
+        ...v,
+        id: null,
+        importId: res1.data.id,
+        moduleName: 'goods',
+        importError: v.description === '成功' ? '0' : '1'
+      }))
+
+      const res2 = await A3m_APIaddZip_2(obj2)
+
+      if (res2.code === 0) {
+        MessageFu.success('导入成功')
+        succFu()
+        closeFu()
+      }
+    }
+  }, [closeFu, info, succFu])
+
+  return (
+    <Modal
+      wrapClassName={styles.C4imgModal}
+      destroyOnClose
+      open={true}
+      title={
+        <>
+          导入数据条数：{info.succ.length + info.err.length}&emsp;&emsp;校验成功条数：
+          {info.succ.length}&emsp;&emsp;校验失败条数：{info.err.length}
+        </>
+      }
+      footer={[]}
+    >
+      <div className='B1XLmain'>
+        <div className='B1XLtop'>
+          {['成功', '失败'].map(v => (
+            <Button key={v} type={v === btnAc ? 'primary' : 'default'} onClick={() => setBtnAc(v)}>
+              {v} {v === '成功' ? info.succ.length : info.err.length}
+            </Button>
+          ))}
+        </div>
+
+        <MyTable
+          classKey='C4imgModal'
+          yHeight={500}
+          list={btnAc === '成功' ? info.succ : info.err}
+          columnsTemp={[
+            ['txt', '图片名称', 'fileName'],
+            ['txt', '检验结果', 'description']
+          ]}
+          lastBtn={[]}
+          pagingInfo={false}
+        />
+
+        <div className='B1XLbtn'>
+          {info.type === '查看' ? (
+            <Button onClick={closeFu}>关闭</Button>
+          ) : (
+            <>
+              <Button type='primary' onClick={againUpFu}>
+                重新上传压缩包
+              </Button>
+              &emsp;
+              <Button type='primary' disabled={info.succ.length === 0} onClick={btnOk}>
+                导入当前数据
+              </Button>
+              &emsp;
+              <MyPopconfirm txtK='取消' onConfirm={closeFu} Dom={<Button>取消导入</Button>} />
+            </>
+          )}
+        </div>
+      </div>
+    </Modal>
+  )
+}
+
+const MemoC4imgModal = React.memo(C4imgModal)
+
+export default MemoC4imgModal

src/pages/A3_ledger/ComPage/C4import/C4impImg/index.tsx

@@ -1,17 +1,50 @@
-import React, { useCallback, useMemo, useRef } from 'react'
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import styles from './index.module.scss'
 import { Button } from 'antd'
 import { MessageFu } from '@/utils/message'
 import { fileDomInitialFu } from '@/utils/domShow'
 import { API_upFile } from '@/store/action/layout'
 import MyTable from '@/components/MyTable'
-import { C4tableCImg } from '@/utils/tableData'
+import { C4zipResDtaFu, C4zipType } from '../data'
+import C4imgModal from '../C4imgModal'
+import { C4tableCFu } from '@/utils/tableData'
+import { A3m_APIdel, A3m_APIgetList, A3m_APIlookInfo } from '@/store/action/A3machineReg'
+import MyPopconfirm from '@/components/MyPopconfirm'
 
 type Props = {
   hidden: boolean
 }
 
 function C4impImg({ hidden }: Props) {
+  const [formData, setFormData] = useState({
+    pageNum: 1,
+    pageSize: 10
+  })
+
+  // 列表数据
+  const [tableObj, setTableObj] = useState({
+    list: [],
+    total: 0
+  })
+
+  // 获取列表信息
+  const getListFu = useCallback(async () => {
+    const res = await A3m_APIgetList({
+      ...formData,
+      type: '3'
+    })
+    if (res.code === 0) {
+      setTableObj({
+        list: res.data.records || [],
+        total: res.data.total
+      })
+    }
+  }, [formData])
+
+  useEffect(() => {
+    getListFu()
+  }, [getListFu])
+
   // 上传表格数据
   const upBiaoGeRef = useRef<HTMLInputElement>(null)
 
@@ -35,7 +68,7 @@ function C4impImg({ hidden }: Props) {
 
       fd.append('file', filesInfo)
       fd.append('type', 'doc')
-      fd.append('dirCode', 'C4machineRegImg')
+      // fd.append('dirCode', 'C4machineRegImg')
       fd.append('isDb', 'true')
 
       // 开启压缩图片
@@ -48,8 +81,16 @@ function C4impImg({ hidden }: Props) {
 
         if (res.code === 0) {
           MessageFu.success('上传成功!')
-          const arrAll: any[] = res.data || []
-          console.log('-------', res)
+          const { succArr, errArr } = C4zipResDtaFu(res.data.img || [])
+          setZipList({
+            type: '上传',
+            succ: succArr,
+            err: errArr,
+            file: {
+              fileName: res.data.fileName,
+              filePath: res.data.filePath
+            }
+          })
         }
         fileDomInitialFu()
       } catch (error) {
@@ -60,12 +101,35 @@ function C4impImg({ hidden }: Props) {
     }
   }, [])
 
+  const lookFu = useCallback(async (id: number) => {
+    const res = await A3m_APIlookInfo('3', id)
+    if (res.code === 0) {
+      const { succArr, errArr } = C4zipResDtaFu(res.data || [], true)
+      setZipList({
+        type: '查看',
+        succ: succArr,
+        err: errArr
+      })
+    }
+  }, [])
+
+  const delFu = useCallback(
+    async (id: number) => {
+      const res = await A3m_APIdel(id)
+      if (res.code === 0) {
+        MessageFu.success('删除成功')
+        getListFu()
+      }
+    },
+    [getListFu]
+  )
+
   const tableLastBtn = useMemo(() => {
     return [
       {
         title: '导入结果',
         render: (item: any) => (
-          <Button size='small' type='text'>
+          <Button size='small' type='text' onClick={() => lookFu(item.id)}>
             查看
           </Button>
         )
@@ -74,13 +138,31 @@ function C4impImg({ hidden }: Props) {
         title: '操作',
         render: (item: any) => {
           return (
-            <Button size='small' type='text' danger>
-              删除记录
-            </Button>
+            <MyPopconfirm
+              txtK='删除'
+              onConfirm={() => delFu(item.id)}
+              Dom={
+                <Button size='small' type='text' danger>
+                  删除记录
+                </Button>
+              }
+            />
           )
         }
       }
     ]
+  }, [delFu, lookFu])
+
+  // zip上传成功
+  const [zipList, setZipList] = useState<C4zipType>({
+    type: '',
+    succ: [],
+    err: []
+  })
+
+  // 页码变化
+  const paginationChange = useCallback((pageNum: number, pageSize: number) => {
+    setFormData({ pageNum, pageSize })
   }, [])
 
   return (
@@ -108,12 +190,30 @@ function C4impImg({ hidden }: Props) {
 
       <MyTable
         classKey='C4impImg'
-        yHeight={638}
-        list={[]}
-        columnsTemp={C4tableCImg}
+        yHeight={590}
+        list={tableObj.list}
+        columnsTemp={C4tableCFu('')}
         lastBtn={tableLastBtn}
-        pagingInfo={false}
+        pageNum={formData.pageNum}
+        pageSize={formData.pageSize}
+        total={tableObj.total}
+        onChange={(pageNum, pageSize) => paginationChange(pageNum, pageSize)}
       />
+
+      {zipList.type ? (
+        <C4imgModal
+          succFu={getListFu}
+          againUpFu={() => upBiaoGeRef.current?.click()}
+          info={zipList}
+          closeFu={() =>
+            setZipList({
+              type: '',
+              succ: [],
+              err: []
+            })
+          }
+        />
+      ) : null}
     </div>
   )
 }

src/pages/A3_ledger/ComPage/C4import/data.ts

@@ -0,0 +1,56 @@
+export type C4zipArrType = {
+  description: string
+  effect: string
+  fileName: string
+  filePath: string
+  importId: string
+  isFlag: number
+  isTrue: number
+  moduleName: string
+  num: string
+  thumb: string
+  type: string
+  id: number
+}
+
+export type C4zipType = {
+  type: '' | '上传' | '查看'
+  succ: C4zipArrType[]
+  err: C4zipArrType[]
+  file?: { fileName: string; filePath: string }
+}
+
+// zip数据整理
+export const C4zipResDtaFu = (arr: C4zipArrType[], isLook?: boolean) => {
+  const succArr: C4zipArrType[] = []
+
+  const errArr: C4zipArrType[] = []
+
+  if (isLook) {
+    arr.forEach((v, i) => {
+      if (v.description === '成功') succArr.push(v)
+      else errArr.push(v)
+    })
+  } else {
+    arr.forEach((v, i) => {
+      if (v.isTrue === 1 && v.isFlag === 1 && v.effect) {
+        succArr.push({
+          ...v,
+          id: i,
+          description: '成功'
+        })
+      } else {
+        let description = ''
+        if (v.isFlag === 0) description = '未匹配到藏品；'
+        else if (!v.effect) description += '未匹配到用途；'
+        errArr.push({
+          ...v,
+          id: i,
+          description
+        })
+      }
+    })
+  }
+
+  return { succArr, errArr }
+}

src/pages/A3_ledger/ComPage/C4import/index.tsx

@@ -2,12 +2,12 @@ import React, { useMemo, useRef, useState } from 'react'
 import styles from './index.module.scss'
 import { Button } from 'antd'
 import MyTable from '@/components/MyTable'
-import { C4tableC } from '@/utils/tableData'
 import MyPopconfirm from '@/components/MyPopconfirm'
 import { baseURL } from '@/utils/http'
 import B1upXLSX from '@/pages/B_enterTibet/B1collect/B1edit/B1upXLSX'
 import { TypeinfoXLSX } from '@/pages/B_enterTibet/B1collect/type'
 import C4impImg from './C4impImg'
+import { C4tableCFu } from '@/utils/tableData'
 
 type Props = {
   colseFu: (flag: boolean) => void
@@ -119,7 +119,7 @@ function C4import({ colseFu }: Props) {
           classKey='C4import'
           yHeight={700}
           list={list}
-          columnsTemp={C4tableC}
+          columnsTemp={C4tableCFu('导入藏品数据')}
           lastBtn={tableLastBtn}
           pagingInfo={false}
         />

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

@@ -68,6 +68,10 @@ function AddGoods({ nowSta, closeFu, succFu, isEdit, editSnap }: Props) {
     dayjs().format('YYYY-MM-DD')
   ])
 
+  useEffect(() => {
+    if (1 + 1 === 1) console.log(setTxtArr)
+  }, [])
+
   // 藏品编辑模块用来对比
   const objOld = useRef<any>({})
 
@@ -84,7 +88,7 @@ function AddGoods({ nowSta, closeFu, succFu, isEdit, editSnap }: Props) {
         if (obj.dateMaking) obj.dateMaking = dayjs(obj.dateMaking)
         // if (obj.inGoodsDate) obj.inGoodsDate = dayjs(obj.inGoodsDate)
 
-        setTxtArr([obj.creatorName, dayjs(obj.createTime).format('YYYY-MM-DD')])
+        // setTxtArr([obj.creatorName, dayjs(obj.createTime).format('YYYY-MM-DD')])
 
         cascaderChArr.forEach(v => {
           if (obj[v] === '0') obj[v] = null

src/pages/E_goodsStorage/E4repair/E4edit/index.tsx

@@ -112,7 +112,7 @@ function E4edit() {
   }, [key])
 
   const timeChange = useCallback(
-    (e: any, key: 'dateStart' | 'dateEnd') => {
+    (e: any, key: 'date' | 'returnDate ') => {
       setTopInfo({ ...topInfo, [key]: dayjs(e).format('YYYY-MM-DD') })
     },
     [topInfo]
@@ -136,7 +136,7 @@ function E4edit() {
       MessageFu.warning('请输入交修部门')
       return true
     }
-    if (!topInfo.dateStart) {
+    if (!topInfo.date) {
       MessageFu.warning('请选择交修日期')
       return true
     }
@@ -491,8 +491,8 @@ function E4edit() {
               <DatePicker
                 disabled={['3', '4'].includes(key)}
                 allowClear={false}
-                value={topInfo.dateStart ? dayjs(topInfo.dateStart) : null}
-                onChange={e => timeChange(e, 'dateStart')}
+                value={topInfo.date ? dayjs(topInfo.date) : null}
+                onChange={e => timeChange(e, 'date')}
               />
             </div>
           </div>
@@ -501,11 +501,13 @@ function E4edit() {
             <div className='E4rowll'>退还日期：</div>
             <div className='E4rowrr'>
               <DatePicker
-                placeholder={['3', '4'].includes(key) && !topInfo.dateEnd ? '（空）' : '请选择日期'}
+                placeholder={
+                  ['3', '4'].includes(key) && !topInfo.returnDate ? '（空）' : '请选择日期'
+                }
                 disabled={['3', '4'].includes(key)}
                 allowClear={false}
-                value={topInfo.dateEnd ? dayjs(topInfo.dateEnd) : null}
-                onChange={e => timeChange(e, 'dateEnd')}
+                value={topInfo.returnDate ? dayjs(topInfo.returnDate) : null}
+                onChange={e => timeChange(e, 'returnDate ')}
               />
             </div>
           </div>

src/pages/E_goodsStorage/E4repair/index.tsx

@@ -20,8 +20,8 @@ const E4baseFormData: E4FormType = {
   pageSize: 10,
   pageNum: 1,
   num: '',
-  dateStart: '',
-  dateEnd: '',
+  businessTimeStart: '',
+  businessTimeEnd: '',
   userName: '',
   userType: '',
   status: ''
@@ -52,13 +52,13 @@ function E4repair() {
   // 时间选择器改变
   const timeChange = useCallback(
     (date: any, dateString: any) => {
-      let dateStart = ''
-      let dateEnd = ''
+      let businessTimeStart = ''
+      let businessTimeEnd = ''
       if (dateString[0] && dateString[1]) {
-        dateStart = dateString[0] + ' 00:00:00'
-        dateEnd = dateString[1] + ' 23:59:59'
+        businessTimeStart = dateString[0] + ' 00:00:00'
+        businessTimeEnd = dateString[1] + ' 23:59:59'
       }
-      setFormData({ ...formData, dateStart, dateEnd })
+      setFormData({ ...formData, businessTimeStart, businessTimeEnd })
     },
     [formData]
   )
@@ -181,7 +181,7 @@ function E4repair() {
           show: true,
           arr: [
             { key: 'num', txt: '申请编号' },
-            { key: 'dateStart', txt: '交修日期' },
+            { key: 'businessTimeStart', txt: '交修日期' },
             { key: 'authUnit', txt: '交修部门' },
             { key: 'creatorName', txt: '发起人' },
             { key: 'createTime', txt: '发送日期' },
@@ -215,7 +215,9 @@ function E4repair() {
             <span>交修日期范围：</span>
             <RangePicker
               value={
-                formData.dateStart ? [dayjs(formData.dateStart), dayjs(formData.dateEnd)] : null
+                formData.businessTimeStart
+                  ? [dayjs(formData.businessTimeStart), dayjs(formData.businessTimeEnd)]
+                  : null
               }
               onChange={timeChange}
             />

src/pages/E_goodsStorage/E4repair/type.d.ts

@@ -2,8 +2,8 @@ export type E4FormType = {
   pageSize: number
   pageNum: number
   num: string
-  dateStart: string
-  dateEnd: string
+  businessTimeStart: string
+  businessTimeEnd: string
   userName: string
   userType: string
   status: string

src/store/action/A3machineReg.ts

@@ -0,0 +1,56 @@
+import http from '@/utils/http'
+
+/**
+ * 总账分账导入-zip点击导入当前数据-1
+ */
+export const A3m_APIaddZip = (data: any) => {
+  return http.post('cms/import/add', data)
+}
+
+/**
+ * 总账分账导入-zip点击导入当前数据-2
+ */
+export const A3m_APIaddZip_2 = (data: any) => {
+  return http.post('cms/import/im/zipData', data)
+}
+
+/**
+ * 总账分账导入-列表数据
+ */
+export const A3m_APIgetList = (data: any) => {
+  return http.post('cms/import/pageList', data)
+}
+
+/**
+ * 总账分账导入-查看数据
+ */
+export const A3m_APIlookInfo = (type: '3' | '4', id: number) => {
+  return http.get(`cms/import/detail/${type}/${id}`)
+}
+
+/**
+ * 总账分账导入-删除记录
+ */
+export const A3m_APIdel = (id: number) => {
+  return http.get(`cms/import/remove/${id}`)
+}
+
+// /**
+//  * 总账分账导入-获取分页列表
+//  */
+// export const C3_APIgetList = (data: any, exportFlag?: boolean): any => {
+//   if (exportFlag) return http.post('cms/goodsFocus/page', data)
+//   else {
+//     return async (dispatch: AppDispatch) => {
+//       const res = await http.post('cms/goodsFocus/page', data)
+//       if (res.code === 0) {
+//         const obj = {
+//           list: res.data.records,
+//           total: res.data.total
+//         }
+
+//         dispatch({ type: 'C3/getList', payload: obj })
+//       }
+//     }
+//   }
+// }

src/utils/http.ts

@@ -13,7 +13,7 @@ export const envFlag = process.env.NODE_ENV === 'development'
 const baseUrlTemp = baseUrlTempOne // 测试环境
 // export const baseUrlTemp = 'http://192.168.20.61:8096' // 线下环境
 
-const baseFlag = baseUrlTemp.includes('https://')
+const baseFlag = baseUrlTemp.includes('https://') || !envFlag
 
 // 请求基地址
 export const baseURL = envFlag ? `${baseUrlTemp}${baseFlag ? '' : '/api/'}` : baseUrlTemp

src/utils/tableData.ts

@@ -213,26 +213,21 @@ export const C2tableC = [
   ['fileSize', '附件大小(MB)', 'fileSize']
 ]
 
-// 待完善
-export const C4tableC = [
-  ['txt', '数据类型', 'type'],
-  ['txt', '文件名称', 'hang1'],
-  ['txt', '导入数据', 'hang2'],
-  ['txt', '成功数据', 'hang3'],
-  ['txt', '失败数据', 'hang3'],
-  ['txt', '导入日期', 'hang3'],
-  ['txt', '导入用户', 'hang3']
-]
-
-// 待完善
-export const C4tableCImg = [
-  ['txt', '文件名称', 'hang1'],
-  ['txt', '导入数据', 'hang2'],
-  ['txt', '成功数据', 'hang3'],
-  ['txt', '失败数据', 'hang3'],
-  ['txt', '导入日期', 'hang3'],
-  ['txt', '导入用户', 'hang3']
-]
+export const C4tableCFu = (val: string) => {
+  let arr: any = [
+    ['txt', '文件名称', 'fileName'],
+    ['txt', '导入数据', 'pcsTotal'],
+    ['txt', '成功数据', 'pcsSuccess'],
+    ['txt', '失败数据', 'pcsError'],
+    ['txt', '导入日期', 'createTime'],
+    ['txt', '导入用户', 'creatorName']
+  ]
+
+  if (val === '导入藏品数据')
+    arr.unshift(['txtChange', '数据类型', 'type', { '1': '一普数据', '2': '省平台数据' }])
+
+  return arr
+}
 
 // V1.1.1藏品编辑
 export const C6tableC = [