Merge branch '移除事业部胜德体育,下单调整'

src/views/group/data-board/sku-quoted-price/index.vue

@@ -151,14 +151,12 @@ const config = computed(() => {
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
 };

src/views/group/data-board/turnover-rate/index.vue

@@ -279,14 +279,12 @@ const config = computed(() => {
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
 };

src/views/group/finance/check-bill/index.vue

@@ -165,7 +165,7 @@ import { copyText } from "vue3-clipboard";
 import ExcelFile from "/src/views/group/finance/check-bill/ExcelFile.vue";
 
 const { proxy } = getCurrentInstance();
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const sourceList = ref({
   data: [],
   pagination: {
@@ -334,14 +334,12 @@ const config = computed(() => {
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
 };

src/views/group/finance/sales-return/index.vue

@@ -26,7 +26,7 @@ import { ElMessage, ElMessageBox } from "element-plus";
 import moment from "moment";
 
 const { proxy } = getCurrentInstance();
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const sourceList = ref({
   data: [],
   pagination: {
@@ -156,14 +156,12 @@ const config = computed(() => {
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
 };

src/views/group/finance/sales-revenue-cost/index.vue

@@ -38,7 +38,7 @@ import { ElMessage, ElMessageBox } from "element-plus";
 import ExcelFile from "/src/views/group/finance/check-bill/ExcelFile.vue";
 
 const { proxy } = getCurrentInstance();
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const sourceList = ref({
   data: [],
   pagination: {
@@ -269,14 +269,12 @@ const config = computed(() => {
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
 };

src/views/group/finance/sales-shipment/index.vue

@@ -93,7 +93,7 @@ import { ElMessage, ElMessageBox } from "element-plus";
 import ExcelFile from "/src/views/group/finance/check-bill/ExcelFile.vue";
 
 const { proxy } = getCurrentInstance();
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const sourceList = ref({
   data: [],
   pagination: {
@@ -169,14 +169,12 @@ const config = computed(() => {
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
 };

src/views/group/finance/summary/index.vue

@@ -58,7 +58,7 @@ import { ElMessage } from "element-plus";
 import ExcelFile from "/src/views/group/finance/check-bill/ExcelFile.vue";
 
 const { proxy } = getCurrentInstance();
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const sourceList = ref({
   data: [],
   pagination: {

src/views/group/maintenance/amend-inventory/index.vue

@@ -69,7 +69,7 @@ import SelectBOM from "/src/views/group/BOM/management/index";
 
 const { proxy } = getCurrentInstance();
 const warehouseList = ref([]);
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const getDemandData = () => {
   proxy.post("/warehouse/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
@@ -83,14 +83,12 @@ const getDemandData = () => {
   });
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
 };

src/views/group/maintenance/order-comparison/index.vue

@@ -25,7 +25,7 @@ import { ElMessage } from "element-plus";
 import Editor from "/src/components/Editor/index.vue";
 
 const { proxy } = getCurrentInstance();
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const sourceList = ref({
   data: [],
   pagination: {
@@ -85,14 +85,12 @@ const config = computed(() => {
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
 };

src/views/group/order/abnormal/index.vue

@@ -28,7 +28,7 @@ import byTable from "/src/components/byTable/index";
 import { ElMessage, ElMessageBox } from "element-plus";
 
 const { proxy } = getCurrentInstance();
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const exceptionTypeList = ref([]);
 const sourceList = ref({
   data: [],
@@ -170,14 +170,12 @@ const config = computed(() => {
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
   proxy.post("/orderInfo/getExceptionTypeList", {}).then((res) => {

src/views/group/order/after-sale/index.vue

@@ -19,7 +19,7 @@
 import byTable from "/src/components/byTable/index";
 
 const { proxy } = getCurrentInstance();
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const sourceList = ref({
   data: [],
   pagination: {
@@ -146,14 +146,12 @@ const config = computed(() => {
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
 };

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

@@ -25,7 +25,7 @@ import byTable from "/src/components/byTable/index";
 import { ElMessage } from "element-plus";
 
 const { proxy } = getCurrentInstance();
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const sourceList = ref({
   data: [],
   pagination: {
@@ -118,14 +118,12 @@ const config = computed(() => {
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
 };

src/views/group/order/draw-design/index.vue

@@ -220,14 +220,12 @@ const config = computed(() => {
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
 };

src/views/group/order/management/index.vue

@@ -183,7 +183,7 @@ const props = defineProps({
   selectStatus: Boolean,
   departmentId: String,
 });
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const sourceList = ref({
   data: [],
   pagination: {
@@ -561,14 +561,12 @@ const config = computed(() => {
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
 };

src/views/group/order/product-management/index.vue

@@ -38,7 +38,7 @@ import { ElMessage } from "element-plus";
 import { copyText } from "vue3-clipboard";
 
 const { proxy } = getCurrentInstance();
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const sourceList = ref({
   data: [],
   pagination: {
@@ -295,14 +295,12 @@ const config = computed(() => {
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
 };

src/views/production/operation/batching/demo.vue

@@ -101,7 +101,7 @@ import byForm from "/src/components/byForm/index";
 import { ElMessage } from "element-plus";
 
 const { proxy } = getCurrentInstance();
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const props = defineProps({
   selectData: Array,
 });
@@ -156,14 +156,12 @@ const rules = ref({
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
 };

src/views/production/operation/batching/index.vue

@@ -165,7 +165,7 @@ import Quick from "/src/views/production/operation/batching/quick";
 
 const { proxy } = getCurrentInstance();
 const activeName = ref("first");
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const sourceList = ref({
   data: [],
   pagination: {
@@ -484,14 +484,12 @@ const getNum = () => {
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
   getNum();

src/views/production/operation/batching/quick.vue

@@ -55,7 +55,7 @@ import byForm from "/src/components/byForm/index";
 import { ElMessage } from "element-plus";
 
 const { proxy } = getCurrentInstance();
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const props = defineProps({
   pagination: Object,
 });
@@ -107,14 +107,12 @@ const rules = ref({
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
 };

src/views/production/schedule/order-inquiry/index.vue

@@ -123,7 +123,7 @@ import SelectBOM from "/src/views/group/BOM/management/index";
 import { ElMessage, ElMessageBox } from "element-plus";
 
 const { proxy } = getCurrentInstance();
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const sourceList = ref({
   data: [],
   pagination: {
@@ -324,14 +324,12 @@ const config = computed(() => {
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
 };

src/views/production/schedule/production-order/index.vue

@@ -151,7 +151,7 @@ import { ElMessage, ElMessageBox } from "element-plus";
 import SelectBOM from "/src/views/group/BOM/management/index";
 
 const { proxy } = getCurrentInstance();
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const tagList = ref({
   10: "warning",
   30: "danger",
@@ -326,14 +326,12 @@ const config = computed(() => {
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
 };

src/views/production/shipment/print-order/index.vue

@@ -226,7 +226,7 @@ import { ElMessage } from "element-plus";
 import PackTotal from "/src/views/production/shipment/print-order/packTotal.vue";
 
 const { proxy } = getCurrentInstance();
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const expressDeliveryList = ref([]);
 const sourceList = ref({
   data: [],
@@ -436,14 +436,12 @@ const config = computed(() => {
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
   proxy.post("/expressDelivery/page", { pageNum: 1, pageSize: 999 }).then((res) => {

src/views/production/warehouse/check/index.vue

@@ -77,7 +77,7 @@ import { ElMessage } from "element-plus";
 
 const { proxy } = getCurrentInstance();
 const activeName = ref("first");
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const warehouseList = ref([]);
 const sourceList = ref({
   data: [],
@@ -368,14 +368,12 @@ const changeActiveName = (val) => {
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
   proxy.post("/warehouse/page", { pageNum: 1, pageSize: 999 }).then((res) => {

src/views/production/warehouse/defective-turnover/index.vue

@@ -93,7 +93,7 @@ import useTagsViewStore from "/src/store/modules/tagsView";
 import SelectInventory from "/src/views/production/warehouse/inventory/index";
 
 const { proxy } = getCurrentInstance();
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const warehouseList = ref([]);
 const router = useRouter();
 const submit = ref(null);
@@ -146,14 +146,12 @@ const rules = ref({
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
   proxy.post("/warehouse/page", { pageNum: 1, pageSize: 999 }).then((res) => {

src/views/production/warehouse/finished-parts-storage/index.vue

@@ -53,7 +53,7 @@ import moment from "moment";
 
 const { proxy } = getCurrentInstance();
 const activeName = ref("first");
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const sourceList = ref({
   data: [],
   pagination: {
@@ -217,14 +217,12 @@ const configTwo = computed(() => {
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
 };

src/views/production/warehouse/flow-record/index.vue

@@ -25,7 +25,7 @@ import { ElMessage, ElMessageBox } from "element-plus";
 import moment from "moment";
 
 const { proxy } = getCurrentInstance();
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const warehouseList = ref([]);
 const sourceList = ref({
   data: [],
@@ -223,14 +223,12 @@ const clickReset = () => {
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
   proxy.post("/warehouse/page", { pageNum: 1, pageSize: 999 }).then((res) => {

src/views/production/warehouse/inventory/index.vue

@@ -251,7 +251,6 @@ const getDemandData = () => {
     proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
       let list = [
         { id: "", name: "全部" },
-        { id: "0", name: "胜德体育" },
       ];
       departmentList.value = list.concat(res.rows);
       if (!(route.query && route.query.backupDate)) {

src/views/production/warehouse/outbound/add.vue

@@ -92,7 +92,7 @@ import useTagsViewStore from "/src/store/modules/tagsView";
 import SelectInventory from "/src/views/production/warehouse/inventory/index";
 
 const { proxy } = getCurrentInstance();
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const warehouseList = ref([]);
 const router = useRouter();
 const submit = ref(null);
@@ -144,14 +144,12 @@ const rules = ref({
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
   proxy.post("/warehouse/page", { pageNum: 1, pageSize: 999 }).then((res) => {

src/views/production/warehouse/outbound/index.vue

@@ -67,7 +67,7 @@ import moment from "moment";
 
 const { proxy } = getCurrentInstance();
 const activeName = ref("first");
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const warehouseList = ref([]);
 const sourceList = ref({
   data: [],
@@ -402,14 +402,12 @@ const changeActiveName = (val) => {
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
   proxy.post("/warehouse/page", { pageNum: 1, pageSize: 999 }).then((res) => {

src/views/production/warehouse/outbound/packing-materials/add.vue

@@ -92,7 +92,7 @@ import useTagsViewStore from "/src/store/modules/tagsView";
 import SelectInventory from "/src/views/production/warehouse/inventory/index";
 
 const { proxy } = getCurrentInstance();
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const warehouseList = ref([]);
 const router = useRouter();
 const submit = ref(null);
@@ -147,14 +147,12 @@ const rules = ref({
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
   proxy.post("/warehouse/page", { pageNum: 1, pageSize: 999 }).then((res) => {

src/views/production/warehouse/putInStorage/add.vue

@@ -113,7 +113,7 @@ import useTagsViewStore from "/src/store/modules/tagsView";
 import SelectBOM from "/src/views/group/BOM/management/index";
 
 const { proxy } = getCurrentInstance();
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const warehouseList = ref([]);
 const purchaseContractList = ref([]);
 const router = useRouter();
@@ -167,14 +167,12 @@ const rules = ref({
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
   proxy.post("/warehouse/page", { pageNum: 1, pageSize: 999 }).then((res) => {

src/views/production/warehouse/putInStorage/index.vue

@@ -63,7 +63,7 @@ import moment from "moment";
 
 const { proxy } = getCurrentInstance();
 const activeName = ref("first");
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const warehouseList = ref([]);
 const sourceList = ref({
   data: [],
@@ -397,14 +397,12 @@ const changeActiveName = (val) => {
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
   proxy.post("/warehouse/page", { pageNum: 1, pageSize: 999 }).then((res) => {

src/views/production/warehouse/transfer/index.vue

@@ -93,7 +93,7 @@ import useTagsViewStore from "/src/store/modules/tagsView";
 import SelectInventory from "/src/views/production/warehouse/inventory/index";
 
 const { proxy } = getCurrentInstance();
-const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const departmentList = ref([]);
 const warehouseList = ref([]);
 const router = useRouter();
 const submit = ref(null);
@@ -144,14 +144,12 @@ const rules = ref({
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = departmentList.value.concat(
-        res.rows.map((item) => {
-          return {
-            dictKey: item.id,
-            dictValue: item.name,
-          };
-        })
-      );
+      departmentList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
     }
   });
   proxy.post("/warehouse/page", { pageNum: 1, pageSize: 999 }).then((res) => {

src/views/subsidiary/order/management/add.vue

@@ -1287,7 +1287,11 @@ const clickSaveShippingPackage = () => {
           if (formData.data.id) {
             type = "edit";
           }
-          proxy.post("/orderInfo/" + type, formData.data).then(() => {
+          let bodyData = proxy.deepClone(formData.data);
+          if (bodyData.departmentId == "0") {
+            delete bodyData.orderPackageBomList;
+          }
+          proxy.post("/orderInfo/" + type, bodyData).then(() => {
             ElMessage({
               message: type == "add" ? "添加成功" : "编辑成功",
               type: "success",
@@ -1310,7 +1314,11 @@ const clickSaveShippingPackage = () => {
             if (formData.data.id) {
               type = "edit";
             }
-            proxy.post("/orderInfo/" + type, formData.data).then(() => {
+            let bodyData = proxy.deepClone(formData.data);
+            if (bodyData.departmentId == "0") {
+              delete bodyData.orderPackageBomList;
+            }
+            proxy.post("/orderInfo/" + type, bodyData).then(() => {
               ElMessage({
                 message: type == "add" ? "添加成功" : "编辑成功",
                 type: "success",

src/views/subsidiary/warehouse/inventory/index.vue

@@ -210,9 +210,8 @@ const config = computed(() => {
 });
 const getDemandData = () => {
   proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
-    let list = [{ id: "0", name: "胜德体育" }];
     if (res.rows && res.rows.length > 0) {
-      departmentList.value = list.concat(res.rows.filter((item) => item.id === proxy.useUserStore().user.deptId));
+      departmentList.value = res.rows.filter((item) => item.id === proxy.useUserStore().user.deptId);
     }
     proxy.post("/inventory/getQuantityByDepartment", {}).then((res) => {
       for (let i = 0; i < departmentList.value.length; i++) {