Browse Source

修改bug

qukaidi 2 years ago
parent
commit
3fcb6e999f

+ 2 - 3
src/layout/components/Sidebar/Logo.vue

@@ -15,12 +15,11 @@
         to="/"
       >
 <!--        途宝-->
-        <img :src="logo" class="sidebar-logo-mini" />
-        <!-- <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ title }} </h1> -->
+        <!-- <img :src="logo" class="sidebar-logo-mini" /> -->
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
 <!--        途宝-->
-        <img :src="logo" class="sidebar-logo" />
+        <!-- <img :src="logo" class="sidebar-logo" /> -->
         <div style="float: right;background-color: #fff" class="other" v-if="company === ''"></div>
         <!-- <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ title }} </h1> -->
       </router-link>

+ 13 - 3
src/views/Warehousing/components/payMoney.vue

@@ -959,7 +959,7 @@ export default {
           width: 150,
         },
       ],
-      handleKey:0,
+      handleKey: 0,
     };
   },
   created() {
@@ -1153,13 +1153,23 @@ export default {
     // 查询作业费信息
     getWhgenlegList() {
       let data = {};
-      this.Navigation = true;
+      if (this.handleKey == 1) {
+        this.Navigation = true;
         data = {
           pageNum: this.pageNum,
           pageSize: this.pageSize,
-          fTaskType:this.handleKey,
+          fTaskType: 1,
           fFleet: this.form.fFleet,
         };
+      } else if (this.handleKey == 2) {
+        this.Navigation = true;
+        data = {
+          pageNum: this.pageNum,
+          pageSize: this.pageSize,
+          fTaskType: 2,
+          fLabour: this.form.fLabour,
+        };
+      }
       operationAgreement(data).then((response) => {
         response.rows.map((e) => {
           if (e.fFeeUnitid) {

+ 5 - 1
src/views/login.vue

@@ -52,8 +52,12 @@
     </el-form>
     <!--  底部  -->
 <!--    青岛途宝软件开发有限公司-->
-   <div class="el-login-footer">
+   <!-- <div class="el-login-footer">
      <img src="./icp.png" alt="" height="14px" style="margin-right:2px"> <span><a href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=37021302000853">鲁公网安备 37021302000853号</a> <a href="https://beian.miit.gov.cn/">鲁ICP备2021000559号</a>  青岛途宝软件开发有限公司</span>
+   </div> -->
+   <!--    青岛海图领信息技术有限公司-->
+   <div class="el-login-footer">
+     <img src="./icp.png" alt="" height="14px" style="margin-right:2px"> <span><a href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=37021302000853">鲁公网安备 37021302000853号</a> <a href="https://beian.miit.gov.cn/">鲁ICP备2021000559号</a>  青岛海图领信息技术有限公司</span>
    </div>
 <!--    凯和-->