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

src/views/basic/line/basicLine.vue

@@ -285,7 +285,7 @@ export default {
 :deep(.avue-form__group--flex) {
     display: flex;
     flex-direction: row;
-    justify-content: flex-start;
+    justify-content: space-between;
 }
 :deep(.avue-form__row){
   max-width:324px;

src/views/basic/property/basicPropertyDetails.vue

@@ -639,7 +639,7 @@ export default {
 
 <style scoped lang='scss'>
 :deep(.no-print ){
-  margin-left: auto !important;
+  // margin-left: auto !important;
 }
 :deep(.el-form-item__label){
   width:auto !important;
@@ -658,16 +658,17 @@ export default {
 :deep(.avue-form__row:nth-child(7)){
     margin-left:35px;
 }
-:deep(.avue-form__row:nth-child(8)){
-    margin-left:35px;
-}
+
 :deep(.avue-form__row){
   margin-left:10px;
 }
+:deep(.avue-form__row:nth-child(4)) {
+    margin-left:0px;
+}
 :deep(.avue-form__row:first-child) {
     margin-left:0px;
 }
-:deep(.avue-form__row:nth-child(6)){
+:deep(.avue-form__row:nth-child(7)){
      margin-left:0px;
 }
 :deep(.avue-form__group--flex){

src/views/basicdata/brand/basicBrand.vue

@@ -645,6 +645,9 @@ export default {
     height: 33px !important;
   }
 }
+:deeP(.no-print){
+  margin-left: auto;
+}
 .fr-fm{
   width: 100%;
   display: flex;

src/views/basicdata/brand/basicStorageServices.vue

@@ -1,9 +1,11 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <el-row   v-if="!search" style="padding:6px 18px">
+      <el-row   v-if="!search" class='fr-fo'>
         <!-- 查询模块 -->
+      
         <el-form :inline="true" :model="query">
+          <div>
 <!--          <el-form-item label="门店名称:">-->
 <!--            <el-input v-model="query.shopId" placeholder="请输入门店名称"></el-input>-->
 <!--          </el-form-item>-->
@@ -13,8 +15,9 @@
           <el-form-item label="服务仓库:">
             <el-input v-model="query.serveWarehouseName" placeholder="请输入服务仓库"></el-input>
           </el-form-item>
+        </div>
           <!-- 查询按钮 -->
-          <el-form-item>
+          <el-form-item class='el-btn'>
             <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
             <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
           </el-form-item>
@@ -472,3 +475,18 @@ export default {
   }
 };
 </script>
+
+<style scoped lang='scss'>
+.el-btn{
+  margin-left:auto;
+  margin-right:0;
+}
+.fr-fo{
+  display:flex;
+  width:100%;
+  form{
+    width:100%;
+    display:flex;
+  }
+}
+</style>

src/views/basicdata/brand/basicdataStoreBrand.vue

@@ -434,4 +434,14 @@ export default {
 };
 </script>
 
-<style></style>
+<style scoped lang='scss'>
+.avue-form__group--flex{
+ justify-content: space-between !important;
+}
+:deep(.no-print){
+  margin-left:auto;
+}
+:deep(.avue-form__row){
+    max-width:300px !important;
+}
+</style>

src/views/basicdata/driverArtery/basicdataDriverArtery.vue

@@ -811,7 +811,7 @@ export default {
 
 <style scoped lang='scss'>
 :deep(.avue-form__row){
-  max-width:300px!important;
+  max-width:250px !important;
 }
 :deep(.avue-form__group--flex){
   justify-content: space-between;
@@ -824,6 +824,7 @@ export default {
   width:auto !important;
 }
 :deep(.no-print){
+  margin-left:auto;
   .el-button{
      margin-right:0
   }

src/views/factory/mt/factoryOrderMain.vue

@@ -40,7 +40,7 @@
       </template>
 
       <template #menu="{ row, index, size }">
-        <el-button type="success" icon="el-icon" :size="size" @click="$refs.crud.rowView(row,index)"
+        <el-button type="success"  :size="size" @click="$refs.crud.rowView(row,index)"
           >查看</el-button
         >
       </template>