Merge branch 'master' into 测试

src/views/group/order/already-removed/index.vue

@@ -51,12 +51,14 @@ const searchConfig = computed(() => {
       prop: "wlnCode",
       label: "万里牛单号",
     },
-    {
-      type: "select",
-      prop: "departmentId",
-      data: departmentList.value,
-      label: "事业部",
-    },
+    !proxy.useUserStore().user.deptId || proxy.useUserStore().user.deptId === "100"
+      ? {
+          type: "select",
+          prop: "departmentId",
+          data: departmentList.value,
+          label: "事业部",
+        }
+      : {},
   ];
 });
 const config = computed(() => {
@@ -138,6 +140,9 @@ const getList = async (req, status) => {
   } else {
     sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
   }
+  if (proxy.useUserStore().user.deptId && proxy.useUserStore().user.deptId !== "100") {
+    sourceList.value.pagination.departmentId = proxy.useUserStore().user.deptId;
+  }
   loading.value = true;
   proxy.post("/orderInfo/deletedOrderPage", sourceList.value.pagination).then((res) => {
     sourceList.value.data = res.rows;