样式修改

src/components/product/treeList.vue

@@ -18,39 +18,42 @@
         </el-icon>
       </el-button>
     </div>
-    <el-tree
-      :data="data"
-      ref="tree"
-      node-key="id"
-      @node-click="treeChange"
-      default-expand-all
-      :filter-node-method="filterNode"
-    >
-      <template #default="{ node, data }">
-        <div class="custom-tree-node">
-          <div style="flex: 1">{{ node.label }}</div>
-          <div style="float: right">
-            <el-icon :size="17" @click.stop="() => edit(node, data)">
-              <Edit />
-            </el-icon>
-            <el-icon
-              :size="17"
-              style="margin-left: 10px"
-              @click.stop="() => add(data)"
-            >
-              <Plus />
-            </el-icon>
-            <el-icon
-              :size="17"
-              style="margin-left: 10px"
-              @click.stop="() => del(data)"
-            >
-              <Delete />
-            </el-icon>
+    <div class="box">
+      <el-tree
+        :data="data"
+        ref="tree"
+        node-key="id"
+        @node-click="treeChange"
+        default-expand-all
+        :filter-node-method="filterNode"
+      >
+        <template #default="{ node, data }">
+          <div class="custom-tree-node">
+            <div style="flex: 1">{{ node.label }}</div>
+            <div style="float: right; width: 71px; margin-left: 10px">
+              <el-icon :size="17" @click.stop="() => edit(node, data)">
+                <Edit />
+              </el-icon>
+              <el-icon
+                :size="17"
+                style="margin-left: 10px"
+                @click.stop="() => add(data)"
+              >
+                <Plus />
+              </el-icon>
+              <el-icon
+                :size="17"
+                style="margin-left: 10px"
+                @click.stop="() => del(data)"
+              >
+                <Delete />
+              </el-icon>
+            </div>
           </div>
-        </div>
-      </template>
-    </el-tree>
+        </template>
+      </el-tree>
+    </div>
+
     <el-dialog
       :title="treeModalType == 'add' ? '添加分类' : '编辑分类'"
       v-model="treeModal"
@@ -247,6 +250,8 @@ const handleMouseOver = (data) => {
   height: 100%;
   background: #fff;
   padding: 20px;
+  height: calc(100vh - 140px);
+
   .search {
     margin-bottom: 20px;
     .el-input {
@@ -255,5 +260,26 @@ const handleMouseOver = (data) => {
       text-align: center;
     }
   }
+  // .searh,.title,.box{
+  //   padding-left:20px ;
+  // }
+  .box {
+    padding-right: 0px;
+    height: calc(100vh - 270px);
+    overflow-y: auto;
+    overflow-x: auto;
+  }
+}
+.el-tree-node__content {
+  display: block;
+  // padding-left: 24px !important;
+  // position: relative;
+}
+.el-tree-node__content > .el-tree-node__expand-icon {
+  // position: absolute;
+  // left: 0px;
+}
+.el-tree-node > .el-tree-node__children {
+  overflow: visible;
 }
-</style>
+</style>

src/views/WDLY/basic/product/index.vue

@@ -53,7 +53,7 @@
       :title="modalType == 'add' ? '添加' : '编辑'"
       v-model="dialogVisible"
       width="500"
-      v-loading="loading"
+      v-loading="loadingOne"
     >
       <byForm
         :formConfig="formConfig"
@@ -295,6 +295,8 @@ import { computed, defineComponent, ref } from "vue";
 let openProduct = ref(false);
 
 const loading = ref(false);
+const loadingOne = ref(false);
+
 const submitLoading = ref(false);
 const sourceList = ref({
   data: [],
@@ -731,8 +733,10 @@ const select = (_selection, row) => {
 };
 
 const tree = ref(null);
+let submitProductData = ref({});
 const submitForm = () => {
   byform.value.handleSubmit((valid) => {
+    submitProductData.value = { ...formData.data };
     const list = formData.data.productCombinationList;
     let jsonObj = JSON.parse(formData.data.victoriatouristJson);
     if (formData.data.combination == 1) {
@@ -751,6 +755,7 @@ const submitForm = () => {
         type: "info",
       });
     }
+    loadingOne.value = true;
     jsonObj.deptId = deptIdCopy.value;
     formData.data.victoriatouristJson = jsonObj;
     jsonObj.productCombinationList = list;
@@ -772,10 +777,17 @@ const submitForm = () => {
           type: "success",
         });
         dialogVisible.value = false;
+        loadingOne.value = false;
+
         submitLoading.value = false;
         getList();
       },
       (err) => {
+        formData.data = { ...submitProductData.value };
+        formData.data.victoriatouristJson = JSON.parse(
+          submitProductData.value.victoriatouristJson
+        );
+        loadingOne.value = false;
         submitLoading.value = false;
       }
     );

src/views/WDLY/outInBound/jdOrderReceive/index.vue

@@ -315,7 +315,7 @@ const config = computed(() => {
   return [
     {
       attrs: {
-        label: "订单订单编号",
+        label: "订单编号",
         prop: "code",
         slot: "code",
       },
@@ -487,14 +487,16 @@ const formConfig = reactive([
 const getList = async (req) => {
   sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
   loading.value = true;
-  proxy.post("/jdOrder/page", sourceList.value.pagination).then((message) => {
-    console.log(message);
-    sourceList.value.data = message.rows;
-    sourceList.value.pagination.total = message.total;
-    setTimeout(() => {
-      loading.value = false;
-    }, 200);
-  });
+  proxy
+    .post("/jdOrder/receivePage", sourceList.value.pagination)
+    .then((message) => {
+      console.log(message);
+      sourceList.value.data = message.rows;
+      sourceList.value.pagination.total = message.total;
+      setTimeout(() => {
+        loading.value = false;
+      }, 200);
+    });
 };
 const openModal = () => {
   dialogVisible.value = true;

src/views/WDLY/stockManage/query/index.vue

@@ -179,7 +179,7 @@ const configData = [
     },
     {
       attrs: {
-        label: "规格",
+        label: "规格型号",
         prop: "productSpec",
       },
     },
@@ -263,7 +263,7 @@ const configData = [
     },
     {
       attrs: {
-        label: "规格",
+        label: "规格型号",
         prop: "productSpec",
       },
     },