diff --git a/src/pages.json b/src/pages.json index 5c16e24..b99c452 100644 --- a/src/pages.json +++ b/src/pages.json @@ -8,106 +8,122 @@ "path": "pages/login/login/index", "style": { "navigationBarTitleText": "登录", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/shouye/index", "style": { "navigationBarTitleText": "首页", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/shouye/me", "style": { "navigationBarTitleText": "我的", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/wms/index", "style": { "navigationBarTitleText": "wms菜单", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/mes/index", "style": { "navigationBarTitleText": "mes菜单", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/equipment/index", "style": { "navigationBarTitleText": "设备管理", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/equipment/Inspection/index", "style": { "navigationBarTitleText": "巡检", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/equipment/Inspection/details", "style": { "navigationBarTitleText": "巡检详情", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/equipment/Inspection/detailsview", "style": { "navigationBarTitleText": "巡检查看", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/equipment/Spotcheck/index", "style": { "navigationBarTitleText": "点检", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/equipment/Upkeep/index", "style": { "navigationBarTitleText": "保养", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/equipment/Repair/index", "style": { "navigationBarTitleText": "维修", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/equipment/Repair/details", + "style": { + "navigationBarTitleText": "维修详情", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/equipment/Repair/repairing", + "style": { + "navigationBarTitleText": "维修中", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/equipment/Repair/Sparepartlist", + "style": { + "navigationBarTitleText": "备件申领", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, - // { - // "path": "pages/equipment/repair/index", - // "style": { - // "navigationBarTitleText": "报修", - // "navigationStyle": "custom", // 隐藏系统导航栏 - // "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 - // } - // }, { "path": "pages/index/index", "style": { @@ -120,148 +136,140 @@ "navigationBarTitleText": "演示" } }, - // { - // "path": "pages/login/area/index", - // "style": { - // "navigationBarTitleText": "登录区选择", - // "navigationStyle": "custom", // 隐藏系统导航栏 - // "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 - // } - // }, { "path": "pages/mes/ProductionQtyInsp/index", "style": { "navigationBarTitleText": "生产质检", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/mes/ProductionQtyInsp/listdata", "style": { "navigationBarTitleText": "生产质检", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/mes/ProductionQtyInsp/detail", "style": { "navigationBarTitleText": "生产质检详细", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/wms/Raw/ReceiveSRM/index", "style": { "navigationBarTitleText": "采购收货SRM", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/wms/Raw/ReceiveSRM/detail", "style": { "navigationBarTitleText": "采购收货SRM详细", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/wms/Raw/ReceivePO/index", "style": { "navigationBarTitleText": "采购收货PO", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/wms/Raw/ReceivePO/detail", "style": { "navigationBarTitleText": "采购收货PO详细", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/wms/Raw/PurchaseWHSRM/index", "style": { "navigationBarTitleText": "采购入库SRM", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/wms/Raw/PurchaseWHSRM/detail", "style": { "navigationBarTitleText": "采购入库SRM详细", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/wms/Raw/PurchaseWHPO/index", "style": { "navigationBarTitleText": "采购入库PO", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/wms/Raw/PurchaseWHPO/detail", "style": { "navigationBarTitleText": "采购入库PO详细", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/wms/Raw/Requisition/index", "style": { "navigationBarTitleText": "生产领料", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/wms/product/SaleOutWH/index", "style": { "navigationBarTitleText": "成品销售出库", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/wms/product/OfflineStorage/index", "style": { "navigationBarTitleText": "成品下线入库", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/mes/PalletChange/index", "style": { "navigationBarTitleText": "下机台设置", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/mes/ChangePalletNew/index", "style": { "navigationBarTitleText": "托盘变更", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/mes/Pallethandling/index", "style": { "navigationBarTitleText": "异常托盘处理", - "navigationStyle": "custom", // 隐藏系统导航栏 - "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一 + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } } ], diff --git a/src/pages/equipment/Repair/Sparepartlist.vue b/src/pages/equipment/Repair/Sparepartlist.vue new file mode 100644 index 0000000..6c6e18b --- /dev/null +++ b/src/pages/equipment/Repair/Sparepartlist.vue @@ -0,0 +1,347 @@ + + + diff --git a/src/pages/equipment/Repair/details.vue b/src/pages/equipment/Repair/details.vue new file mode 100644 index 0000000..d048851 --- /dev/null +++ b/src/pages/equipment/Repair/details.vue @@ -0,0 +1,583 @@ + + + + diff --git a/src/pages/equipment/Repair/index.vue b/src/pages/equipment/Repair/index.vue index 7f35bc5..4f7e5de 100644 --- a/src/pages/equipment/Repair/index.vue +++ b/src/pages/equipment/Repair/index.vue @@ -5,7 +5,7 @@ - 巡检 + 维修 @@ -52,10 +52,10 @@ export default class ChangePalletNew extends BasePage { model = model; list: any = [ { - cate_name: '今日任务', + cate_name: '待处理', }, { - cate_name: '巡检记录', + cate_name: '维修记录', }, ]; current: any = 0; @@ -80,18 +80,18 @@ export default class ChangePalletNew extends BasePage { productCodelocList: any = {}; detailsdataceshi: any = [ { - itemq: '巡检任务1', - item2: '已巡检', + itemq: '维修任务1', + item2: '已维修', item3: '2023-08-01 - 2023-08-31', - item4: '每月巡检', + item4: '每月维修', item5: 'XXXXX', item6: '未发现异常', }, { - itemq: '巡检任务1', - item2: '已巡检', + itemq: '维修任务1', + item2: '已维修', item3: '2023-08-01 - 2023-08-31', - item4: '每月巡检', + item4: '每月维修', item5: 'XXXXX', item6: '未发现异常', }, @@ -134,14 +134,14 @@ export default class ChangePalletNew extends BasePage { } linkdetails(item) { uni.navigateTo({ - url: `/pages/equipment/Inspection/details?listitem=` + encodeURIComponent(JSON.stringify(item)), + url: `/pages/equipment/Repair/details?listitem=` + encodeURIComponent(JSON.stringify(item)), }); } linkdetailscheck(item) { this.ischecked = true; item.ischecked = true; uni.navigateTo({ - url: `/pages/equipment/Inspection/detailsview?listitem=` + encodeURIComponent(JSON.stringify(item)), + url: `/pages/equipment/Repair/detailsview?listitem=` + encodeURIComponent(JSON.stringify(item)), }); } } diff --git a/src/pages/equipment/Repair/model.ts b/src/pages/equipment/Repair/model.ts index 2425a39..662900d 100644 --- a/src/pages/equipment/Repair/model.ts +++ b/src/pages/equipment/Repair/model.ts @@ -2,6 +2,7 @@ import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decor import store from '@/store'; import http from '@/utils/request'; import { url } from '@/utils/url'; +import { session } from '@/store/modules/session'; @Module({ namespaced: true, dynamic: true, @@ -9,6 +10,7 @@ import { url } from '@/utils/url'; name: 'page.mes.PalletChange', }) export class ChangePalletNew extends VuexModule { + rowdata: any; orderNoItemList: any = []; getTaskRecordList: any = []; @MutationAction @@ -49,6 +51,21 @@ export class ChangePalletNew extends VuexModule { const SubmitCode: [] = result.code; return { SubmitCode }; } + Checklist: any = []; + @MutationAction + async queryhandChecklist() { + const result: any = await http.get(url.lanjumes.product.queryhandChecklist, { + //loginName: session.loginName, + params: { + factoryCode: session.FactoryCode, + createBy: session.user?.loginName, + }, + }); + const Checklist: any = result.rows; + console.log('this.tableData', Checklist); + // debugger + return { Checklist }; + } } export default getModule(ChangePalletNew); diff --git a/src/pages/equipment/Repair/repairing.vue b/src/pages/equipment/Repair/repairing.vue new file mode 100644 index 0000000..0ff57a5 --- /dev/null +++ b/src/pages/equipment/Repair/repairing.vue @@ -0,0 +1,679 @@ + + + + diff --git a/src/pages/mes/Pallethandling/index.vue b/src/pages/mes/Pallethandling/index.vue index 21a38db..4b5c43e 100644 --- a/src/pages/mes/Pallethandling/index.vue +++ b/src/pages/mes/Pallethandling/index.vue @@ -225,11 +225,11 @@ export default class ChangePalletNew extends BasePage { }; await this.model.palletInforUpdate(params); if (model.SubmitCode.code == 200) { - this.uni.showToast({ title: '成功' }); - this.Clear(); + this.uni.showToast({ title: '成功' }); //成功弹窗 + this.Clear(); //清除数据 } else { (this.$refs.uToast as any).show({ - title: model.SubmitCode.msg, + title: model.SubmitCode.message, //错误信息展示 type: 'default', }); } @@ -282,7 +282,7 @@ export default class ChangePalletNew extends BasePage { this.isshow = false; } else { (this.$refs.uToast as any).show({ - title: model.SubmitCode.msg, + title: model.SubmitCode.message, type: 'default', }); this.isshow = false; diff --git a/src/static/images/add.png b/src/static/images/add.png new file mode 100644 index 0000000..4e57af9 Binary files /dev/null and b/src/static/images/add.png differ