tijiao

hb_client/src/api/inm.js

@@ -61,6 +61,14 @@ export function getfifoList(query) {
   })
 }
 //出入库记录删除
+export function deleteFifo(id, data) {
+  return request({
+    url: `/inm/fifo/${id}/`,
+    method: 'delete',
+    data
+  })
+}
+//出入库记录删除
 export function deleteFifoitem(id, data) {
   return request({
     url: `/inm/fifoitem/${id}/`,

hb_client/src/views/inm/fifo.vue

@@ -234,6 +234,7 @@ import {
   createInventory,
   getWarehouseList,
   deleteFifoitem,
+  deleteFifo,
   audit,
 } from "@/api/inm";
 import checkPermission from "@/utils/permission";
@@ -402,7 +403,7 @@ export default {
         type: "error",
       })
         .then(async () => {
-          await deleteFifoitem(scope.row.id);
+          await deleteFifo(scope.row.id);
           this.getList();
           this.$message.success("成功");
         })

hb_client/src/views/mtm/materialDetail.vue

@@ -256,7 +256,7 @@ getMaterial(){
       })
     },
      getOrderList(){
-       getOrderList({product:this.material,page:0}).then((response) => {
+       getOrderList({material:this.material,page:0}).then((response) => {
         if (response.data) {
           this.orderlist = response.data;//物料关联的订单
          
@@ -264,7 +264,7 @@ getMaterial(){
       })
      },
        getplanList() {
-      getProductionplanList({product:this.material,page:0}).then((response) => {
+      getProductionplanList({material:this.material,page:0}).then((response) => {
         if (response.data) {
           this.productionplanList = response.data;//物料关联计划
         }

hb_client/src/views/wpm/worktask.vue

@@ -129,19 +129,23 @@
                 @click="handlework(item)"
                 >{{ item.name }}</el-button
               >
-              <el-button
-                type="primary"
-                @click="handleAll()"
-                style="float: right"
-                >显示全部</el-button
-              >
-              <el-button
+               <el-button
                 type="primary"
                 @click="handleScrapbcp()"
                 id="scrap"
                 style="float: right; display: none"
                 >报废</el-button
               >
+              <el-badge :value="count" class="item"  style="float:right">
+  <el-button
+                type="primary"
+                @click="handleAll()"
+               
+                >显示全部</el-button
+              >
+</el-badge>
+             
+             
 
               <el-table
                 :data="wproductData"
@@ -714,6 +718,12 @@
    
   </div>
 </template>
+<style>
+.item {
+ 
+  margin-right: 20px;
+}
+</style>
   <script>
 import { getsubproductionplanList, createPick_need } from "@/api/pm";
 import checkPermission from "@/utils/permission";
@@ -832,6 +842,7 @@ export default {
         { lable: "划伤", value: 30 },
         { lable: "其他", value: 40 },
       ],
+      count:null,
     };
   },
   process: "",
@@ -1100,7 +1111,10 @@ export default {
       if (this.values++ > this.forms.length) this.values = 0;
     },
     handleSelectionChange(val) {
+      this.count=val.length;
+      console.log(this.count);
       let _this = this;
+
       _this.wpID = [];
       val.forEach((item) => {
         _this.wpID.push(item.id);