新增3个excel下载

src/views/basicdata/brand/basicBrand.vue

@@ -1,16 +1,17 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <el-row v-if="!search" style="padding: 6px 18px">
+      <el-row v-if="!search">
         <!-- 查询模块 -->
-        <el-form :inline="true" :model="query">
+        <el-form :inline="true" :model="query" class='fr-fm'>
+          <div>
           <el-form-item label="品牌名称:">
             <el-input v-model="query.brandName" placeholder="请输入品牌名称"></el-input>
           </el-form-item>
           <el-form-item label="品牌编号:">
             <el-input v-model="query.brandCode" placeholder="请输入品牌编号"></el-input>
           </el-form-item>
-          <el-form-item label="承接时间:">
+          <el-form-item label="承接时间:" class='el-times'>
             <!--            <el-input v-model="query.acceptanceTime" placeholder="请输入承接时间"></el-input>-->
             <div class="block">
               <!--              <span class="demonstration">With quick options</span>-->
@@ -26,8 +27,9 @@
               />
             </div>
           </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>
@@ -638,6 +640,19 @@ export default {
   height: 178px;
   display: block;
 }
+.el-times {
+  :deep(.el-tooltip__trigger) {
+    height: 33px !important;
+  }
+}
+.fr-fm{
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+}
+.el-btn{
+  margin-right:0;
+}
 </style>
 
 <style>

src/views/basicdata/brand/basicClient.vue

@@ -1,9 +1,10 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <el-row v-if="!search" style="padding: 6px 18px">
+      <el-row v-if="!search">
         <!-- 查询模块 -->
-        <el-form :inline="true" :model="query">
+        <el-form :inline="true" :model="query"  class='fr-fo'>
+          <div>
           <el-form-item label="客户名称:">
             <el-input v-model="query.clientName" placeholder="请输入客户名称"></el-input>
           </el-form-item>
@@ -36,7 +37,7 @@
           <!--            <el-input v-model="query.bladeRegionAreaId" placeholder="请输入区/县"></el-input>-->
           <!--            -->
           <!--          </el-form-item>-->
-          <el-form-item label="合同开始时间:">
+          <el-form-item label="合同开始时间:" class='el-times'>
             <!--            <el-input v-model="query.contractStartTime" placeholder="请输入合同开始时间"></el-input>-->
             <div class="block">
               <!--              <span class="demonstration">With quick options</span>-->
@@ -57,8 +58,9 @@
           <!--          <el-form-item label="合同结束时间:">-->
           <!--            <el-input v-model="query.contractEntTime" 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>
@@ -1423,3 +1425,22 @@ export default {
   },
 };
 </script>
+
+<style scoped lang='scss'>
+.el-form-item__content {
+  height: 30px;
+}
+.el-times {
+  :deep(.el-tooltip__trigger) {
+    height: 32px !important;
+  }
+}
+.fr-fo{
+  width: 100%;
+  display: flex;
+    justify-content: space-between;
+}
+.el-btn{
+  margin-right:0;
+}
+</style>

src/views/basicdata/brand/basicZonePrice.vue

@@ -1,9 +1,10 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <el-row   v-if="!search" style="padding:6px 18px">
+      <el-row   v-if="!search">
         <!-- 查询模块 -->
-        <el-form :inline="true" :model="query">
+        <el-form :inline="true" :model="query" class='fr-fm'>
+        <div>
           <el-form-item label="始发地地址:">
 <!--            <el-input v-model="query.province" placeholder="请输入省"></el-input>-->
             <el-cascader :options="optioner" v-model="query.province"  :props="{ checkStrictly: true }" popper-class='ca'>
@@ -48,8 +49,9 @@
 <!--          <el-form-item label="状态:">-->
 <!--            <el-input v-model="query.condition" 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>
@@ -909,3 +911,14 @@ export default {
 }
 
 </style>
+
+<style scoped lang='scss'>
+.fr-fm{
+width: 100%;
+display: flex;
+justify-content: space-between;
+}
+.el-btn{
+  margin-right:0;
+}
+</style>

src/views/basicdata/driverArtery/basicdataDriverArtery.vue

@@ -209,7 +209,7 @@ export default {
             type: 'input',
             search: true,
             labelWidth: '150',
-            width: '100px',
+            width: '130px',
             align: 'center',
             span: 11,
           },
@@ -809,4 +809,18 @@ export default {
 };
 </script>
 
-<style></style>
+<style scoped lang='scss'>
+:deep(.avue-form__row){
+  max-width:300px!important;
+}
+:deep(.avue-form__group--flex){
+  justify-content: space-between;
+  
+}
+.avue-form__row{
+  margin-left:0 !important;
+}
+:deep(.el-form-item__label){
+  width:auto !important;
+}
+</style>

src/views/basicdata/vehicle/basicdataVehicle.vue

@@ -1080,4 +1080,22 @@ export default {
 };
 </script>
 
-<style></style>
+<style scoped lang='scss'>
+:deep(.avue-form__row){
+  margin-left:10px;
+  max-width:250px!important;
+}
+:deep(.avue-form__row){
+  margin-left:0;
+}
+:deep(.el-form-item__label){
+  width:auto !important;
+}
+:deep(.no-print){
+  max-width:120px !important;
+  margin-left:auto;
+  .el-button{
+    margin-right:0;
+  }
+}
+</style>

src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue

@@ -551,8 +551,21 @@ export default {
 };
 </script>
 
-<style scoped lang='scss'>
+<style scoped lang="scss">
 :deep(.no-print) {
-  margin-right:auto;
+  margin-right: 0;
+}
+:deep(.avue-form__row){
+  margin-left:10px;
+  max-width:300px!important;
+}
+.avue-form__group--flex{
+  justify-content: space-between;
+}
+:deep(.avue-form__row){
+  margin-left:0;
+}
+:deep(.el-form-item__label){
+  width: auto !important;
 }
 </style>

src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue

@@ -489,6 +489,16 @@
       </span>
     </template> -->
   </el-dialog>
+  <el-dialog v-model="eldc" title="选择要导出的内容" width="30%" destroy-on-close center>
+    <div class="el-dc">
+      <!-- type:1 -->
+      <el-button @click='dcx(1)'>包条</el-button>
+      <!-- type:2 -->
+      <el-button @click='dcx(2)'>库存品</el-button>
+      <!-- type:3 -->
+      <el-button @click='dcx(3)'>零担</el-button>
+    </div>
+  </el-dialog>
 </template>
 <script setup>
 import {
@@ -507,6 +517,7 @@ import { downloadXls } from '@/utils/util';
 import { dateNow } from '@/utils/date';
 const { proxy } = getCurrentInstance();
 let loadtc = ref(false);
+const eldc = ref(false); //导出弹窗
 let details = reactive({
   columnList: [],
   tablistarr: [],
@@ -585,7 +596,13 @@ async function initconfig() {
 function initpage() {
   // let warehousearr=
 }
+// 导出功能
 function handleExportArea() {
+  eldc.value = true;
+}
+// 选择导出内容信息
+function dcx(val){
+  console.log(val);
   let id = details.arrlist[details.checkselect]?.id || 0;
   let name = details.arrlist[details.checkselect]?.name || '';
   if (id === 0) {
@@ -601,6 +618,7 @@ function handleExportArea() {
   console.log('id>>>>>>>>>>>>>>', id);
   let values = {
     areaId: id,
+    type:val,
   };
   proxy
     .$confirm('是否导出数据?', '提示', {
@@ -615,8 +633,8 @@ function handleExportArea() {
         NProgress.done();
       });
     });
-}
 
+}
 function currentChange(currentPage) {
   details.currentPage = currentPage;
   searchbuts();
@@ -2563,4 +2581,8 @@ const {
 .el-input__suffix {
   width: 16px !important;
 }
+.el-dc {
+  display: flex;
+  justify-content: space-around;
+}
 </style>

src/views/basicdata/warehouse/tray/basicdataTray.vue

@@ -558,4 +558,18 @@ export default {
 };
 </script>
 
-<style></style>
+<style scoped lang='scss'>
+:deep(.avue-form__row){
+  margin-left:10px;
+  max-width:300px!important;
+}
+:deep(.no-print){
+  margin-left:auto;
+}
+:deep(.el-form-item__label){
+  width:auto !important;
+}
+:deep(.avue-form__row){
+  margin-left:0;
+}
+</style>

src/views/distribution/deliverylist/distributionDeliveryList.vue

@@ -1183,8 +1183,9 @@ export default {
 .el-btn {
   min-width:200px;
   margin-right: 0 !important;
-  .el-form-item__content {
+  :deep(.el-form-item__content) {
     width: 180px;
+    justify-content: flex-end ;
   }
 }
 .el-form-item {

src/views/distribution/deliverylist/distributionDeliveryListdis.vue

@@ -1235,9 +1235,10 @@ export default {
 .el-btn {
   min-width: 200px;
   margin-right: 0 !important;
-  .el-form-item__content {
+ :deep( .el-form-item__content) {
     width: 180px;
     justify-content: flex-end;
+    justify-content: flex-end
   }
 }
 .avue-crud__right {

src/views/distribution/deliverylist/distributionDeliveryListmar.vue

@@ -3,7 +3,7 @@
     <div class="avue-crud">
       <el-row v-if="!search">
         <!-- 查询模块 -->
-        <el-form :inline="true" :model="query">
+        <el-form :inline="true" :model="query" class='fr-fo'>
           <el-form-item label="配送车次:">
             <el-input v-model="query.trainNumber" placeholder="请输入配送车次"></el-input>
           </el-form-item>
@@ -1195,12 +1195,16 @@ export default {
 .el-btn {
   min-width: 200px;
   margin-right: 0 !important;
-  .el-form-item__content {
+  :deep(.el-form-item__content) {
     width: 180px;
+    justify-content: flex-end
   }
 }
 .avue-crud__right{
   display: flex;
     align-items: flex-end;
 }
+.fr-fo{
+  display:flex; 
+}
 </style>

src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue

@@ -2,16 +2,17 @@
   <!--全部订单-->
   <basic-container>
     <div class="avue-crud">
-      <el-row   v-if="!search" style="padding:6px 18px">
+      <el-row   v-if="!search">
         <!-- 查询模块 -->
-        <el-form :inline="true" :model="query">
+        <el-form :inline="true" :model="query" class='fr-fo'>
+          <div>
           <el-form-item label="订单自编号:">
             <el-input v-model="query.orderCodeNum" placeholder="请输入订单自编号" ></el-input>
           </el-form-item>
           <el-form-item label="运单">
             <el-input v-model="query.waybillNum"  placeholder="请输入运单编号" />
           </el-form-item>
-          <el-form-item label="入库时间:">
+          <el-form-item label="入库时间:" class='el-times'>
             <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
             <el-date-picker
               v-model="stockupDate"
@@ -46,7 +47,8 @@
           <!--            <el-input v-model="query.state" placeholder="请输入状态;1 配送 2 待配送"></el-input>-->
           <!--          </el-form-item>-->
           <!-- 查询按钮 -->
-          <el-form-item>
+          </div>
+          <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>
@@ -1620,7 +1622,7 @@ export default {
   }
 };
 </script>
-<style scoped>
+<style scoped lang='scss'>
 .el-button--text {
   margin-right: 15px;
 }
@@ -1633,5 +1635,18 @@ export default {
 .dialog-footer button:first-child {
   margin-right: 10px;
 }
+.el-times {
+  :deep(.el-tooltip__trigger) {
+    height: 32px !important;
+  }
+}
+.fr-fo{
+  width:100%;
+  display:flex;
+  justify-content: space-between;
+}
+.el-btn{
+  margin-right: 0;
+}
 </style>
 

src/views/distribution/reservation/reservationDiscuss.vue

@@ -1,27 +1,20 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <el-row v-if="!search" style="padding: 6px 18px">
+      <el-row v-if="!search">
         <!-- 查询模块 -->
-        <el-form :inline="true" :model="query">
+        <el-form :inline="true" :model="query" class="fr-fo">
           <!-- 查询按钮 -->
-          <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>
         </el-form>
       </el-row>
-      <el-row style="margin-top: 30px">
-        <el-button-group>
-          <el-button type="primary" icon="el-icon-warning" @click="aaa">待确认</el-button>
-          <el-button type="primary" icon="el-icon-circle-check" @click="bbb"
-            >已确认<i class="el-icon-arrow-right el-icon--right"></i
-          ></el-button>
-          <!--                    <el-button type="primary" icon="el-icon-view" @click="ccc">全部</el-button>-->
-        </el-button-group>
+      <el-row>
       <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
-          <div class="avue-crud__left" style="margin-top: 20px">
+          <div class="avue-crud__left" >
             <el-button type="primary" icon="el-icon-plus" @click="handleAdd">添加预约</el-button>
             <el-button
               v-if="this.query.reservationStatus === '1'"
@@ -31,6 +24,13 @@
               plain
               >批量确认
             </el-button>
+              <el-button-group>
+          <el-button type="primary" icon="el-icon-warning" @click="aaa">待确认</el-button>
+          <el-button type="primary" icon="el-icon-circle-check" @click="bbb"
+            >已确认<i class="el-icon-arrow-right el-icon--right"></i
+          ></el-button>
+          <!--                    <el-button type="primary" icon="el-icon-view" @click="ccc">全部</el-button>-->
+        </el-button-group>
             <el-button
               v-if="this.query.reservationStatus === '2'"
               type="danger"
@@ -920,4 +920,12 @@ export default {
 .el-pager li.is-active {
   font-weight: normal !important;
 }
+.fr-fo {
+  width: 100%;
+  display: flex;
+  justify-content: flex-end;
+}
+.el-btn {
+  margin-right: 0;
+}
 </style>

src/views/distribution/reservation/reservationMarket.vue

@@ -1,32 +1,34 @@
 <template>
     <basic-container>
         <div class="avue-crud">
-            <el-row  v-if="!search" style="padding:6px 18px">
+            <el-row  v-if="!search">
                 <!-- 查询模块 -->
-                <el-form :inline="true" :model="query">
+                <el-form :inline="true" :model="query" class='fr-fo'>
                     <!-- 查询按钮 -->
-                    <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>
                 </el-form>
             </el-row>
-            <el-row style="margin-top: 30px">
-                <el-button-group>
-                    <el-button type="primary" icon="el-icon-warning" @click="aaa">待确认</el-button>
-                    <el-button type="primary" icon="el-icon-circle-check" @click="bbb">已确认<i
-                            class="el-icon-arrow-right el-icon--right"></i></el-button>
-<!--                    <el-button type="primary" icon="el-icon-view" @click="ccc">全部</el-button>-->
-                </el-button-group>
+            <el-row>
+
                 <div class="avue-crud__header">
                     <!-- 头部左侧按钮模块 -->
-                    <div class="avue-crud__left" style="margin-top: 20px">
+                    <div class="avue-crud__left">
                         <el-button type="primary" icon="el-icon-plus" @click="handleAdd">添加预约</el-button>
                         <el-button v-if="this.query.reservationStatus==='1'" type="danger" icon="el-icon-delete" @click="handleConfirmReservations" plain>批量确认
                         </el-button>
                         <el-button v-if="this.query.reservationStatus==='2'" type="danger" icon="el-icon-delete" @click="handleStockUp" plain>批量转备货</el-button>
                         <el-button  v-if="this.query.reservationStatus==='2'" type="danger" icon="el-icon-delete" @click="handleDeliverys" plain>批量转配送</el-button>
+                                    <el-button-group>
+                    <el-button type="primary" icon="el-icon-warning" @click="aaa">待确认</el-button>
+                    <el-button type="primary" icon="el-icon-circle-check" @click="bbb">已确认<i
+                            class="el-icon-arrow-right el-icon--right"></i></el-button>
+<!--                    <el-button type="primary" icon="el-icon-view" @click="ccc">全部</el-button>-->
+                </el-button-group>
                       </div>
+                    
                     <!-- 头部右侧按钮模块 -->
                     <div class="avue-crud__right">
                         <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
@@ -829,3 +831,14 @@
     }
   };
 </script>
+
+<style scoped lang='scss'>
+.fr-fo {
+  width: 100%;
+  display: flex;
+  justify-content: flex-end;
+}
+.el-btn {
+  margin-right: 0;
+}
+</style>

src/views/distribution/reservation/reservationSelf.vue

@@ -1,31 +1,32 @@
 <template>
     <basic-container>
         <div class="avue-crud">
-            <el-row  v-if="!search" style="padding:6px 18px">
+            <el-row  v-if="!search">
                 <!-- 查询模块 -->
-                <el-form :inline="true" :model="query">
+                <el-form :inline="true" :model="query" class='fr-fo'>
                     <!-- 查询按钮 -->
-                    <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>
                 </el-form>
             </el-row>
-            <el-row style="margin-top: 30px">
-                <el-button-group>
-                    <el-button type="primary" icon="el-icon-warning" @click="aaa">待确认</el-button>
-                    <el-button type="primary" icon="el-icon-circle-check" @click="bbb">已确认<i
-                            class="el-icon-arrow-right el-icon--right"></i></el-button>
-<!--                    <el-button type="primary" icon="el-icon-view" @click="ccc">全部</el-button>-->
-                </el-button-group>
+            <el-row>
+
                 <div class="avue-crud__header">
                     <!-- 头部左侧按钮模块 -->
-                    <div class="avue-crud__left" style="margin-top: 20px">
+                    <div class="avue-crud__left">
                         <el-button type="primary" icon="el-icon-plus" @click="handleAdd">添加预约</el-button>
                         <el-button v-if="this.query.reservationStatus==='1'" type="danger" icon="el-icon-delete" @click="handleConfirmReservations" plain>批量确认
                         </el-button>
                         <el-button v-if="this.query.reservationStatus==='2'" type="danger" icon="el-icon-delete" @click="handleStockUp" plain>批量转备货</el-button>
                         <el-button  v-if="this.query.reservationStatus==='2'" type="danger" icon="el-icon-delete" @click="handleDeliverys" plain>批量转配送</el-button>
+                <el-button-group>
+                    <el-button type="primary" icon="el-icon-warning" @click="aaa">待确认</el-button>
+                    <el-button type="primary" icon="el-icon-circle-check" @click="bbb">已确认<i
+                            class="el-icon-arrow-right el-icon--right"></i></el-button>
+<!--                    <el-button type="primary" icon="el-icon-view" @click="ccc">全部</el-button>-->
+                </el-button-group>
                       </div>
                     <!-- 头部右侧按钮模块 -->
                     <div class="avue-crud__right">
@@ -829,3 +830,14 @@
     }
   };
 </script>
+
+<style scoped lang='scss'>
+.fr-fo {
+  width: 100%;
+  display: flex;
+  justify-content: flex-end;
+}
+.el-btn {
+  margin-right: 0;
+}
+</style>

src/views/distribution/signfor/distributionSignfortreat.vue

@@ -1605,4 +1605,9 @@ export default {
     align-items: flex-end;
     }
 }
+.el-btn{
+  :deep(.el-form-item__content){
+    align-items: flex-end
+  }
+}
 </style>

src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue

@@ -1,9 +1,10 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <el-row v-if="!search" style="padding: 6px 18px">
+      <el-row v-if="!search">
         <!-- 查询模块 -->
-        <el-form :inline="true" :model="query" @submit.native.prevent>
+        <el-form :inline="true" :model="query" @submit.native.prevent class="fr-fo">
+          <div>
             <el-form-item label="货物仓库:">
               <el-input
                 v-model="query.warehouseName"
@@ -48,8 +49,9 @@
                 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>
@@ -874,3 +876,9 @@ export default {
   },
 };
 </script>
+
+<style scoped lang="scss">
+.el-btn {
+  margin-right: 0;
+}
+</style>

src/views/warehouse/warehouseWaybill.vue

@@ -1,17 +1,19 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <el-row v-if="!search" style="padding: 6px 18px">
+      <el-row v-if="!search">
         <!-- 查询模块 -->
-        <el-form :inline="true" :model="query">
+        <el-form :inline="true" :model="query" class='fr-fo'>
+          <div>
           <el-form-item label="运单号:">
             <el-input v-model="query.waybillNo" placeholder="请输入运单号"></el-input>
           </el-form-item>
           <el-form-item label="客户车次号:">
             <el-input v-model="query.customerTrain" 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>
@@ -1348,8 +1350,16 @@ export default {
 }
 </style>
 
-<style scoped>
+<style scoped lang='scss'>
 .el-form-item__label {
   justify-content: flex-start;
 }
+.fr-fo{
+    display: flex;
+    width: 100%;
+    justify-content: space-between;
+}
+.el-btn{
+    margin-right:0
+}
 </style>