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

src/option/storagecost/Traincostbreakdown.js

@@ -89,6 +89,17 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'trainCompletionTime',
+    label: '复核完成时',
+    type: 1,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'destinationWarehouse',
     label: '目的仓',

src/page/index/logo.vue

@@ -15,7 +15,7 @@
           <span class="avue-logo_title" key="1">{{ website.indexTitle }} </span>
         </template>
       </transition-group>
-     
+
     </div>
   </div>
 </template>
@@ -28,7 +28,7 @@ export default {
   data() {
     return {};
   },
-  created() {},
+  created() { },
   computed: {
     ...mapGetters(['isCollapse']),
   },
@@ -37,13 +37,22 @@ export default {
 </script>
 <style lang="scss" scoped>
 .logo-img {
+  height: 100%;
+  display: flex;
+  align-items: center;
+  margin:0 10px;
   img {
-    width: 60px;
-    height: 60px;
-    margin-top: -5px;
+    width: 40px;
+    height: 40px;
   }
 }
+
 .logo-x {
   display: flex;
+  height: 100%;
+  background-color: #fff;
+}
+.avue-logo{
+  color: #000000;
 }
 </style>

src/page/login/index.vue

@@ -14,8 +14,10 @@
       <div class="login-border">
         <div class="login-main">
           <h4 class="login-title">
+            <img src="../../../public/img/logo-login.png" />
             <!-- {{ $t('login.title') }} -->
-            {{ website.title }}
+            <!-- {{ website.title }} -->
+            <span>物流信息平台</span>
             <!-- <top-lang></top-lang> -->
             <!-- 语言转换 -->
           </h4>
@@ -76,7 +78,7 @@ export default {
     this.handleLogin();
     this.getTime();
   },
-  mounted() {},
+  mounted() { },
   computed: {
     ...mapGetters(['tagWel']),
   },
@@ -148,13 +150,29 @@ export default {
 
 <style lang="scss">
 @import '@/styles/login.scss';
+
 .index_footer {
   position: fixed;
   bottom: 0;
   width: 100%;
+
   p {
     text-align: center;
     color: #999;
   }
 }
+
+.login-title {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  img {
+    width: 130px;
+    height: 60px;
+  }
+span{
+  margin-left: 10px;
+}
+}
 </style>

src/page/login/userlogin.vue

@@ -1,7 +1,5 @@
 <template>
-  <div class="login-logo">
-    <img src="../../../public/img/p-logo.png" />
-  </div>
+
   <el-form
     class="login-form"
     status-icon
@@ -361,10 +359,10 @@ export default {
 }
 .login-logo {
   position: absolute;
-  right: 70px;
+  // right: 60px;
   top: 66px;
   img {
-    width: 60px;
+    width:130px;
     height: 60px;
   }
 }

src/views/aftersales/aftersalesWorkOrderend.vue

@@ -490,14 +490,14 @@
                             identifyingC3: item.difference == '3',
                             'mx-1': true,
                           }" effect="dark">{{
-                            item.difference == '1'
-                              ? ' 调查记录'
-                              : item.difference == '2'
-                                ? '指定记录'
-                                : item.difference == '3'
-                                  ? '操作记录'
-                                  : ''
-                          }}
+                              item.difference == '1'
+                                ? ' 调查记录'
+                                : item.difference == '2'
+                                  ? '指定记录'
+                                  : item.difference == '3'
+                                    ? '操作记录'
+                                    : ''
+                            }}
                           </el-tag>
                         </div>
 
@@ -582,10 +582,10 @@
                         />
                       </el-select> -->
                       </div>
-                      <!-- <el-button v-if="$route.query.RouteIndexs == '2'" type="primary" class="el_next"
+                      <el-button v-if="$route.query.RouteIndexs == '2'" type="primary" class="el_next"
                         @click="NextRecord()">
                         下一条
-                      </el-button> -->
+                      </el-button>
                     </div>
 
                     <el-input v-model="Msgtextarea" :rows="5" type="textarea" placeholder="请输入要回复的内容"
@@ -2177,11 +2177,14 @@ const replyMessage = () => {
 };
 // 下一条跳转
 const Nextjump = res => {
-  console.log(res);
+    console.log(res);
+    
+
   if (res.data) {
+
     if (res.data.data.records.length) {
       let dataInfo = res.data.data.records[0];
-
+ 
       const workOrderInfoPath_end = '/aftersales/aftersalesWorkOrderend'; //跳转路径
       const queryParams = {
         id: dataInfo.id, //异常工单ID
@@ -2190,18 +2193,8 @@ const Nextjump = res => {
         RouteIndexs: '2', //当前菜单编号
         workOrderStatus: dataInfo.workOrderStatus, //工单状态
       };
-
-      if (res.data.data.total > Nextpage.value) {
-        Nextpage.value = Nextpage.value - 1;
-        ElMessage({
-          type: 'warning',
-          message: '没有更多数据了',
-        })
-        onLoad()
-      } else {
-        $router.push({ path: workOrderInfoPath_end, query: { ...queryParams } });
-        onLoad()
-      }
+      $router.push({ path: workOrderInfoPath_end, query: { ...queryParams } });
+      onLoad()
       $useStore.commit('DEL_ONCE_TAG', '/aftersales/aftersalesWorkOrderend');
     } else {
       Nextpage.value = Nextpage.value - 1;

src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue

@@ -38,7 +38,19 @@
                 :value-format="'YYYY-MM-DD HH:mm:ss'"
               />
             </el-form-item>
-
+            <el-form-item label="复核完成时间">
+              <el-date-picker
+                v-model="TopQuery.traintime"
+                type="datetimerange"
+                unlink-panels
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                :shortcuts="shortcuts"
+                :default-time="defaultTime2"
+                :value-format="'YYYY-MM-DD HH:mm:ss'"
+              />
+            </el-form-item>
             <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>
@@ -433,6 +445,14 @@ const TopSearch = () => {
     delete details.query.deliveryDateStart;
     delete details.query.deliveryDateEnd;
   }
+  if (TopQuery.value.traintime?.length) {
+    details.query.trainCompletionTimeStart = TopQuery.value.traintime[0]; //开始日期
+    details.query.trainCompletionTimeEnd = TopQuery.value.traintime[1]; //结束日期
+  } else {
+    delete details.query.trainCompletionTimeStart;
+    delete details.query.trainCompletionTimeEnd;
+  }
+  
 
   if (TopQuery.value.destinationWarehouse?.length) {
     details.query.destinationWarehouse = TopQuery.value.destinationWarehouse.join(',');

src/views/distribution/signfor/distributionSignforedt.vue

@@ -66,8 +66,8 @@
       </div>
       <div class="el-txt" style="margin-top: 20px">
         <el-icon><Stopwatch /></el-icon>
-        <span class="title-name"> 实际配送时间:</span>
-        <el-input v-model="pageRow.taskTime" disabled placeholder="卸车班组" />
+        <span class="title-name"> 配送时间:</span>
+        <el-input v-model="pageRow.taskTime" disabled placeholder="暂无配送时间" />
       </div>
     </div>
 
@@ -165,17 +165,17 @@
       <div class="el-txt">
         <el-icon><User /></el-icon>
         <span class="title-name">计划件数:</span>
-        <el-input v-model="pageRow.reservationNum" disabled placeholder="暂无计划件数" />
+        <el-input v-model="pageRow.planNum" disabled placeholder="暂无计划件数" />
       </div>
       <div class="el-txt">
         <el-icon><User /></el-icon>
         <span class="title-name">装车件数:</span>
-        <el-input v-model="pageRow.loadedNumber" disabled placeholder="暂无装车件数" />
+        <el-input v-model="pageRow.loadingNum" disabled placeholder="暂无装车件数" />
       </div>
       <div class="el-txt">
         <el-icon><Postcard /></el-icon>
         <span class="title-name"> 签收件数:</span>
-        <el-input v-model="pageRow.receivedQuantity" disabled placeholder="暂无签收件数" />
+        <el-input v-model="pageRow.signingNum" disabled placeholder="暂无签收件数" />
       </div>
       <div class="el-txt">
         <el-icon><Van /></el-icon>