Merge branch 'pre-production'

src/api/distribution/distributionStockList.js

@@ -131,7 +131,7 @@ export const update = (row) => {
  */
 export const getInventoryList = (current, size, params) => {
   return request({
-    url: '/api/logpm-distribution/distributionStockList/getLnventoryList',
+    url: '/api/logpm-distribution/distributionStockList/getInventoryList',
     method: 'get',
     params: {
       ...params,

src/components/tablecmt/tablecmt.vue

@@ -157,21 +157,11 @@
         <template #header>
           <div style="display: inline-block">
             <div class="tilbox">
-              <el-text class="mx-1 tabtitles">{{ column.label }}</el-text>
+              <el-text class="mx-1 tabtitles" @click.stop @dblclick.stop="copyalls(column)">{{
-              <el-icon
+                column.label
-                v-if="column.type == 1 || column.type == 2 || column.type == 3"
+              }}</el-text>
-                @click.stop="copyalls(column)"
-                ><DocumentCopy
-              /></el-icon>
             </div>
           </div>
-          <!-- <el-input
-          v-if="column.type == 2"
-          v-model="column.values"
-          clearable
-          size="10"
-          placeholder="Type to search"
-        /> -->
         </template>
       </el-table-column>
     </el-table>
@@ -347,6 +337,8 @@ function godowns(url) {
 let shownm = ref(false);
 
 function copyalls(column: TableColumnType) {
+  const _isReturn = column.type == 1 || column.type == 2 || column.type == 3;
+  if (!_isReturn) return;
   let text = '';
   props.tableData.map((item, index) => {
     if (index < props.tableData.length - 1) {

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>

src/views/wel/index.vue

@@ -124,9 +124,29 @@
         <img class="left3" src="./static/rigth.png" />
       </div>
     </div>
+    <div class="el-gl">
+      <div>公告栏</div>
+    </div>
   </div>
 </template>
 <script lang="ts" setup></script>
+<style scoped lang="scss">
+.el-gl {
+  font-weight: 500;
+  text-align: center;
+  position: absolute;
+  right: 10px;
+  top: 10px;
+  width: 15%;
+  background-color: #fff;
+  border-radius: 32px;
+  padding: 5px;
+  box-sizing: border-box;
+  border: 1px solid #f1eeee69;
+  box-shadow: 4px 6px 0 #d3dff6, 1px 1px 9px #d3dff6;
+  height:762px;
+}
+</style>
 <style lang="scss" scope>
 @import '../../styles/flowStyle.scss';