diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml
index 383637f..eb92165 100644
--- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml
+++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml
@@ -82,7 +82,7 @@
and bmi.erp_id = #{erpId}
- and bmi.material_code = #{materialCode}
+ and bmi.material_code like concat('%', #{materialCode},'%')
and bmi.old_material_code = #{oldMaterialCode}
and bmi.material_name like concat('%', #{materialName},
diff --git a/hw-modules/hw-system/src/main/java/com/hw/system/controller/SysNoticeController.java b/hw-modules/hw-system/src/main/java/com/hw/system/controller/SysNoticeController.java
index 63c257d..4592e5b 100644
--- a/hw-modules/hw-system/src/main/java/com/hw/system/controller/SysNoticeController.java
+++ b/hw-modules/hw-system/src/main/java/com/hw/system/controller/SysNoticeController.java
@@ -98,10 +98,11 @@ public class SysNoticeController extends BaseController
* @return
*/
@GetMapping("/workshopNoticeList")
- public AjaxResult workshopNoticeList(SysNotice notice)
+ public TableDataInfo workshopNoticeList(SysNotice notice)
{
+ startPage();
List list = noticeService.workshopNoticeList(notice);
- return success(list);
+ return getDataTable(list);
}
/**
diff --git a/hw-modules/hw-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/hw-modules/hw-system/src/main/resources/mapper/system/SysNoticeMapper.xml
index cd0e3f1..9999d76 100644
--- a/hw-modules/hw-system/src/main/resources/mapper/system/SysNoticeMapper.xml
+++ b/hw-modules/hw-system/src/main/resources/mapper/system/SysNoticeMapper.xml
@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND b.user_id = #{userId}
-
+
AND b.check_status = #{checkStatus}
diff --git a/hw-ui/src/components/workshopNotice/index.vue b/hw-ui/src/components/workshopNotice/index.vue
index dd163da..0c112a6 100644
--- a/hw-ui/src/components/workshopNotice/index.vue
+++ b/hw-ui/src/components/workshopNotice/index.vue
@@ -1,42 +1,99 @@
-
-
-
-
-
- {{ noticeListData.noticeTitle }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/hw-ui/src/utils/notice.js b/hw-ui/src/utils/notice.js
index 56303b4..912f98c 100644
--- a/hw-ui/src/utils/notice.js
+++ b/hw-ui/src/utils/notice.js
@@ -13,9 +13,15 @@ export const noticeData = {
};
},
mounted() {
- setInterval(() => {
+ setInterval(() => this.workshopNoticeTasks(), 60 * 1000)
+ },
+ methods: {
+ workshopNoticeTasks() {
+ if (this.notificationInstance) {
+ this.notificationInstance.close(); // 手动关闭通知
+ }
workshopNoticeList({noticeType: '1', checkStatus: '0'}).then(res => {
- this.noticeList = res.data;
+ this.noticeList = res.rows;
if (this.noticeList.length > 0) {
this.notificationInstance = this.$notify.info({
title: '通知',
@@ -35,9 +41,9 @@ export const noticeData = {
});
}
});
- }, 60 * 1000)
- },
- methods: {
+ },
+
+ //点击查看弹窗逻辑
handleNotificationClick() {
this.noticeListData = this.noticeList[0];
let userNotice = this.noticeListData.sysUserNoticeList[0];
@@ -51,7 +57,7 @@ export const noticeData = {
this.notificationInstance.close(); // 手动关闭通知
}
},
- }
+ },
};
diff --git a/hw-ui/src/views/mes/materialBom/index.vue b/hw-ui/src/views/mes/materialBom/index.vue
index 2a97a5b..7a972f5 100644
--- a/hw-ui/src/views/mes/materialBom/index.vue
+++ b/hw-ui/src/views/mes/materialBom/index.vue
@@ -202,7 +202,7 @@
-
+
{
- this.baseMaterialTypeOptions = [];
- const data = {matrialTypeId: 0, typeName: '顶级节点', children: []};
- data.children = this.handleTree(response.data, "matrialTypeId", "parentId");
- this.baseMaterialTypeOptions.push(data);
+ this.baseMaterialTypeOptions = this.handleTree(response.data, "matrialTypeId", "parentId");
});
},
/** 删除按钮操作 */
diff --git a/hw-ui/src/views/mes/processInfo/index.vue b/hw-ui/src/views/mes/processInfo/index.vue
index 8708da4..dd28e16 100644
--- a/hw-ui/src/views/mes/processInfo/index.vue
+++ b/hw-ui/src/views/mes/processInfo/index.vue
@@ -85,6 +85,7 @@
+
{{ formatDayHourMinutes(scope.row.productionTime) }}
@@ -128,6 +129,7 @@
size="mini"
type="text"
icon="el-icon-s-check"
+ v-if="scope.row.processType !== '3'"
@click="handleUserUpdate(scope.row)"
>关联人员
@@ -163,6 +165,9 @@
>
+
+
+
@@ -362,6 +367,7 @@ export default {
processCode: null,
processName: null,
processType: null,
+ processFloor: null,
productionTime: null,
activeFlag: null,
remark: null,
@@ -392,6 +398,7 @@ export default {
{key: 8, label: `创建时间`, visible: true},
{key: 9, label: `更新人`, visible: false},
{key: 10, label: `更新时间`, visible: true},
+ {key: 11, label: `所在楼层`, visible: true},
],
//产线选项
prodLineList: [],
@@ -433,6 +440,7 @@ export default {
processName: null,
processType: null,
productionTime: null,
+ processFloor: null,
productionTimeDays: 0,
productionTimeHours: 0,
productionTimeMinutes: 0,
@@ -618,8 +626,13 @@ export default {
},
//在选择下拉列表时赋username的值
- handleSelectUser(){
- const selected = this.userList.find(option => option.value === newValue);
+ handleSelectUser(row){
+ const selectedUser = this.userList.find(user => user.userId === row.userId);
+ if (selectedUser) {
+ row.userName = selectedUser.nickName;
+ } else {
+ row.userName = null;
+ }
},
/** 工序关联人员删除按钮操作 */