From 43c639ff731b6bfaa050dc923a5b09413fe25457 Mon Sep 17 00:00:00 2001
From: "LAPTOP-R6EHHS26\\86155" <2217640373@qq.com>
Date: Mon, 13 Nov 2023 16:21:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=BE=E5=A4=87=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages.json | 48 +
src/pages/equipment/Inspection/details.vue | 5 +-
.../equipment/Inspection/detailsview.vue | 2 +-
src/pages/equipment/Inspection/model.ts | 7 +-
src/pages/equipment/Repair/Sparepartlist.vue | 910 ++++++++++++-
src/pages/equipment/Repair/details.vue | 27 +-
src/pages/equipment/Repair/index.vue | 45 +-
src/pages/equipment/Repair/model.ts | 26 +-
src/pages/equipment/Repair/repairing.vue | 239 +++-
src/pages/equipment/Repair/repairingview.vue | 848 ++++++++++++
src/pages/equipment/Repairbx/index.vue | 557 ++++++++
src/pages/equipment/Repairbx/model.ts | 34 +
src/pages/equipment/Spotcheck/details.vue | 6 +-
src/pages/equipment/Spotcheck/detailsview.vue | 4 +-
src/pages/equipment/Spotcheck/index.vue | 6 +-
src/pages/equipment/Spotcheck/model.ts | 7 +-
src/pages/equipment/Upkeep/Sparepartlist.vue | 1133 +++++++++++++++++
src/pages/equipment/Upkeep/details.vue | 583 +++++++++
src/pages/equipment/Upkeep/index.vue | 340 +++--
src/pages/equipment/Upkeep/model.ts | 94 +-
src/pages/equipment/Upkeep/repairing.vue | 848 ++++++++++++
src/pages/equipment/Upkeep/repairingview.vue | 848 ++++++++++++
src/pages/mes/Pallethandling/index.vue | 1 +
src/pages/mes/Pallethandling/model.ts | 2 +-
src/pages/shouye/me.vue | 2 +-
src/utils/request.ts | 12 +-
src/utils/url.ts | 25 +-
vue.config.js | 4 +-
28 files changed, 6251 insertions(+), 412 deletions(-)
create mode 100644 src/pages/equipment/Repair/repairingview.vue
create mode 100644 src/pages/equipment/Repairbx/index.vue
create mode 100644 src/pages/equipment/Repairbx/model.ts
create mode 100644 src/pages/equipment/Upkeep/Sparepartlist.vue
create mode 100644 src/pages/equipment/Upkeep/details.vue
create mode 100644 src/pages/equipment/Upkeep/repairing.vue
create mode 100644 src/pages/equipment/Upkeep/repairingview.vue
diff --git a/src/pages.json b/src/pages.json
index b99c452..128c744 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -84,6 +84,22 @@
"navigationBarTextStyle": "white"
}
},
+ {
+ "path": "pages/equipment/Spotcheck/details",
+ "style": {
+ "navigationBarTitleText": "点检详情",
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/equipment/Spotcheck/detailsview",
+ "style": {
+ "navigationBarTitleText": "点检查看",
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "white"
+ }
+ },
{
"path": "pages/equipment/Upkeep/index",
"style": {
@@ -92,6 +108,30 @@
"navigationBarTextStyle": "white"
}
},
+ {
+ "path": "pages/equipment/Upkeep/details",
+ "style": {
+ "navigationBarTitleText": "保养详情",
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/equipment/Upkeep/repairing",
+ "style": {
+ "navigationBarTitleText": "保养中",
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "white"
+ }
+ },
+ {
+ "path": "pages/equipment/Upkeep/Sparepartlist",
+ "style": {
+ "navigationBarTitleText": "保养申领",
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "white"
+ }
+ },
{
"path": "pages/equipment/Repair/index",
"style": {
@@ -124,6 +164,14 @@
"navigationBarTextStyle": "white"
}
},
+ {
+ "path": "pages/equipment/Repairbx/index",
+ "style": {
+ "navigationBarTitleText": "报修",
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "white"
+ }
+ },
{
"path": "pages/index/index",
"style": {
diff --git a/src/pages/equipment/Inspection/details.vue b/src/pages/equipment/Inspection/details.vue
index b6e67db..878a428 100644
--- a/src/pages/equipment/Inspection/details.vue
+++ b/src/pages/equipment/Inspection/details.vue
@@ -45,7 +45,7 @@
检查标准: {{ item1.standardName }}
实际值:
-
+
单位:mm
@@ -385,8 +385,9 @@ export default class ChangePalletNew extends BasePage {
} else {
(this.$refs.uToast as any).show({
title: '失败请扫码正确条码',
- type: 'error',
+ type: 'default',
});
+ this.isaccord = false;
}
}
}
diff --git a/src/pages/equipment/Inspection/detailsview.vue b/src/pages/equipment/Inspection/detailsview.vue
index 4368475..864c513 100644
--- a/src/pages/equipment/Inspection/detailsview.vue
+++ b/src/pages/equipment/Inspection/detailsview.vue
@@ -44,7 +44,7 @@
检查标准: {{ item1.standardName }}
实际值:
-
+
单位:mm
diff --git a/src/pages/equipment/Inspection/model.ts b/src/pages/equipment/Inspection/model.ts
index 2425a39..b96231a 100644
--- a/src/pages/equipment/Inspection/model.ts
+++ b/src/pages/equipment/Inspection/model.ts
@@ -6,17 +6,21 @@ import { url } from '@/utils/url';
namespaced: true,
dynamic: true,
store,
- name: 'page.mes.PalletChange',
+ name: 'page.equipment.Inspection',
})
export class ChangePalletNew extends VuexModule {
orderNoItemList: any = [];
getTaskRecordList: any = [];
@MutationAction
+ // 点检:spotInspection
+ // 巡检:inspection
+ // 保养:maintenance
async getTodayTask(userId: any) {
const result: any = await http.get(url.lanjuequipment.product.Inspection.getTodayTask, {
//loginName: session.loginName,
params: {
userId: userId,
+ planType: 'inspection',
},
});
const orderNoItemList = result.data;
@@ -28,6 +32,7 @@ export class ChangePalletNew extends VuexModule {
//loginName: session.loginName,
params: {
userId: userId,
+ planType: 'inspection',
},
});
const getTaskRecordList = result.data;
diff --git a/src/pages/equipment/Repair/Sparepartlist.vue b/src/pages/equipment/Repair/Sparepartlist.vue
index 6c6e18b..3f276f0 100644
--- a/src/pages/equipment/Repair/Sparepartlist.vue
+++ b/src/pages/equipment/Repair/Sparepartlist.vue
@@ -4,9 +4,14 @@
- 生产质检
+ 备件申领
+
+ 备件名称:
+
+
+
@@ -14,14 +19,15 @@
- 质检
+ 确定
- 详细查看
+ 返回
+
diff --git a/src/pages/equipment/Repair/repairingview.vue b/src/pages/equipment/Repair/repairingview.vue
new file mode 100644
index 0000000..ec57d3d
--- /dev/null
+++ b/src/pages/equipment/Repair/repairingview.vue
@@ -0,0 +1,848 @@
+
+
+
+
+
+
+
+
报修信息
+
+
报修人: {{ detailsinfolist.equipmentCode }}
+
+
+
+
保修时间: {{ detailsinfolist.equipmentCode }}
+
+
+
+
故障时间: {{ detailsinfolist.equipmentCode }}
+
+
+
+
报修来源: {{ detailsinfolist.equipmentCode }}
+
+
+
+
故障时间: {{ detailsinfocontent.planWorkshop }}
+
+
+
+
是否立即维修: {{ detailsinfocontent.planWorkshop }}
+
+
+
+
联系方式: {{ detailsinfocontent.planWorkshop }}
+
+
+
+
故障描述: {{ detailsinfocontent.planWorkshop }}
+
+
+
+
+
+
+
+
+
+ 检查项: {{ item.itemName }}
+ 检查方法: {{ item.itemMethod }}
+
+
+
检查标准: {{ item1.standardName }}
+
+
+
+ {{ n.name }}
+
+
+
+
+
+
检查标准: {{ item1.standardName }}
+
+ 实际值:
+
+ 单位:mm
+
+
+
+
+
+
+
+
+
备件申领单
+
+
件编码: {{ detailsinfolist.equipmentCode }}
+
+
+
+
备件名称: {{ detailsinfolist.equipmentCode }}
+
+
+
+
申请数量: {{ detailsinfolist.equipmentCode }}
+
+
+
+
备件费用: {{ detailsinfolist.equipmentCode }}
+
+
+
+
申请人: {{ detailsinfocontent.planWorkshop }}
+
+
+
+
申请时间: {{ detailsinfocontent.planWorkshop }}
+
+
+
+
审核人: {{ detailsinfocontent.planWorkshop }}
+
+
+
+
审核时间: {{ detailsinfocontent.planWorkshop }}
+
+
+
+
+
+
+
维修单
+
+
+ {{ detailsinfolist.equipmentCode }}
+
+
+
+
+
+
+ {{ n.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加照片
+
+
+
+
+
+
+
提交
+
+
+
+
+
+
点检人: 刘XX
+
点检时间: 2023-08-09
+
+
+
是否异常: 是
+
报修单: 90272931234
+
+
+
+
+
+
检查标准:{{ form.item5 }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加照片
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/equipment/Repairbx/index.vue b/src/pages/equipment/Repairbx/index.vue
new file mode 100644
index 0000000..ed09e1e
--- /dev/null
+++ b/src/pages/equipment/Repairbx/index.vue
@@ -0,0 +1,557 @@
+
+
+
+
+
+
+
+
+ 条码:
+
+
+
+ 查询
+
+
+
+
+
+
+
+
设备编码:{{ formdata.equipmentCode }}
+
设备名称:{{ formdata.equipmentName }}
+
+
+
位置:{{ formdata.equipmentLocation }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加照片
+
+
+
+
+
+
+
+
+
+
+
+
+ 提交
+
+
+
+ 返回
+
+
+
+
+
+
+
+
diff --git a/src/pages/equipment/Repairbx/model.ts b/src/pages/equipment/Repairbx/model.ts
new file mode 100644
index 0000000..50e1f0a
--- /dev/null
+++ b/src/pages/equipment/Repairbx/model.ts
@@ -0,0 +1,34 @@
+import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
+import store from '@/store';
+import http from '@/utils/request';
+import { url } from '@/utils/url';
+@Module({
+ namespaced: true,
+ dynamic: true,
+ store,
+ name: 'page.equipment.Repairbx',
+})
+export class ChangePalletNew extends VuexModule {
+ orderNoItemList: any = [];
+ @MutationAction
+ async queryOrderNo(orderNo: any) {
+ const result: any = await http.get(url.lanjuequipment.product.Repairbx.getInfoRepair + orderNo);
+ const orderNoItemList = result.data;
+ return { orderNoItemList };
+ }
+ @MutationAction
+ async empty() {
+ const orderNoItemList = [];
+ return { orderNoItemList };
+ }
+ SubmitCode: any = '';
+ //托盘信息变更x
+ @MutationAction
+ async addRepairRecord(params: any) {
+ const result: any = await http.post(url.lanjuequipment.product.Repairbx.addRepairRecord, params);
+ const SubmitCode = result;
+ return { SubmitCode };
+ }
+}
+
+export default getModule(ChangePalletNew);
diff --git a/src/pages/equipment/Spotcheck/details.vue b/src/pages/equipment/Spotcheck/details.vue
index b4bfb5e..761ed21 100644
--- a/src/pages/equipment/Spotcheck/details.vue
+++ b/src/pages/equipment/Spotcheck/details.vue
@@ -5,7 +5,7 @@
- 巡检详情
+ 点检详情
@@ -45,7 +45,7 @@
检查标准: {{ item1.standardName }}
实际值:
-
+
单位:mm
@@ -91,7 +91,7 @@
+
diff --git a/src/pages/equipment/Upkeep/details.vue b/src/pages/equipment/Upkeep/details.vue
new file mode 100644
index 0000000..7af3e70
--- /dev/null
+++ b/src/pages/equipment/Upkeep/details.vue
@@ -0,0 +1,583 @@
+
+
+
+
+
+
+
+
+
工单号: {{ detailsinfolist.orderCode }}
+
+
设备编码: {{ detailsinfolist.equipmentCode }}
+
设备名称: {{ detailsinfolist.equipmentName }}
+
+
+
车间: {{ detailsinfocontent.planWorkshop }}
+
工作中心: {{ detailsinfocontent.workCenterName }}
+
+
+
+
+
+
+
+
+ 检查项: {{ item.itemName }}
+ 检查方法: {{ item.itemMethod }}
+
+
+
检查标准: {{ item1.standardName }}
+
+
+
+ {{ n.name }}
+
+
+
+
+
+
检查标准: {{ item1.standardName }}
+
+ 实际值:
+
+ 单位:mm
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/equipment/Upkeep/index.vue b/src/pages/equipment/Upkeep/index.vue
index 3c3e3f0..b17bc85 100644
--- a/src/pages/equipment/Upkeep/index.vue
+++ b/src/pages/equipment/Upkeep/index.vue
@@ -5,61 +5,33 @@
- 托盘变更
+ 维修
-
-
-
-
- rfid:
-
-
-
- 查询
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 确定
-
-
-
- 返回
-
-
+
+
+
+
工单号: {{ item.planCode }}
+
{{ item.orderStatus == 0 ? '进行中' : item.orderStatus == 1 ? '已完成' : '已逾期' }}
+
+
+ 车间编码: {{ item.planWorkshop }}
+ 周期: {{ item.planLoop }}
+ 循环执行时间开始: {{ item.planLoopStart }}
+ 循环执行时间结束: {{ item.planLoopEnd }}
+
+
+
+
+
工单号: {{ item.planCode }}
+
{{ item.orderStatus == 0 ? '进行中' : item.orderStatus == 1 ? '已完成' : '已逾期' }}
+
+
+ 车间编码: {{ item.planWorkshop }}
+ 周期: {{ item.planLoop }}
+ 循环执行时间开始: {{ item.planLoopStart }}
+ 循环执行时间结束: {{ item.planLoopEnd }}
-
diff --git a/src/pages/equipment/Upkeep/repairingview.vue b/src/pages/equipment/Upkeep/repairingview.vue
new file mode 100644
index 0000000..ec57d3d
--- /dev/null
+++ b/src/pages/equipment/Upkeep/repairingview.vue
@@ -0,0 +1,848 @@
+
+
+
+
+
+
+
+
报修信息
+
+
报修人: {{ detailsinfolist.equipmentCode }}
+
+
+
+
保修时间: {{ detailsinfolist.equipmentCode }}
+
+
+
+
故障时间: {{ detailsinfolist.equipmentCode }}
+
+
+
+
报修来源: {{ detailsinfolist.equipmentCode }}
+
+
+
+
故障时间: {{ detailsinfocontent.planWorkshop }}
+
+
+
+
是否立即维修: {{ detailsinfocontent.planWorkshop }}
+
+
+
+
联系方式: {{ detailsinfocontent.planWorkshop }}
+
+
+
+
故障描述: {{ detailsinfocontent.planWorkshop }}
+
+
+
+
+
+
+
+
+
+ 检查项: {{ item.itemName }}
+ 检查方法: {{ item.itemMethod }}
+
+
+
检查标准: {{ item1.standardName }}
+
+
+
+ {{ n.name }}
+
+
+
+
+
+
检查标准: {{ item1.standardName }}
+
+ 实际值:
+
+ 单位:mm
+
+
+
+
+
+
+
+
+
备件申领单
+
+
件编码: {{ detailsinfolist.equipmentCode }}
+
+
+
+
备件名称: {{ detailsinfolist.equipmentCode }}
+
+
+
+
申请数量: {{ detailsinfolist.equipmentCode }}
+
+
+
+
备件费用: {{ detailsinfolist.equipmentCode }}
+
+
+
+
申请人: {{ detailsinfocontent.planWorkshop }}
+
+
+
+
申请时间: {{ detailsinfocontent.planWorkshop }}
+
+
+
+
审核人: {{ detailsinfocontent.planWorkshop }}
+
+
+
+
审核时间: {{ detailsinfocontent.planWorkshop }}
+
+
+
+
+
+
+
维修单
+
+
+ {{ detailsinfolist.equipmentCode }}
+
+
+
+
+
+
+ {{ n.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加照片
+
+
+
+
+
+
+
提交
+
+
+
+
+
+
点检人: 刘XX
+
点检时间: 2023-08-09
+
+
+
是否异常: 是
+
报修单: 90272931234
+
+
+
+
+
+
检查标准:{{ form.item5 }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加照片
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/mes/Pallethandling/index.vue b/src/pages/mes/Pallethandling/index.vue
index 4b5c43e..f1dac5d 100644
--- a/src/pages/mes/Pallethandling/index.vue
+++ b/src/pages/mes/Pallethandling/index.vue
@@ -226,6 +226,7 @@ export default class ChangePalletNew extends BasePage {
await this.model.palletInforUpdate(params);
if (model.SubmitCode.code == 200) {
this.uni.showToast({ title: '成功' }); //成功弹窗
+ this.model.getDictList();
this.Clear(); //清除数据
} else {
(this.$refs.uToast as any).show({
diff --git a/src/pages/mes/Pallethandling/model.ts b/src/pages/mes/Pallethandling/model.ts
index b508260..7c10a6e 100644
--- a/src/pages/mes/Pallethandling/model.ts
+++ b/src/pages/mes/Pallethandling/model.ts
@@ -7,7 +7,7 @@ import { session } from '@/store/modules/session';
namespaced: true,
dynamic: true,
store,
- name: 'page.mes.PalletChangeNew',
+ name: 'page.mes.Pallethandling',
})
export class ChangePalletNew extends VuexModule {
orderNoItemList: any = [];
diff --git a/src/pages/shouye/me.vue b/src/pages/shouye/me.vue
index 915ecf5..d7e15dd 100644
--- a/src/pages/shouye/me.vue
+++ b/src/pages/shouye/me.vue
@@ -65,7 +65,7 @@ export default class RawHome extends BasePage {
model = model;
src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg';
today = dayjs().format('YYYY-MM-DD dddd');
- version = '0.0.9';
+ version = '0.0.10';
checkversion: any = {};
onLoad() {
// this.model.getMenuList();
diff --git a/src/utils/request.ts b/src/utils/request.ts
index f3a13a1..c5c8d54 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -23,11 +23,11 @@ http.interceptors.request.use(
(config: any) => {
//console.log('123456',config)
//生产请将注释解开重要重要
- // if (config.url.includes('/api')) {
- // config.baseURL = 'http://192.168.202.23:5001';
- // } else {
- // config.baseURL = 'http://192.168.202.34:30000';
- // }
+ if (config.url.includes('/api')) {
+ config.baseURL = 'http://192.168.202.23:5001';
+ } else {
+ config.baseURL = 'http://192.168.202.34:30000';
+ }
// 所有请求默认提示加载中
if (!loading) {
uni.showLoading({ title: '加载中' });
@@ -36,7 +36,7 @@ http.interceptors.request.use(
}
// 在请求发送之前做一些处理
config.header['Referrer-Policy'] = 'strict-origin-when-cross-origin';
- config.header['poolName'] = session.PoolName;
+ // config.header['poolName'] = 'ds_1000';
try {
const token = session.user.access_token; //store.state.session.accessToken;
if (token) {
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 9dcbcfb..2ab88fa 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -78,20 +78,21 @@ export const url = {
// 提交巡检工单详情信息
updateInspectionRecord: qianzhuione + '/device/devicePDA/updateInspectionRecord',
},
- // 销售出库/sellout/showProduceCode/ /sellout/s/订单号/产品编码
-
- SaleOutWH: {
+ // 报修
+ Repairbx: {
// 根据交货单号查询下面的产品编码
- showProduceCode: qianzhuione + '/wms/sellout/showProduceCode',
+ getInfoRepair: qianzhuione + '/device/devicePDA/queryEquipment/',
// 根据订单号和产品编码查询
- queryinformation: qianzhuione + '/wms/sellout/s',
- // 扫描箱码接口
- selloutconntray: qianzhuione + '/wms/selloutconntray',
- deleteTray: qianzhuione + '/wms/selloutconntray/deleteTray',
- // 根据交货单号和产品编码查询展示接口
- showTrays: qianzhuione + '/wms/selloutconntray/showTrays',
- // 手持出库确认
- out: qianzhuione + '/wms/selloutconntray/out',
+ addRepairRecord: qianzhuione + '/device/devicePDA/addRepairRecord',
+ },
+ // 维修
+ Repair: {
+ // 获取今日任务 获取历史记录
+ getTodayTask: qianzhuione + '/device/devicePDA/getMaintenanceRecords',
+ // 获取历史记录
+ getTaskRecord: qianzhuione + '/device/devicePDA/getMaintenanceRecords',
+ // 获取历史记录
+ selectPdaRepairWorkOrderDetails: qianzhuione + '/device/devicePDA/selectPdaRepairWorkOrderDetails',
},
},
},
diff --git a/vue.config.js b/vue.config.js
index dcac11a..30d530f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -12,8 +12,8 @@ module.exports = {
// },
},
'/dev-api': {
- target: 'http://192.168.3.93:8080',
- //target: 'http://192.168.3.231:8080',
+ // target: 'http://192.168.3.66:8080',
+ target: 'http://192.168.3.231:8080',
changeOrigin: true,
pathRewrite: {
'^/dev-api': '',