update

src/views/education/MaterialDelivery.vue

@@ -81,7 +81,7 @@
 
        </div>
        <store-dialog :titleText="'物料出库单'" :type="'out'"  v-if="popShow" @closeDialog="closeDialog" @conserve="conserve" />
-       <delete-pop ref="delete" :deletetext="deletetext" :type="typeV" v-if="deleteShow"></delete-pop>
+       <delete-pop ref="delete" :deletetext="deletetext" @confirmDel="confirmDel" :type="typeV" v-if="deleteShow"></delete-pop>
   </div>
 </template>
 
@@ -210,20 +210,28 @@ export default {
         $this.deleteShow = true
         $this.typeV = 2
       } else {
-        var list = []
-        $this.checkList.forEach((item) => {
-          list.push(item.ID)
-        })
-        $this.$axios({
-          method:"post",
-          url:`/api/MaterialDelivery/MaterialDelivery_Delete`,
-          data:list
-        }).then((res)=>{
-          let postData = this.resetData()
-          $this.searchData(postData)
-        })
+        this.deleteShow = true
+        this.typeV = '4_2'
       }
     },
+    confirmDel (num) {
+        var $this = this
+        $this.deleteShow = false
+          if (num == '2') {
+          var list = []
+          $this.checkList.forEach((item) => {
+            list.push(item.ID)
+          })
+          $this.$axios({
+            method:"post",
+            url:`/api/MaterialDelivery/MaterialDelivery_Delete`,
+            data:list
+          }).then((res)=>{
+            let postData = this.resetData()
+            $this.searchData(postData)
+          })
+        }
+    },
     resetData () {
       return {
         argKeyWord: this.formData.argKeyWord,

src/views/education/MaterialWarehousingMoudle.vue

@@ -79,7 +79,7 @@
           <Pagination ref="page" :totalCount="totalCount" :totalPage="totalPage" @pageFun="pageFun" />
        </div>
        <store-dialog :titleText="'物料入库单'"  v-if="popShow" @closeDialog="closeDialog" @conserve="conserve" />
-       <delete-pop ref="delete" :deletetext="deletetext" :type="typeV" v-if="deleteShow"></delete-pop>
+       <delete-pop ref="delete" :deletetext="deletetext" @confirmDel="confirmDel" :type="typeV" v-if="deleteShow"></delete-pop>
   </div>
 </template>
 
@@ -228,20 +228,28 @@ export default {
         $this.deleteShow = true
         $this.typeV = 2
       } else {
-        var list = []
-        $this.checkList.forEach((item) => {
-          list.push(item.ID)
-        })
-        $this.$axios({
-          method:"post",
-          url:`/api/MaterialDelivery/MaterialDelivery_Delete`,
-          data:list
-        }).then((res)=>{
-          var postData = $this.resetData()
-          $this.searchData(postData)
-        })
+        this.deleteShow = true
+        this.typeV = '4_2'
       }
     },
+    confirmDel (num) {
+        var $this = this
+        $this.deleteShow = false
+        if (num == '2') {
+          var list = []
+          $this.checkList.forEach((item) => {
+            list.push(item.ID)
+          })
+          $this.$axios({
+            method:"post",
+            url:`/api/MaterialDelivery/MaterialDelivery_Delete`,
+            data:list
+          }).then((res)=>{
+            var postData = $this.resetData()
+            $this.searchData(postData)
+          })
+        }
+    },
     //关闭提示弹窗
     cancel_delete(){
       this.deleteShow = false

src/views/education/ProductDelivery.vue

@@ -81,7 +81,7 @@
 
        </div>
        <store-dialog :titleText="'产品出库单'" :titleType="'pro'" :type="'out'"  v-if="popShow" @closeDialog="closeDialog" @conserve="conserve" />
-       <delete-pop ref="delete" :deletetext="deletetext" :type="typeV" v-if="deleteShow"></delete-pop>
+       <delete-pop ref="delete" :deletetext="deletetext" @confirmDel="confirmDel" :type="typeV" v-if="deleteShow"></delete-pop>
   </div>
 </template>
 
@@ -218,6 +218,14 @@ export default {
         $this.deleteShow = true
         $this.typeV = 2
       } else {
+        $this.deleteShow = true
+        $this.typeV = '4_2'
+      }
+    },
+    confirmDel (num) {
+      var $this = this
+      $this.deleteShow = false
+      if (num == '2') {
         var list = []
         $this.checkList.forEach((item) => {
           list.push(item.ID)

src/views/education/ProductStorage.vue

@@ -81,7 +81,7 @@
 
        </div>
        <store-dialog :titleText="'产品入库单'" :titleType="'pro'"  v-if="popShow" @closeDialog="closeDialog" @conserve="conserve" />
-       <delete-pop ref="delete" :deletetext="deletetext" :type="typeV" v-if="deleteShow"></delete-pop>
+       <delete-pop ref="delete" :deletetext="deletetext" @confirmDel="confirmDel" :type="typeV" v-if="deleteShow"></delete-pop>
   </div>
 </template>
 
@@ -223,20 +223,28 @@ export default {
         $this.deleteShow = true
         $this.typeV = 2
       } else {
-        var list = []
-        $this.checkList.forEach((item) => {
-          list.push(item.ID)
-        })
-        $this.$axios({
-          method:"post",
-          url:`/api/ProductStorage/ProductStorage_Delete`,
-          data:list
-        }).then((res)=>{
-          var postData = $this.resetData()
-          $this.searchData(postData)
-        })
+        this.deleteShow = true
+        this.typeV = '4_2'
       }
     },
+    confirmDel (num) {
+        var $this = this
+        $this.deleteShow = false
+        if (num == '2') {
+          var list = []
+          $this.checkList.forEach((item) => {
+            list.push(item.ID)
+          })
+          $this.$axios({
+            method:"post",
+            url:`/api/ProductStorage/ProductStorage_Delete`,
+            data:list
+          }).then((res)=>{
+            var postData = $this.resetData()
+            $this.searchData(postData)
+          })
+        }
+    },
     //关闭提示弹窗
     cancel_delete(){
       this.deleteShow = false

src/views/education/ProductionPlan.vue

@@ -80,7 +80,8 @@
                  
                      <el-table-column
                         label="操作"
-                        show-overflow-tooltip>
+                        show-overflow-tooltip
+                        width="170">
                         <template slot-scope="scope">
                           <div class="table_edit" @click="editFun(scope.row)" >
                             <div class="edit_img"></div>

src/views/education/component/deletePop.vue

@@ -19,6 +19,12 @@
             <div @click="deleteBtn('2')" class="yes">是（YES）</div>
         </div>
 
+        <!-- new -->
+        <div v-if="type ==4 ||type==1 ||type=='4_2' || type=='9' || type=='10'" class="delete_btn">
+            <div @click="confirmDel('1')" class="no">否（NO）</div>
+            <div @click="confirmDel('2')" class="yes">是（YES）</div>
+        </div>
+
           <div v-if="type == 2 || type==3 || type == 5 ||type==6 || type==7 || type==8" class="delete_btn">
             <div @click="deleteBtn('1')" class="deleteConfig">确认</div>
         </div>
@@ -84,7 +90,10 @@ export default {
                       console.log('this==4',this.pathE)
                   }
               }
-        }
+        },
+        confirmDel (num) {
+            this.$emit('confirmDel', num)
+        },
     }
 
 }