linweidong
/
besure_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style：入库单据/出库单据-详情-审核记录字段调整

Browse Source
main
黄伟杰 6 days ago
parent 1f150cb206
commit a14b8a5a27
2 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File

27
src/views/erp/stock/in/StockInForm.vue
Unescape Escape View File

@ -131,18 +131,25 @@
<el-table <el-table
v-loading="auditRecordLoading" v-loading="auditRecordLoading"
:data="auditRecordList" :data="auditRecordList"
border
size="small"
:stripe="true" :stripe="true"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
<el-table-column type="index" :label="t('ErpStock.In.index')" align="center" width="80" /> <el-table-column label="变更前状态" prop="fromStatus" align="center" min-width="110">
<el-table-column :label="t('ErpStock.In.operator')" align="center" prop="creatorName" min-width="120" /> <template #default="scope">
<el-table-column :label="t('ErpStock.In.operateTime')" align="center" prop="createTime" :formatter="dateFormatter" min-width="180" /> <dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.fromStatus" />
<el-table-column :label="t('ErpStock.In.operateAction')" align="center" min-width="120">
<template #default="{ row }">
{{ formatAuditAction(row) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="t('ErpStock.In.operateDesc')" align="center" prop="remark" min-width="180" /> <el-table-column label="变更后状态" prop="toStatus" align="center" min-width="110">
<template #default="scope">
<dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.toStatus" />
</template>
</el-table-column>
<el-table-column label="目标审核人" prop="targetUserName" min-width="120" />
<el-table-column label="操作人" prop="creatorName" min-width="120" />
<el-table-column label="操作时间" prop="createTime" :formatter="dateFormatter" min-width="170" />
<el-table-column label="备注" prop="remark" min-width="160" show-overflow-tooltip />
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@ -257,12 +264,6 @@ const getAuditRecordList = async (id: number) => {
} }
} }
const formatAuditAction = (row: StockInApproveRecordVO) => {
if (row.actionType === 'SUBMIT') return t('ErpStock.In.submitAudit')
if (row.actionType === 'AUDIT') return t('ErpStock.In.auditApprove')
return row.actionType || '-'
}
const normalizeUserId = (value: any) => { const normalizeUserId = (value: any) => {
if (value === undefined || value === null || value === '') return undefined if (value === undefined || value === null || value === '') return undefined
return String(value) return String(value)

27
src/views/erp/stock/out/StockOutForm.vue
Unescape Escape View File

@ -131,18 +131,25 @@
<el-table <el-table
v-loading="auditRecordLoading" v-loading="auditRecordLoading"
:data="auditRecordList" :data="auditRecordList"
border
size="small"
:stripe="true" :stripe="true"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
<el-table-column type="index" :label="t('ErpStock.Out.index')" align="center" width="80" /> <el-table-column label="变更前状态" prop="fromStatus" align="center" min-width="110">
<el-table-column :label="t('ErpStock.Out.operator')" align="center" prop="creatorName" min-width="120" /> <template #default="scope">
<el-table-column :label="t('ErpStock.Out.operateTime')" align="center" prop="createTime" :formatter="dateFormatter" min-width="180" /> <dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.fromStatus" />
<el-table-column :label="t('ErpStock.Out.operateAction')" align="center" min-width="120">
<template #default="{ row }">
{{ formatAuditAction(row) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="t('ErpStock.Out.operateDesc')" align="center" prop="remark" min-width="180" /> <el-table-column label="变更后状态" prop="toStatus" align="center" min-width="110">
<template #default="scope">
<dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.toStatus" />
</template>
</el-table-column>
<el-table-column label="目标审核人" prop="targetUserName" min-width="120" />
<el-table-column label="操作人" prop="creatorName" min-width="120" />
<el-table-column label="操作时间" prop="createTime" :formatter="dateFormatter" min-width="170" />
<el-table-column label="备注" prop="remark" min-width="160" show-overflow-tooltip />
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@ -248,12 +255,6 @@ const getAuditRecordList = async (id: number) => {
} }
} }
const formatAuditAction = (row: StockOutApproveRecordVO) => {
if (row.actionType === 'SUBMIT') return t('ErpStock.Out.submitAudit')
if (row.actionType === 'AUDIT') return t('ErpStock.Out.auditApprove')
return row.actionType || '-'
}
const normalizeUserId = (value: any) => { const normalizeUserId = (value: any) => {
if (value === undefined || value === null || value === '') return undefined if (value === undefined || value === null || value === '') return undefined
return String(value) return String(value)

Write Preview
Loading…
Cancel
Save