root/yinnihailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:印尼mdm变更前端优化

Browse Source
This commit is contained in:
郑旭明\73939
2026-06-20 12:00:00 +08:00
parent cb1d544f7e
commit 46b60bbeb4
12 changed files with 444 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lms/nladmin-ui/src/api/monitor/sysapilog.js Normal file
View File

@@ -0,0 +1,17 @@
import request from '@/utils/request'
export function getBizCodeList(systemFlag,direction) {
return request({
url: 'api/sysApiLog/bizCodeList',
method: 'get',
params: { systemFlag, direction }
})
}
export function archiveLogs() {
return request({
url: 'api/sysApiLog/archive',
method: 'post'
})
}
export default { getBizCodeList,archiveLogs }

366
lms/nladmin-ui/src/views/monitor/sysapiLog/index.vue Normal file
View File

@@ -0,0 +1,366 @@
<template>
<div class="app-container">
<div class="head-container">
<div v-if="crud.props.searchToggle">
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix=":"
>
<el-form-item label="关键字">
<el-input
v-model="query.keyword"
clearable
size="mini"
placeholder="请输入关键字查询"
class="filter-item"
style="width: 200px;"
/>
</el-form-item>
<el-form-item label="接口走向">
<el-select
v-model="query.direction"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
>
<el-option label="出站" :value="0" />
<el-option label="入站" :value="1" />
</el-select>
</el-form-item>
<el-form-item label="系统标识">
<el-select
v-model="query.systemFlag"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
@change="handleSystemFlagChange"
>
<el-option label="mes" value="mes" />
<el-option label="sap" value="sap" />
<el-option label="crm" value="crm" />
<el-option label="mdm" value="mdm" />
</el-select>
</el-form-item>
<el-form-item label="业务类型" class="biz-code-item">
<el-select
v-model="query.bizCode"
clearable
filterable
size="mini"
placeholder="请选择"
class="filter-item"
>
<el-option
v-for="item in bizCodeList"
:key="item.bizCode"
:label="item.bizDesc"
:value="item.bizCode"
/>
</el-select>
</el-form-item>
<el-form-item label="状态">
<el-select
v-model="query.status"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
>
<el-option label="SUCCESS" value="SUCCESS" />
<el-option label="FAIL" value="FAIL" />
</el-select>
</el-form-item>
<el-form-item label="请求时间">
<el-date-picker
v-model="query.createTime"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
/>
</el-form-item>
<rrOperation />
</el-form>
</div>
<crudOperation>
<el-button
slot="right"
class="filter-item"
type="primary"
icon="el-icon-folder-checked"
:loading="archiveLoading"
@click="handleArchive"
>
日志归档
</el-button>
</crudOperation>
</div>
<!--表格渲染-->
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
style="width: 100%;"
:row-style="{height: '50px'}"
:cell-style="{fontSize: '14px'}"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="direction" label="接口走向" width="100">
<template slot-scope="scope">
<el-tag v-if="scope.row.direction === 0" type="success"><i class="el-icon-upload2" />出站</el-tag>
<el-tag v-else-if="scope.row.direction === 1" type="primary"><i class="el-icon-download" />入站</el-tag>
</template>
</el-table-column>
<el-table-column prop="systemFlag" label="系统标识" width="100" />
<el-table-column prop="bizCode" label="业务类型" width="260" />
<el-table-column prop="bizDesc" label="业务描述" show-overflow-tooltip width="500" />
<el-table-column prop="status" label="状态" width="100">
<template slot-scope="scope">
<el-tag v-if="scope.row.status === 'SUCCESS'" type="success">请求成功</el-tag>
<el-tag v-else-if="scope.row.status === 'FAIL'" type="danger">请求失败</el-tag>
</template>
</el-table-column>
<el-table-column prop="costTime" label="耗时(ms)" width="100" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.costTime <= 300" type="success">{{ scope.row.costTime }}ms</el-tag>
<el-tag v-else-if="scope.row.costTime <= 1000" type="warning">{{ scope.row.costTime }}ms</el-tag>
<el-tag v-else type="danger">{{ scope.row.costTime }}ms</el-tag>
</template>
</el-table-column>
<el-table-column prop="createTime" label="请求时间" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column prop="requestParams" label="请求参数" show-overflow-tooltip min-width="200" />
<el-table-column prop="responseBody" label="响应结果" show-overflow-tooltip min-width="200" />
<el-table-column label="详情" width="100" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="primary" plain @click="showDetail(scope.row)">查看详情</el-button>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
<!-- 详情抽屉 -->
<el-drawer
:visible.sync="drawerVisible"
title="接口日志详情"
direction="rtl"
size="60%"
:before-close="handleCloseDrawer"
>
<div class="drawer-content">
<el-descriptions :column="2" border size="small">
<el-descriptions-item label="日志ID">{{ currentRow.logId }}</el-descriptions-item>
<el-descriptions-item label="链路追踪ID">{{ currentRow.traceId }}</el-descriptions-item>
<el-descriptions-item label="接口走向">
<el-tag v-if="currentRow.direction === 0" type="success" size="small"><i class="el-icon-upload2" />出站</el-tag>
<el-tag v-else-if="currentRow.direction === 1" type="primary" size="small"><i class="el-icon-download" />入站</el-tag>
</el-descriptions-item>
<el-descriptions-item label="系统标识">{{ currentRow.systemFlag }}</el-descriptions-item>
<el-descriptions-item label="业务类型">{{ currentRow.bizCode }}</el-descriptions-item>
<el-descriptions-item label="业务描述">{{ currentRow.bizDesc }}</el-descriptions-item>
<el-descriptions-item label="接口地址" :span="2">{{ currentRow.apiUrl }}</el-descriptions-item>
<el-descriptions-item label="请求方法">{{ currentRow.requestMethod }}</el-descriptions-item>
<el-descriptions-item label="请求IP">{{ currentRow.requestIp }}</el-descriptions-item>
<el-descriptions-item label="状态">
<el-tag v-if="currentRow.status === 'SUCCESS'" type="success" size="small">SUCCESS</el-tag>
<el-tag v-else-if="currentRow.status === 'FAIL'" type="danger" size="small">FAIL</el-tag>
</el-descriptions-item>
<el-descriptions-item label="响应状态码">{{ currentRow.responseStatus }}</el-descriptions-item>
<el-descriptions-item label="耗时">{{ currentRow.costTime }}ms</el-descriptions-item>
<el-descriptions-item label="请求时间">{{ parseTime(currentRow.createTime) }}</el-descriptions-item>
<el-descriptions-item v-if="currentRow.errorMsg" label="错误信息" :span="2">
<span style="color: #f56c6c;">{{ currentRow.errorMsg }}</span>
</el-descriptions-item>
</el-descriptions>
<el-divider content-position="left">请求头</el-divider>
<pre class="json-content">{{ formatJson(currentRow.requestHeaders) }}</pre>
<el-divider content-position="left">请求参数</el-divider>
<pre class="json-content">{{ formatJson(currentRow.requestParams) }}</pre>
<el-divider content-position="left">响应结果</el-divider>
<pre class="json-content">{{ formatJson(currentRow.responseBody) }}</pre>
</div>
</el-drawer>
</div>
</template>
<script>
import CRUD, { presenter, header } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
import apiLog from '@/api/monitor/sysapilog'
export default {
name: 'SysApiLog',
components: { rrOperation, crudOperation, pagination },
cruds() {
const today = new Date()
const year = today.getFullYear()
const month = String(today.getMonth() + 1).padStart(2, '0')
const day = String(today.getDate()).padStart(2, '0')
const dateStr = `${year}-${month}-${day}`
return CRUD({
title: '接口日志',
url: 'api/sysApiLog',
query: {
createTime: [dateStr, dateStr]
}
})
},
mixins: [presenter(), header()],
data() {
return {
drawerVisible: false,
currentRow: {},
bizCodeList: [],
archiveLoading: false
}
},
created() {
this.crud.optShow = {
add: false,
edit: false,
del: false,
download: false
}
},
methods: {
handleSystemFlagChange() {
this.query.bizCode = undefined
this.bizCodeList = []
if (this.query.systemFlag) {
apiLog.getBizCodeList(this.query.systemFlag, this.query.direction).then(res => {
this.bizCodeList = res
})
}
this.crud.toQuery()
},
showDetail(row) {
this.currentRow = row
this.drawerVisible = true
},
handleCloseDrawer() {
this.drawerVisible = false
this.currentRow = {}
},
formatJson(json) {
if (!json) return ''
try {
return JSON.stringify(JSON.parse(json), null, 2)
} catch (e) {
return json
}
},
handleArchive() {
this.$confirm('确认将历史接口日志数据进行归档备份吗？此操作可能需要较长时间。', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.archiveLoading = true
apiLog.archiveLogs().then(() => {
this.archiveLoading = false
this.$notify({
title: '归档成功',
message: '历史日志数据已成功归档备份',
type: 'success',
duration: 3000
})
this.crud.toQuery()
}).catch(err => {
this.archiveLoading = false
this.$notify({
title: '归档失败',
message: err.message || '归档操作失败，请稍后重试',
type: 'error',
duration: 3000
})
})
}).catch(() => {
})
}
}
}
</script>
<style scoped>
.demo-table-expand label {
width: 90px;
color: #99a9bf;
}
.demo-table-expand .el-form-item {
margin-right: 0;
margin-bottom: 0;
width: 100%;
}
.demo-table-expand .el-form-item__content {
font-size: 12px;
}
.drawer-content {
padding: 0 20px 20px;
}
.json-content {
background-color: #f5f7fa;
padding: 15px;
border-radius: 4px;
max-height: 400px;
overflow: auto;
font-size: 12px;
line-height: 1.5;
margin: 10px 0;
}
::v-deep .el-drawer__header {
margin-bottom: 10px;
padding: 15px 20px;
border-bottom: 1px solid #e8e8e8;
}
::v-deep .el-drawer__body {
padding: 0;
}
.biz-code-item {
min-width: 350px;
}
.biz-code-item .el-select {
width: 100%;
}
::v-deep .el-drawer__body {
padding: 0;
}
.biz-code-item {
min-width: 350px;
}
.biz-code-item .el-select {
width: 100%;
}
</style>
<style>
.el-tooltip__popper {
max-width: 800px !important;
word-wrap: break-word !important;
word-break: break-all !important;
white-space: normal !important;
}
</style>

6
lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue
View File

@@ -229,6 +229,7 @@
/>
</template>
</el-table-column>
<el-table-column prop="mdm_status" :label="$t('common.mdm_data_status')" :formatter="mdmStatusTrans" />
<el-table-column
v-permission="['admin','customerbase:edit','customerbase:del']"
:label="$t('wms.basedata.master.customer.operation')"
@@ -303,7 +304,7 @@ const defaultForm = {
}
export default {
name: 'Customerbase',
dicts: ['is_used', 'print_temple', 'two_print_temple'],
dicts: ['is_used', 'print_temple', 'two_print_temple', 'CUSTOMERBASE_MDM_STATUS'],
components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
@@ -438,6 +439,9 @@ export default {
},
singleRollSingleBox(row) {
return this.dict.label.is_used[row.is_single_roll_single_box]
},
mdmStatusTrans(row) {
return this.dict.label.CUSTOMERBASE_MDM_STATUS[row.mdm_status]
}
}
}

6
lms/nladmin-ui/src/views/wms/basedata/master/material/index.vue
View File

@@ -168,6 +168,7 @@
/>
</template>
</el-table-column>
<el-table-column prop="mdm_status" :label="$t('common.mdm_data_status')" :formatter="mdmStatusTrans" />
<el-table-column prop="update_optname" :label="$t('wms.basedata.master.material.modifier')" />
<el-table-column prop="update_time" :label="$t('wms.basedata.master.material.modificationTime')" width="135" />
<el-table-column
@@ -236,7 +237,7 @@ const defaultForm = {
export default {
name: 'Materialbase',
// 数据字典
dicts: ['is_used', 'material_type'],
dicts: ['is_used', 'material_type' ,'MATERIALBASE_MDM_STATUS'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
@@ -319,6 +320,9 @@ export default {
data.is_used = '0'
}
})
},
mdmStatusTrans(row) {
return this.dict.label.MATERIALBASE_MDM_STATUS[row.mdm_status]
}
}
}

6
lms/nladmin-ui/src/views/wms/basedata/master/transport/index.vue
View File

@@ -187,6 +187,7 @@
/>
</template>
</el-table-column>
<el-table-column prop="mdm_status" :label="$t('common.mdm_data_status')" width="120px" :formatter="mdmStatusTrans" />
<el-table-column prop="country" :label="$t('wms.basedata.master.transport.country')" :min-width="flexWidth('country',crud.data,$t('wms.basedata.master.transport.country'))" />
<el-table-column prop="state" :label="$t('wms.basedata.master.transport.province')" :min-width="flexWidth('state',crud.data,$t('wms.basedata.master.transport.province'))" />
<el-table-column prop="city" :label="$t('wms.basedata.master.transport.city')" :min-width="flexWidth('city',crud.data,$t('wms.basedata.master.transport.city'))" />
@@ -261,7 +262,7 @@ const defaultForm = {
remark: null
}
export default {
dicts: ['is_used'],
dicts: ['is_used', 'TRANSPORTATIONBASE_MDM_STATUS'],
name: 'Transportationbase',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
@@ -329,6 +330,9 @@ export default {
data.is_used = '0'
}
})
},
mdmStatusTrans(row) {
return this.dict.label.TRANSPORTATIONBASE_MDM_STATUS[row.mdm_status]
}
}
}

14
lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
View File

@@ -62,6 +62,7 @@
>
<el-option
v-for="item in isPlanProducList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -98,6 +99,7 @@
>
<el-option
v-for="item in dict.sub_package_relation"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -144,6 +146,7 @@
>
<el-option
v-for="item in typeList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -646,9 +649,7 @@ import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import { download } from '@/api/data'
import { downloadFile } from '@/utils'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
import crudPastivtquery from '@/views/wms/stat/pastivt/pastivtquery'
import { format } from 'date-fns'
const defaultForm = {
workorder_id: null,
@@ -792,6 +793,14 @@ export default {
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
const rangeTime = this.query.createTime
if (rangeTime && Array.isArray(rangeTime) && rangeTime.length === 2) {
this.query.begin_time = this.query.createTime[0]
this.query.end_time = this.query.createTime[1]
} else {
this.query.begin_time = null
this.query.end_time = null
}
return true
},
toView(data) {
@@ -850,7 +859,6 @@ export default {
if (this.currentRow !== null) {
this.showDtlLoading = true
download('/api/subpackagerelation/download', this.crud.query).then(result => {
// debugger
downloadFile(result, '子卷包装', 'xlsx')
this.showDtlLoading = false
}).catch(() => {

20
lms/nladmin-ui/src/views/wms/st/inStor/productscrap/AddDialog.vue
View File

@@ -102,6 +102,20 @@
:disabled="crud.status.view > 0"
/>
</el-form-item>
<el-form-item :label="$t('common.scrap_type')" prop="scrap_type">
<el-select
v-model="form.scrap_type"
:placeholder="$t('common.select_scrap_type')"
class="filter-item"
>
<el-option
v-for="item in dict.ST_INV_OUT_TYPE.filter(item => item.para1 === '1')"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('common.remark')" prop="remark">
<label slot="label">{{ $t('common.remark') }}:</label>
<el-input
@@ -244,6 +258,7 @@ const defaultForm = {
stor_id: '',
stor_code: '',
stor_name: '',
scrap_type:'',
bill_status: '10',
total_qty: '0',
detail_count: '0',
@@ -263,7 +278,7 @@ export default {
default: false
}
},
dicts: ['SCRAP_STATUS', 'FAIL_SOURCE'],
dicts: ['SCRAP_STATUS', 'FAIL_SOURCE','ST_INV_OUT_TYPE'],
data() {
return {
dialogVisible: false,
@@ -287,6 +302,9 @@ export default {
],
biz_date: [
{ required: true, message: this.$t('common.businessDateCannotBeEmpty'), trigger: 'blur' }
],
scrap_type:[
{ required: true, message: '报废类型不能为空', trigger: 'blur' }
]
}
}

1
lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue
View File

@@ -388,7 +388,6 @@ export default {
})
},
allDivStruct() {
// debugger
if (!this.sect_id) {
this.crud.notify(this.$t('common.pleaseSelectVirtualWarehouseAreaFirst'), CRUD.NOTIFICATION_TYPE.INFO)
return

2
lms/nladmin-ui/src/views/wms/st/incharge/index.vue
View File

@@ -80,7 +80,7 @@
<el-option
v-for="item in dict.ST_INV_IN_TYPE"
:key="item.value"
:disabled="item.value !== '0002'"
:disabled="item.value !== '0002' && item.value !== '0013' && item.value !== '0014'"
:label="item.label"
:value="item.value"
/>

6
lms/nladmin-ui/src/views/wms/st/outcharge/index.vue
View File

@@ -79,7 +79,11 @@
<el-option
v-for="item in dict.ST_INV_OUT_TYPE"
:key="item.value"
:disabled="item.value !== '1001' && item.value !== '1009'"
:disabled="item.value !== '1001'
&& item.value !== '1009'
&& item.value !== '1013'
&& item.value !== '1014'
&& item.value !== '1015'"
:label="item.label"
:value="item.value"
/>

10
lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue
View File

@@ -314,7 +314,15 @@
v-if="crud.query.is_all === '0'"
show-overflow-tooltip
prop="width"
:label="$t('pdm_bi_subpackagerelationrecord.width')"
:label="$t('common.width_standard')"
:formatter="crud.formatNum0"
:min-width="flexWidth('width_standard',crud.data,$t('common.width_standard'))"
/>
<el-table-column
v-if="crud.query.is_all === '0'"
show-overflow-tooltip
prop="width"
:label="$t('common.width')"
:formatter="crud.formatNum0"
:min-width="flexWidth('width',crud.data,$t('pdm_bi_subpackagerelationrecord.width'))"
/>

1
lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue
View File

@@ -130,6 +130,7 @@
<el-table-column show-overflow-tooltip prop="sale_order_name" :label="$t('pdm_bi_subpackagerelation.sale_order_name')" :min-width="flexWidth('sale_order_name',crud.data,$t('pdm_bi_subpackagerelation.sale_order_name'))" />
<el-table-column show-overflow-tooltip prop="input_time" :label="$t('st_ivt_iostorinv.input_time')" :min-width="flexWidth('input_time',crud.data,$t('st_ivt_iostorinv.input_time'))" />
<el-table-column show-overflow-tooltip prop="width" :label="$t('common.width')" :formatter="crud.formatNum0" :min-width="flexWidth('width',crud.data,$t('common.width'))" />
<el-table-column show-overflow-tooltip prop="width_standard" :label="$t('common.width_standard')" :formatter="crud.formatNum1" :min-width="flexWidth('width_standard',crud.data,$t('common.width_standard'))" />
<el-table-column show-overflow-tooltip prop="thickness" :label="$t('common.thickness')" :min-width="flexWidth('thickness',crud.data,$t('common.thickness'))" />
<el-table-column show-overflow-tooltip prop="paper_type" :label="$t('pdm_bi_slittingproductionplan.paper_type')" :min-width="flexWidth('paper_type',crud.data,$t('pdm_bi_slittingproductionplan.paper_type'))" />
<el-table-column show-overflow-tooltip prop="paper_code" :label="$t('pdm_bi_slittingproductionplan.paper_code')" :min-width="flexWidth('paper_code',crud.data,$t('pdm_bi_slittingproductionplan.paper_code'))" />