lxf 1 жил өмнө
parent
commit
67e71ce135

BIN
public/favicon.ico


+ 6 - 8
src/layout/components/AppMain.vue

@@ -1,10 +1,9 @@
 <template>
-  <section class="app-main">
+  <section class="app-main" style="padding: 10px">
     <router-view v-slot="{ Component, route }">
       <transition name="fade-transform" mode="out-in">
         <keep-alive :include="tagsViewStore.cachedViews">
-          
-          <component v-if="!route.meta.link" :is="Component" :key="route.fullPath"/>
+          <component v-if="!route.meta.link" :is="Component" :key="route.fullPath" />
         </keep-alive>
       </transition>
     </router-view>
@@ -13,11 +12,10 @@
 </template>
 
 <script setup>
-import iframeToggle from "./IframeToggle/index"
-import useTagsViewStore from '@/store/modules/tagsView'
-
-const tagsViewStore = useTagsViewStore()
+import iframeToggle from "./IframeToggle/index";
+import useTagsViewStore from "@/store/modules/tagsView";
 
+const tagsViewStore = useTagsViewStore();
 </script>
 
 <style lang="scss" scoped>
@@ -52,4 +50,4 @@ const tagsViewStore = useTagsViewStore()
     padding-right: 17px;
   }
 }
-</style>
+</style>

+ 0 - 1
src/layout/index.vue

@@ -118,6 +118,5 @@ function setLayout() {
   max-height: calc(100vh - 120px);
   overflow-y: auto;
   overflow-x: hidden;
-  margin: 10px;
 }
 </style>

+ 1 - 5
src/views/group/BOM/classification/index.vue

@@ -206,8 +206,4 @@ const clickDelete = (row) => {
 };
 </script>
 
-<style lang="scss" scoped>
-.tenant {
-  padding: 10px;
-}
-</style>
+<style lang="scss" scoped></style>

+ 21 - 43
src/views/group/order/management/index.vue

@@ -20,21 +20,18 @@
 
 <script setup>
 import byTable from "@/components/byTable/index";
-import { ElMessage, ElMessageBox } from "element-plus";
 
 const { proxy } = getCurrentInstance();
-const orderStatus = ref([]);
 const sourceList = ref({
-  data: [{ code: "踩踩踩踩踩踩踩踩踩踩踩踩踩踩踩踩踩踩从" }, {}],
+  data: [],
   pagination: {
     total: 1000,
     pageNum: 1,
     pageSize: 10,
-    keyword: "",
-    status: "",
-    payStatus: "",
+    name: "",
   },
 });
+const loading = ref(false);
 const selectConfig = computed(() => {
   return [
     {
@@ -58,21 +55,18 @@ const config = computed(() => {
   return [
     {
       attrs: {
-        label: "采购单号",
-        prop: "code",
+        label: "分类名称",
+        prop: "name",
         "min-width": 180,
       },
     },
-    // {
-    //   attrs: {
-    //     label: "供应商",
-    //     prop: "sellCorporationId",
-    //     "min-width": 220,
-    //   },
-    //   render(type) {
-    //     return proxy.dictValueLabel(type, supplierList.value);
-    //   },
-    // },
+    {
+      attrs: {
+        label: "排序",
+        prop: "sort",
+        width: 100,
+      },
+    },
     {
       attrs: {
         label: "操作",
@@ -86,35 +80,19 @@ const config = computed(() => {
     },
   ];
 });
-const getDict = () => {
-  proxy.getDictOne(["order_status"]).then((res) => {
-    if (res["order_status"] && res["order_status"].length > 0) {
-      orderStatus.value = res["order_status"].map((x) => ({
-        label: x.dictValue,
-        value: x.dictKey,
-      }));
-    }
-  });
-};
-getDict();
 const getList = async (req) => {
-  console.log(req);
-  //   sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
-  //   loading.value = true;
-  //   proxy.post("/ehsdPurchase/page", sourceList.value.pagination).then((res) => {
-  //     console.log(res);
-  //     sourceList.value.data = res.rows;
-  //     sourceList.value.pagination.total = res.total;
-  //     setTimeout(() => {
-  //       loading.value = false;
-  //     }, 200);
-  //   });
+  sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
+  loading.value = true;
+  proxy.post("/bomClassify/tree", sourceList.value.pagination).then((res) => {
+    sourceList.value.data = res.rows;
+    sourceList.value.pagination.total = res.total;
+    setTimeout(() => {
+      loading.value = false;
+    }, 200);
+  });
 };
 getList();
 </script>
 
 <style lang="scss" scoped>
-.tenant {
-  padding: 10px;
-}
 </style>

+ 0 - 3
src/views/group/order/product-management/index.vue

@@ -112,7 +112,4 @@ getList();
 </script>
 
 <style lang="scss" scoped>
-.tenant {
-  padding: 10px;
-}
 </style>