白坯工单，删除湿料计划按钮

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({

src/layout/components/Navbar.vue

@@ -40,6 +40,18 @@
 	          }}
 	        </span>
         </el-tooltip>
+
+        <el-tooltip :content="unReadComments" effect="dark" v-if="showPrise">
+          <el-badge :value="commentNum" class="item" style="margin-right: 10px;">
+            <i class="el-icon-bell right-menu-item hover-effect" 
+            style="line-height: 50px;color:#FF4D4F;font-size: 25px;padding-right: 0px;margin-top: -9px;" 
+            @click="gotoComment"></i> 
+          </el-badge>
+        </el-tooltip>
+        <el-tooltip :content="unReadComments" effect="dark" v-else>
+            <i class="el-icon-bell right-menu-item hover-effect" style="line-height: 50px;color:grey;font-size: 25px;" @click="gotoComment"></i> 
+        </el-tooltip> 
+
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
         <el-tooltip content="布局大小" effect="dark" placement="bottom">
@@ -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); 
   },
 };
 </script>

src/views/plan/workorder/index.vue

@@ -202,9 +202,7 @@
       </el-table-column>-->
       <el-table-column width="120" label="派工数量" align="center" prop="quantitySplit"/>
       <el-table-column width="50" label="单位" align="center" prop="unit"/>
-      <el-table-column width="150" label="工艺编码" align="center" prop="routeCode"/>
-      <el-table-column width="200" label="工艺名称" align="center" prop="routeName" :show-overflow-tooltip="true"/>
-      <!-- show-overflow-tooltip -->
+      <el-table-column width="130" label="产线设备编码" align="center" prop="prodLineCode" v-if="false"/>
       <el-table-column width="300" label="产线设备"  align="center" >
         <template slot-scope="scope">
           <el-popover width="250" placement="top-start" trigger="hover" :content="scope.row.prodLineName">
@@ -212,14 +210,14 @@
           </el-popover>
         </template>
       </el-table-column>
-      <el-table-column width="130" label="产线设备编码" align="center" prop="prodLineCode" v-if="false"/>
+      <el-table-column label="班次" align="center" prop="shiftId" :formatter="shiftFormat"/>
+      <el-table-column width="150" label="工艺编码" align="center" prop="routeCode"/>
+      <el-table-column width="200" label="工艺名称" align="center" prop="routeName" :show-overflow-tooltip="true"/>
       <el-table-column width="120" label="工单生产日期" align="center" prop="productDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="班次" align="center" prop="shiftId" :formatter="shiftFormat">
-      </el-table-column>
 
       <el-table-column label="工单状态" align="center" prop="status">
         <template slot-scope="scope">

src/views/plan/workorderBP/index.vue

@@ -80,16 +80,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <!--<el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['mes:bppro:workorder:add']"
-        >上传SAP生产</el-button>
-      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -173,6 +163,17 @@
         >设备修改
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="deleteWetMaterial"
+          v-hasPermi="['mes:bppro:workorder:edit']"
+        >湿料计划删除</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -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(() => {
+      });
+    },
   }
 };
 </script>