Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
I
integrate-admin
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
刘旭
integrate-admin
Commits
04e6c9f5
提交
04e6c9f5
authored
11月 22, 2022
作者:
刘旭
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
完成产品日志页面
上级
2d0c0201
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
101 行增加
和
30 行删除
+101
-30
index.ts
src/router/index.ts
+11
-14
commonConfig.ts
...services/api/systemApi/fieldConfiguration/commonConfig.ts
+2
-1
logApi.ts
src/services/api/systemApi/log/logApi.ts
+32
-0
search.ts
src/store/modules/search.ts
+6
-0
newField.vue
src/views/manage/components/fieldConfiguration/newField.vue
+5
-3
fieldConfiguration.vue
src/views/manage/fieldConfiguration.vue
+14
-9
platformProducts.vue
src/views/manage/platformProducts.vue
+6
-3
productLog.vue
src/views/manage/productLog.vue
+0
-0
useXyunLog.ts
src/views/system/tableConfigData/useXyunLog.ts
+25
-0
没有找到文件。
src/router/index.ts
浏览文件 @
04e6c9f5
...
@@ -17,20 +17,17 @@ const routes: Array<RouteRecordRaw> = [
...
@@ -17,20 +17,17 @@ const routes: Array<RouteRecordRaw> = [
},
},
],
],
},
},
// {
{
// path: '/manage',
path
:
'/manage'
,
// component: Layout,
component
:
Layout
,
// children: [
children
:
[
// {
{
// path: '/manage/configMap',
path
:
'/manage/fieldConfiguration'
,
// name: 'configMap',
name
:
'configMap'
,
// component: () => import("@/views/manage/configMap.vue"),
component
:
()
=>
import
(
"@/views/manage/fieldConfiguration.vue"
),
// props: {
},
// id: 0
]
// }
},
// },
// ]
// },
{
{
path
:
"/login"
,
path
:
"/login"
,
name
:
"login"
,
name
:
"login"
,
...
...
src/services/api/systemApi/fieldConfiguration/commonConfig.ts
浏览文件 @
04e6c9f5
...
@@ -2,6 +2,7 @@ import { request } from "../../config";
...
@@ -2,6 +2,7 @@ import { request } from "../../config";
// 金蝶通用配置列表
// 金蝶通用配置列表
export
function
getCommonConfig
(
export
function
getCommonConfig
(
platformProductRelationId
:
number
,
pageNo
?:
number
,
pageNo
?:
number
,
pageSize
?:
number
,
pageSize
?:
number
,
name
?:
string
,
name
?:
string
,
...
@@ -10,7 +11,7 @@ export function getCommonConfig(
...
@@ -10,7 +11,7 @@ export function getCommonConfig(
return
request
({
return
request
({
url
:
"/api/kingdee/common/config/list"
,
url
:
"/api/kingdee/common/config/list"
,
method
:
"get"
,
method
:
"get"
,
params
:
{
pageNo
,
pageSize
,
name
,
operation
},
params
:
{
p
latformProductRelationId
,
p
ageNo
,
pageSize
,
name
,
operation
},
});
});
}
}
...
...
src/services/api/systemApi/log/logApi.ts
浏览文件 @
04e6c9f5
...
@@ -45,3 +45,34 @@ export function getThirdPartyLog(
...
@@ -45,3 +45,34 @@ export function getThirdPartyLog(
params
:
{
pageNo
,
pageSize
,
dateFrom
,
dateTo
,
name
,
flag
,
queueId
},
params
:
{
pageNo
,
pageSize
,
dateFrom
,
dateTo
,
name
,
flag
,
queueId
},
});
});
}
}
// 产品日志
export
function
getProductLog
(
platformProductRelationId
:
number
,
pageNo
?:
number
,
pageSize
?:
number
,
dateFrom
?:
string
,
dateTo
?:
string
,
name
?:
string
,
flag
?:
any
,
costTimeFrom
?:
number
,
costTimeTo
?:
number
,
queueId
?:
string
,
)
{
return
request
({
url
:
"/api/product/log/list"
,
method
:
"get"
,
params
:
{
platformProductRelationId
,
pageNo
,
pageSize
,
dateFrom
,
dateTo
,
name
,
flag
,
costTimeFrom
,
costTimeTo
,
queueId
},
});
}
\ No newline at end of file
src/store/modules/search.ts
浏览文件 @
04e6c9f5
...
@@ -3,6 +3,7 @@ export type SearchState = {
...
@@ -3,6 +3,7 @@ export type SearchState = {
kingdeeSearch
:
Object
;
kingdeeSearch
:
Object
;
thirdPartySearch
:
Object
;
thirdPartySearch
:
Object
;
monitoringSearch
:
Object
;
monitoringSearch
:
Object
;
productSearch
:
Object
;
};
};
//定义state
//定义state
...
@@ -10,6 +11,7 @@ export const state: SearchState = {
...
@@ -10,6 +11,7 @@ export const state: SearchState = {
kingdeeSearch
:
{},
kingdeeSearch
:
{},
thirdPartySearch
:
{},
thirdPartySearch
:
{},
monitoringSearch
:
{},
monitoringSearch
:
{},
productSearch
:
{},
};
};
//定义mutations
//定义mutations
export
const
mutations
=
{
export
const
mutations
=
{
...
@@ -17,6 +19,10 @@ export const mutations = {
...
@@ -17,6 +19,10 @@ export const mutations = {
state
.
kingdeeSearch
=
data
;
state
.
kingdeeSearch
=
data
;
},
},
setproductSearch
(
state
:
SearchState
,
data
:
Object
)
{
state
.
productSearch
=
data
;
},
setThirdPartySearch
(
state
:
SearchState
,
data
:
Object
)
{
setThirdPartySearch
(
state
:
SearchState
,
data
:
Object
)
{
state
.
thirdPartySearch
=
data
;
state
.
thirdPartySearch
=
data
;
},
},
...
...
src/views/manage/components/fieldConfiguration/newField.vue
浏览文件 @
04e6c9f5
...
@@ -45,7 +45,6 @@
...
@@ -45,7 +45,6 @@
<el-input
v-model=
"fieidForm.entryPrimaryKeyField"
placeholder=
"请输入单据分录主键字段"
/>
<el-input
v-model=
"fieidForm.entryPrimaryKeyField"
placeholder=
"请输入单据分录主键字段"
/>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<!--
<el-col></el-col>
-->
<el-col
:span=
"8"
v-if=
"fieidForm.operation === '2' || fieidForm.operation === 'MES->ERP'"
>
<el-col
:span=
"8"
v-if=
"fieidForm.operation === '2' || fieidForm.operation === 'MES->ERP'"
>
<el-form-item
label=
"分录标识"
prop=
"entryName"
>
<el-form-item
label=
"分录标识"
prop=
"entryName"
>
<!-- :prop="fieidForm.operation === '1' && fieidForm.operation === 'MES->ERP' ? '' : 'entryName'" -->
<!-- :prop="fieidForm.operation === '1' && fieidForm.operation === 'MES->ERP' ? '' : 'entryName'" -->
...
@@ -109,6 +108,9 @@ import { ElMessage, ElMessageBox } from 'element-plus';
...
@@ -109,6 +108,9 @@ import { ElMessage, ElMessageBox } from 'element-plus';
import
{
addCommonConfig
,
putCommonConfig
}
from
'@/services/api/systemApi/fieldConfiguration/commonConfig'
import
{
addCommonConfig
,
putCommonConfig
}
from
'@/services/api/systemApi/fieldConfiguration/commonConfig'
const
props
=
defineProps
({
const
props
=
defineProps
({
platformProductRelationId
:
{
type
:
Number
,
},
currentPage
:
{
currentPage
:
{
type
:
Number
,
type
:
Number
,
},
},
...
@@ -163,7 +165,7 @@ const onConfirm = () => {
...
@@ -163,7 +165,7 @@ const onConfirm = () => {
addCommonConfig
(
fieidForm
.
value
).
then
((
res
:
any
)
=>
{
addCommonConfig
(
fieidForm
.
value
).
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
200
)
{
if
(
res
.
code
===
200
)
{
clear
()
clear
()
emits
(
'initCommonConfig'
,
props
.
currentPage
,
props
.
pageSize
)
emits
(
'initCommonConfig'
,
props
.
platformProductRelationId
,
props
.
currentPage
,
props
.
pageSize
)
ElMessage
({
type
:
'success'
,
message
:
'添加成功'
})
ElMessage
({
type
:
'success'
,
message
:
'添加成功'
})
}
}
})
})
...
@@ -171,7 +173,7 @@ const onConfirm = () => {
...
@@ -171,7 +173,7 @@ const onConfirm = () => {
putCommonConfig
(
fieidForm
.
value
).
then
((
res
:
any
)
=>
{
putCommonConfig
(
fieidForm
.
value
).
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
200
)
{
if
(
res
.
code
===
200
)
{
clear
()
clear
()
emits
(
'initCommonConfig'
,
props
.
currentPage
,
props
.
pageSize
)
emits
(
'initCommonConfig'
,
props
.
platformProductRelationId
,
props
.
currentPage
,
props
.
pageSize
)
ElMessage
({
type
:
'success'
,
message
:
'更新成功'
})
ElMessage
({
type
:
'success'
,
message
:
'更新成功'
})
}
}
})
})
...
...
src/views/manage/fieldConfiguration.vue
浏览文件 @
04e6c9f5
...
@@ -32,12 +32,13 @@
...
@@ -32,12 +32,13 @@
layout=
"->, total, sizes, prev, pager, next, jumper"
:total=
"total"
hide-on-single-page
layout=
"->, total, sizes, prev, pager, next, jumper"
:total=
"total"
hide-on-single-page
@
size-change=
"handleSizeChange"
@
current-change=
"handleCurrentChange"
style=
"margin-top: 20px;"
/>
@
size-change=
"handleSizeChange"
@
current-change=
"handleCurrentChange"
style=
"margin-top: 20px;"
/>
</div>
</div>
<new-field
ref=
"newFieldRef"
@
initCommonConfig=
"initCommonConfig"
:currentPage=
"currentPage"
:pageSize=
"pageSize"
/>
<new-field
ref=
"newFieldRef"
@
initCommonConfig=
"initCommonConfig"
:kingdeeCommonConfigId=
"kingdeeCommonConfigId"
:currentPage=
"currentPage"
:pageSize=
"pageSize"
/>
<config-map
ref=
"configMapRef"
:kingdeeCommonConfigId=
"kingdeeCommonConfigId"
/>
<config-map
ref=
"configMapRef"
:kingdeeCommonConfigId=
"kingdeeCommonConfigId"
/>
</template>
</template>
<
script
setup
lang=
"ts"
>
<
script
setup
lang=
"ts"
>
import
{
ref
}
from
'vue'
import
{
ref
,
onMounted
}
from
'vue'
import
{
ElMessage
,
ElMessageBox
}
from
'element-plus'
;
import
{
ElMessage
,
ElMessageBox
}
from
'element-plus'
;
import
{
getCommonConfig
,
deleteCommonConfig
}
from
'@/services/api/systemApi/fieldConfiguration/commonConfig'
import
{
getCommonConfig
,
deleteCommonConfig
}
from
'@/services/api/systemApi/fieldConfiguration/commonConfig'
import
newField
from
'./components/fieldConfiguration/newField.vue'
;
import
newField
from
'./components/fieldConfiguration/newField.vue'
;
...
@@ -51,17 +52,23 @@ const currentPage = ref(1)
...
@@ -51,17 +52,23 @@ const currentPage = ref(1)
const
pageSize
=
ref
(
10
)
const
pageSize
=
ref
(
10
)
const
total
=
ref
(
0
)
const
total
=
ref
(
0
)
const
kingdeeCommonConfigId
=
ref
()
// 配置字段id
const
kingdeeCommonConfigId
=
ref
()
// 配置字段id
const
platformProductRelationId
:
any
=
sessionStorage
.
getItem
(
'platformProductRelationId'
)
// 产品id
onMounted
(()
=>
{
initCommonConfig
(
platformProductRelationId
,
currentPage
.
value
,
pageSize
.
value
)
})
const
handleSizeChange
=
(
value
:
number
)
=>
{
const
handleSizeChange
=
(
value
:
number
)
=>
{
pageSize
.
value
=
value
pageSize
.
value
=
value
initCommonConfig
(
currentPage
.
value
,
pageSize
.
value
)
initCommonConfig
(
platformProductRelationId
,
currentPage
.
value
,
pageSize
.
value
)
}
}
const
handleCurrentChange
=
(
value
:
number
)
=>
{
const
handleCurrentChange
=
(
value
:
number
)
=>
{
currentPage
.
value
=
value
currentPage
.
value
=
value
initCommonConfig
(
value
,
pageSize
.
value
)
initCommonConfig
(
platformProductRelationId
,
currentPage
.
value
,
pageSize
.
value
)
}
}
const
showFieid
=
()
=>
{
const
showFieid
=
()
=>
{
newFieldRef
.
value
.
fieldTitle
=
'新增字段'
newFieldRef
.
value
.
fieldTitle
=
'新增字段'
newFieldRef
.
value
.
updateCount
=
0
newFieldRef
.
value
.
updateCount
=
0
...
@@ -102,7 +109,7 @@ const handleDelete = (id: number) => {
...
@@ -102,7 +109,7 @@ const handleDelete = (id: number) => {
.
then
(()
=>
{
.
then
(()
=>
{
deleteCommonConfig
(
id
).
then
((
res
:
any
)
=>
{
deleteCommonConfig
(
id
).
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
200
)
{
if
(
res
.
code
===
200
)
{
initCommonConfig
(
currentPage
.
value
,
pageSize
.
value
)
initCommonConfig
(
platformProductRelationId
,
currentPage
.
value
,
pageSize
.
value
)
ElMessage
({
type
:
'success'
,
message
:
'删除成功'
})
ElMessage
({
type
:
'success'
,
message
:
'删除成功'
})
}
}
})
})
...
@@ -110,18 +117,16 @@ const handleDelete = (id: number) => {
...
@@ -110,18 +117,16 @@ const handleDelete = (id: number) => {
}
}
// 通用配置列表数据
// 通用配置列表数据
const
initCommonConfig
=
(
pageNo
?:
number
,
pageSize
?:
number
,
name
?:
string
)
=>
{
const
initCommonConfig
=
(
id
:
number
,
pageNo
?:
number
,
pageSize
?:
number
,
name
?:
string
)
=>
{
getCommonConfig
(
pageNo
,
pageSize
,
name
).
then
((
res
:
any
)
=>
{
getCommonConfig
(
id
,
pageNo
,
pageSize
,
name
).
then
((
res
:
any
)
=>
{
if
(
res
.
code
===
200
)
{
if
(
res
.
code
===
200
)
{
fieidData
.
value
=
res
.
data
.
records
fieidData
.
value
=
res
.
data
.
records
total
.
value
=
res
.
data
.
total
total
.
value
=
res
.
data
.
total
loading
.
value
=
false
loading
.
value
=
false
console
.
log
(
res
,
'通用配置列表数据'
);
}
}
})
})
}
}
initCommonConfig
(
currentPage
.
value
,
pageSize
.
value
)
</
script
>
</
script
>
<
style
scoped
>
<
style
scoped
>
...
...
src/views/manage/platformProducts.vue
浏览文件 @
04e6c9f5
...
@@ -64,7 +64,9 @@
...
@@ -64,7 +64,9 @@
import
{
ref
,
computed
}
from
'vue'
import
{
ref
,
computed
}
from
'vue'
import
{
getPlatformProductList
,
createPlatformProduct
,
deletePlatformProduct
,
getDictItemList
}
from
'@/services/api/platformProducts'
import
{
getPlatformProductList
,
createPlatformProduct
,
deletePlatformProduct
,
getDictItemList
}
from
'@/services/api/platformProducts'
import
{
ElMessage
,
ElMessageBox
}
from
'element-plus'
;
import
{
ElMessage
,
ElMessageBox
}
from
'element-plus'
;
import
{
useRouter
}
from
'vue-router'
;
const
router
=
useRouter
();
const
options
=
ref
([]
as
any
)
// select 数据源
const
options
=
ref
([]
as
any
)
// select 数据源
const
showDialog
=
ref
(
false
)
const
showDialog
=
ref
(
false
)
const
productAfterCode
=
ref
()
// 第一个选择产品
const
productAfterCode
=
ref
()
// 第一个选择产品
...
@@ -107,9 +109,10 @@ const selectBeforeProducts = () => {
...
@@ -107,9 +109,10 @@ const selectBeforeProducts = () => {
}
}
// 选择场景
// 选择场景
const
selectScene
=
(
id
:
number
)
=>
{
const
selectScene
=
(
id
:
string
)
=>
{
console
.
log
(
'选择场景'
);
console
.
log
(
'选择场景'
,
id
);
sessionStorage
.
setItem
(
'platformProductRelationId'
,
id
)
router
.
push
({
path
:
'/manage/fieldConfiguration'
});
//调用router.push()
}
}
// 删除产品
// 删除产品
...
...
src/views/manage/productLog.vue
0 → 100644
浏览文件 @
04e6c9f5
差异被折叠。
点击展开。
src/views/system/tableConfigData/useXyunLog.ts
浏览文件 @
04e6c9f5
...
@@ -2,6 +2,7 @@ import { ref, onMounted } from "vue";
...
@@ -2,6 +2,7 @@ import { ref, onMounted } from "vue";
import
{
import
{
getkingdeeLog
,
getkingdeeLog
,
getThirdPartyLog
,
getThirdPartyLog
,
getProductLog
}
from
"@/services/api/systemApi/log/logApi"
;
}
from
"@/services/api/systemApi/log/logApi"
;
export
const
usekingdeeLogTableList
=
()
=>
{
export
const
usekingdeeLogTableList
=
()
=>
{
...
@@ -50,3 +51,27 @@ export const useThirdPartyTableList = () => {
...
@@ -50,3 +51,27 @@ export const useThirdPartyTableList = () => {
pageSize
,
pageSize
,
};
};
};
};
export
const
useproductLogTableList
=
()
=>
{
const
tableList
=
ref
([]);
const
total
=
ref
(
0
);
// 当前页数
const
currentPage
=
ref
(
1
);
// 每页条数
const
pageSize
=
ref
(
10
);
const
loading
=
ref
(
true
);
const
platformProductRelationId
=
1
onMounted
(
async
()
=>
{
const
res
=
await
getProductLog
(
platformProductRelationId
,
currentPage
.
value
,
pageSize
.
value
);
tableList
.
value
=
res
.
data
.
records
;
total
.
value
=
res
.
data
.
total
;
loading
.
value
=
false
;
});
return
{
tableList
,
total
,
loading
,
currentPage
,
pageSize
,
};
};
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论