shaogen1995 преди 2 месеца
родител
ревизия
e4f08ec2dd

+ 1 - 1
public/index.html

@@ -16,7 +16,7 @@
       // const baseUrlTempOne = 'http://192.168.20.61:8096'
 
       // 钉钉模式
-      const isDingTemp = true
+      const isDingTemp = false
 
       // const script = document.createElement('script')
       // script.src = `//${window.g_config.cdnHost}/gdt/dd-web-dev-center/3.12.0/assets/js/app_567f70b3-6512-4dca-8683-c2b5e2755fd0.js`

+ 0 - 1
src/pages/A3_ledger/ComPage/C4import/index.tsx

@@ -131,7 +131,6 @@ function C4import({ colseFu }: Props) {
     setFormData({ pageNum, pageSize })
   }, [])
 
-  // 待完善
   return (
     <div className={styles.C4import}>
       <div className='C4top'>

+ 8 - 1
src/pages/A_workbench/A2business/index.tsx

@@ -116,7 +116,14 @@ function A2business() {
           </div>
           <div className='A2ll1_2'>
             <Button onClick={() => setEditUser(true)}>编辑个人资料</Button>&emsp;
-            {isDing ? null : (
+            {isDing ? (
+              <MyPopconfirm
+                txtK='退出登录'
+                onConfirm={loginExit}
+                Dom={<Button>退出登录(测试专用)</Button>}
+                loc='bottom'
+              />
+            ) : (
               <>
                 <Button
                   onClick={() => store.dispatch({ type: 'layout/passEditShow', payload: true })}

+ 1 - 1
src/pages/E_goodsStorage/E1accident/index.tsx

@@ -220,7 +220,7 @@ function E1accident() {
             { key: 'goodsName', txt: '藏品名称' },
             { key: 'authUser', txt: '鉴定人' },
             { key: 'creatorName', txt: '发起人' },
-            { key: 'createTime', txt: '发日期' },
+            { key: 'createTime', txt: '发日期' },
             { key: 'status', txt: '申请状态' }
           ],
           data: res.data.records.map((v: FourTableType) => ({

+ 1 - 1
src/pages/E_goodsStorage/E3actuality/index.tsx

@@ -212,7 +212,7 @@ function E3actuality() {
             { key: 'goodsName', txt: '藏品名称' },
             { key: 'sonUser', txt: '经手人' },
             { key: 'creatorName', txt: '发起人' },
-            { key: 'createTime', txt: '发日期' },
+            { key: 'createTime', txt: '发日期' },
             { key: 'status', txt: '申请状态' }
           ],
           data: res.data.records.map((v: FourTableType) => ({

+ 1 - 1
src/pages/E_goodsStorage/E4repair/index.tsx

@@ -184,7 +184,7 @@ function E4repair() {
             { key: 'businessTimeStart', txt: '交修日期' },
             { key: 'authUnit', txt: '交修部门' },
             { key: 'creatorName', txt: '发起人' },
-            { key: 'createTime', txt: '发日期' },
+            { key: 'createTime', txt: '发日期' },
             { key: 'status', txt: '申请状态' }
           ],
           data: res.data.records.map((v: FourTableType) => ({

+ 3 - 3
src/utils/tableData.ts

@@ -378,7 +378,7 @@ export const E1tableC = [
   ['txt', '藏品名称', 'goodsName'],
   ['txt', '鉴定人', 'authUser'],
   ['txt', '发起人', 'creatorName'],
-  ['txt', '发日期', 'createTime'],
+  ['txt', '发日期', 'createTime'],
   ['txtChange', '申请状态', 'status', statusObj]
 ]
 
@@ -400,7 +400,7 @@ export const E3tableC = [
   ['txt', '藏品名称', 'goodsName'],
   ['txt', '经手人', 'sonUser'],
   ['txt', '发起人', 'creatorName'],
-  ['txt', '发日期', 'createTime'],
+  ['txt', '发日期', 'createTime'],
   ['txtChange', '申请状态', 'status', statusObj]
 ]
 
@@ -410,7 +410,7 @@ export const E4tableC = [
   ['txt', '交修日期', 'date'],
   ['txt', '交修部门', 'authUnit'],
   ['txt', '发起人', 'creatorName'],
-  ['txt', '发日期', 'createTime'],
+  ['txt', '发日期', 'createTime'],
   ['txtChange', '申请状态', 'status', statusObj]
 ]