diff --git a/src/api/plan/bpworkorder.js b/src/api/plan/bpworkorder.js
index 06db209..281df1a 100644
--- a/src/api/plan/bpworkorder.js
+++ b/src/api/plan/bpworkorder.js
@@ -85,6 +85,14 @@ export function delWorkorder(workorderId) {
});
}
+// 删除白坯湿料计划
+export function deleteWetMaterial(workorderId) {
+ return request({
+ url: '/plan/bppro/workorder/deleteWetMaterial/' + workorderId,
+ method: 'delete'
+ });
+}
+
//下发生产工单
export function downWorkorder(workorderId) {
return request({
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 4c345ec..fde35db 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -40,6 +40,18 @@
}}
+
+
+
+
+
+
+
+
+
+
@@ -138,6 +150,7 @@ import SizeSelect from "@/components/SizeSelect";
import Search from "@/components/HeaderSearch";
import RuoYiGit from "@/components/RuoYi/Git";
import RuoYiDoc from "@/components/RuoYi/Doc";
+import { getUnReadComment } from "@/api/visit/visitComment";
import {
listNotice,
getNotice,
@@ -164,6 +177,9 @@ export default {
single1: true,
// 非多个禁用
multiple1: true,
+ showPrise: false,
+ unReadComments: '您有0新的未读消息，请点击查看',
+ commentNum:0
};
},
created() {
@@ -281,6 +297,30 @@ export default {
window.location.reload();
});
},
+ /** 获取未读消息数 */
+ getUnReadList() {
+ console.log("++未读消息查询++");
+ getUnReadComment(this.queryParams).then(response => {
+ if(response>0){
+ this.unReadComments='您有'+response+'新的未读消息，请点击查看';
+ this.commentNum = response;
+ this.showPrise = true;
+ }else{
+ this.showPrise = false;
+ }
+ });
+ },
+ /** 跳转到【消息】 */
+ gotoComment() {
+ alert("301")
+ this.showPrise = false;
+ },
+ //先执行一次
+ this.getUnReadList()
+ // 实现轮询
+ this.timer = setInterval(() => {
+ setTimeout(this.getUnReadList(), 30000);
+ }, 30000);
},
};
diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue
index 1afb049..d7df7c5 100644
--- a/src/views/plan/workorder/index.vue
+++ b/src/views/plan/workorder/index.vue
@@ -202,9 +202,7 @@
-->
-
-
-
+
@@ -212,14 +210,14 @@
-
+
+
+
{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}
-
-
diff --git a/src/views/plan/workorderBP/index.vue b/src/views/plan/workorderBP/index.vue
index e46ac9a..e9c4189 100644
--- a/src/views/plan/workorderBP/index.vue
+++ b/src/views/plan/workorderBP/index.vue
@@ -80,16 +80,6 @@
-
设备修改
+
+ 湿料计划删除
+
@@ -633,7 +634,8 @@ import {
getOrderAndWork,getProSortNo,
getWorkBatchList,
subChangeWorkOrder,subChangeWorkOrderM,
- checkWorkOrder
+ checkWorkOrder,
+ deleteWetMaterial
} from '@/api/plan/bpworkorder'
import moment from 'moment';
import { getProEquipment, getProRoutes, getProShifts,selectMaterielList} from '@/api/plan/order'
@@ -1724,7 +1726,20 @@ export default {
this.splitForm.materialName = this.materielBP[0].productDescZh;
this.innerBPVisible = false;
- }
+ },
+ //删除湿料计划
+ deleteWetMaterial(row) {
+ const workorderIds = row.workorderId || this.ids;
+ const workorderCodes = row.workorderCode || this.codes;
+
+ this.$modal.confirm('是否确认删除生产工单编号为"' + workorderCodes + '"的湿料数据项？').then(function () {
+ return deleteWetMaterial(workorderIds);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("删除湿料计划成功");
+ }).catch(() => {
+ });
+ },
}
};