From d357802799670b3f8bc30ad1f5d8a0fe4d2733d8 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Thu, 22 Aug 2024 20:07:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../popupnotification/popupnotification.vue   | 137 +++++++++++++
 .../distribution/SeparateTheListInfo.js       | 191 +++++++-----------
 .../distributionDeliveryListedt.vue           | 145 +++++++++++--
 .../inventory/delivery/SeparateTheList.vue    |   1 -
 .../delivery/SeparateTheListInfo.vue          |  41 ++--
 5 files changed, 366 insertions(+), 149 deletions(-)
 create mode 100644 src/components/popupnotification/popupnotification.vue

diff --git a/src/components/popupnotification/popupnotification.vue b/src/components/popupnotification/popupnotification.vue
new file mode 100644
index 00000000..ae85b15f
--- /dev/null
+++ b/src/components/popupnotification/popupnotification.vue
@@ -0,0 +1,137 @@
+<template>
+  <div class="popupnotification">
+    <el-dialog
+      v-model="props.modelValue"
+      v-bind="{
+        width,
+        closeOnClickModal,
+        showClose,
+      }"
+    >
+      <!-- 标题 -->
+      <template #title>
+        <div class="el_dialog_title">
+          <el-icon><WarnTriangleFilled /></el-icon>
+          <span>{{ title }}</span>
+        </div>
+      </template>
+
+      <el-text class="mx-1" size="large"
+        >请<strong>仔细阅读</strong>以下内容，此操作<strong>不可撤销</strong>！</el-text
+      >
+
+      <!-- 内容主体 -->
+      <div class="el_content">
+        <el-icon class="el_content_icon"><InfoFilled /></el-icon>
+        <slot name="content"></slot>
+      </div>
+
+      <!-- 页脚 -->
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="onClose">{{ cancelButtonText }}</el-button>
+          <el-button @click="onConfirm" class="el_delte_button" type="primary">
+            <el-icon><QuestionFilled /></el-icon>{{ confirmButtonText }}
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { defineProps, defineEmits } from 'vue';
+
+const props = defineProps({
+  width: {
+    type: String,
+    default: '500',
+    validator: value => !isNaN(Number(value)), // 确保宽度是数值型字符串
+  },
+  closeOnClickModal: {
+    type: Boolean,
+    default: false,
+  },
+  showClose: {
+    type: Boolean,
+    default: false,
+  },
+  title: {
+    type: String,
+    default: '删除警告提示！',
+  },
+  cancelButtonText: {
+    type: String,
+    default: '关闭窗口',
+  },
+  confirmButtonText: {
+    type: String,
+    default: '确定删除',
+  },
+  confirmLoading: {
+    type: Boolean,
+    default: true,
+  },
+  modelValue: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const emit = defineEmits(['close', 'confirm']);
+
+const onClose = () => {
+  emit('close');
+};
+
+const onConfirm = () => {
+  emit('confirm');
+};
+</script>
+
+<style scoped lang="scss">
+.popupnotification {
+  :deep(.el-dialog) {
+    border: 1px dashed #f44336;
+    border-radius: 6px;
+    .el_dialog_title {
+      display: flex;
+      box-shadow: 0px 1px #f44336 !important;
+      align-items: center;
+      border-bottom: 1px solid #ff5722;
+      border-radius: 1.25em;
+      padding: 0 0.25em;
+      i {
+        color: #ff0000;
+        margin-right: 0.5em;
+      }
+    }
+    .el_delte_button {
+      color: white;
+      background-color: #f44336;
+      border: 1px solid #e91e63;
+      span {
+        align-items: flex-end;
+      }
+    }
+    .el-dialog__body {
+      padding-top: 0.5em;
+    }
+
+    .el_content {
+      margin-top: 1em;
+      border: 1px dashed #f44336;
+      padding: 2em;
+      border-radius: 0.25em;
+      position: relative;
+      .el_content_icon {
+        position: absolute;
+        top: -0.8em;
+        right: -0.5em;
+        font-size: 1.5em;
+        color: #f44336;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/option/distribution/SeparateTheListInfo.js b/src/option/distribution/SeparateTheListInfo.js
index 934841f9..9a6bccdf 100644
--- a/src/option/distribution/SeparateTheListInfo.js
+++ b/src/option/distribution/SeparateTheListInfo.js
@@ -19,7 +19,7 @@ export const columnList = [
   {
     prop: 'newOrderCode',
     label: '拆单订单号',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     fixed: false,
@@ -29,7 +29,7 @@ export const columnList = [
   {
     prop: 'orderCode',
     label: '原订单编号',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     fixed: false,
@@ -66,13 +66,27 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
+    checkarr: [
+      {
+        label: '未完成',
+        value: 1,
+      },
+      {
+        label: '已完成',
+        value: 2,
+      },
+      {
+        label: '已撤回',
+        value: 3,
+      },
+    ],
   },
   // 1.2.3
   // 未完成  已完成 已撤销
   {
     prop: 'customerName',
     label: '客户姓名',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     fixed: false,
@@ -82,7 +96,7 @@ export const columnList = [
   {
     prop: 'customerTelephone',
     label: '客户电话',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     fixed: false,
@@ -92,7 +106,7 @@ export const columnList = [
   {
     prop: 'customerAddress',
     label: '客户地址',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     fixed: false,
@@ -132,124 +146,55 @@ export const columnList = [
   },
 ];
 
-
-
-
 /** 详情 */
 export const TccolumnList = [
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: '50',
+    fixed: true,
+  },
 
-    {
-      prop: '',
-      label: '序号',
-      type: 12,
-      values: '',
-      width: '50',
-      fixed: true,
-    },
-  
-    {
-      prop: 'orderCode',
-      label: '包条码',
-      type: 1,
-      values: '',
-      width: '150',
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
-    {
-      prop: 'orderCode',
-      label: '物料编码',
-      type: 1,
-      values: '',
-      width: '150',
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
-    {
-      prop: 'taskNumber',
-      label: '拆单件数',
-      type: 1,
-      values: '',
-      width: '150',
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
-    {
-      prop: 'number',
-      label: '已拆件数',
-      type: 1,
-      values: '',
-      width: '150',
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
-  
-    {
-      prop: 'stateNameS',
-      label: '拆单状态',
-      type: 3,
-      values: '',
-      width: '150',
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
-    // 1.2.3
-    // 未完成  已完成 已撤销
-    {
-      prop: 'customerName',
-      label: '客户姓名',
-      type: 1,
-      values: '',
-      width: '150',
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
-    {
-      prop: 'customerTelephone',
-      label: '客户电话',
-      type: 1,
-      values: '',
-      width: '150',
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
-    {
-      prop: 'customerAddress',
-      label: '客户地址',
-      type: 1,
-      values: '',
-      width: '150',
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
-  
-    {
-      prop: 'finishTime',
-      label: '完成时间',
-      type: 1,
-      values: '',
-      width: '150',
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
-    {
-      prop: 'createUser',
-      label: '操作人',
-      type: 1,
-      values: '',
-      width: '150',
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
-  ];
-  
\ No newline at end of file
+  {
+    prop: 'packageCode',
+    label: '包条码',
+    type: 1,
+    values: '',
+    width: '150',
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'materielNo',
+    label: '物料编码',
+    type: 1,
+    values: '',
+    width: '150',
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'materiel',
+    label: '物料名称',
+    type: 1,
+    values: '',
+    width: '150',
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'category',
+    label: '品类',
+    type: 1,
+    values: '',
+    width: '150',
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+];
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index dcf0f4ba..659a161c 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -964,6 +964,29 @@
         </div>
       </template>
     </el-dialog>
+
+    <!-- 备货删除提示 -->
+
+
+
+  <DeleteWarningDialog
+    :modelValue="popupnotification"
+    :width="'600'"
+    title="取消计划警告！"
+    confirmButtonText="确认取消"
+    @close="handleDialogClose"
+    @confirm="handleDialogConfirm"
+
+  >
+    <template #content>
+      <el-text class="mx-1" size="large">
+        <el-icon><StarFilled /></el-icon>
+        数据存在<strong>已备货</strong>状态,请<strong>仔细核验数据</strong>,避免误操作！<br />
+        如果核验无误请继续执行...
+      </el-text>
+    </template>
+  </DeleteWarningDialog>
+
   </basic-container>
 </template>
 
@@ -994,6 +1017,7 @@ import {
 import{compressImageBlob } from '@/components/IMGcompressor/imgcompressor.js'   
 import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
 import { exportBlob } from '@/api/common';
+import DeleteWarningDialog  from '@/components/popupnotification/popupnotification.vue'
 import { downloadXls } from '@/utils/util';
 import { dateNow } from '@/utils/date';
 import NProgress from 'nprogress';
@@ -1023,10 +1047,16 @@ import { setNodeHeight } from '@/utils/util.js';
 import { AbnormalReview } from '@/option/distribution/DeliveryExceptionReview.js';
 import print from '@/utils/print';
 import { useStore } from 'vuex';
-
+import { Delete, Edit, Search, Share, Upload } from '@element-plus/icons-vue'
 export default {
+  components: {
+    DeleteWarningDialog
+  },
   data() {
     return {
+      DataRwo:{},
+      popupnotification:false,//
+      Deleteloading:false,
       ViRejectselect: [
         {
           value: true,
@@ -4573,7 +4603,58 @@ export default {
         },
       });
     },
+
+    // 取消备货接口
+    Cancelstocking(data){
+      this.loading = true;
+      cancelReservationPackage(data)
+            .then(res => {
+              if (res.data.code === 200) {
+                this.$message.success(res.data.msg);
+                this.getReservationInventoryPackageListInfo(this.page);
+              }
+            })
+            .catch(error => {
+              console.log(error);
+              
+            }).finally(()=>{
+              this.loading = false;
+            });
+    },
+        // 确认删除备货
+    confirmdelete(){
+ 
+    },
+    // 关闭
+    handleDialogClose(){
+      this.popupnotification=false
+    },
+    // 确定事件
+    handleDialogConfirm(){
+      this.loading = true; //开启加载
+          let data = {
+            deliveryId: this.deliveryId,
+            reservationId: this.wid,
+            type: 2,
+            packageIds:'',
+          };
+          if(this.selectionList.length){
+            data.packageIds= this.selectionList.map(item => item.id).join(',');//批量取消
+          }else{
+            data.packageIds= this.DataRwo.id;//单个取消
+          }
+          this.Cancelstocking(data)
+          this.popupnotification=false;
+      
+    },
+    // 计划取消
     cancelReservationInventoryPackage(row) {
+    this.DataRwo=row
+    console.log(row)
+    if(row.stockStatus ==20 || row.stockStatusName =="已备货"){
+      this.popupnotification=true
+      return
+    }
       this.$confirm('是否计划取消？')
         .then(() => {
           this.loading = true; //开启加载
@@ -4583,17 +4664,7 @@ export default {
             type: 2,
             packageIds: row.id,
           };
-          this.loading = true;
-          cancelReservationPackage(data)
-            .then(res => {
-              if (res.data.code === 200) {
-                this.$message.success(res.data.msg);
-                this.getReservationInventoryPackageListInfo(this.page);
-              }
-            })
-            .catch(res => {
-              this.loading = false;
-            });
+          this.Cancelstocking(data)
         })
         .catch(() => {});
     },
@@ -5013,6 +5084,13 @@ export default {
         });
         return;
       }
+      // 查询是否有已经备货的
+     let StockupState=  this.selectionList.find(item=>item.stockStatus == 20 ||  item.stockStatusName =="已备货")
+     if(StockupState){
+      this.popupnotification=true
+      return
+    }
+
       this.$confirm('是否进行批量计划取消？')
         .then(() => {
           this.loading = true; //开启加载
@@ -5614,6 +5692,8 @@ export default {
           this.loading = false;
         });
     },
+
+
     //一键签收
     handleSignone(row) {
       if (row.isHaveAbnormalPackage == 2) {
@@ -5936,4 +6016,45 @@ export default {
   align-items: center;
   justify-content: center;
 }
+// :deep(.popupnotification){
+//   .el_dialog_title{
+//   display: flex;
+//   align-items: center;
+//   border-bottom: 1px solid #FF5722;
+//   padding-bottom: 5px;
+//   border-radius: 21px;
+//   padding: 0 4px;
+//   i{
+//     color: #ff0000;
+//     margin-right: 8px;
+//   }
+
+// }
+// .el_delte_button{
+//     color: white;
+//     background-color: #F44336;
+//     border: 1px solid #E91E63;
+//     span{
+//       align-items: flex-end;
+//     }
+//   }
+//   .el-dialog__body{
+//     padding-top: 8px;
+//   }
+//   .el_content{
+//     margin-top: 10px;
+//     border: 1px dashed #F44336;
+//     padding: 31px;
+//     border-radius: 4px;
+//     position: relative;
+//     .el_content_icon{
+//       position: absolute;
+//       top: -13px;
+//       right: -8px;
+//       font-size: 26px;
+//       color: #F44336;
+//     }
+//   }
+// }
+
 </style>
diff --git a/src/views/distribution/inventory/delivery/SeparateTheList.vue b/src/views/distribution/inventory/delivery/SeparateTheList.vue
index 3ca41de6..077e15d7 100644
--- a/src/views/distribution/inventory/delivery/SeparateTheList.vue
+++ b/src/views/distribution/inventory/delivery/SeparateTheList.vue
@@ -262,7 +262,6 @@ const searchChange = () => {
 /** 清空表单 */
 const searchReset = () => {
   details.query = {};
-  details.stockupDate = [];
   details.page.currentPage = 1;
   handleClearTableQuery(details.columnList);
   onLoad();
diff --git a/src/views/distribution/inventory/delivery/SeparateTheListInfo.vue b/src/views/distribution/inventory/delivery/SeparateTheListInfo.vue
index 2864b2fc..fd8e03c9 100644
--- a/src/views/distribution/inventory/delivery/SeparateTheListInfo.vue
+++ b/src/views/distribution/inventory/delivery/SeparateTheListInfo.vue
@@ -96,8 +96,8 @@
       <tablecmt
         class="TCtableNode"
         :columnList="TccolumnList"
-        :tableData="data"
-        :loading="loadingObj.list"
+        :tableData="Tcdata"
+        :loading="loadingObj.packageListLoading"
         @inputTxt="inputsc"
         @timeCheck="timesc"
         @btnCheck="btnsc"
@@ -146,7 +146,7 @@ import { columnList, TccolumnList } from '@/option/distribution/SeparateTheListI
 import { processRowProperty, setNodeHeight } from '@/utils/util';
 import functions from '@/utils/functions.js';
 import { ElMessageBox, ElMessage } from 'element-plus';
-import { $_tasklist, $_canceltask,$_gettaskdetail } from '@/api/distribution/SeparateTheList';
+import { $_tasklist, $_canceltask, $_gettaskdetail } from '@/api/distribution/SeparateTheList';
 import { downloadXls } from '@/utils/util';
 import { useStore } from 'vuex';
 import dayjs from 'dayjs';
@@ -197,6 +197,7 @@ const details = reactive({
   TccolumnList,
   /** 列表数据 */
   data: [],
+  Tcdata: [], //弹窗数据
   /** 页面loading */
   loadingObj: {
     /** 列表加载loading */
@@ -252,6 +253,7 @@ const {
   popUpShow,
   recorddata,
   defaultTime2,
+  Tcdata,
 } = toRefs(details);
 
 /** 展开列表控件 */
@@ -262,7 +264,7 @@ const showdrawer = _flag => {
 const inputsc = (index, row) => {
   details.query[row.prop] = index;
   processRowProperty(index, row, details);
-  test(details.query);
+  onLoad();
 };
 // 实例函数
 const test = val => {};
@@ -276,6 +278,7 @@ const timesc = (index, row) => {
   if (!index) {
     delete details.query[row.prop];
   }
+  onLoad();
 };
 
 /** 表格表头输入框搜索 */
@@ -285,6 +288,7 @@ const btnsc = val => {
 /** 表格表头下拉框选择 */
 const selectsc = (index, row) => {
   processRowProperty(index, row, details);
+  onLoad();
 };
 /** 表格表头复选框选择 */
 const selectionChange = list => {
@@ -365,22 +369,33 @@ const onLoad = () => {
     }
   });
 };
-const view = (row) => {
+const view = row => {
   dialogVisible.value = true;
-  gieInfo(row)
+  gieInfo(row);
   setTimeout(() => {
     const _node = document.querySelector('.TCtableNode');
     setNodeHeight(_node, '', true);
   }, 500);
 };
-const gieInfo=(row)=>{
-    let data={
-        taskId:row.id
-    }
-    $_gettaskdetail(data).then(res=>{
-        console.log(res,'详情');
+const gieInfo = row => {
+  let data = {
+    taskId: row.id,
+  };
+  details.loadingObj.packageListLoading = true;
+  $_gettaskdetail(data)
+    .then(res => {
+      console.log(res, '详情');
+      if (res.data.code == 200) {
+        details.Tcdata = res.data.data.packageList || [];
+      }
     })
-}
+    .catch(error => {
+      console.log(error);
+    })
+    .finally(() => {
+      details.loadingObj.packageListLoading = false;
+    });
+};
 // 页面初始化方法
 const pageOnlaod = () => {
   onLoad();