优化
This commit is contained in:
zds
@@ -92,7 +92,11 @@
|
||||
<el-table-column min-width="120" prop="change_reason" label="变更内容" align="center" />
|
||||
<el-table-column min-width="80" prop="change_name" label="操作人" align="center" />
|
||||
<el-table-column min-width="80" prop="invtype" label="源单类型" align="center" :formatter="inv_typeFormat"/>
|
||||
<el-table-column min-width="120" prop="invcode" label="源单号" align="center" />
|
||||
<el-table-column min-width="120" prop="invcode" label="源单号" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-link type="warning" @click="toView(scope.row)">{{ scope.row.invcode }}</el-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column min-width="120" prop="change_content" label="备注" align="center" />
|
||||
</el-table>
|
||||
</el-tab-pane>
|
||||
@@ -128,6 +132,8 @@
|
||||
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<ViewDialog1 :dialog-show.sync="viewShow1" :rowmst="mstrow" />
|
||||
<ViewDialog2 :dialog-show.sync="viewShow2" :rowmst="mstrow" />
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
@@ -136,13 +142,17 @@
|
||||
import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
|
||||
import localStorage from '@/api/tools/localStorage'
|
||||
import equipmentfile from '@/api/wms/basedata/em/equipmentfile'
|
||||
import ViewDialog1 from '@/views/wms/basedata/em/equipmentfile/ViewDialog1'
|
||||
import ViewDialog2 from '@/views/wms/basedata/em/equipmentfile/ViewDialog2'
|
||||
import { getToken } from '@/utils/auth'
|
||||
import { mapGetters } from 'vuex'
|
||||
import CRUD, { crud } from '@crud/crud'
|
||||
import crudDevicerepairmst from '@/api/wms/sb/devicerepairmst'
|
||||
import crudDevicemaintenancemst from '@/api/wms/sb/devicemaintenancemst'
|
||||
|
||||
export default {
|
||||
name: 'ChangeDialog',
|
||||
components: { },
|
||||
components: { ViewDialog1, ViewDialog2 },
|
||||
mixins: [crud()],
|
||||
props: {
|
||||
dialogShow: {
|
||||
@@ -163,6 +173,9 @@ export default {
|
||||
tableDtl: [],
|
||||
tableDtl2: [],
|
||||
tableDtl3: [],
|
||||
mstrow: {},
|
||||
viewShow1: false,
|
||||
viewShow2: false,
|
||||
form: {}
|
||||
}
|
||||
},
|
||||
@@ -222,7 +235,6 @@ export default {
|
||||
})
|
||||
},
|
||||
submitUpload() {
|
||||
debugger
|
||||
const flag = this.$refs.upload.submit()
|
||||
},
|
||||
beforeUpload(file) {
|
||||
@@ -245,6 +257,29 @@ export default {
|
||||
submitUpload2() {
|
||||
this.dialogVisible2 = true
|
||||
},
|
||||
toView(row) {
|
||||
debugger
|
||||
if (row.invcode.includes('WXD')) {
|
||||
const data = {
|
||||
'id': row.invcode
|
||||
}
|
||||
crudDevicerepairmst.findByCode(data).then(res => {
|
||||
this.mstrow = res
|
||||
this.mstrow.device_code = this.form.device_code
|
||||
this.viewShow1 = true
|
||||
})
|
||||
}else{
|
||||
const data = {
|
||||
'id': row.invcode
|
||||
}
|
||||
crudDevicemaintenancemst.findByCode(data).then(res => {
|
||||
this.mstrow = res
|
||||
this.mstrow.device_code = this.form.device_code
|
||||
this.viewShow2 = true
|
||||
})
|
||||
}
|
||||
|
||||
},
|
||||
deleteRow(index, row) {
|
||||
localStorage.del([row.storage_id])
|
||||
equipmentfile.queryivt3(this.form).then(res => {
|
||||
|
||||
187
mes/qd/src/views/wms/basedata/em/equipmentfile/ViewDialog1.vue
Normal file
187
mes/qd/src/views/wms/basedata/em/equipmentfile/ViewDialog1.vue
Normal file
@@ -0,0 +1,187 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
title="维修单详情"
|
||||
append-to-body
|
||||
fullscreen
|
||||
:visible.sync="dialogVisible"
|
||||
@close="close"
|
||||
@open="open"
|
||||
>
|
||||
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="120px" label-suffix=":">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="单据号" prop="repair_code">
|
||||
<el-input v-model="form.repair_code" style="width: 200px;" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="8">
|
||||
<el-form-item label="计划维修日期" prop="plan_start_date">
|
||||
<el-date-picker v-model="form.plan_start_date" type="date" placeholder="选择日期" style="width: 200px" value-format="yyyy-MM-dd" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="8">
|
||||
<el-form-item label="维修类型" prop="maintenancecycle">
|
||||
<el-select
|
||||
v-model="form.maintenancecycle"
|
||||
disabled
|
||||
size="mini"
|
||||
placeholder="请选择"
|
||||
class="filter-item"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dict.EM_DEVICE_WX_INVTYPE"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="设备" prop="devicerecord_id">
|
||||
<el-input v-model="form.device_code" :disabled="true" style="width: 200px;">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="故障等级" prop="fault_level">
|
||||
<el-select
|
||||
v-model="form.fault_level"
|
||||
size="mini"
|
||||
placeholder="请选择"
|
||||
disabled
|
||||
class="filter-item"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dict.EM_FAULT_LEVEL"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="故障描述" prop="fault_desc">
|
||||
<el-input v-model="form.fault_desc" style="width: 580px;" rows="2" type="textarea" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" style="width: 580px;" rows="2" type="textarea" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
|
||||
<div class="crud-opts2">
|
||||
<span class="role-span">项目明细</span>
|
||||
</div>
|
||||
|
||||
<el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table2"
|
||||
:data="tableData"
|
||||
style="width: 100%;"
|
||||
max-height="500"
|
||||
border
|
||||
:highlight-current-row="true"
|
||||
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
|
||||
>
|
||||
<el-table-column type="index" label="序号" width="55" align="center" />
|
||||
<el-table-column show-overflow-tooltip prop="repair_item_code" label="维修项目编号" align="center" />
|
||||
<el-table-column show-overflow-tooltip prop="repair_item_name" label="维修项目名称" align="center" />
|
||||
<el-table-column show-overflow-tooltip prop="requirement" label="要求" align="center" />
|
||||
<el-table-column prop="dtl_remark" label="备注" align="center" />
|
||||
</el-table>
|
||||
</el-card>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import crudDevicerepairmst from '@/api/wms/sb/devicerepairmst'
|
||||
|
||||
export default {
|
||||
name: 'ViewDialog1',
|
||||
components: { },
|
||||
dicts: ['EM_DEVICE_WX_INVTYPE', 'EM_FAULT_LEVEL'],
|
||||
props: {
|
||||
dialogShow: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
rowmst: {
|
||||
type: Object
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
dialogShow: {
|
||||
handler(newValue) {
|
||||
this.dialogVisible = newValue
|
||||
}
|
||||
},
|
||||
rowmst: {
|
||||
handler(newValue) {
|
||||
this.form = newValue
|
||||
}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialogVisible: false,
|
||||
form: {},
|
||||
tableData: [],
|
||||
deviceDialog: false,
|
||||
itemDialog: false
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
open() {
|
||||
debugger
|
||||
const data = {
|
||||
'repair_id': this.form.repair_id
|
||||
}
|
||||
crudDevicerepairmst.getDtl(data).then(res => {
|
||||
this.tableData = res
|
||||
})
|
||||
},
|
||||
close() {
|
||||
this.$emit('update:dialogShow', false)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.crud-opts2 {
|
||||
padding: 0;
|
||||
display: -webkit-flex;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.crud-opts2 .el-dialog__title2 {
|
||||
line-height: 24px;
|
||||
font-size:20px;
|
||||
color:#303133;
|
||||
}
|
||||
|
||||
.crud-opts2 .role-span {
|
||||
padding: 10px 0px 10px 0px;
|
||||
}
|
||||
.crud-opts2 .crud-opts-form {
|
||||
padding: 10px 0px 0px 20px;
|
||||
}
|
||||
|
||||
.input-with-select {
|
||||
background-color: #fff;
|
||||
}
|
||||
</style>
|
||||
173
mes/qd/src/views/wms/basedata/em/equipmentfile/ViewDialog2.vue
Normal file
173
mes/qd/src/views/wms/basedata/em/equipmentfile/ViewDialog2.vue
Normal file
@@ -0,0 +1,173 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
title="保养单详情"
|
||||
append-to-body
|
||||
fullscreen
|
||||
:visible.sync="dialogVisible"
|
||||
@close="close"
|
||||
@open="open"
|
||||
>
|
||||
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="120px" label-suffix=":">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="单据号" prop="maint_code">
|
||||
<el-input v-model="form.maint_code" style="width: 200px;" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="8">
|
||||
<el-form-item label="业务日期" prop="plan_start_date">
|
||||
<el-date-picker v-model="form.plan_start_date" type="date" placeholder="选择日期" style="width: 200px" value-format="yyyy-MM-dd" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="8">
|
||||
<el-form-item label="保养类型" prop="maintenancecycle">
|
||||
<el-select
|
||||
v-model="form.maintenancecycle"
|
||||
disabled
|
||||
size="mini"
|
||||
placeholder="请选择"
|
||||
class="filter-item"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in dict.EM_DEVICE_BY_INVTYPE"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="设备" prop="devicerecord_id">
|
||||
<el-input v-model="form.device_code" :disabled="true" style="width: 200px;">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="16">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" style="width: 580px;" rows="2" type="textarea" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
|
||||
<div class="crud-opts2">
|
||||
<span class="role-span">项目明细</span>
|
||||
</div>
|
||||
|
||||
<el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
|
||||
<!--表格渲染-->
|
||||
<el-table
|
||||
ref="table2"
|
||||
:data="tableData"
|
||||
style="width: 100%;"
|
||||
max-height="500"
|
||||
border
|
||||
:highlight-current-row="true"
|
||||
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
|
||||
>
|
||||
<el-table-column type="index" label="序号" width="55" align="center" />
|
||||
<el-table-column show-overflow-tooltip prop="maint_item_code" label="保养项目编号" align="center" />
|
||||
<el-table-column show-overflow-tooltip prop="maint_item_name" label="保养项目名称" align="center" />
|
||||
<el-table-column show-overflow-tooltip prop="item_level" label="保养等级" align="center" :formatter="formatLevel" />
|
||||
<el-table-column show-overflow-tooltip prop="contents" label="保养内容" align="center" />
|
||||
<el-table-column show-overflow-tooltip prop="requirement" label="要求" align="center" />
|
||||
<el-table-column prop="dtl_remark" label="备注" align="center" />
|
||||
</el-table>
|
||||
</el-card>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import crudDevicemaintenancemst from '@/api/wms/sb/devicemaintenancemst'
|
||||
|
||||
export default {
|
||||
name: 'ViewDialog1',
|
||||
components: { },
|
||||
dicts: ['EM_DEVICE_WX_INVTYPE', 'EM_DEVICE_BY_INVTYPE'],
|
||||
props: {
|
||||
dialogShow: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
rowmst: {
|
||||
type: Object
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
dialogShow: {
|
||||
handler(newValue) {
|
||||
this.dialogVisible = newValue
|
||||
}
|
||||
},
|
||||
rowmst: {
|
||||
handler(newValue) {
|
||||
this.form = newValue
|
||||
}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
dialogVisible: false,
|
||||
form: {},
|
||||
tableData: [],
|
||||
deviceDialog: false,
|
||||
itemDialog: false
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
open() {
|
||||
debugger
|
||||
const data = {
|
||||
'maint_id': this.form.maint_id
|
||||
}
|
||||
crudDevicemaintenancemst.getDtl(data).then(res => {
|
||||
this.tableData = res
|
||||
})
|
||||
},
|
||||
formatLevel(row, cloum) {
|
||||
if (row.item_level === '01') {
|
||||
return '日常'
|
||||
} else if (row.item_level === '02') {
|
||||
return '一级'
|
||||
} else if (row.item_level === '03') {
|
||||
return '二级'
|
||||
}
|
||||
},
|
||||
close() {
|
||||
this.$emit('update:dialogShow', false)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.crud-opts2 {
|
||||
padding: 0;
|
||||
display: -webkit-flex;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.crud-opts2 .el-dialog__title2 {
|
||||
line-height: 24px;
|
||||
font-size:20px;
|
||||
color:#303133;
|
||||
}
|
||||
|
||||
.crud-opts2 .role-span {
|
||||
padding: 10px 0px 10px 0px;
|
||||
}
|
||||
.crud-opts2 .crud-opts-form {
|
||||
padding: 10px 0px 0px 20px;
|
||||
}
|
||||
|
||||
.input-with-select {
|
||||
background-color: #fff;
|
||||
}
|
||||
</style>
|
||||
@@ -48,9 +48,9 @@
|
||||
<el-table-column prop="sum_qty" label="计划重量(吨)" :formatter="crud.formatNum3" min-width="80" />
|
||||
<el-table-column prop="product_num" label="计划批次" min-width="80" />
|
||||
<el-table-column prop="device_name" label="关键设备" width="100" />
|
||||
<el-table-column prop="workorder_date" min-width="85" label="粉料配粉时间" />
|
||||
<el-table-column prop="pw_time" label="粉料喷雾时间" width="140" />
|
||||
<el-table-column prop="in_time" label="最后入库时间" width="140" />
|
||||
<el-table-column prop="workorder_date" min-width="130" label="粉料配粉时间" />
|
||||
<el-table-column prop="pw_time" label="粉料喷雾时间" width="130" />
|
||||
<el-table-column prop="in_time" label="最后入库时间" width="130" />
|
||||
<el-table-column prop="in_qty" label="入库重量(吨)" :formatter="crud.formatNum3" min-width="80" />
|
||||
<el-table-column prop="in_num" label="入库批数" width="80" />
|
||||
</el-table>
|
||||
|
||||
@@ -133,8 +133,8 @@
|
||||
<el-table-column prop="sum_qty12" label="PEG2000\PEG" :formatter="crud.formatNum3" min-width="120" align="center" />
|
||||
<el-table-column prop="sum_qty13" label="石蜡/kg" :formatter="crud.formatNum3" min-width="80" align="center" />
|
||||
<el-table-column prop="sum_qty14" label="白油" :formatter="crud.formatNum3" min-width="80" align="center" />
|
||||
<el-table-column prop="sum_qty15" label="合计" :formatter="crud.formatNum3" min-width="100" align="center" />
|
||||
</el-table-column>
|
||||
<el-table-column prop="sum_qty15" label="合计" :formatter="crud.formatNum3" min-width="100" align="center" />
|
||||
<el-table-column prop="sum_qty16" label="投入汇总" :formatter="crud.formatNum3" min-width="100" align="center" />
|
||||
</el-table-column>
|
||||
<el-table-column label="投料工序流记录" align="center">
|
||||
|
||||
Reference in New Issue
Block a user