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

Merge branch 'master' of http://121.40.234.130:8899/root/wuHanXinRui

Browse Source
This commit is contained in:
lyd
2022-11-17 10:38:52 +08:00
parent dea602779d 94454485d0
commit 075be48844
9 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mes/qd/src/views/wms/basedata/em/devicebom/AddDialog.vue
View File

@@ -215,13 +215,21 @@ export default {
this.form.tableData = res
})
},
[CRUD.HOOK.afterToView]() {
[CRUD.HOOK.afterToView](crud, form) {
const data = {
'device_bom_id': this.form.device_bom_id
}
crudDevicebom.getDtl(data).then(res => {
this.form.tableData = res
})
if (!form.device_bom_code) {
this.queryClassId()
} else {
const data = {}
data.id = form.material_type_id
data.goal_id = this.classBj_id
this.getSubTypes(data)
}
},
[CRUD.HOOK.afterToCU](crud, form) {
if (!form.device_bom_code) {

7
mes/qd/src/views/wms/pdm/produce/mouthtask/index.vue
View File

@@ -165,8 +165,8 @@
<el-table-column prop="material_code" label="物料编码" min-width="150"/>
<el-table-column :formatter="seriesFormat" min-width="80" prop="product_series" label="系列" />
<el-table-column prop="product_type_name" label="生产方式" />
<el-table-column prop="fact_weight" label="生产重量(t)" :formatter="pcsn_num_format2" min-width="90" />
<el-table-column prop="standard_weight" label="每批重量kg" width="90" :formatter="crud.formatNum3"/>
<el-table-column prop="fact_weight" label="生产重量Kg" :formatter="crud.formatNum0" min-width="95" />
<el-table-column prop="standard_weight" label="每批重量Kg" width="95" :formatter="crud.formatNum0"/>
<el-table-column prop="pcsn_num" label="批数" :formatter="pcsn_num_format"/>
<el-table-column :formatter="stateFormat" min-width="80" prop="is_proc" label="状态" />
<el-table-column prop="update_time" label="提交时间" width="140px" />
@@ -268,9 +268,6 @@ export default {
pcsn_num_format(row) {
return Math.ceil(row.fact_weight / row.standard_weight)
},
pcsn_num_format2(row) {
return parseFloat(row.fact_weight / 1000.0).toFixed(3)
},
onInput() {
this.$forceUpdate()
},

8
mes/qd/src/views/wms/pdm/produce/producetask/index.vue
View File

@@ -176,14 +176,14 @@
<el-table-column prop="material_code" label="物料编码" min-width="150"/>
<el-table-column prop="old_mark" min-width="100" label="牌号" />
<el-table-column prop="product_type_name" label="生产方式" />
<el-table-column prop="product_weight" label="需求重量" :formatter="crud.formatNum3"/>
<el-table-column prop="fact_weight" label="生产重量" :formatter="crud.formatNum3" width="150" align="center">
<el-table-column prop="product_weight" label="需求重量" :formatter="crud.formatNum0"/>
<el-table-column prop="fact_weight" label="生产重量" :formatter="crud.formatNum0" width="150" align="center">
<template scope="scope">
<el-input-number size="mini" v-model="scope.row.fact_weight" :precision="3" :controls="false" :min="1" style="width: 120px" :disabled="scope.row.is_proc > 0" />
<el-input-number size="mini" v-model="scope.row.fact_weight" :precision="0" :controls="false" :min="1" style="width: 120px" :disabled="scope.row.is_proc > 0" />
</template>
</el-table-column>
<el-table-column prop="weight_unit_name" label="单位"/>
<el-table-column prop="standard_weight" label="每批重量kg" width="90" :formatter="crud.formatNum3"/>
<el-table-column prop="standard_weight" label="每批重量kg" width="90" :formatter="crud.formatNum0"/>
<el-table-column prop="pcsn_num" label="批数" :formatter="pcsn_num_format"/>
<el-table-column :formatter="stateFormat" min-width="80" prop="is_proc" label="状态" />
<el-table-column prop="input_time" label="生成时间" width="140px" />

8
mes/qd/src/views/wms/pf/acceptmark/index.vue
View File

@@ -46,19 +46,19 @@
/>
</template>
</el-table-column>
<el-table-column prop="mark_code" width="150px" label="牌号" align="center">
<el-table-column prop="material_code" label="碳化钨编码" width="120" align="center" />
<el-table-column prop="material_name" width="120" label="碳化钨名称" align="center">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.mark_code }}</el-link>
<el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.material_name }}</el-link>
</template>
</el-table-column>
<el-table-column prop="mark_code" width="150px" label="牌号" align="center" />
<el-table-column prop="c_balance" label="碳平衡" width="90px" align="center" :formatter="crud.formatQlNum4" />
<el-table-column prop="liquid_rate" label="液料比" width="60" align="center" :formatter="crud.formatNum2" />
<el-table-column prop="ball_rate" label="球料比" width="60" align="center" :formatter="crud.formatNum2" />
<el-table-column prop="ball_speed" label="球磨转速(RPM)" width="120px" align="center" :formatter="crud.formatNum2" />
<el-table-column prop="ball_time" label="研磨时间(h)" width="90px" align="center" :formatter="crud.formatNum2" />
<el-table-column prop="accept_qty" label="标准重量(g)" width="90px" align="center" :formatter="crud.formatNum2" />
<el-table-column prop="material_code" label="碳化钨编码" width="120" align="center" />
<el-table-column prop="material_name" label="碳化钨名称" width="120" align="center" />
<el-table-column prop="detail_count" label="明细数" align="center" min-width="60" />
<el-table-column prop="remark" label="备注" align="center" min-width="135" />
<el-table-column prop="create_name" label="创建人" align="center" min-width="80" />

2
mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/StartDialog.vue
View File

@@ -1,6 +1,6 @@
<template>
<el-dialog
title="开始维修"
title="开始保养"
append-to-body
:visible.sync="dialogVisible"
:before-close="handleClose"

2
mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/StartDialog.vue
View File

@@ -1,6 +1,6 @@
<template>
<el-dialog
title="开始维修"
title="开始保养"
append-to-body
:visible.sync="dialogVisible"
:before-close="handleClose"