chuangte/yh-ui
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新：1、报表新增表面处理、颜色

Browse Source 
2、新增关联其他车间的订单
This commit is contained in:
磷叶 2025-02-10 11:20:22 +08:00
parent 96ead6fd6f
commit af291d04cd
4 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Business/ProdOrder/ProdOrderCheck.vue
View File

@ -19,9 +19,9 @@
/>
</el-select>
</el-form-item> -->
<!-- <el-form-item label="生产车间" prop="deptId">
<el-form-item label="生产车间" prop="deptId">
<dept-tree-select v-model="queryParams.deptId" class="small-tree-select" @change="handleQuery"/>
</el-form-item> -->
</el-form-item>
<!-- <el-form-item label="业务状态" prop="erpStatusList">
<el-checkbox-group v-model="queryParams.erpStatusList" @change="handleQuery">
<el-checkbox-button

14
src/views/yh/report/edit/components/ReportProductEdit.vue
View File

@ -49,6 +49,18 @@
<!-- 数据指标网格 -->
<div class="metrics-grid">
<div class="metric-item">
<span class="label">表面处理</span>
<div class="value-unit">
<span class="value">{{item.surface | dv}}</span>
</div>
</div>
<div class="metric-item">
<span class="label">颜色</span>
<div class="value-unit">
<span class="value">{{item.color | dv}}</span>
</div>
</div>
<div class="metric-item">
<span class="label">良品数</span>
<div class="value-unit">
@ -276,6 +288,8 @@ export default {
num: null,
defectNum: null,
totalAmount: 0,
surface: null,
color: null,
orderProdList: [],
userProdList: [],
...data

6
src/views/yh/report/edit/components/ReportProductRowEdit.vue
View File

@ -28,6 +28,12 @@
<form-col :span="span / 2 " label="总价">
{{ row.totalAmount | dv }} 元
</form-col>
<form-col :span="span" label="表面处理" prop="surface">
<el-input v-model="row.surface" placeholder="请输入表面处理"/>
</form-col>
<form-col :span="span" label="颜色" prop="color">
<el-input v-model="row.color" placeholder="请输入颜色"/>
</form-col>
<form-col :span="span" label="良品" prop="num">
<el-input-number v-model="row.num" type="number" :min="0" placeholder="请输入良品数" controls-position="right" style="width: calc(100% - 2em)" @change="calcTotalAmount"/>
{{row.priceUnit}}

4
src/views/yh/reportProd/index.vue
View File

@ -78,6 +78,8 @@
<el-descriptions-item label="图案">{{d.row.pricePattern | dv}}</el-descriptions-item>
<el-descriptions-item label="规格">{{d.row.priceSpec | dv}}</el-descriptions-item>
<el-descriptions-item label="分类">{{d.row.priceClassify | dv}}</el-descriptions-item>
<el-descriptions-item label="表面处理">{{d.row.surface | dv}}</el-descriptions-item>
<el-descriptions-item label="颜色">{{d.row.color | dv}}</el-descriptions-item>
<el-descriptions-item label="倍数">{{formatFraction(d.row.priceQuantityNumerator, d.row.priceQuantityDenominator)}}</el-descriptions-item>
</el-descriptions>
<template v-if="!isEmpty(d.row.userProdList)">
@ -277,6 +279,8 @@ export default {
{key: 'priceName', visible: true, label: '工序', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'priceSubName', visible: true, label: '子工序', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
{key: 'priceType', visible: true, label: '类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'surface', visible: false, label: '表面处理', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'color', visible: false, label: '颜色', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'num', visible: true, label: '良品', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'defectNum', visible: true, label: '不良品', minWidth: null, sortable: true, overflow: false, align: 'center', width: "100"},
{key: 'priceUnit', visible: true, label: '单位', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},