fix:优化部分功能

@@ -246,7 +246,7 @@ const columnList = ref([
   {
   {
     label: "分拣数量",
     label: "分拣数量",
     prop: "totalItemCount",
     prop: "totalItemCount",
-    width: 200,
+    // width: 200, 
   },
   },
   {
   {
     label: "创建时间",
     label: "创建时间",

@@ -94,7 +94,8 @@
     </el-form>
     </el-form>
     <el-row :gutter="10" class="mb8">
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
       <el-col :span="1.5">
-        <el-button type="primary" :disabled="scanCodeDisabled" plain icon="Plus" @click="handleAdd"
+        <!-- :disabled="scanCodeDisabled" -->
+        <el-button type="primary" plain icon="Plus" @click="handleAdd"
           >扫码</el-button
           >扫码</el-button
         >
         >
       </el-col>
       </el-col>
@@ -244,6 +245,7 @@
               <el-select
               <el-select
                 v-model="form.deviceTypeId"
                 v-model="form.deviceTypeId"
                 placeholder="请选择类型"
                 placeholder="请选择类型"
+                :disabled="deviceTypeList.length == 1"
                 @change="handleDeviceType"
                 @change="handleDeviceType"
               >
               >
                 <el-option
                 <el-option
@@ -317,7 +319,7 @@
 <script setup>
 <script setup>
 import { getToken } from "@/utils/auth";
 import { getToken } from "@/utils/auth";
 import { formatDate } from "@/utils/index";
 import { formatDate } from "@/utils/index";
-import { nextTick, onMounted, onUnmounted, ref,computed } from "vue";
+import { nextTick, onMounted, onUnmounted, ref, computed } from "vue";
 import {
 import {
   scanSpecQueryList,
   scanSpecQueryList,
   deviceTypeQueryList,
   deviceTypeQueryList,
@@ -409,7 +411,7 @@ const deviceTypeList = ref([]);
 
 
 const searchBusinessLoading = ref(false);
 const searchBusinessLoading = ref(false);
 
 
-const scanCodeDisabled = computed(() => dataList.value.length >= 1)
+const scanCodeDisabled = computed(() => dataList.value.length >= 1);
 
 
 const getDeviceTypeList = () => {
 const getDeviceTypeList = () => {
   deviceTypeQueryList(
   deviceTypeQueryList(
@@ -417,6 +419,12 @@ const getDeviceTypeList = () => {
   ).then((res) => {
   ).then((res) => {
     console.log(res, 111);
     console.log(res, 111);
     deviceTypeList.value = res.data;
     deviceTypeList.value = res.data;
+    // 编辑的时候 只允许一个类型
+    if (proxy.$route.query.scanTaskId && dataList.value.length > 0) {
+      deviceTypeList.value = deviceTypeList.value.filter(
+        (item) => dataList.value[0].deviceTypeId === item.id
+      );
+    }
   });
   });
 };
 };
 
 
@@ -471,10 +479,30 @@ function submitForm() {
       //   open.value = false;
       //   open.value = false;
       //   getList();
       //   getList();
       // });
       // });
+      // 判断是否是第一个
+      const isFirstOne =
+        dataList.value.length > 0
+          ? form.value.id === dataList.value[0].id
+          : false;
+
+      // 安全地获取要比较的businessId
+      let compareBusinessId = null;
+      if (dataList.value.length === 0) {
+        // 数组为空，无法比较
+        compareBusinessId = null;
+      } else if (isFirstOne && dataList.value.length > 1) {
+        // 如果是第一个元素且数组有第二个元素，比较第二个元素的businessId
+        compareBusinessId = dataList.value[1]?.businessId;
+      } else {
+        // 其他情况比较第一个元素的businessId
+        compareBusinessId = dataList.value[0]?.businessId;
+      }
 
 
       if (
       if (
-        dataList.value.length <= 1 ||
-        form.value.businessId === dataList.value[0].businessId
+        dataList.value.length == 0 ||
+        isFirstOne ||
+        (compareBusinessId !== null &&
+          form.value.businessId === compareBusinessId)
       ) {
       ) {
         const localStoreTableData = localStorage.getItem("localStoreTableData")
         const localStoreTableData = localStorage.getItem("localStoreTableData")
           ? JSON.parse(localStorage.getItem("localStoreTableData"))
           ? JSON.parse(localStorage.getItem("localStoreTableData"))
@@ -488,6 +516,7 @@ function submitForm() {
           target.deviceTypeName = form.value.deviceTypeName;
           target.deviceTypeName = form.value.deviceTypeName;
           target.deviceTypeId = form.value.deviceTypeId;
           target.deviceTypeId = form.value.deviceTypeId;
           target.quantity = form.value.quantity;
           target.quantity = form.value.quantity;
+          target.businessId = form.value.businessId;
           localStorage.setItem(
           localStorage.setItem(
             "localStoreTableData",
             "localStoreTableData",
             JSON.stringify(localStoreTableData)
             JSON.stringify(localStoreTableData)
@@ -571,6 +600,10 @@ function handleAdd() {
   reset();
   reset();
   open.value = true;
   open.value = true;
   title.value = "扫码录入";
   title.value = "扫码录入";
+  if (deviceTypeList.value.length == 1) {
+    form.value.deviceTypeId = deviceTypeList.value[0].id;
+    form.value.deviceTypeName = deviceTypeList.value[0].name;
+  }
   nextTick(() => {
   nextTick(() => {
     setTimeout(() => {
     setTimeout(() => {
       barcodeRef.value.focus();
       barcodeRef.value.focus();
@@ -619,8 +652,14 @@ const handleEdit = (row) => {
     ...row,
     ...row,
   };
   };
   if (proxy.$route.query.scanTaskId) {
   if (proxy.$route.query.scanTaskId) {
-    form.value.businessName = detailData.value.businessName;
-    form.value.businessId = detailData.value.businessId;
+    // form.value.businessName = detailData.value.businessName;
+    // form.value.businessId = detailData.value.businessId;
+    form.value.businessName = row.businessName;
+    form.value.businessId = row.businessId;
+  }
+  if (deviceTypeList.value.length == 1) {
+    form.value.deviceTypeId = deviceTypeList.value[0].id;
+    form.value.deviceTypeName = deviceTypeList.value[0].name;
   }
   }
   nextTick(() => {
   nextTick(() => {
     setTimeout(() => {
     setTimeout(() => {
@@ -655,6 +694,7 @@ const confirmAddTask = () => {
           quantity: item.quantity,
           quantity: item.quantity,
         })),
         })),
       };
       };
+      // 新增的时候 类型需保持一致
       if (proxy.$route.query.scanTaskId) {
       if (proxy.$route.query.scanTaskId) {
         data.id = detailData.value.id;
         data.id = detailData.value.id;
         data.name = taskForm.value.taskName;
         data.name = taskForm.value.taskName;
@@ -675,36 +715,70 @@ const confirmAddTask = () => {
               quantity: item.quantity,
               quantity: item.quantity,
             }))
             }))
         );
         );
-        taskLoading.value = true;
-        editScanTask(data)
-          .then((response) => {
-            proxy.$modal.msgSuccess("编辑任务成功！");
-            open.value = false;
-            localStorage.removeItem("localStoreTableData");
-            goBack();
-          })
-          .finally(() => {
-            taskLoading.value = false;
-          });
+        const businessIdList = data.specList.map((item) => item.businessId);
+        console.log(businessIdList, "businessIdList");
+        const businessIdFlag = businessIdList.every(
+          (element) => element === businessIdList[0]
+        );
+        if (businessIdFlag) {
+          taskLoading.value = true;
+          editScanTask(data)
+            .then((response) => {
+              proxy.$modal.msgSuccess("编辑任务成功！");
+              open.value = false;
+              localStorage.removeItem("localStoreTableData");
+              goBack();
+            })
+            .finally(() => {
+              taskLoading.value = false;
+            });
+        } else {
+          proxy.$modal.msgError(
+            "营业厅需保持一致，请检查输入条码修改后重新提交！"
+          );
+        }
       } else {
       } else {
-        taskLoading.value = true;
-        addScanTask(data)
-          .then((response) => {
-            proxy.$modal.msgSuccess("新增任务成功！");
-            open.value = false;
-            localStorage.removeItem("localStoreTableData");
-            goBack();
-          })
-          .finally(() => {
-            taskLoading.value = false;
-          });
+        // 新增的时候 类型需保持一致
+        const specList = data.specList.map((item) => item.deviceTypeId);
+        const specListFlag = specList.every(
+          (element) => element === specList[0]
+        );
+        console.log(data);
+        console.log(specListFlag);
+        console.log(specList);
+        const businessIdList = data.specList.map((item) => item.businessId);
+        console.log(businessIdList, "businessIdList");
+        const businessIdFlag = businessIdList.every(
+          (element) => element === businessIdList[0]
+        );
+        if (businessIdFlag) {
+          if (specListFlag) {
+            taskLoading.value = true;
+            addScanTask(data)
+              .then((response) => {
+                proxy.$modal.msgSuccess("新增任务成功！");
+                open.value = false;
+                localStorage.removeItem("localStoreTableData");
+                goBack();
+              })
+              .finally(() => {
+                taskLoading.value = false;
+              });
+          } else {
+            proxy.$modal.msgError("类型需保持一致，请检查修改后重新提交！");
+          }
+        } else {
+          proxy.$modal.msgError(
+            "营业厅需保持一致，请检查输入条码修改后重新提交！"
+          );
+        }
       }
       }
     }
     }
   });
   });
 };
 };
 
 
 // Query list
 // Query list
-const getList = () => {
+const getList = (isTrigged) => {
   let localStoreTableData = localStorage.getItem("localStoreTableData")
   let localStoreTableData = localStorage.getItem("localStoreTableData")
     ? JSON.parse(localStorage.getItem("localStoreTableData"))
     ? JSON.parse(localStorage.getItem("localStoreTableData"))
     : [];
     : [];
@@ -714,16 +788,20 @@ const getList = () => {
   }));
   }));
   if (!proxy.$route.query.scanTaskId) {
   if (!proxy.$route.query.scanTaskId) {
     loading.value = false;
     loading.value = false;
-
     dataList.value = localStoreTableData;
     dataList.value = localStoreTableData;
+    getDeviceTypeList();
   } else {
   } else {
     loading.value = true;
     loading.value = true;
-    scanSpecQueryList(
-      proxy.addDateRange(queryParams.value, dateRange.value)
-    ).then((res) => {
-      loading.value = false;
-      dataList.value = res.data.concat(localStoreTableData);
-    });
+    scanSpecQueryList(proxy.addDateRange(queryParams.value, dateRange.value))
+      .then((res) => {
+        loading.value = false;
+        dataList.value = res.data.concat(localStoreTableData);
+      })
+      .finally(() => {
+        if (isTrigged) {
+          getDeviceTypeList();
+        }
+      });
   }
   }
 };
 };
 
 
@@ -840,8 +918,7 @@ const handleKeydown = (e) => {
 };
 };
 
 
 onMounted(() => {
 onMounted(() => {
-  getList();
-  getDeviceTypeList();
+  getList(true);
 
 
   if (proxy.$route.query.scanTaskId) {
   if (proxy.$route.query.scanTaskId) {
     getDetail();
     getDetail();

@@ -315,17 +315,16 @@ const columnList = ref([
   {
   {
     label: "分拣时间",
     label: "分拣时间",
     prop: "scanTime",
     prop: "scanTime",
-    width: 150,
+    width: 200,
   },
   },
   {
   {
     label: "分拣结果",
     label: "分拣结果",
-    prop: "scanResult",
-    width: 150
+    prop: "scanResult"
   },
   },
   {
   {
     label: "备注",
     label: "备注",
     prop: "remark",
     prop: "remark",
-    width: 150
+    width: 200
   },
   },
   {
   {
     label: "分拣人",
     label: "分拣人",