DeXun/klp-oa
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(wms): 新增带改判记录的钢卷列表接口及展示

Browse Source 
feat(crm): 在订单异议页面添加异议内容和处理结果的HTML展示

feat(erp): 新增ERP仪表盘页面并优化采购订单表单

refactor(wms): 移除钢卷列表中的冗余代码并添加改判原因列
This commit is contained in:
砂糖
2026-05-09 14:08:11 +08:00
parent e42afdaf20
commit d09079f4c1
6 changed files with 1005 additions and 1114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
klp-ui/src/views/crm/components/OrderObjection.vue
View File

@@ -27,7 +27,11 @@
<el-table v-loading="loading" :data="salesObjectionList" @selection-change="handleSelectionChange">
<el-table-column label="编号" align="center" prop="objectionCode" />
<!-- <el-table-column label="异议类型" align="center" prop="objectionType" /> -->
<!-- <el-table-column label="异议内容" align="center" prop="objectionContent" /> -->
<el-table-column label="异议内容" align="center" prop="objectionContent" show-overflow-tooltip>
<template slot-scope="scope">
<div class="cell-html" v-html="scope.row.objectionContent"></div>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="objectionStatus">
<template slot-scope="scope">
<el-tag v-if="scope.row.objectionStatus === 0" type="danger">待处理</el-tag>
@@ -35,7 +39,11 @@
<el-tag v-else-if="scope.row.objectionStatus === 2" type="info">已关闭</el-tag>
</template>
</el-table-column>
<!-- <el-table-column label="处理内容" align="center" prop="handleContent" /> -->
<el-table-column label="处理结果" align="center" prop="handleContent" show-overflow-tooltip>
<template slot-scope="scope">
<div class="cell-html" v-html="scope.row.handleContent"></div>
</template>
</el-table-column>
<el-table-column label="处理人" align="center" prop="handleUser" />
<el-table-column label="处理时间" align="center" prop="handleTime" width="180">
<template slot-scope="scope">
@@ -133,8 +141,12 @@
</div>
</el-dialog>
<el-dialog title="查看处理结果" :visible.sync="viewOpen" width="500px" append-to-body>
<el-descriptions :column="2" :data="viewForm" label-width="80px">
<el-dialog title="查看处理结果" :visible.sync="viewOpen" width="700px" append-to-body>
<el-descriptions :column="2" :data="viewForm" label-width="80px" border>
<el-descriptions-item label="异议编号" :span="2">{{ viewForm.objectionCode }}</el-descriptions-item>
<el-descriptions-item label="异议内容" :span="2">
<div v-html="viewForm.objectionContent"></div>
</el-descriptions-item>
<el-descriptions-item label="处理人">{{ viewForm.handleUser }}</el-descriptions-item>
<el-descriptions-item label="处理时间">{{ viewForm.handleTime }}</el-descriptions-item>
<el-descriptions-item label="处理内容" :span="2">
@@ -379,3 +391,12 @@ export default {
}
};
</script>
<style scoped>
.cell-html {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
max-width: 200px;
}
</style>