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

优化

Browse Source
This commit is contained in:
zds
2022-08-03 09:45:36 +08:00
parent 158e17ae09
commit 420e5f66da
9 changed files with 45 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/qd/src/views/wms/pdm/produce/dailyplan/AddDialog.vue
View File

@@ -92,7 +92,7 @@
<el-option
v-for="item in Devices"
:key="item.id"
:label="item.code"
:label="item.name"
:value="item.id"
/></el-select>
</el-form-item>

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

@@ -37,7 +37,7 @@
<el-option
v-for="item in Devices"
:key="item.id"
:label="item.code"
:label="item.name"
:value="item.id"
/>
</el-select>
@@ -159,7 +159,7 @@
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column prop="plan_code" label="日计划编码" width="120" />
<el-table-column :formatter="seriesFormat" min-width="80" prop="product_series_id" label="系列产线" />
<el-table-column prop="device_code" label="关键设备" width="100" />
<el-table-column prop="device_name" label="关键设备" width="100" />
<el-table-column prop="planstart_date" label="计划开始日期" width="100" />
<el-table-column prop="plan_org_name" label="申报单位" width="100" />
<el-table-column prop="workorder_type" label="计划类型" :formatter="workorder_typeFormat" min-width="120" />
@@ -167,6 +167,7 @@
<el-table-column prop="old_mark" label="牌号" />
<el-table-column :formatter="seriesFormat" min-width="80" prop="mater_product_series" label="产品系列" />
<el-table-column prop="product_weight" label="生产重量(kg)" :formatter="crud.formatNum3" min-width="120" />
<el-table-column prop="product_num" label="批数" width="100" />
<el-table-column prop="planend_date" label="计划结束日期" width="100" />
<el-table-column prop="plan_finish_date" label="交货日期" width="100" />
<el-table-column prop="day_num" label="提前天数" width="90" :formatter="crud.formatNum0" />
@@ -210,7 +211,7 @@ export default {
title: '日计划管理',
url: 'api/dailyplan',
idField: 'dailyplan_id',
sort: 'dailyplan_id',
sort: '',
query: { device_id: '' },
crudMethod: { ...dailyplan },
optShow: {

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

@@ -38,7 +38,7 @@
<el-option
v-for="item in Devices"
:key="item.id"
:label="item.code"
:label="item.name"
:value="item.id"
/>
</el-select>
@@ -156,9 +156,9 @@
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column prop="plan_month" label="计划月份" />
<el-table-column prop="task_code" label="任务号" />
<el-table-column prop="task_code" label="任务号" min-width="130"/>
<el-table-column prop="plan_org_name" label="申报单位" width="100" />
<el-table-column prop="device_code" label="关键设备" width="100" />
<el-table-column prop="device_name" label="关键设备" width="100" />
<el-table-column prop="plan_finish_date" label="交货日期" width="90" />
<el-table-column prop="old_mark" label="牌号" />
<el-table-column prop="material_code" label="物料编码" min-width="150"/>

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

@@ -106,7 +106,6 @@
type="primary"
icon="el-icon-position"
size="mini"
:disabled="save_flag"
@click="submit()"
>
保存
@@ -117,7 +116,6 @@
type="primary"
icon="el-icon-position"
size="mini"
:disabled="sub_flag"
@click="save()"
>
提交
@@ -181,15 +179,17 @@
<el-table-column prop="product_weight" label="需求重量" :formatter="crud.formatNum3"/>
<el-table-column prop="fact_weight" label="生产重量" :formatter="crud.formatNum3" width="150" align="center">
<template scope="scope">
<el-input-number size="mini" v-model="scope.row.fact_weight" :disabled="save_flag" :precision="3" :controls="false" :min="1" style="width: 120px" />
<el-input-number size="mini" v-model="scope.row.fact_weight" :precision="3" :controls="false" :min="1" style="width: 120px" />
</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="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" />
<el-table-column prop="update_optname" label="提交人" />
<el-table-column prop="input_time" label="生成时间" width="140px" />
<el-table-column prop="input_optname" label="生成人" />
<el-table-column prop="update_time" label="更新时间" width="140px" />
<el-table-column prop="update_optname" label="更新人" />
<el-table-column prop="remark" label="备注" />
</el-table>
<!--分页组件-->
@@ -360,7 +360,7 @@ export default {
submit() {
this.checkrows = this.$refs.table.data
if(this.checkrows.length === 0 ){
this.crud.notify('无可提交的记录！')
this.crud.notify('无可操作的记录！')
return false
}
crudProducetask.submit({'status': '0', rows: this.checkrows}).then(res => {

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

@@ -232,7 +232,7 @@
<el-table-column prop="planend_time" min-width="140" label="计划结束时间"/>
<el-table-column prop="realstart_time" min-width="140" label="实际开始时间"/>
<el-table-column prop="realend_time" min-width="140" label="实际结束时间"/>
<el-table-column min-width="100" prop="source_bill_type" label="源类型" />
<el-table-column min-width="100" prop="source_bill_type" :formatter="workorder_typeFormat2" label="源类型" />
<el-table-column prop="source_bill_code" label="来源单据编号" min-width="100" />
<el-table-column min-width="90" prop="workprocedure_id" label="当前工序" :formatter="seriesFormat2" />
<el-table-column prop="startwork_name" min-width="80" label="开工人"/>
@@ -280,7 +280,7 @@ export default {
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['workorder_status', 'workorder_type', 'product_series'],
dicts: ['workorder_status', 'workorder_type', 'product_series', 'workorder_type2'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
@@ -338,6 +338,9 @@ export default {
mySelectionChange(rows) {
this.buttonChange(rows)
},
workorder_typeFormat2(row) {
return this.dict.label.workorder_type2[row.workorder_type]
},
buttonChange(rows) {
if (rows.length !== 0) {
this.sub_flag = false