diff --git a/src/api/device/sparePartsApplicationRecord.js b/src/api/device/sparePartsApplicationRecord.js index ed6fb54..56e1316 100644 --- a/src/api/device/sparePartsApplicationRecord.js +++ b/src/api/device/sparePartsApplicationRecord.js @@ -42,3 +42,12 @@ export function delSparePartsApplicationRecord(applyId) { method: 'delete' }); } + +// 查询当前维修单备件申领记录列表 +export function listRepairSparePartsRecord(query) { + return request({ + url: '/device/sparePartsApplicationRecord/listRepairSparePartsRecord', + method: 'get', + params: query + }); +} diff --git a/src/api/mes/reportWork.js b/src/api/mes/reportWork.js index faa87dc..07c3792 100644 --- a/src/api/mes/reportWork.js +++ b/src/api/mes/reportWork.js @@ -105,4 +105,53 @@ export function getProShifts() { url: '/mes/reportWork/getProShifts/', method: 'get' }) + } + + +// 查询人员列表 +export function getMesListUser(query) { + return request({ + url: '/mes/reportWork/getMesListUser', + method: 'get', + params: query + }); +} + +//查询工单列表 +export function getMesListWorkOrder(query) { + return request({ + url: '/mes/reportWork/getMesListWorkOrder', + method: 'get', + params: query + }); +} + +//查询线体列表 +export function getMesListEquip(query) { + return request({ + url: '/mes/reportWork/getMesListEquip', + method: 'get', + params: query + }); +} +//报工按钮 +export function reportSap(reportCode) { + const data = { + reportCode + } + return request({ + url: '/mes/reportWork/reportSap', + method: 'put', + data: data + }); +} + + +// 查询物料管理列表 +export function getMesListBom(query) { + return request({ + url: '/mes/reportWorkConsume/getMesListBom', + method: 'get', + params: query + }); } \ No newline at end of file diff --git a/src/assets/images/bg-body.png b/src/assets/images/bg-body.png index 8b1428f..c5c19c4 100644 Binary files a/src/assets/images/bg-body.png and b/src/assets/images/bg-body.png differ diff --git a/src/views/device/equTeam/index.vue b/src/views/device/equTeam/index.vue index a904e95..ef3acfe 100644 --- a/src/views/device/equTeam/index.vue +++ b/src/views/device/equTeam/index.vue @@ -192,15 +192,6 @@ - - - - - - - - + + + + + + +
确 定 @@ -1034,6 +1038,9 @@ export default { dicts: ["device_order_source"], data() { return { + //图片存储 + fileList: [], + //设备选择 equipmentCodeOption: [], // 遮罩层 loading: true, @@ -1146,7 +1153,26 @@ export default { // 表单参数 form: {}, // 表单校验 - rules: {}, + rules: { + equipmentCode: [ + { required: true, message: "设备编码不能为空", trigger: "blur" }, + ], + orderBreakdownTime: [ + { required: true, message: "故障时间不能为空", trigger: "blur" }, + ], + orderTime: [ + { required: true, message: "报修时间不能为空", trigger: "blur" }, + ], + orderRepairman: [ + { required: true, message: "报修人不能为空", trigger: "blur" }, + ], + orderDesc: [ + { required: true, message: "故障描述不能为空", trigger: "blur" }, + ], + orderConnection: [ + { required: true, message: "联系方式不能为空", trigger: "blur" }, + ], + }, }; }, created() { @@ -1194,6 +1220,7 @@ export default { // 表单重置 reset() { this.form = { + fileList: "", orderId: null, orderCode: null, equipmentCode: null, @@ -1247,6 +1274,16 @@ export default { const orderId = row.orderId || this.ids; getFaultReport(orderId).then((response) => { this.form = response.data; + if (response.data.files != null) { + var newFiles = []; + response.data.files.forEach((item) => { + var newFile = {}; + newFile.name = item.fileName; + newFile.url = item.fileAddress; + newFiles.push(newFile); + }); + this.form.fileList = newFiles; + } this.open = true; this.title = "修改故障报修"; }); diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue index bb930a1..54bcc05 100644 --- a/src/views/device/repairOrder/index.vue +++ b/src/views/device/repairOrder/index.vue @@ -908,7 +908,7 @@
-
+
@@ -950,7 +950,7 @@ placeholder="请选择维修状态" @change="$forceUpdate()" clearable - style="width: 220px" + style="width: 195px" @keyup.enter.native="handleQuery" > - + @@ -1028,7 +1029,7 @@
- +
@@ -1064,11 +1065,11 @@ import { getMaintenanceTeamList } from "@/api/device/equTeam"; import ItemSelect from "./selectSingleEquipment.vue"; import ItemSelectPerson from "./selectSinglePerson.vue"; import { Message } from "element-ui"; -import SelectSpareParts from "./selectSpareParts.vue"; +import ItemSelectSpareParts from "./selectSpareParts.vue"; export default { name: " RepairOrder", - components: { ItemSelect, ItemSelectPerson, SelectSpareParts }, + components: { ItemSelect, ItemSelectPerson, ItemSelectSpareParts }, data() { return { //选择设备维修班组 @@ -1169,31 +1170,35 @@ export default { ], // 日期范围选择快捷 pickerOptions: { - shortcuts: [{ - text: '最近一周', - onClick(picker) { - const end = new Date(); - const start = new Date(); - start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); - picker.$emit('pick', [start, end]); - } - }, { - text: '最近一个月', - onClick(picker) { - const end = new Date(); - const start = new Date(); - start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); - picker.$emit('pick', [start, end]); - } - }, { - text: '最近三个月', - onClick(picker) { - const end = new Date(); - const start = new Date(); - start.setTime(start.getTime() - 3600 * 1000 * 24 * 90); - picker.$emit('pick', [start, end]); - } - }] + shortcuts: [ + { + text: "最近一周", + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); + picker.$emit("pick", [start, end]); + }, + }, + { + text: "最近一个月", + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); + picker.$emit("pick", [start, end]); + }, + }, + { + text: "最近三个月", + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 90); + picker.$emit("pick", [start, end]); + }, + }, + ], }, // 表单参数 form: {}, @@ -1206,6 +1211,13 @@ export default { this.getTeamList(); }, methods: { + //计算时间 结束维修时间-开始维修时间 + handleMouseout(){ + console.log("打印维修时间") + if(this.form.workEndTime != null && this.form.workStartTime != null){ + this.form.workCostTime = this.form.workEndTime - this.form.workStartTime; + } + }, // 填写维修记录步骤上一步 stepLast() { this.repairRecordSteps--; @@ -1223,7 +1235,6 @@ export default { this.loading = false; }); }, - /** 查询维修工单列表 */ getTeamList() { this.loading = true; @@ -1295,9 +1306,9 @@ export default { resetQuery() { this.resetForm("queryForm"); //计划维修时间组、计划停机时间组 - this.queryParams.workPlanTimeArray = [], - this.queryParams.workPlanDownTimeArray = [], - this.handleQuery(); + (this.queryParams.workPlanTimeArray = []), + (this.queryParams.workPlanDownTimeArray = []), + this.handleQuery(); }, // 多选框备品备件选中数据 handleSelectionSparePartsChange(selection) { diff --git a/src/views/device/repairOrder/selectSpareParts.vue b/src/views/device/repairOrder/selectSpareParts.vue index 9c018c2..1f5a6e6 100644 --- a/src/views/device/repairOrder/selectSpareParts.vue +++ b/src/views/device/repairOrder/selectSpareParts.vue @@ -7,9 +7,10 @@ plain icon="el-icon-plus" size="mini" - @click="handleAdd" + @click="handleSelectSparePartsLedger" v-hasPermi="['device:sparePartsApplicationRecord:add']" >新增 + - + + - -