cz 2 жил өмнө
parent
commit
6a2781e033
25 өөрчлөгдсөн 38 нэмэгдсэн , 25 устгасан
  1. 1 1
      src/views/inbound-outbound/abnormalManage/index.vue
  2. 1 1
      src/views/inbound-outbound/arrivalInspection/index.vue
  3. 1 1
      src/views/inbound-outbound/flow/index.vue
  4. 2 0
      src/views/inbound-outbound/inbound/cgInbound/index.vue
  5. 1 1
      src/views/inbound-outbound/inbound/manualInbound/index.vue
  6. 1 1
      src/views/inbound-outbound/inbound/qualityTesting.vue
  7. 1 1
      src/views/inbound-outbound/outbound/JDoutbound/index.vue
  8. 1 1
      src/views/inbound-outbound/outbound/manualOutbound/index.vue
  9. 2 0
      src/views/inbound-outbound/transfer/JDtransfer.vue
  10. 1 1
      src/views/inbound-outbound/transfer/index.vue
  11. 1 1
      src/views/inventory-management/check/index.vue
  12. 1 1
      src/views/inventory-management/combination/index.vue
  13. 1 1
      src/views/inventory-management/split/index.vue
  14. 1 1
      src/views/order-management/JDReturnGoods/index.vue
  15. 1 1
      src/views/order-management/JDReturnGoods/logisticsList.vue
  16. 1 1
      src/views/order-management/JDinspection/index.vue
  17. 1 1
      src/views/order-management/JDsalesData/index.vue
  18. 1 1
      src/views/order-management/afterSales/index.vue
  19. 1 1
      src/views/order-management/order/JDorder.vue
  20. 1 1
      src/views/order-management/order/index.vue
  21. 1 1
      src/views/product-material/customer/index.vue
  22. 12 3
      src/views/purchase-management/purchase/index.vue
  23. 1 1
      src/views/purchase-management/returnsManagement/index.vue
  24. 1 1
      src/views/purchase-management/settlement/purchaseSettlement.vue
  25. 1 1
      src/views/purchase-management/subscribe/index.vue

+ 1 - 1
src/views/inbound-outbound/abnormalManage/index.vue

@@ -229,7 +229,7 @@ export default {
   }
   .body-main {
     flex: 1;
-    overflow-y: auto;
+    overflow-y: auto !important;
   }
 }
 </style>

+ 1 - 1
src/views/inbound-outbound/arrivalInspection/index.vue

@@ -270,7 +270,7 @@ export default {
   }
   .body-main {
     flex: 1;
-    overflow-y: auto;
+    overflow-y: auto !important;
   }
 }
 </style>

+ 1 - 1
src/views/inbound-outbound/flow/index.vue

@@ -242,7 +242,7 @@ export default {
   }
   .body-main {
     flex: 1;
-    overflow-y: auto;
+    overflow-y: auto !important;
   }
 }
 </style>

+ 2 - 0
src/views/inbound-outbound/inbound/cgInbound/index.vue

@@ -304,6 +304,8 @@ export default {
     box-sizing: border-box;
   }
   .body-main {
+    height: calc(100vh - 110px);
+
     flex: 1;
     overflow-y: auto;
   }

+ 1 - 1
src/views/inbound-outbound/inbound/manualInbound/index.vue

@@ -225,7 +225,7 @@ export default {
   }
   .body-main {
     flex: 1;
-    overflow-y: auto;
+    overflow-y: auto !important;
   }
 }
 </style>

+ 1 - 1
src/views/inbound-outbound/inbound/qualityTesting.vue

@@ -326,7 +326,7 @@ export default {
   }
   .body-main {
     flex: 1;
-    overflow-y: auto;
+    overflow-y: auto !important;
   }
 }
 </style>

+ 1 - 1
src/views/inbound-outbound/outbound/JDoutbound/index.vue

@@ -348,7 +348,7 @@ export default {
   }
   .body-main {
     flex: 1;
-    overflow-y: auto;
+    overflow-y: auto !important;
   }
 }
 // .box-card {

+ 1 - 1
src/views/inbound-outbound/outbound/manualOutbound/index.vue

@@ -244,7 +244,7 @@ export default {
   }
   .body-main {
     flex: 1;
-    overflow-y: auto;
+    overflow-y: auto !important;
   }
 }
 </style>

+ 2 - 0
src/views/inbound-outbound/transfer/JDtransfer.vue

@@ -307,6 +307,8 @@ export default {
   //   box-sizing: border-box;
   // }
   .body-main {
+    height: calc(100vh - 110px);
+
     flex: 1;
     overflow-y: auto;
   }

+ 1 - 1
src/views/inbound-outbound/transfer/index.vue

@@ -308,7 +308,7 @@ export default {
   }
   .body-main {
     flex: 1;
-    overflow-y: auto;
+    overflow-y: auto !important;
   }
 }
 </style>

+ 1 - 1
src/views/inventory-management/check/index.vue

@@ -282,7 +282,7 @@ export default {
   }
   .body-main {
     flex: 1;
-    overflow-y: auto;
+    overflow-y: auto !important;
   }
 }
 </style>

+ 1 - 1
src/views/inventory-management/combination/index.vue

@@ -230,7 +230,7 @@ export default {
   }
   .body-main {
     flex: 1;
-    overflow-y: auto;
+    overflow-y: auto !important;
   }
 }
 </style>

+ 1 - 1
src/views/inventory-management/split/index.vue

@@ -231,7 +231,7 @@ export default {
   }
   .body-main {
     flex: 1;
-    overflow-y: auto;
+    overflow-y: auto !important;
   }
 }
 </style>

+ 1 - 1
src/views/order-management/JDReturnGoods/index.vue

@@ -400,7 +400,7 @@ export default {
   }
   .body-main {
     flex: 1;
-    overflow-y: auto;
+    overflow-y: auto !important;
   }
 }
 </style>

+ 1 - 1
src/views/order-management/JDReturnGoods/logisticsList.vue

@@ -616,7 +616,7 @@ export default {
   }
   .body-main {
     flex: 1;
-    overflow-y: auto;
+    overflow-y: auto !important;
   }
 }
 </style>

+ 1 - 1
src/views/order-management/JDinspection/index.vue

@@ -210,7 +210,7 @@ export default {
   }
   .body-main {
     flex: 1;
-    overflow-y: auto;
+    overflow-y: auto !important;
   }
 }
 </style>

+ 1 - 1
src/views/order-management/JDsalesData/index.vue

@@ -203,7 +203,7 @@ export default {
   }
   .body-main {
     flex: 1;
-    overflow-y: auto;
+    overflow-y: auto !important;
   }
 }
 </style>

+ 1 - 1
src/views/order-management/afterSales/index.vue

@@ -348,7 +348,7 @@ export default {
   }
   .body-main {
     flex: 1;
-    overflow-y: auto;
+    overflow-y: auto !important;
   }
 }
 .record-item {

+ 1 - 1
src/views/order-management/order/JDorder.vue

@@ -376,7 +376,7 @@ export default {
   }
   .body-main {
     flex: 1;
-    overflow-y: auto;
+    overflow-y: auto !important;
   }
 }
 </style>

+ 1 - 1
src/views/order-management/order/index.vue

@@ -345,7 +345,7 @@ export default {
   }
   .body-main {
     flex: 1;
-    overflow-y: auto;
+    overflow-y: auto !important;
   }
 }
 </style>

+ 1 - 1
src/views/product-material/customer/index.vue

@@ -302,7 +302,7 @@ export default {
   }
   .body-main {
     flex: 1;
-    overflow-y: auto;
+    overflow-y: auto !important;
   }
 }
 </style>

+ 12 - 3
src/views/purchase-management/purchase/index.vue

@@ -163,8 +163,17 @@ export default {
         supplierId: "",
         goodsList: goodsList,
       };
-      this.titleText = "add";
-      this.open = true;
+      this.$router.push({
+        path: "/process/examinationApproval/index",
+        query: {
+          id: "",
+          processInstanceId: "",
+          flowCode: "PURCHASE",
+          detailsData: JSON.stringify({ ...this.form }),
+        },
+      });
+      // this.titleText = "add";
+      // this.open = true;
     },
     handlePurchases() {
       if (!this.selectData.length > 0)
@@ -444,7 +453,7 @@ export default {
   }
   .body-main {
     flex: 1;
-    overflow-y: auto;
+    overflow-y: auto !important;
   }
 }
 </style>

+ 1 - 1
src/views/purchase-management/returnsManagement/index.vue

@@ -263,7 +263,7 @@ export default {
   }
   .body-main {
     flex: 1;
-    overflow-y: auto;
+    overflow-y: auto !important;
   }
 }
 </style>

+ 1 - 1
src/views/purchase-management/settlement/purchaseSettlement.vue

@@ -259,7 +259,7 @@ export default {
   }
   .body-main {
     flex: 1;
-    overflow-y: auto;
+    overflow-y: auto !important;
   }
 }
 </style>

+ 1 - 1
src/views/purchase-management/subscribe/index.vue

@@ -409,7 +409,7 @@ export default {
   }
   .body-main {
     flex: 1;
-    overflow-y: auto;
+    overflow-y: auto !important;
   }
 }
 </style>