Merge branch 'pre-production'

src/page/login/index.vue

@@ -1,11 +1,17 @@
 <template>
   <div class="login-container" ref="login" @keyup.enter="handleLogin">
     <div class="login-weaper animated bounceInDown">
+      <div class="top">
+          <img src="https://www.v6g.cn/IMAGE/top.png" />
+        </div>
       <div class="login-left">
         <div class="login-time">
           {{ time }}
         </div>
-
+        <div class="left">
+          <img src="https://www.v6g.cn/IMAGE/left.png" />
+        </div>
+ 
         <img src="../../../public/img/indexbg.png" />
         <!-- <p class="title">{{ $t('login.info') }}</p> -->
 
@@ -31,6 +37,9 @@
             <!-- <a :href="website.ssoUrl + website.redirectUri">{{ $t('login.ssoLogin') }}</a> -->
           </div>
         </div>
+        <div class="right">
+          <img src="https://www.v6g.cn/IMAGE/right.png" />
+        </div>
       </div>
     </div>
     <div class="index_footer">
@@ -159,6 +168,8 @@ export default {
   p {
     text-align: center;
     color: #999;
+    color: #fff;
+    margin-bottom: 4px;
   }
 }
 
@@ -175,4 +186,44 @@ span{
   margin-left: 10px;
 }
 }
+.left{
+  position: absolute;
+  left: 0;
+  width: 80px;
+  height: 100%;
+  mask: linear-gradient(to right, #000000, #ffffffb0);
+  
+  img{
+    width: 100%;
+    height: 100%;
+  }
+}
+.right{
+  position: absolute;
+  right: 0;
+  width: 80px;
+  height: 100%;
+  mask: linear-gradient(to left, #000000, #ffffffb0);
+  img{
+    width: 100%;
+    height: 100%;
+  }
+}
+.login-weaper{
+  position: relative;
+}
+.top{
+  position: absolute;
+    top: -18%;
+    left: 35%;
+    width: 30%;
+    height: 70px;
+    z-index: 1;
+    overflow: hidden;
+    border-radius: 15px;
+  img{
+    width: 100%;
+    height: 100%;
+  }
+}
 </style>

src/styles/login.scss

@@ -5,14 +5,15 @@
   width: 100%;
   height: 100%;
   margin: 0 auto;
-  background-image: url('/img/bg/bg.jpg');
+  // background-image: url('/img/bg/bg.jpg');
+  background-image: url('https://www.v6g.cn/IMAGE/fm2.png');
   background-size: 100% 100%;
 }
 
 .login-weaper {
   margin: 0 auto;
   width: 1000px;
-  box-shadow: 1px 1px 4px #d9d9d9;
+  // box-shadow: 1px 1px 4px #d9d9d9;
 
   .el-input-group__append {
     border: none;
@@ -46,6 +47,7 @@
 .login-time {
   position: absolute;
   left: 25px;
+  left:100px;
   top: 25px;
   width: 100%;
   color: #002e55;

src/views/aftersales/aftersalesWorkOrder.vue

@@ -2448,11 +2448,11 @@ const ViewDetails6 = row => {
  * @return {void}
  */
 const ViewDetails7 = row => {
-  console.log(row, '【完结】当前行数据');
+  console.log(row, '【超时未处理】当前行数据');
   const workOrderInfoPath_end = '/aftersales/aftersalesWorkOrderend'; //跳转路径
   const queryParams = {
     id: row.id, //异常工单ID
-    name: `${row.workOrderNumber}-完结`,
+    name: `${row.workOrderNumber}-超时未处理`,
     workOrderNumber: row.workOrderNumber, //异常工单号
     RouteIndexs: TabPermissions.value, //当前菜单编号
     workOrderStatus: row.workOrderStatus, //工单状态

src/views/distribution/checkInventoryTask/createTask.vue

@@ -29,6 +29,7 @@
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button icon="Download" @click="handleExportData" circle></el-button>
             <el-button icon="el-icon-refresh" @click="searchChangeS" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="Search" @click="searchHide" circle></el-button>
@@ -419,6 +420,7 @@ import {
 import DeleteWarningDialog from '@/components/popupnotification/popupnotification.vue';
 import { useStore } from 'vuex';
 import dayjs from 'dayjs';
+import { exportExcel } from '@/utils/exportData';
 const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
@@ -1344,6 +1346,11 @@ const Inventorysynchronization = row => {
     })
     .catch(() => {});
 };
+
+/** 导出表格数据 */
+const handleExportData = () => {
+  exportExcel(details.columnList, details.data, '预入库车次 - ' + new Date().getTime());
+};
 </script>
 
 <style scoped lang="scss">

src/views/distribution/signfor/distributionSignfortreat.vue

@@ -1,6 +1,6 @@
 <template>
   <basic-container>
-    <div class="avue-crud">
+    <div class="avue-crud" v-loading="loadingObj.pageLoading">
       <div v-h5uShow="!search">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query" class="header_search">
@@ -1772,6 +1772,9 @@ export default {
       option: option,
       // 表单列表
       data: [],
+      loadingObj: {
+        pageLoading: false,
+      },
     };
   },
   mounted() {
@@ -1801,21 +1804,28 @@ export default {
     /**
      * 导出
      * */
-    handleExportInfo() {
-      let row = {};
-      // if (!!this.ids) {
-      //   row.ids = this.ids;
-      // }
-      const ids = this.selectionList.join(',');
-      row.ids = ids;
-      row.signingStatus = '1';
-      // console.log("<><><>>",ids);
-      row = { ...row, ...this.query };
-      delete row.deliveryTypeName;
-      getSignforExport(row).then(res => {
+    async handleExportInfo() {
+      try {
+        this.loadingObj.pageLoading = true;
+
+        let row = {};
+        // if (!!this.ids) {
+        //   row.ids = this.ids;
+        // }
+        const ids = this.selectionList.join(',');
+        row.ids = ids;
+        row.signingStatus = '1';
+        // console.log("<><><>>",ids);
+        row = { ...row, ...this.query };
+        delete row.deliveryTypeName;
+        const res = await getSignforExport(row);
         // console.log(res.data);
         downloadXls(res.data, '待签收数据.xlsx');
-      });
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loadingObj.pageLoading = false;
+      }
     },
     showdrawer(value) {
       this.drawerShow = value;

src/views/warehouse/warehouseWaybill.vue

@@ -34,6 +34,7 @@
           <div></div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
+            <el-button icon="Download" @click="handleExportData" circle></el-button>
             <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
             <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
             <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
@@ -414,6 +415,7 @@ import {
 import option from '@/option/warehouse/warehouseWaybill';
 import { mapGetters } from 'vuex';
 import { downloadXls, getObjType, handleClearTableQuery, isNumber } from '@/utils/util';
+import { exportExcel } from '@/utils/exportData';
 
 export default {
   data() {
@@ -1214,6 +1216,9 @@ export default {
       }
       this.orderlist.splice(index, 1);
     },
+    handleExportData() {
+      exportExcel(this.columnList, this.data, '预入库车次 - ' + new Date().getTime());
+    },
   },
 };
 </script>