Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/views/basicdata/driverArtery/basicdataDriverArtery.vue

@@ -193,16 +193,16 @@ export default {
               }
             },
           },
-          // {
+          {
-          //   label: "姓名",
+            label: "姓名",
-          //   prop: "name",
+            prop: "name",
-          //   type: "input",
+            type: "input",
-          //   search: true,
+            search: true,
-          //   labelWidth:'150',
+            labelWidth:'150',
-          //   width:"100px",
+            width:"100px",
-          //   align:'center',
+            align:'center',
-          //   span:11,
+            span:11,
-          // },
+          },
           {
             label: '手机号码',
             prop: 'phone',

src/views/distribution/deliverylist/distributionDeliveryList.vue

@@ -1198,7 +1198,7 @@ export default {
 }
 .avue-crud__right {
   display: flex;
-  align-items: flex-end;
+  align-items: center;
 }
 .el-form-item__content {
   height: 30px;
@@ -1209,4 +1209,9 @@ export default {
     height:30px !important;
   }
 }
+:deep(.avue-crud__header){
+  .avue-crud__left{
+    margin-top:0 !important;
+  }
+}
 </style>

src/views/distribution/deliverylist/distributionDeliveryListdis.vue

@@ -1243,7 +1243,7 @@ export default {
 }
 .avue-crud__right {
   display: flex;
-  align-items: flex-end;
+  align-items: center;
 }
 .fr-fm {
   width: 100%;
@@ -1257,4 +1257,9 @@ export default {
     }
   }
 }
+:deep(.avue-crud__header){
+  .avue-crud__left{
+    margin-top:0 !important;
+  }
+}
 </style>

src/views/distribution/deliverylist/distributionDeliveryListmar.vue

@@ -1184,7 +1184,7 @@ export default {
   }
 }
 .avue-crud__header {
-  align-items: flex-end !important;
+  // align-items: flex-end !important;  
 }
 // 日期选择框
 .el-times {
@@ -1202,9 +1202,14 @@ export default {
 }
 .avue-crud__right{
   display: flex;
-    align-items: flex-end;
+ align-items: center;
 }
 .fr-fo{
   display:flex; 
 }
+:deep(.avue-crud__header){
+  .avue-crud__left{
+    margin-top:0 !important;
+  }
+}
 </style>

src/views/distribution/stockup/distributionStockupDetailsSelf.vue

@@ -1541,13 +1541,14 @@ export default {
       });
     },
     //备货id
-    handleStockUp(row, type) {
+    async handleStockUp(row, type) {
-      getListUser().then(res => {
+     // const  a = await getListUser().then( res => {
-        //查询当前人信息
+     //    //查询当前人信息
-        console.log('res>>>', res.data.data);
+     //    console.log('res>>>', res.data.data);
-        this.deptId = res.data.data.deptId;
+     //    this.deptId = res.data.data.deptId;
-        this.getStorageArea();
+     //
-      });
+     //  });
+      await this.getStorageArea();
       console.log('备货数据！！', row);
       switch (type) {
         case '1':
@@ -1576,7 +1577,7 @@ export default {
         department: this.deptId,
       };
       stockUp(params).then(res => {
-        // console.log("res>>>",res.data.data);
+        console.log("备货区res>>>",res.data.data);
         let fo = [];
         res.data.data.forEach(i => {
           let v = {