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

rev：1.设备档案功能修改2.设备保养功能修改

Browse Source
This commit is contained in:
liuxy
2023-09-05 18:55:58 +08:00
parent a4f0e49a3c
commit dbd57d25d1
21 changed files with 109 additions and 1806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/AddDialog.vue
View File

@@ -185,21 +185,6 @@
style="width: 210px"
/>
</el-form-item>
<el-form-item label="设备BOM" prop="device_bom_id">
<el-select
v-model="form.device_bom_id"
placeholder="设备BOM"
style="width: 210px"
class="filter-item"
>
<el-option
v-for="item in bomlist"
:key="item.device_bom_id"
:label="item.material_name"
:value="item.device_bom_id"
/>
</el-select>
</el-form-item>
<el-form-item label="卡片编号" prop="card_code">
<label slot="label">卡片编号:</label>
<el-input v-model.trim="form.card_code" clearable style="width: 210px" />
@@ -254,7 +239,6 @@ import equipmentfile from '@/views/wms/device_manage/deviceFile/equipmentfile/eq
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudDept from '@/views/system/dept/dept'
// import crudDevicebom from '@/api/wms/basedata/em/devicebom'
const defaultForm = {
devicerecord_id: '',
@@ -377,23 +361,6 @@ export default {
this.class_idStr = res.class_idStr
this.queryClassId()
})
equipmentfile.queryBomList({ material_type_id: '-1' }).then(res => {
this.bomlist = res
})
} else {
equipmentfile.queryBomList({ material_type_id: form.material_type_id }).then(res => {
this.bomlist = res
})
this.getSupDepts(form.use_deptid)
const param = {
'materOpt_code': '26'
}
crudDevicebom.getBjId(param).then(res => {
const data = {}
data.id = form.material_type_id
data.goal_id = res.class_idStr
this.getSubTypes(data)
})
}
},
queryClassId() {
@@ -453,12 +420,6 @@ export default {
children: node.children
}
},
typeChange(old) {
/*this.form.device_bom_id = ''
equipmentfile.queryBomList({ material_type_id: old.class_id }).then(res => {
this.bomlist = res
})*/
},
[CRUD.HOOK.beforeSubmit]() {
}
}

202
mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/ChangeDialog.vue
View File

@@ -19,9 +19,9 @@
<label slot="label">设备名称:</label>
<el-input v-model.trim="form.device_name" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="使用班组" prop="use_groupname">
<label slot="label">使用班组:</label>
<el-input v-model.trim="form.use_groupname" disabled style="width: 210px" />
<el-form-item label="使用部门" prop="use_deptname">
<label slot="label">使用部门:</label>
<el-input v-model.trim="form.use_deptname" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="归属部门" prop="belong_deptname">
<label slot="label">归属部门:</label>
@@ -29,29 +29,6 @@
</el-form-item>
</el-form>
<el-tabs type="card">
<el-tab-pane label="备品备件" name="first">
<!--表格渲染-->
<el-table
ref="table2"
:data="tableDtl2"
style="width: 100%;"
max-height="400"
size="mini"
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 min-width="150" prop="sparepart_only_id" label="备件编码" align="center" />
<el-table-column min-width="120" prop="material_code" label="物料编码" align="center" />
<el-table-column min-width="80" prop="material_name" label="物料名称" align="center" />
<el-table-column min-width="80" prop="class_code" label="分类编码" align="center" />
<el-table-column min-width="120" prop="class_name" label="分类名称" align="center" />
<el-table-column prop="last_change" label="上次更换时间" width="120px" />
<el-table-column prop="current_change" label="本次更换时间" width="120px" />
<el-table-column prop="interval_time" label="更换间隔" width="120px" />
</el-table>
</el-tab-pane>
<el-tab-pane label="文档管理" name="second">
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload2">新增文档</el-button>
<!--表格渲染-->
@@ -114,156 +91,10 @@
<el-table-column prop="changetype" label="变更类型名称" align="center" width="120px" :formatter="device_typeFormat" />
<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">
<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="invcode" label="源单号" align="center" />
<el-table-column min-width="120" prop="change_content" label="备注" align="center" />
</el-table>
</el-tab-pane>
<el-tab-pane label="维修计划" name="third1">
<!--表格渲染-->
<el-table
ref="table4"
:data="tableDtl4"
style="width: 100%;"
max-height="400"
size="mini"
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 prop="repair_plan_code" label="计划单号" width="120px" />
<el-table-column prop="repair_plan_name" label="计划名称" show-overflow-tooltip />
<el-table-column prop="class_name" label="设备类型" />
<el-table-column prop="device_code" label="设备编号" show-overflow-tooltip />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
<el-table-column prop="maintenancecycle" label="维修周期" :formatter="formatMainName" />
<el-table-column prop="repair_type" label="维修类型" :formatter="formatRepairpType" />
<el-table-column prop="is_active" label="是否启用" :formatter="format_is_active" />
<el-table-column prop="plan_start_date" label="计划开始日期" width="120px" />
<el-table-column prop="real_start_date" label="实际开始日期" width="120px" />
<el-table-column prop="real_end_date" label="实际结束日期" width="120px" />
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" width="150px" />
<el-table-column prop="confirm_optname" label="审核人" />
<el-table-column prop="confirm_time" label="审核时间" width="150px" />
<el-table-column prop="remark" label="备注" show-overflow-tooltip />
</el-table>
</el-tab-pane>
<el-tab-pane label="保养计划" name="third2">
<!--表格渲染-->
<el-table
ref="table5"
:data="tableDtl5"
style="width: 100%;"
max-height="400"
size="mini"
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 prop="maint_plan_code" label="保养计划单号" width="120px" />
<el-table-column prop="maint_plan_name" label="保养计划名称" width="120px" />
<el-table-column prop="class_name" label="设备类型" width="120px" />
<el-table-column prop="device_code" label="设备编码" />
<el-table-column prop="device_name" label="设备名称" />
<el-table-column prop="extend_code" label="设备自编码" width="90px" />
<el-table-column prop="maintenancecycle" label="保养周期" :formatter="formatMainName" />
<el-table-column prop="maint_object" label="保养对象" :formatter="formatMainObject" />
<el-table-column prop="detail_count" label="明细数" />
<el-table-column prop="is_active" label="是否启用" :formatter="format_is_active" />
<el-table-column prop="plan_start_date" label="计划开始日期" width="150px" />
<el-table-column prop="real_start_date" label="实际开始日期" width="150px" />
<el-table-column prop="real_end_date" label="实际结束日期" width="150px" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" width="150px" />
<el-table-column prop="confirm_optname" label="审核人" />
<el-table-column prop="confirm_time" label="审核时间" width="150px" />
</el-table>
</el-tab-pane>
<el-tab-pane label="维修单" name="third3">
<!--表格渲染-->
<el-table
ref="table6"
:data="tableDtl6"
style="width: 100%;"
max-height="400"
size="mini"
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 prop="repair_code" label="维修单号" width="120px" />
<el-table-column prop="device_code" label="设备编码" width="120px" />
<el-table-column prop="device_name" label="设备名称" />
<el-table-column prop="extend_code" label="设备自编码" width="90px" />
<el-table-column prop="dept_name" label="归属部门" />
<el-table-column prop="use_name" label="使用班组" />
<el-table-column prop="invstatus" label="单据状态" :formatter="formatStatusName" />
<el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatTypeName" />
<el-table-column prop="fault_level" label="故障等级" :formatter="formatLevelName" />
<el-table-column prop="plan_start_date" label="计划维修日期" width="120px" />
<el-table-column prop="fault_desc" label="故障描述" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="input_optname" label="制单人" />
<el-table-column prop="input_time" label="制单时间" width="150px" />
<el-table-column prop="update_optname" label="维修人" />
<el-table-column prop="real_start_date" label="开始时间" width="150px" />
<el-table-column prop="real_end_date" label="结束时间" width="150px" />
<el-table-column prop="confirm_optname" label="确认人" />
<el-table-column prop="confirm_time" label="确认时间" width="150px" />
<el-table-column prop="audit_optname" label="审核人" />
<el-table-column prop="audit_time" label="审核时间" width="150px" />
<el-table-column prop="source_bill_code" label="源单号" />
<el-table-column prop="source_bill_type" label="源单业务类型" width="120px" />
</el-table>
</el-tab-pane>
<el-tab-pane label="保养单" name="third4">
<!--表格渲染-->
<el-table
ref="table7"
:data="tableDtl7"
style="width: 100%;"
max-height="400"
size="mini"
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 prop="maint_code" label="保养单号" width="120px" />
<el-table-column prop="device_code" label="设备编码" />
<el-table-column prop="device_name" label="设备名称" />
<el-table-column prop="extend_code" label="设备自编码" width="90px" />
<el-table-column prop="dept_name" label="归属部门" />
<el-table-column prop="use_name" label="使用班组" />
<el-table-column prop="maint_object" label="保养对象" :formatter="formatMainObject" />
<el-table-column prop="invstatus" label="单据状态" :formatter="formatInvsName" />
<el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatMainName" />
<el-table-column prop="plan_start_date" label="计划保养日期" width="150px" />
<el-table-column prop="input_optname" label="创建人" />
<el-table-column prop="input_time" label="创建时间" width="150px" />
<el-table-column prop="update_optname" label="保养人" />
<el-table-column prop="real_start_date" label="开始时间" width="150px" />
<el-table-column prop="real_end_date" label="结束时间" width="150px" />
<el-table-column prop="confirm_optname" label="确认人" />
<el-table-column prop="confirm_time" label="确认时间" width="150px" />
<el-table-column prop="audit_optname" label="审核人" />
<el-table-column prop="audit_time" label="审核时间" width="150px" />
</el-table>
</el-tab-pane>
</el-tabs>
<!-- 质保书上传弹出框-->
@@ -311,8 +142,6 @@ import ViewDialog2 from '@/views/wms/device_manage/deviceFile/equipmentfile/View
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',
@@ -474,28 +303,6 @@ 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]).then(res => {
equipmentfile.queryivt3(this.form).then(res => {
@@ -508,6 +315,7 @@ export default {
})
},
inv_typeFormat(row) {
debugger
if (row.invcode.includes('WXD')) {
return this.dict.label.EM_DEVICE_WX_INVTYPE[row.invtype]
} else {

26
mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/ViewDialog.vue
View File

@@ -91,10 +91,6 @@
<label slot="label">使用部门:</label>
<el-input v-model.trim="form.use_deptname" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="使用班组" prop="use_groupid">
<label slot="label">使用班组:</label>
<el-input v-model.trim="form.use_groupname" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="设备属性" prop="device_type">
<el-select
v-model="form.device_type"
@@ -174,22 +170,6 @@
style="width: 210px"
/>
</el-form-item>
<el-form-item label="设备BOM" prop="device_bom_id">
<el-select
v-model="form.device_bom_id"
placeholder="设备BOM"
disabled
style="width: 210px"
class="filter-item"
>
<el-option
v-for="item in bomlist"
:key="item.device_bom_id"
:label="item.material_name"
:value="item.device_bom_id"
/>
</el-select>
</el-form-item>
<el-form-item label="卡片编号" prop="card_code">
<label slot="label">卡片编号:</label>
<el-input v-model.trim="form.card_code" disabled style="width: 210px" />
@@ -235,7 +215,6 @@
<script>
import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
import equipmentfile from '@/views/wms/device_manage/deviceFile/equipmentfile/equipmentfile'
export default {
name: 'ViewDialog',
@@ -280,11 +259,6 @@ export default {
this.$emit('update:dialogShow', false)
this.form = {}
this.$emit('AddChanged')
},
open() {
equipmentfile.queryBomList({ material_type_id: this.form.material_type_id }).then(res => {
this.bomlist = res
})
}
}
}

84
mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/index.vue
View File

@@ -185,16 +185,6 @@
>
档案维护
</el-button>
<el-button
slot="right"
class="filter-item"
type="warning"
icon="el-icon-check"
size="mini"
@click="printCard"
>
打印
</el-button>
<el-button
slot="right"
class="filter-item"
@@ -238,31 +228,30 @@
<el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.device_code }}</el-link>
</template>
</el-table-column>
<el-table-column fixed="left" prop="device_name" min-width="150" label="设备名称" />
<el-table-column fixed="left" prop="extend_code" min-width="100" label="内部自编号" />
<el-table-column fixed="left" prop="device_model" min-width="130" label="设备型号" />
<el-table-column fixed="left" prop="device_spec" min-width="130" label="设备规格" />
<el-table-column fixed="left" prop="device_level" min-width="70" label="设备等级" :formatter="device_levelFormat" />
<el-table-column fixed="left" prop="material_type_name" min-width="150" label="设备类别" />
<el-table-column fixed="left" :formatter="is_produceuseFormat" min-width="70" prop="is_produceuse" label="生产用途" />
<el-table-column fixed="left" :formatter="stateFormat" min-width="70" prop="status" label="设备状态" />
<el-table-column prop="beginuse_date" min-width="90" label="启用日期" />
<el-table-column prop="use_deptname" min-width="130" label="使用部门" />
<el-table-column prop="use_groupname" min-width="130" label="使用班组" />
<el-table-column prop="supplier_name" min-width="180" label="供应商" />
<el-table-column prop="manufacturer" min-width="180" label="制造商" />
<el-table-column prop="country_manufactur" min-width="90" label="制造国别" />
<el-table-column prop="leavefactory_date" min-width="80" label="出厂日期" />
<el-table-column prop="leavefactory_number" min-width="130" label="出厂编号" />
<el-table-column prop="drawing_number" min-width="130" label="图号" />
<el-table-column prop="device_type" min-width="70" label="设备属性" :formatter="device_typeFormat" />
<el-table-column prop="workprocedure_id" min-width="70" label="工序" :formatter="seriesFormat2" />
<el-table-column prop="assets_code" min-width="100" label="资产编码" />
<el-table-column prop="assets_name" min-width="150" label="资产名称" />
<el-table-column prop="create_name" min-width="90" label="生成人" />
<el-table-column prop="create_time" min-width="140" label="生成时间" />
<el-table-column prop="update_optname" min-width="90" label="修改人" />
<el-table-column prop="update_time" min-width="140" label="修改时间" />
<el-table-column prop="device_name" min-width="150" label="设备名称" />
<el-table-column prop="extend_code" min-width="100" label="内部自编号" />
<el-table-column prop="device_model" min-width="130" label="设备型号" />
<el-table-column prop="device_spec" min-width="130" label="设备规格" />
<el-table-column prop="device_level" min-width="90" label="设备等级" :formatter="device_levelFormat" />
<el-table-column prop="material_type_name" min-width="150" label="设备类别" />
<el-table-column :formatter="is_produceuseFormat" min-width="90" prop="is_produceuse" label="生产用途" />
<el-table-column :formatter="stateFormat" min-width="90" prop="status" label="设备状态" />
<el-table-column prop="beginuse_date" min-width="90" label="启用日期" show-overflow-tooltip />
<el-table-column prop="use_deptname" min-width="150" label="使用部门" show-overflow-tooltip />
<el-table-column prop="supplier_name" min-width="180" label="供应商" show-overflow-tooltip />
<el-table-column prop="manufacturer" min-width="180" label="制造商" show-overflow-tooltip />
<el-table-column prop="country_manufactur" min-width="90" label="制造国别" show-overflow-tooltip />
<el-table-column prop="leavefactory_date" min-width="80" label="出厂日期" show-overflow-tooltip />
<el-table-column prop="leavefactory_number" min-width="130" label="出厂编号" show-overflow-tooltip />
<el-table-column prop="drawing_number" min-width="130" label="图号" show-overflow-tooltip />
<el-table-column prop="device_type" min-width="90" label="设备属性" :formatter="device_typeFormat" show-overflow-tooltip />
<el-table-column prop="workprocedure_id" min-width="100" label="工序" :formatter="seriesFormat2" show-overflow-tooltip />
<el-table-column prop="assets_code" min-width="100" label="资产编码" show-overflow-tooltip />
<el-table-column prop="assets_name" min-width="150" label="资产名称" show-overflow-tooltip />
<el-table-column prop="create_name" min-width="90" label="生成人" show-overflow-tooltip />
<el-table-column prop="create_time" min-width="140" label="生成时间" show-overflow-tooltip />
<el-table-column prop="update_optname" min-width="90" label="修改人" show-overflow-tooltip />
<el-table-column prop="update_time" min-width="140" label="修改时间" show-overflow-tooltip />
</el-table>
<!--分页组件-->
<pagination />
@@ -283,11 +272,9 @@ import pagination from '@crud/Pagination'
import AddDialog from '@/views/wms/device_manage/deviceFile/equipmentfile/AddDialog'
import ViewDialog from '@/views/wms/device_manage/deviceFile/equipmentfile/ViewDialog'
import ChangeDialog from '@/views/wms/device_manage/deviceFile/equipmentfile/ChangeDialog'
import { getLodop } from '@/assets/js/lodop/LodopFuncs'
import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
// import { getDepts } from '@/api/system/dept'
import crudDept, { getDeptTree } from '@/views/system/dept/dept'
import crudClassstandard from '@/api/wms/basedata/master/classstandard'
import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
@@ -522,29 +509,6 @@ export default {
}
return stylejson
}
},
printCard() {
const _selectData = this.$refs.table.selection
if (_selectData.length > 1 || _selectData.length === 0) {
return this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO)
}
const data = _selectData[0]
const LODOP = getLodop()
LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
// 打印纸张大小设置https://www.it610.com/article/2094844.html
LODOP.PRINT_INIT('')
LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
LODOP.SET_PRINT_STYLE('FontSize', 12)
LODOP.SET_PRINT_STYLE('Bold', 1)
LODOP.ADD_PRINT_BARCODE('10mm', '12mm', '60mm', '20mm', '128A', data.device_code)
LODOP.ADD_PRINT_TEXT('34mm', '12mm', '80mm', '15mm', '设备编码：' + data.device_code + '')
LODOP.ADD_PRINT_TEXT('42mm', '12mm', '80mm', '15mm', '设备名称：' + data.device_name + '')
LODOP.ADD_PRINT_TEXT('49mm', '12mm', '80mm', '15mm', '设备型号：' + data.device_model + '')
LODOP.PRINT()// 打印
this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
}
}
}

21
mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/AddDialog.vue
View File

@@ -60,21 +60,6 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="保养对象" prop="maint_object">
<el-select
v-model="form.maint_object"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
>
<el-option
v-for="item in objectList"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
@@ -176,9 +161,6 @@ export default {
dialogVisible: false,
deviceDialog: false,
itemDialog: false,
objectList: [
{ 'label': '维修班', 'value': '02' }
],
rules: {
plan_start_date: [
{ required: true, message: '计划开始日期不能为空', trigger: 'blur' }
@@ -188,9 +170,6 @@ export default {
],
devicerecord_id: [
{ required: true, message: '设备不能为空', trigger: 'blur' }
],
maint_object: [
{ required: true, message: '保养对象不能为空', trigger: 'blur' }
]
}
}

10
mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/devicemaintenancemst.js
View File

@@ -72,14 +72,6 @@ export function submitMain(data) {
})
}
export function confirmMaintain(data) {
return request({
url: 'api/devicemaintenancemst/confirmMaintain',
method: 'post',
data
})
}
export function auditMaintain(data) {
return request({
url: 'api/devicemaintenancemst/auditMaintain',
@@ -88,4 +80,4 @@ export function auditMaintain(data) {
})
}
export default { findByCode, add, edit, del, getDtl, putIn, startMaintain, endMaintain, submitMain, confirmMaintain, auditMaintain }
export default { findByCode, add, edit, del, getDtl, putIn, startMaintain, endMaintain, submitMain, auditMaintain }

41
mes/qd/src/views/wms/device_manage/upkeep/devicemaintenance/index.vue
View File

@@ -96,35 +96,23 @@
>
提交
</el-button>
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
:disabled="crud.selections.length !== 1"
@click="createExcel"
>
生成保养单
</el-button>
</crudOperation>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column fixed="left" type="selection" min-width="35" />
<el-table-column fixed="left" prop="maint_code" label="保养单号" min-width="115" >
<el-table-column type="selection" min-width="35" />
<el-table-column prop="maint_code" label="保养单号" min-width="130" show-overflow-tooltip>
<template slot-scope="scope">
<el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.maint_code }}</el-link>
</template>
</el-table-column>
<el-table-column fixed="left" prop="device_code" label="设备编码" min-width="85" />
<el-table-column fixed="left" prop="device_name" label="设备名称" min-width="150" />
<el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100" />
<el-table-column fixed="left" prop="dept_name" label="归属部门" min-width="130" />
<el-table-column fixed="left" prop="use_name" label="使用班组" min-width="130" />
<el-table-column fixed="left" prop="maint_object" label="保养对象" :formatter="formatMainObject" min-width="70" />
<el-table-column fixed="left" prop="invstatus" label="单据状态" :formatter="formatInvsName" min-width="70" />
<el-table-column fixed="left" prop="maintenancecycle" label="单据类型" :formatter="formatMainName" min-width="70" />
<el-table-column fixed="left" prop="plan_start_date" label="计划保养日期" min-width="95" />
<el-table-column prop="device_code" label="设备编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="device_name" label="设备名称" min-width="150" show-overflow-tooltip />
<el-table-column prop="extend_code" label="设备自编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="dept_name" label="归属部门" min-width="150" show-overflow-tooltip />
<el-table-column prop="use_name" label="使用部门" min-width="150" show-overflow-tooltip />
<el-table-column prop="invstatus" label="单据状态" :formatter="formatInvsName" min-width="90" />
<el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatMainName" min-width="90" />
<el-table-column prop="plan_start_date" label="计划保养日期" min-width="125" show-overflow-tooltip />
<el-table-column prop="input_optname" label="创建人" min-width="90" />
<el-table-column prop="input_time" label="创建时间" min-width="140" />
<el-table-column prop="update_optname" label="保养人" min-width="90" />
@@ -264,15 +252,6 @@ export default {
return obj
})
})
},
createExcel() {
const _selectData = this.$refs.table.selection
const data = _selectData[0]
download('api/devicemaintenancemst/createExcel', { 'maint_id': data.maint_id }).then(result => {
const name = data.maint_code + '保养工单'
this.crud.toQuery()
downloadFile(result, name, 'xlsx')
})
}
}
}

20
mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceaudit/index.vue
View File

@@ -99,14 +99,14 @@
</crudOperation>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column fixed="left" type="selection" min-width="35" />
<el-table-column fixed="left" prop="maint_code" label="保养单号" min-width="100" />
<el-table-column fixed="left" prop="device_code" label="设备编码" min-width="85" />
<el-table-column fixed="left" prop="device_name" label="设备名称" min-width="150" />
<el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100" />
<el-table-column fixed="left" prop="invstatus" label="单据状态" :formatter="formatInvsName" min-width="70" />
<el-table-column fixed="left" prop="maintenancecycle" label="单据类型" :formatter="formatMainName" min-width="70" />
<el-table-column fixed="left" prop="plan_start_date" label="计划保养日期" min-width="95" />
<el-table-column type="selection" min-width="35" />
<el-table-column prop="maint_code" label="保养单号" min-width="150" show-overflow-tooltip />
<el-table-column prop="device_code" label="设备编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="device_name" label="设备名称" min-width="150" show-overflow-tooltip />
<el-table-column prop="extend_code" label="设备自编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="invstatus" label="单据状态" :formatter="formatInvsName" min-width="90" />
<el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatMainName" min-width="90" />
<el-table-column prop="plan_start_date" label="计划保养日期" min-width="140" />
<el-table-column prop="input_optname" label="创建人" min-width="90" />
<el-table-column prop="input_time" label="创建时间" min-width="140" />
<el-table-column prop="update_optname" label="保养人" min-width="90" />
@@ -222,8 +222,8 @@ export default {
auditMaintain() {
const _selectData = this.$refs.table.selection
const data = _selectData[0]
if (data.invstatus !== '05') {
return this.crud.notify('只能对确认状态的单据审核', CRUD.NOTIFICATION_TYPE.INFO)
if (data.invstatus !== '04') {
return this.crud.notify('只能对结束状态的单据审核', CRUD.NOTIFICATION_TYPE.INFO)
}
crudDevicemaintenancemst.auditMaintain(data).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)

312
mes/qd/src/views/wms/device_manage/upkeep/devicemaintenancegrid/AddDialog.vue
View File

@@ -1,312 +0,0 @@
<template>
<el-dialog
:title="crud.status.title"
append-to-body
fullscreen
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0 || crud.status.view > 0"
>
<el-row v-show="crud.status.cu > 0" :gutter="20">
<el-col :span="20" style="border: 1px solid white">
<span />
</el-col>
<el-col :span="4">
<span>
<el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
<el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
</span>
</el-col>
</el-row>
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="120px" label-suffix=":">
<el-row>
<el-col :span="6">
<el-form-item label="单据号" prop="maint_code">
<el-input v-model.trim="form.maint_code" style="width: 200px;" disabled placeholder="系统自动生成" />
</el-form-item>
</el-col>
<el-col :span="6">
<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="crud.status.view > 0" />
</el-form-item>
</el-col>
<el-col :span="6">
<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="6">
<el-form-item label="设备" prop="devicerecord_id">
<el-input v-model.trim="form.device_code" :disabled="true" style="width: 200px;">
<el-button slot="append" icon="el-icon-plus" :disabled="crud.status.view > 0" @click="putDevice" />
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="保养对象" prop="maint_object">
<el-select
v-model="form.maint_object"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
>
<el-option
v-for="item in objectList"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model.trim="form.remark" style="width: 580px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="crud-opts2">
<span class="role-span">项目明细</span>
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-check"
size="mini"
:disabled="crud.status.view > 0"
@click="putItem"
>
添加项目
</el-button>
</span>
</div>
<el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
<!--表格渲染-->
<el-table
ref="table2"
:data="form.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">
<template slot-scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.dtl_remark" :disabled="crud.status.view > 0" class="input-with-select" />
</template>
</el-table-column>
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<el-button type="danger" class="filter-item" size="mini" icon="el-icon-delete" :disabled="crud.status.view > 0" @click.native.prevent="delRow(scope.$index, form.tableData)" />
</template>
</el-table-column>
</el-table>
</el-card>
<DeviceDialog :dialog-show.sync="deviceDialog" :is-single="true" @tableChanged2="tableChanged2" />
<ItemDialog :dialog-show.sync="itemDialog" :is-single="false" :open-param="openParam" @tableChanged1="tableChanged1" />
</el-dialog>
</template>
<script>
const defaultForm = {
maint_code: null,
maint_object: null,
devicerecord_id: null,
maintenancecycle: '02',
plan_start_date: null,
material_type_id: null,
device_code: null,
tableData: []
}
import crudDevicemaintenancemst from '@/views/wms/device_manage/upkeep/devicemaintenance/devicemaintenancemst'
import DeviceDialog from '@/views/wms/device_manage/upkeep/devicemaintenanceplan/DeviceDialog'
import ItemDialog from '@/views/wms/device_manage/upkeep/devicemaintenanceplan/ItemDialog'
import CRUD, { form, crud } from '@crud/crud'
export default {
name: 'AddDialog',
dicts: ['EM_DEVICE_BY_INVTYPE'],
components: { ItemDialog, DeviceDialog },
mixins: [form(defaultForm), crud()],
props: {
dialogShow: {
type: Boolean,
default: false
},
openParam: {
type: Object
}
},
data() {
return {
dialogVisible: false,
deviceDialog: false,
itemDialog: false,
objectList: [
{ 'label': '班组', 'value': '01' }
],
rules: {
plan_start_date: [
{ required: true, message: '计划开始日期不能为空', trigger: 'blur' }
],
maintenancecycle: [
{ required: true, message: '保养周期不能为空', trigger: 'blur' }
],
devicerecord_id: [
{ required: true, message: '设备不能为空', trigger: 'blur' }
],
maint_object: [
{ required: true, message: '保养对象不能为空', trigger: 'blur' }
]
}
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
}
},
methods: {
[CRUD.HOOK.beforeSubmit]() {
const arr = this.form.tableData
if (arr.length === 0) {
this.crud.notify('明细不能为空', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
},
[CRUD.HOOK.afterToEdit]() {
const data = {
'maint_id': this.form.maint_id
}
this.form.device_code = this.form.device_name + '-' + this.form.device_code
crudDevicemaintenancemst.getDtl(data).then(res => {
this.form.tableData = res
})
},
[CRUD.HOOK.afterToView]() {
const data = {
'maint_id': this.form.maint_id
}
crudDevicemaintenancemst.getDtl(data).then(res => {
this.form.tableData = res
})
},
handleClose(done) {
this.$confirm('确认关闭？')
.then(_ => {
done()
})
.catch(_ => {
})
},
close() {
this.$emit('update:dialogShow', false)
},
formatLevel(row, cloum) {
if (row.item_level === '01') {
return '日常'
} else if (row.item_level === '02') {
return '一级'
} else if (row.item_level === '03') {
return '二级'
}
},
putDevice() {
this.deviceDialog = true
},
putItem() {
this.openParam = this.form
this.itemDialog = true
},
tableChanged1(row) {
const arr = row
const data = this.form.tableData
arr.forEach((item) => {
if (this.form.tableData.length !== 0) {
this.fla = false
for (let i = 0; i < data.length; i++) {
if (data[i].maint_item_id === item.maint_item_id) {
this.fla = true
}
}
if (this.fla === false) {
this.form.tableData.push(item)
}
} else {
this.form.tableData.push(item)
}
})
},
tableChanged2(row) {
this.form.devicerecord_id = row.devicerecord_id
this.form.material_type_id = row.material_type_id
this.form.device_code = row.device_name + '-' + row.device_code
},
delRow(index, rows) {
rows.splice(index, 1)
}
}
}
</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>

458
mes/qd/src/views/wms/device_manage/upkeep/devicemaintenancegrid/index.vue
View File

@@ -1,458 +0,0 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="110px"
label-suffix=":"
>
<el-form-item label="设备类别">
<treeselect
v-model="query.material_type_id"
:load-options="loadClass"
:options="classes"
style="width: 200px;"
placeholder="请选择"
/>
</el-form-item>
<el-form-item label="设备">
<el-input
v-model="query.device_code"
clearable
size="mini"
placeholder="请输入设备编码、名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="使用班组">
<treeselect
v-model="query.dept_id"
:load-options="loadDepts"
:options="depts"
style="width: 200px;"
placeholder="请选择"
/>
</el-form-item>
<el-form-item label="保养类型">
<el-select
v-model="query.maintenancecycle"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
@change="hand"
>
<el-option
v-for="item in dict.EM_DEVICE_BY_INVTYPE"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="单据编码">
<el-input
v-model="query.maint_code"
clearable
size="mini"
placeholder="请输入单据编码、名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="日期">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="hand"
/>
</el-form-item>
<el-form-item label="状态">
<el-select
v-model="query.invstatus"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
@change="hand"
>
<el-option
v-for="item in dict.EM_DEVICE_BY_INVSTATUS"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<rrOperation />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
:disabled="crud.selections.length !== 1"
@click="putIn"
>
提交
</el-button>
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
:disabled="crud.selections.length !== 1"
@click="createExcel"
>
生成保养单
</el-button>
</crudOperation>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column fixed="left" type="selection" min-width="35" />
<el-table-column fixed="left" prop="maint_code" label="保养单号" min-width="115" >
<template slot-scope="scope">
<el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.maint_code }}</el-link>
</template>
</el-table-column>
<el-table-column fixed="left" prop="device_code" label="设备编码" min-width="85" />
<el-table-column fixed="left" prop="device_name" label="设备名称" min-width="150" />
<el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100" />
<el-table-column fixed="left" prop="dept_name" label="归属部门" min-width="130" />
<el-table-column fixed="left" prop="use_name" label="使用班组" min-width="130" />
<el-table-column fixed="left" prop="maint_object" label="保养对象" :formatter="formatMainObject" min-width="70" />
<el-table-column fixed="left" prop="invstatus" label="单据状态" :formatter="formatInvsName" min-width="70" />
<el-table-column fixed="left" prop="maintenancecycle" label="单据类型" :formatter="formatMainName" min-width="70" />
<el-table-column fixed="left" prop="plan_start_date" label="计划保养日期" min-width="95" />
<el-table-column prop="input_optname" label="创建人" min-width="90" />
<el-table-column prop="input_time" label="创建时间" min-width="140" />
<el-table-column prop="update_optname" label="保养人" min-width="90" />
<el-table-column prop="real_start_date" label="开始时间" min-width="140" />
<el-table-column prop="real_end_date" label="结束时间" min-width="140" />
<el-table-column prop="confirm_optname" label="确认人" min-width="90" />
<el-table-column prop="confirm_time" label="确认时间" min-width="140" />
<el-table-column prop="audit_optname" label="审核人" min-width="90" />
<el-table-column prop="audit_time" label="审核时间" min-width="140" />
<el-table-column v-permission="[]" label="操作" min-width="125" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
:disabled-edit="scope.row.invstatus !== '01'"
:disabled-dle="scope.row.invstatus !== '01'"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
<AddDialog />
</div>
</template>
<script>
import crudDevicemaintenancemst from '@/views/wms/device_manage/upkeep/devicemaintenance/devicemaintenancemst'
import CRUD, { presenter, header, crud } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import crudClassstandard from '@/api/wms/basedata/master/classstandard'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
import DateRangePicker from '@/components/DateRangePicker'
import AddDialog from '@/views/wms/device_manage/upkeep/devicemaintenancegrid/AddDialog'
import { download } from '@/api/data'
import { downloadFile } from '@/utils'
import { mapGetters } from 'vuex'
// import { getDepts, getDeptSuperior } from '@/api/system/dept'
export default {
name: 'Devicemaintenancegrid',
dicts: ['EM_DEVICE_BY_INVSTATUS', 'EM_DEVICE_BY_INVTYPE', 'EM_DEVICE_MAINT_OBJECT'],
components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect, DateRangePicker },
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({
title: '班组保养维护',
url: 'api/devicemaintenancemst/query4',
idField: 'maint_id',
sort: 'maint_id,desc',
crudMethod: { ...crudDevicemaintenancemst },
optShow: {
add: true,
edit: false,
del: false,
download: false,
reset: true
}
})
},
data() {
return {
classes: [],
depts: [],
class_idStr: null,
materOpt_code: '23',
permission: {
}
}
},
computed: {
...mapGetters({
user: 'user'
})
},
created() {
const param = {
'materOpt_code': this.materOpt_code
}
crudMaterialbase.getMaterOptType(param).then(res => {
this.class_idStr = res.class_idStr
this.crud.query.class_idStr = this.class_idStr
this.crud.toQuery()
this.queryClassId()
})
this.getDepts()
this.query.dept_id = this.user.dept.id
this.getSupDepts(this.user.dept.id)
this.crud.toQuery()
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
hand(value) {
this.crud.toQuery()
},
formatMainObject(row, cloum) {
return this.dict.label.EM_DEVICE_MAINT_OBJECT[row.maint_object]
},
formatInvsName(row, cloum) {
return this.dict.label.EM_DEVICE_BY_INVSTATUS[row.invstatus]
},
formatMainName(row, cloum) {
return this.dict.label.EM_DEVICE_BY_INVTYPE[row.maintenancecycle]
},
putIn() {
const _selectData = this.$refs.table.selection
const data = _selectData[0]
if (data.invstatus !== '01') {
return this.crud.notify('只能对生成状态的单据提交', CRUD.NOTIFICATION_TYPE.INFO)
}
crudDevicemaintenancemst.putIn(data).then(res => {
this.crud.notify('提交成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
},
loadClass({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
parentNode.children = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
return obj
})
setTimeout(() => {
callback()
}, 100)
})
}
},
queryClassId() {
const param = {
'class_idStr': this.class_idStr
}
crudClassstandard.queryClassById(param).then(res => {
this.classes = res.content.map(obj => {
if (obj.hasChildren) {
obj.children = null
}
return obj
})
})
},
createExcel() {
const _selectData = this.$refs.table.selection
const data = _selectData[0]
download('api/devicemaintenancemst/createExcel', { 'maint_id': data.maint_id }).then(result => {
const name = data.maint_code + '保养工单'
this.crud.toQuery()
downloadFile(result, name, 'xlsx')
})
},
// 获取弹窗内部门数据
loadDepts({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
getDepts({ enabled: true, pid: parentNode.id }).then(res => {
parentNode.children = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
return obj
})
setTimeout(() => {
callback()
}, 200)
})
}
},
getDepts() {
getDepts({ enabled: true }).then(res => {
this.depts = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
return obj
})
})
},
getSupDepts(deptId) {
debugger
var number = parseFloat(deptId)
getDeptSuperior(number).then(res => {
const date = res.content
this.buildDepts(date)
this.depts = date
})
},
buildDepts(depts) {
depts.forEach(data => {
if (data.children) {
this.buildDepts(data.children)
}
if (data.hasChildren && !data.children) {
data.children = null
}
})
}
}
}
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
::v-deep {
.vue-treeselect__menu {
overflow-x: auto !important;
width: 300px;
max-height: 300px !important;
}
.vue-treeselect__label {
overflow: unset;
text-overflow: unset;
}
.vue-treeselect__control {
height: 20px !important;
}
.vue-treeselect__multi-value-item-container,
.vue-treeselect--has-value .vue-treeselect__multi-value {
height: 30px;
line-height: 24px;
padding: 0;
}
.vue-treeselect__limit-tip,
.vue-treeselect--searchable.vue-treeselect--multi.vue-treeselect--has-value
.vue-treeselect__input-container {
padding-top: 0;
}
.vue-treeselect--has-value .vue-treeselect__multi-value {
// margin-bottom: 15px;
}
.vue-treeselect__placeholder,
.vue-treeselect__single-value {
height: 28px;
line-height: 32px;
font-size: small;
color: "#CCCFD6";
}
.vue-treeselect--has-value .vue-treeselect__input {
height: 18px !important;
line-height: 18px !important;
}
.vue-treeselect div,
.vue-treeselect span {
box-sizing: content-box;
}
// 选中后的溢出隐藏
.vue-treeselect__multi-value-label {
display: block;
width: 140px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.vue-treeselect__value-container {
display: block;
height: 32px;
}
}
</style>

97
mes/qd/src/views/wms/device_manage/upkeep/devicemaintenancepa/index.vue
View File

@@ -80,22 +80,6 @@
/>
</el-select>
</el-form-item>
<el-form-item label="保养对象">
<el-select
v-model="query.maint_object"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
@change="hand"
>
<el-option
v-for="item in dict.EM_DEVICE_MAINT_OBJECT"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<rrOperation />
</el-form>
</div>
@@ -112,17 +96,6 @@
>
开始保养
</el-button>
<!-- <el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
:disabled="execu_flag"
@click="executeMaintain"
>
保养执行
</el-button>-->
<el-button
slot="right"
class="filter-item"
@@ -134,34 +107,22 @@
>
结束保养
</el-button>
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
:disabled="confirm_flag"
@click="confirmMaintain"
>
保养验收
</el-button>
</crudOperation>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="mySelectionChange">
<el-table-column fixed="left" type="selection" min-width="35" />
<el-table-column fixed="left" prop="maint_code" label="保养单号" min-width="100" />
<el-table-column fixed="left" prop="device_code" label="设备编码" min-width="85" />
<el-table-column fixed="left" prop="device_name" label="设备名称" min-width="150" />
<el-table-column fixed="left" prop="dept_name" label="所属部门" min-width="130" />
<el-table-column fixed="left" prop="use_name" label="使用班组" min-width="130" />
<el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100" />
<el-table-column fixed="left" prop="maint_object" label="保养对象" :formatter="formatMainObject" min-width="70" />
<el-table-column fixed="left" prop="invstatus" label="单据状态" :formatter="formatInvsName" min-width="70" />
<el-table-column fixed="left" prop="maintenancecycle" label="单据类型" :formatter="formatMainName" min-width="70" />
<el-table-column fixed="left" prop="plan_start_date" label="计划保养日期" min-width="95" />
<el-table-column prop="input_optname" label="创建人" min-width="90" />
<el-table-column type="selection" min-width="35" />
<el-table-column prop="maint_code" label="保养单号" min-width="150" show-overflow-tooltip />
<el-table-column prop="device_code" label="设备编码" min-width="90" show-overflow-tooltip />
<el-table-column prop="device_name" label="设备名称" min-width="150" show-overflow-tooltip />
<el-table-column prop="dept_name" label="所属部门" min-width="130" show-overflow-tooltip />
<el-table-column prop="use_name" label="使用部门" min-width="140" show-overflow-tooltip />
<el-table-column prop="extend_code" label="设备自编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="invstatus" label="单据状态" :formatter="formatInvsName" min-width="90" />
<el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatMainName" min-width="90" />
<el-table-column prop="plan_start_date" label="计划保养日期" min-width="140" />
<el-table-column prop="input_optname" label="创建人" min-width="90" />
<el-table-column prop="input_time" label="创建时间" min-width="140" />
<el-table-column prop="update_optname" label="保养人" min-width="90" />
<el-table-column prop="update_optname" label="保养人" min-width="90" />
<el-table-column prop="real_start_date" label="开始时间" min-width="140" />
<el-table-column prop="real_end_date" label="结束时间" min-width="140" />
<el-table-column prop="confirm_optname" label="确认人" min-width="90" />
@@ -194,7 +155,7 @@ import StartDialog from '@/views/wms/device_manage/upkeep/devicemaintenancepa/St
export default {
name: 'Devicemaintenancepa',
dicts: ['EM_DEVICE_BY_INVSTATUS', 'EM_DEVICE_BY_INVTYPE', 'EM_DEVICE_MAINT_OBJECT'],
dicts: ['EM_DEVICE_BY_INVSTATUS', 'EM_DEVICE_BY_INVTYPE'],
components: { ExecuteDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect, DateRangePicker, StartDialog },
mixins: [presenter(), header(), crud()],
cruds() {
@@ -248,9 +209,6 @@ export default {
hand(value) {
this.crud.toQuery()
},
formatMainObject(row, cloum) {
return this.dict.label.EM_DEVICE_MAINT_OBJECT[row.maint_object]
},
formatInvsName(row, cloum) {
return this.dict.label.EM_DEVICE_BY_INVSTATUS[row.invstatus]
},
@@ -307,35 +265,6 @@ export default {
}
this.executeDialog = true
})
// crudDevicemaintenancemst.endMaintain(data).then(res => {
// this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
// this.crud.toQuery()
// })
},
executeMaintain() {
const _selectData = this.$refs.table.selection
const data = _selectData[0]
if (data.invstatus !== '03') {
return this.crud.notify('只能对开始状态的单据执行', CRUD.NOTIFICATION_TYPE.INFO)
}
crudDevicemaintenancemst.getDtl(data).then(res => {
this.openParam = {
'form': data,
'tableData': res
}
this.executeDialog = true
})
},
confirmMaintain() {
const _selectData = this.$refs.table.selection
const data = _selectData[0]
if (data.invstatus !== '04') {
return this.crud.notify('只能对结束状态的单据确认', CRUD.NOTIFICATION_TYPE.INFO)
}
crudDevicemaintenancemst.confirmMaintain(data).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
},
mySelectionChange(rows) {
this.buttonChange(rows)

20
mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/AddDialog.vue
View File

@@ -66,21 +66,6 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="保养对象" prop="maint_object">
<el-select
v-model="form.maint_object"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
>
<el-option
v-for="item in dict.EM_DEVICE_MAINT_OBJECT"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
@@ -176,7 +161,7 @@ import CRUD, { form, crud } from '@crud/crud'
export default {
name: 'AddDialog',
dicts: ['EM_DEVICE_BY_CYCLE', 'EM_DEVICE_MAINT_OBJECT'],
dicts: ['EM_DEVICE_BY_CYCLE'],
components: { ItemDialog, DeviceDialog },
mixins: [form(defaultForm), crud()],
props: {
@@ -205,9 +190,6 @@ export default {
],
devicerecord_id: [
{ required: true, message: '设备不能为空', trigger: 'blur' }
],
maint_object: [
{ required: true, message: '保养对象不能为空', trigger: 'blur' }
]
}
}

20
mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/CopyAddDialog.vue
View File

@@ -69,21 +69,6 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="保养对象" prop="maint_object">
<el-select
v-model="form1.maint_object"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
>
<el-option
v-for="item in dict.EM_DEVICE_MAINT_OBJECT"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
@@ -155,7 +140,7 @@ import CRUD, { crud } from '@crud/crud'
export default {
name: 'CopyAddDialog',
dicts: ['EM_DEVICE_BY_CYCLE', 'EM_DEVICE_MAINT_OBJECT'],
dicts: ['EM_DEVICE_BY_CYCLE'],
components: { ItemDialog, DeviceDialog },
mixins: [crud()],
props: {
@@ -263,9 +248,6 @@ export default {
if (data.plan_start_date === null) {
return this.crud.notify('计划开始日期不能为空', CRUD.NOTIFICATION_TYPE.INFO)
}
if (data.maint_object === '') {
return this.crud.notify('保养对象不能为空', CRUD.NOTIFICATION_TYPE.INFO)
}
if (data.tableData.length === 0) {
return this.crud.notify('明细不能为空', CRUD.NOTIFICATION_TYPE.INFO)
}

45
mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/DeviceDialog.vue
View File

@@ -28,15 +28,17 @@
<treeselect
v-model="query.dept_id"
:load-options="loadDepts"
:normalizer="normalizer"
:options="depts"
style="width: 200px;"
placeholder="请选择"
/>
</el-form-item>
<el-form-item label="使用班组">
<el-form-item label="使用部门">
<treeselect
v-model="query.use_id"
:load-options="loadDepts"
:normalizer="normalizer"
:options="depts"
style="width: 200px;"
placeholder="请选择"
@@ -70,7 +72,7 @@
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
<el-table-column prop="class_name" label="设备类型" show-overflow-tooltip />
<el-table-column prop="dept_name" label="归属部门" show-overflow-tooltip />
<el-table-column prop="use_name" label="使用班组" show-overflow-tooltip />
<el-table-column prop="use_name" label="使用部门" show-overflow-tooltip />
<el-table-column prop="device_spec" label="规格" min-width="130" show-overflow-tooltip />
<el-table-column prop="device_model" label="型号" show-overflow-tooltip />
<el-table-column prop="supplier_name" label="供应商" show-overflow-tooltip />
@@ -96,8 +98,8 @@ import pagination from '@crud/Pagination'
import crudDevicemaintenanceplanmst from '@/views/wms/device_manage/upkeep/devicemaintenanceplan/devicemaintenanceplanmst'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
// import { getDepts, getDeptSuperior } from '@/api/system/dept'
import { mapGetters } from 'vuex'
import crudDept from '@/views/system/dept/dept'
export default {
name: 'Device',
@@ -169,7 +171,7 @@ export default {
this.$refs.table.clearSelection()
},
open() {
this.getDepts()
this.deptTree()
this.query.use_id = this.user.dept.id
this.getSupDepts(this.user.dept.id)
this.crud.toQuery()
@@ -197,37 +199,30 @@ export default {
// 获取弹窗内部门数据
loadDepts({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
getDepts({ enabled: true, pid: parentNode.id }).then(res => {
crudDept.getDeptvo({ is_used: true, pid: parentNode.dept_id }).then(res => {
parentNode.children = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
obj.children = null
return obj
})
setTimeout(() => {
callback()
}, 200)
}, 100)
})
}
},
getDepts() {
getDepts({ enabled: true }).then(res => {
this.depts = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
return obj
deptTree() {
setTimeout(() => {
crudDept.getDeptTree().then(res => {
this.depts = res.content
})
})
}, 100)
},
getSupDepts(deptId) {
debugger
var number = parseFloat(deptId)
getDeptSuperior(number).then(res => {
const date = res.content
this.buildDepts(date)
this.depts = date
})
normalizer(node) {
return {
id: node.dept_id,
label: node.name,
children: node.children
}
},
buildDepts(depts) {
depts.forEach(data => {

41
mes/qd/src/views/wms/device_manage/upkeep/devicemaintenanceplan/index.vue
View File

@@ -80,22 +80,6 @@
/>
</el-select>
</el-form-item>
<el-form-item label="保养对象">
<el-select
v-model="query.maint_object"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
@change="hand"
>
<el-option
v-for="item in dict.EM_DEVICE_MAINT_OBJECT"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<rrOperation />
</el-form>
</div>
@@ -115,8 +99,8 @@
</crudOperation>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column fixed="left" type="selection" min-width="35" />
<el-table-column fixed="left" prop="is_active" label="是否启用" min-width="75">
<el-table-column type="selection" min-width="35" />
<el-table-column fixed prop="is_active" label="是否启用" min-width="75">
<template slot-scope="scope">
<el-switch
:value="format_is_active(scope.row.is_active)"
@@ -126,14 +110,14 @@
/>
</template>
</el-table-column>
<el-table-column fixed="left" prop="maint_plan_code" label="保养计划单号" min-width="115" />
<el-table-column fixed="left" prop="maint_plan_name" label="保养计划名称" min-width="130" />
<el-table-column fixed="left" prop="class_name" label="设备类型" min-width="130" />
<el-table-column fixed="left" prop="device_code" label="设备编码" min-width="85" />
<el-table-column fixed="left" prop="device_name" label="设备名称" min-width="150" />
<el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100" />
<el-table-column fixed="left" prop="maintenancecycle" label="保养周期" :formatter="formatMainName" min-width="75" />
<el-table-column fixed="left" prop="maint_object" label="保养对象" :formatter="formatMainObject" min-width="75" />
<el-table-column prop="maint_plan_code" label="保养计划单号" min-width="130" show-overflow-tooltip />
<el-table-column prop="maint_plan_name" label="保养计划名称" min-width="130" />
<el-table-column prop="class_name" label="设备类型" min-width="130" />
<el-table-column prop="device_code" label="设备编码" min-width="85" />
<el-table-column prop="device_name" label="设备名称" min-width="150" />
<el-table-column prop="extend_code" label="设备自编码" min-width="100" />
<el-table-column prop="maintenancecycle" label="保养周期" :formatter="formatMainName" min-width="75" />
<el-table-column prop="maint_object" label="保养对象" :formatter="formatMainObject" min-width="75" />
<el-table-column prop="detail_count" label="明细数" min-width="60" />
<el-table-column prop="plan_start_date" label="计划初始日期" min-width="100" />
<el-table-column prop="real_start_date" label="最近保养开始日期" min-width="125" />
@@ -178,7 +162,7 @@ import CopyAddDialog from '@/views/wms/device_manage/upkeep/devicemaintenancepla
export default {
name: 'Devicemaintenanceplan',
dicts: ['IS_OR_NOT', 'EM_DEVICE_BY_CYCLE', 'EM_DEVICE_MAINT_OBJECT'],
dicts: ['IS_OR_NOT', 'EM_DEVICE_BY_CYCLE'],
components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect, DateRangePicker, CopyAddDialog },
mixins: [presenter(), header(), crud()],
cruds() {
@@ -253,9 +237,6 @@ export default {
formatMainName(row, cloum) {
return this.dict.label.EM_DEVICE_BY_CYCLE[row.maintenancecycle]
},
formatMainObject(row, cloum) {
return this.dict.label.EM_DEVICE_MAINT_OBJECT[row.maint_object]
},
copyAdd() {
const _selectData = this.$refs.table.selection
const data = {