diff --git a/index.html b/index.html
index b71c8756..3efaed5c 100644
--- a/index.html
+++ b/index.html
@@ -1,46 +1,27 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta http-equiv="X-UA-Compatible" content="chrome=1" />
-    <meta name="renderer" content="webkit" />
-    <meta
-      name="viewport"
-      content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0"
-    />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
-    <meta name="format-detection" content="telephone=no" />
-    <link rel="icon" href="/favicon.png" />
-    <link rel="stylesheet" href="/iconfont/index.css" />
-    <link rel="stylesheet" href="/iconfont/avue/iconfont.css" />
-    <link rel="stylesheet" href="/iconfont/saber/iconfont.css" />
-    <link rel="stylesheet" href="/css/loading.css" />
-    <link rel="stylesheet" href="/css/loadinge.css" />
-    <script>
-      window._AMapSecurityConfig = {
-        securityJsCode: 'ca257c159b4cbb3f499fd107ff21ab34',
-      };
-    </script>
 
-    <script
-      type="text/javascript"
-      src="https://webapi.amap.com/maps?v=1.4.15&key=f003ec4feb3fcc4cf0742e94f569fd33&plugin=AMap.PlaceSearch,AMap.Geocoder,Map3D,ElasticMarker,AMap.Driving,AMap.TruckDriving"
-    ></script>
-    <!--  <script type="text/javascript" src='https://webapi.amap.com/maps?v=2.0&key=f003ec4feb3fcc4cf0742e94f569fd33&plugin=AMap.PlaceSearch,AMap.Geocoder,Map3D,ElasticMarker,AMap.Driving,'></script>-->
+<head>
+  <meta charset="UTF-8" />
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+  <meta http-equiv="X-UA-Compatible" content="chrome=1" />
+  <meta name="renderer" content="webkit" />
+  <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0" />
+  <meta name="apple-mobile-web-app-capable" content="yes" />
+  <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+  <meta name="format-detection" content="telephone=no" />
+  <link rel="icon" href="/favicon.png" />
+  <link rel="stylesheet" href="/iconfont/index.css" />
+  <link rel="stylesheet" href="/iconfont/avue/iconfont.css" />
+  <link rel="stylesheet" href="/iconfont/saber/iconfont.css" />
+  <link rel="stylesheet" href="/css/loading.css" />
+  <link rel="stylesheet" href="/css/loadinge.css" />
+</head>
 
-    <script src="//webapi.amap.com/ui/1.1/main.js"></script>
-    <script
-      type="text/javascript"
-      src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=FpjVxjf9nGo47eLj9I0ZuUvSZm1wGGqr"
-    ></script>
-  </head>
-
-  <body>
-    <div id="app">
-      <!-- <div class="loading">
+<body>
+  <div id="app">
+    <!-- <div class="loading">
       <div class="loading-wrap">
         <div class="loading-dots">
           <span class="dot dot-spin">
@@ -56,19 +37,33 @@
       </div>
     </div> -->
 
-      <div class="truck-wrapper">
-        <div class="truck">
-          <div class="truck-container"></div>
-          <div class="glases"></div>
-          <div class="bonet"></div>
-          <div class="base"></div>
-          <div class="base-aux"></div>
-          <div class="wheel-back"></div>
-          <div class="wheel-front"></div>
-          <div class="smoke"></div>
-        </div>
+    <div class="truck-wrapper">
+      <div class="truck">
+        <div class="truck-container"></div>
+        <div class="glases"></div>
+        <div class="bonet"></div>
+        <div class="base"></div>
+        <div class="base-aux"></div>
+        <div class="wheel-back"></div>
+        <div class="wheel-front"></div>
+        <div class="smoke"></div>
       </div>
     </div>
-    <script type="module" src="/src/main.js"></script>
-  </body>
-</html>
+  </div>
+  <script type="module" src="/src/main.js"></script>
+</body>
+<script>
+  window._AMapSecurityConfig = {
+    securityJsCode: 'ca257c159b4cbb3f499fd107ff21ab34',
+  };
+</script>
+
+<script type="text/javascript"
+  src="https://webapi.amap.com/maps?v=1.4.15&key=f003ec4feb3fcc4cf0742e94f569fd33&plugin=AMap.PlaceSearch,AMap.Geocoder,Map3D,ElasticMarker,AMap.Driving,AMap.TruckDriving"></script>
+<!--  <script type="text/javascript" src='https://webapi.amap.com/maps?v=2.0&key=f003ec4feb3fcc4cf0742e94f569fd33&plugin=AMap.PlaceSearch,AMap.Geocoder,Map3D,ElasticMarker,AMap.Driving,'></script>-->
+
+<script src="//webapi.amap.com/ui/1.1/main.js"></script>
+<script type="text/javascript"
+  src="https://api.map.baidu.com/api?v=1.0&type=webgl&ak=FpjVxjf9nGo47eLj9I0ZuUvSZm1wGGqr"></script>
+
+</html>
\ No newline at end of file
diff --git a/src/components/edittablehead/index.vue b/src/components/edittablehead/index.vue
index 2852f605..62b828b5 100644
--- a/src/components/edittablehead/index.vue
+++ b/src/components/edittablehead/index.vue
@@ -119,7 +119,7 @@ let props = defineProps({
   /** 从本地获取的list名称 */
   columnListName: {
     type: String as PropType<string>,
-    required: true,
+    required: false,
     default: 'columnList',
   },
 });
diff --git a/src/components/popupnotification/popupnotification.vue b/src/components/popupnotification/popupnotification.vue
index d7d4c808..be978f59 100644
--- a/src/components/popupnotification/popupnotification.vue
+++ b/src/components/popupnotification/popupnotification.vue
@@ -1,21 +1,22 @@
 <template>
-  <div class="popupnotification">
+  <div class="popupnotification" >
     <el-dialog
-      v-model="props.modelValue"
+      v-model="localModelValue"
       v-bind="{
         width,
         closeOnClickModal,
         showClose,
       }"
     >
+
       <!-- 标题 -->
-      <template #title>
+      <template #header>
         <div class="el_dialog_title">
           <el-icon><WarnTriangleFilled /></el-icon>
           <span>{{ title }}</span>
         </div>
       </template>
-
+      <div v-loading="loading" element-loading-text="正在执行中，请稍等..."> 
       <el-text class="mx-1" size="large"
         >请<strong>仔细阅读</strong>以下内容，此操作<strong>不可撤销</strong>！</el-text
       >
@@ -25,12 +26,13 @@
         <el-icon class="el_content_icon"><InfoFilled /></el-icon>
         <slot name="content"></slot>
       </div>
-
+    </div>
       <!-- 页脚 -->
       <template #footer>
         <div class="dialog-footer">
           <el-button @click="onClose">{{ cancelButtonText }}</el-button>
           <el-button
+            :disabled="loading"
             @click="onConfirm"
             class="el_delte_button"
             icon="QuestionFilled"
@@ -40,16 +42,22 @@
           </el-button>
         </div>
       </template>
+
     </el-dialog>
   </div>
 </template>
 
 <script setup>
-import { defineProps, defineEmits } from 'vue';
+import { defineProps, defineEmits, getCurrentInstance } from 'vue';
+const instance = getCurrentInstance();
 
 const props = defineProps({
+  loading:{
+    type: Boolean,
+    default: false,
+  },
   width: {
-    type: String,
+    type: [String, Number],
     default: '500',
     validator: value => !isNaN(Number(value)), // 确保宽度是数值型字符串
   },
@@ -83,10 +91,25 @@ const props = defineProps({
   },
 });
 
-const emit = defineEmits(['close', 'confirm']);
-
+const emit = defineEmits(['update:modelValue', 'close', 'confirm']);
+// 通过 computed 代理 modelValue，并在更新时触发事件
+const localModelValue = computed({
+  get() {
+    return props.modelValue;
+  },
+  set(value) {
+    emit('update:modelValue', value);
+  },
+});
 const onClose = () => {
+  const hasExternalCloseListener = instance.vnode.props?.onClose;
+  console.log(instance, 'instance');
+
   emit('close');
+  // 如果没有外部监听器，才执行默认关闭
+  if (!hasExternalCloseListener) {
+    emit('update:modelValue', false);
+  }
 };
 
 const onConfirm = () => {
@@ -131,8 +154,8 @@ const onConfirm = () => {
       position: relative;
       .el_content_icon {
         position: absolute;
-        top: -0.8em;
-        right: -0.5em;
+        top: -8px;
+        right: -2px;
         font-size: 1.5em;
         color: #f44336;
       }
diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue
index 3fe1b062..198bac0f 100644
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@@ -376,12 +376,12 @@ let props = defineProps({
   /** 从本地获取的list名称 */
   columnListName: {
     type: String as PropType<string>,
-    required: true,
+    required: false,
     default: 'columnList',
   },
   minWidth: {
     type: Number as PropType<number>,
-    required: true,
+    required: false,
     default: 55,
   },
 });
diff --git a/src/page/login/aiqa.vue b/src/page/login/aiqa.vue
index b52aed5a..99fbbcf8 100644
--- a/src/page/login/aiqa.vue
+++ b/src/page/login/aiqa.vue
@@ -106,7 +106,7 @@ const isFirstMessage = ref(true);
 const chatContainer = ref(null);
 const inputState = ref(false); //当前是否在回答
 const props = defineProps({
-  templateData: Object,
+  templateData:Boolean,
 });
 const input = ref(null); //输入框实例
 const Data = ref({
diff --git a/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue b/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue
index 1077f725..944a47fb 100644
--- a/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue
+++ b/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue
@@ -121,7 +121,6 @@
   </basic-container>
   <!-- 列表配置显示 -->
   <edittablehead
-    @setcolum="setnewcolum"
     @closce="showdrawer"
     :drawerShow="drawerShow"
     :columnList="details.columnList"
diff --git a/src/views/cost/Deliverycostmanagement/Financialreview.vue b/src/views/cost/Deliverycostmanagement/Financialreview.vue
index b9145268..ee9651b2 100644
--- a/src/views/cost/Deliverycostmanagement/Financialreview.vue
+++ b/src/views/cost/Deliverycostmanagement/Financialreview.vue
@@ -148,7 +148,6 @@
 
   <!-- 列表配置显示 -->
   <edittablehead
-    @setcolum="setnewcolum"
     @closce="showdrawer"
     :drawerShow="drawerShow"
     :columnList="details.columnList"
diff --git a/src/views/cost/Deliverycostmanagement/OrderTotalCostDetail.vue b/src/views/cost/Deliverycostmanagement/OrderTotalCostDetail.vue
index 34d6f279..235c0db6 100644
--- a/src/views/cost/Deliverycostmanagement/OrderTotalCostDetail.vue
+++ b/src/views/cost/Deliverycostmanagement/OrderTotalCostDetail.vue
@@ -93,7 +93,6 @@
   </basic-container>
   <!-- 列表配置显示 -->
   <edittablehead
-    @setcolum="setnewcolum"
     @closce="showdrawer"
     :drawerShow="drawerShow"
     :columnList="details.columnList"
diff --git a/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue b/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue
index a7f74bbc..ca0646ff 100644
--- a/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue
+++ b/src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue
@@ -150,7 +150,6 @@
   </basic-container>
   <!-- 列表配置显示 -->
   <edittablehead
-    @setcolum="setnewcolum"
     @closce="showdrawer"
     :drawerShow="drawerShow"
     :columnList="details.columnList"
diff --git a/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue b/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue
index fb630ee5..1f91e244 100644
--- a/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue
+++ b/src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue
@@ -78,7 +78,6 @@
   </basic-container>
   <!-- 列表配置显示 -->
   <edittablehead
-    @setcolum="setnewcolum"
     @closce="showdrawer"
     :drawerShow="drawerShow"
     :columnList="details.columnList"
diff --git a/src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue b/src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue
index 6aa81dac..7f29d501 100644
--- a/src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue
+++ b/src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue
@@ -114,7 +114,6 @@
   </basic-container>
   <!-- 列表配置显示 -->
   <edittablehead
-    @setcolum="setnewcolum"
     @closce="showdrawer"
     :drawerShow="drawerShow"
     :columnList="details.columnList"
diff --git a/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue b/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue
index 1b563de6..555fae82 100644
--- a/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue
+++ b/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue
@@ -111,7 +111,6 @@
 
   <!-- 列表配置显示 -->
   <edittablehead
-    @setcolum="setnewcolum"
     @closce="showdrawer"
     :drawerShow="drawerShow"
     :columnList="details.columnList"
diff --git a/src/views/cost/Deliverycostmanagement/WarehouseTemplate.vue b/src/views/cost/Deliverycostmanagement/WarehouseTemplate.vue
index d6688f74..03684783 100644
--- a/src/views/cost/Deliverycostmanagement/WarehouseTemplate.vue
+++ b/src/views/cost/Deliverycostmanagement/WarehouseTemplate.vue
@@ -107,7 +107,6 @@
 
   <!-- 列表配置显示 -->
   <edittablehead
-    @setcolum="setnewcolum"
     @closce="showdrawer"
     :drawerShow="drawerShow"
     :columnList="details.columnList"
diff --git a/src/views/cost/storagecost/Monthlyorderwarehousing.vue b/src/views/cost/storagecost/Monthlyorderwarehousing.vue
index a96f0198..26f93c5e 100644
--- a/src/views/cost/storagecost/Monthlyorderwarehousing.vue
+++ b/src/views/cost/storagecost/Monthlyorderwarehousing.vue
@@ -116,7 +116,6 @@
   </basic-container>
   <!-- 列表配置显示 -->
   <edittablehead
-    @setcolum="setnewcolum"
     @closce="showdrawer"
     :drawerShow="drawerShow"
     :columnList="details.columnList"
diff --git a/src/views/cost/storagecost/OrderTotalTransferDetails.vue b/src/views/cost/storagecost/OrderTotalTransferDetails.vue
index 6dfb0cf5..360f569b 100644
--- a/src/views/cost/storagecost/OrderTotalTransferDetails.vue
+++ b/src/views/cost/storagecost/OrderTotalTransferDetails.vue
@@ -138,7 +138,6 @@
   </basic-container>
   <!-- 列表配置显示 -->
   <edittablehead
-    @setcolum="setnewcolum"
     @closce="showdrawer"
     :drawerShow="drawerShow"
     :columnList="details.columnList"
diff --git a/src/views/cost/storagecost/OrderTotalWarehouse.vue b/src/views/cost/storagecost/OrderTotalWarehouse.vue
index 08945f11..f6320275 100644
--- a/src/views/cost/storagecost/OrderTotalWarehouse.vue
+++ b/src/views/cost/storagecost/OrderTotalWarehouse.vue
@@ -120,7 +120,6 @@
   </basic-container>
   <!-- 列表配置显示 -->
   <edittablehead
-    @setcolum="setnewcolum"
     @closce="showdrawer"
     :drawerShow="drawerShow"
     :columnList="details.columnList"
diff --git a/src/views/cost/storagecost/Transferwarehouseorders.vue b/src/views/cost/storagecost/Transferwarehouseorders.vue
index 5a5fff09..72c216fb 100644
--- a/src/views/cost/storagecost/Transferwarehouseorders.vue
+++ b/src/views/cost/storagecost/Transferwarehouseorders.vue
@@ -141,7 +141,6 @@
   </basic-container>
   <!-- 列表配置显示 -->
   <edittablehead
-    @setcolum="setnewcolum"
     @closce="showdrawer"
     :drawerShow="drawerShow"
     :columnList="details.columnList"
diff --git a/src/views/cost/storagecost/Transferwarehousestatistics.vue b/src/views/cost/storagecost/Transferwarehousestatistics.vue
index 4397ffa7..95d6ad44 100644
--- a/src/views/cost/storagecost/Transferwarehousestatistics.vue
+++ b/src/views/cost/storagecost/Transferwarehousestatistics.vue
@@ -113,7 +113,6 @@
     </basic-container>
     <!-- 列表配置显示 -->
     <edittablehead
-      @setcolum="setnewcolum"
       @closce="showdrawer"
       :drawerShow="drawerShow"
       :columnList="details.columnList"
diff --git a/src/views/cost/storagecost/WarehouseMonthly.vue b/src/views/cost/storagecost/WarehouseMonthly.vue
index b6c69ad1..dddafbe0 100644
--- a/src/views/cost/storagecost/WarehouseMonthly.vue
+++ b/src/views/cost/storagecost/WarehouseMonthly.vue
@@ -115,7 +115,6 @@
   </basic-container>
   <!-- 列表配置显示 -->
   <edittablehead
-    @setcolum="setnewcolum"
     @closce="showdrawer"
     :drawerShow="drawerShow"
     :columnList="details.columnList"
diff --git a/src/views/cost/storagecost/Warehouserentalmanagement.vue b/src/views/cost/storagecost/Warehouserentalmanagement.vue
index 1c2a7814..e42b69d7 100644
--- a/src/views/cost/storagecost/Warehouserentalmanagement.vue
+++ b/src/views/cost/storagecost/Warehouserentalmanagement.vue
@@ -215,7 +215,6 @@
   </basic-container>
   <!-- 列表配置显示 -->
   <edittablehead
-    @setcolum="setnewcolum"
     @closce="showdrawer"
     :drawerShow="drawerShow"
     :columnList="details.columnList"
diff --git a/src/views/distribution/checkInventoryTask/createTask.vue b/src/views/distribution/checkInventoryTask/createTask.vue
index 98df5dec..6f37bdff 100644
--- a/src/views/distribution/checkInventoryTask/createTask.vue
+++ b/src/views/distribution/checkInventoryTask/createTask.vue
@@ -2555,7 +2555,7 @@ const formInventoryChange = val => {
   formInventory.value.id = val;
   const matchedInfo = matchInfoById(val, formInventory.value.select);
   console.log(matchedInfo, '处理好的参数');
-  formInventory.value.brandName;
+  // formInventory.value.brandName;
   let name = [];
   matchedInfo.forEach(item => {
     name.push(item.brandName);
diff --git a/src/views/distribution/checkInventoryTask/createTaskTemp.vue b/src/views/distribution/checkInventoryTask/createTaskTemp.vue
index 7ad658a4..962f7d97 100644
--- a/src/views/distribution/checkInventoryTask/createTaskTemp.vue
+++ b/src/views/distribution/checkInventoryTask/createTaskTemp.vue
@@ -22,6 +22,9 @@
             <el-button type="primary" icon="CirclePlusFilled" @click="InventoryTask"
               >创建盘点任务</el-button
             >
+            <el-button type="primary" icon="CircleCloseFilled" @click="discard"
+              >废弃盘点任务</el-button
+            >
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -93,8 +96,21 @@
       </el-row>
     </div>
     <!-- 创建判断任务 -->
-    <el-dialog v-model="InventoryPopup" title="创建盘点任务" width="30%">
-      <el-form :model="formInventory" label-width="120px">
+    <el-dialog
+      v-model="InventoryPopup"
+      title="创建盘点任务"
+      width="30%"
+      :close-on-click-modal="false"
+      :show-close="false"
+    >
+      <el-form
+        :model="formInventory"
+        label-width="120px"
+        ref="ruleFormRef"
+        :rules="rules"
+        v-loading="formInventoryloading"
+        element-loading-text="正在处理中,此任务可能较耗时请耐心等待..."
+      >
         <el-form-item label="商场名称">
           <el-select
             multiple
@@ -119,7 +135,7 @@
           <el-input v-model="formInventory.brandName" disabled placeholder="品牌名称" />
         </el-form-item>
 
-        <el-form-item label="盘点时间" class="pdsj">
+        <el-form-item label="盘点时间" prop="time">
           <el-date-picker
             v-model="formInventory.time"
             type="datetimerange"
@@ -135,15 +151,33 @@
       </el-form>
       <template #footer>
         <span class="dialog-footer">
-          <el-button @click="InventoryPopup = false">取消</el-button>
-          <el-button type="primary" @click="InventorySubmit"> 提交 </el-button>
+          <el-button @click="InventoryPopup = false">关闭</el-button>
+          <el-button type="primary" @click="InventorySubmit" :disabled="formInventoryloading">
+            提交
+          </el-button>
         </span>
       </template>
     </el-dialog>
+
+    <!-- 备货删除提示 -->
+    <DeleteWarningDialog
+      v-model="popupnotification"
+      :width="'600'"
+      title="废弃盘点计划警告！"
+      confirmButtonText="确认取消"
+      :loading="popupnotificationloading"
+      @confirm="handleDialogConfirm"
+    >
+      <template #content>
+        <el-text class="mx-1" size="large">
+          <el-icon><StarFilled /></el-icon>
+          是否确定<strong>废弃</strong>盘点计划，此操作<strong>不可撤销</strong>会造成<strong>数据丢失</strong>，是否继续?
+        </el-text>
+      </template>
+    </DeleteWarningDialog>
   </basic-container>
   <!-- 列表配置显示 -->
   <edittablehead
-    @setcolum="setnewcolum"
     @closce="showdrawer"
     :drawerShow="drawerShow"
     :columnList="details.columnList"
@@ -161,9 +195,14 @@ import {
   getTaskQuestPage,
   getAllDataWithPackage,
   getDictList,
+  postAddtaskQuest,
+  $_postBatchDelete,
 } from '@/api/distribution/createTask';
+import DeleteWarningDialog from '@/components/popupnotification/popupnotification.vue';
 import { useStore } from 'vuex';
 import dayjs from 'dayjs';
+import { Value } from 'sass';
+import error from '@/error';
 const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
@@ -171,6 +210,13 @@ const $route = useRoute(); //获取地址栏参数
 const formInventory = ref({});
 const shoppingmall = ref([]); // 商场
 const InventoryPopup = ref(false); //创建盘点任务弹窗
+const popupnotificationloading = ref(false);
+const popupnotification = ref(false);
+const ruleFormRef = ref(null);
+const formInventoryloading = ref(false);
+const rules = reactive({
+  time: [{ required: true, message: '请选择盘点时间', trigger: 'blur' }],
+});
 const details = reactive({
   /** 是否开启搜索 */
   search: false,
@@ -429,7 +475,6 @@ const Getshoppingmall = () => {
     }
     if (res.data?.data.length) {
       res.data.data.forEach(item => {
-        console.log(item, '盘点任务返回值');
         shoppingmall.value.push({
           clientName: item.clientName, // 商城名称
           id: item.id, // 商场id
@@ -449,10 +494,109 @@ onLoadPage();
 const InventoryTask = () => {
   InventoryPopup.value = true;
 };
-const InventorySubmit=()=>{
-    console.log(formInventory.value);
-    
+// 废弃盘点任务
+const discard = () => {
+  if (!details.selectionList.length) {
+    ElMessage({
+      message: '请选择要废弃的盘点任务',
+      type: 'warning',
+    });
+    return;
+  }
+  popupnotification.value = true;
+};
+// 废弃盘点取消
+
+// 废弃盘点确认
+const handleDialogConfirm = () => {
+  let data = {
+    ids: details.selectionList.map(item => item.id).join(','),
+  };
+  popupnotificationloading.value = true;
+  $_postBatchDelete(data)
+    .then(res => {
+      console.log(res);
+      if (res.data.code == 200) {
+        ElMessage({
+          message: res.data.msg,
+          type: 'success',
+        });
+        onLoad();
+        popupnotification.value = false;
+      }
+    })
+    .catch(error => {
+      console.log(error, 'error');
+    })
+    .finally(() => {
+      popupnotificationloading.value = false;
+    });
+};
+// 处理商场名称函数根据传入ID读取列表中的商场
+function matchInfoById(idArray, infoArray) {
+  const matchedInfo = [];
+  idArray.forEach(id => {
+    const matchedItem = infoArray.find(item => item.id === id);
+    if (matchedItem) {
+      matchedInfo.push(matchedItem);
+    }
+  });
+  return matchedInfo;
 }
+// 商场名称选择回调
+const formInventoryChange = Value => {
+  const matchedInfo = matchInfoById(Value, shoppingmall.value);
+  formInventory.value.brandName;
+  let name = [];
+  matchedInfo.forEach(item => {
+    name.push(item.brandName);
+  });
+  formInventory.value.brandName = name.join(','); //处理品牌名称显示
+};
+// 盘点提交
+const InventorySubmit = async () => {
+  try {
+    await ruleFormRef.value.validate();
+  } catch (error) {
+    console.error('表单验证失败:', error);
+    return;
+  }
+  //结构参数
+  const {
+    scname,
+    time: [startTime, endTime],
+  } = formInventory.value;
+  //商场处理
+  const matchedInfo = (scname && matchInfoById(scname, shoppingmall.value)) || [];
+
+  const list = scname
+    ? matchedInfo.map(({ id, clientName }) => ({
+        refId: id,
+        refName: clientName,
+      }))
+    : [];
+  //构建提交数据
+  const data = { startTime, endTime, list };
+  console.log('数据:', data);
+  formInventoryloading.value = true;
+  postAddtaskQuest(data)
+    .then(res => {
+      if ((res.data.code = 200)) {
+        ElMessage({
+          message: res.data.msg,
+          type: 'success',
+        });
+        InventoryPopup.value = false;
+        onLoad(); //初始化页面
+      }
+    })
+    .catch(error => {
+      console.log(error, 'error');
+    })
+    .finally(() => {
+      formInventoryloading.value = false;
+    });
+};
 // 页面初始化方法
 // 导出盘点数据
 const ExportDataIndexRwo = row => {
diff --git a/src/views/distribution/inventory/delivery/SeparateTheListInfo.vue b/src/views/distribution/inventory/delivery/SeparateTheListInfo.vue
index e975436b..4568f470 100644
--- a/src/views/distribution/inventory/delivery/SeparateTheListInfo.vue
+++ b/src/views/distribution/inventory/delivery/SeparateTheListInfo.vue
@@ -132,7 +132,6 @@
   </basic-container>
   <!-- 列表配置显示 -->
   <edittablehead
-    @setcolum="setnewcolum"
     @closce="showdrawer"
     :drawerShow="drawerShow"
     :columnList="details.columnList"
diff --git a/src/views/distribution/signfor/asurcharge.vue b/src/views/distribution/signfor/asurcharge.vue
index e2dd02ae..b0abca5d 100644
--- a/src/views/distribution/signfor/asurcharge.vue
+++ b/src/views/distribution/signfor/asurcharge.vue
@@ -240,7 +240,6 @@
   </el-dialog>
   <!-- 列表配置显示 -->
   <edittablehead
-    @setcolum="setnewcolum"
     @closce="showdrawer"
     :drawerShow="drawerShow"
     :columnList="details.columnList"
diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue
index 52b64740..f2659cdc 100644
--- a/src/views/distribution/signfor/distributionSignfortreat.vue
+++ b/src/views/distribution/signfor/distributionSignfortreat.vue
@@ -1913,14 +1913,14 @@ checkImageUrls(row) {
     }
   }
   
-  if (invalidImages.length > 0) {
+  if (invalidImages.length) {
     invalidImages.forEach(item=>{
     ElMessage({
-    message: `图片名称为：${item}存在问题，请删除图片重新上传或者刷新页面重试`,
+    message: `图片名称为：${item}未上传成功，请删除图片重新上传或者刷新页面重试`,
     type: 'warning',
     })
     })
-    console.log(`图片名称为: ${invalidImages.join(', ')}存在问题，请删除图片重新上传，或刷新页面重新尝试`);
+    console.log(`图片名称为: ${invalidImages.join(', ')}未上传成功，请删除图片重新上传，或刷新页面重新尝试`);
     return false;
   } else {
     return true;
diff --git a/src/views/factory/mt/Mengtiandatapushback.vue b/src/views/factory/mt/Mengtiandatapushback.vue
index 2f9e1402..168ac912 100644
--- a/src/views/factory/mt/Mengtiandatapushback.vue
+++ b/src/views/factory/mt/Mengtiandatapushback.vue
@@ -109,7 +109,6 @@
   </basic-container>
   <!-- 列表配置显示 -->
   <edittablehead
-    @setcolum="setnewcolum"
     @closce="showdrawer"
     :drawerShow="drawerShow"
     :columnList="details.columnList"
@@ -327,6 +326,7 @@ const onLoad = () => {
     size: details.page.pageSize,
     ...details.query,
   };
+  details.loadingObj.list=true
   $_factory(data).then(res => {
     if (res.data.code == 200) {
       details.data = res.data.data.records || [];
@@ -343,6 +343,10 @@ const onLoad = () => {
       }
       details.page.total = res.data.data.total;
     }
+  }).catch((error)=>{
+    console.log(error,'error'); 
+  }).finally(()=>{
+    details.loadingObj.list=false
   });
 };
 onLoad();
diff --git a/src/views/warehouse/warehouseRetentionRecord/warehouseRetentionRecord.vue b/src/views/warehouse/warehouseRetentionRecord/warehouseRetentionRecord.vue
index a65b4b02..2191b7e6 100644
--- a/src/views/warehouse/warehouseRetentionRecord/warehouseRetentionRecord.vue
+++ b/src/views/warehouse/warehouseRetentionRecord/warehouseRetentionRecord.vue
@@ -90,7 +90,6 @@
   </basic-container>
   <!-- 列表配置显示 -->
   <edittablehead
-    @setcolum="setnewcolum"
     @closce="showdrawer"
     :drawerShow="drawerShow"
     :columnList="details.columnList"
