changjiaming vor 2 Wochen
Ursprung
Commit
2b01d3c1fb
36 geänderte Dateien mit 446 neuen und 112 gelöschten Zeilen
  1. BIN
      src/assets/aboutUs/blackTip.png
  2. 3 0
      src/assets/login1/emailIcon.svg
  3. 3 0
      src/assets/login1/telIcon.svg
  4. 8 0
      src/assets/tradeTool/tool-1-1.svg
  5. 8 0
      src/assets/tradeTool/tool-1.svg
  6. 8 0
      src/assets/tradeTool/tool-2-2.svg
  7. 8 0
      src/assets/tradeTool/tool-2.svg
  8. 7 0
      src/assets/tradeTool/tool-3-3.svg
  9. 7 0
      src/assets/tradeTool/tool-3.svg
  10. 8 0
      src/assets/tradeTool/tool-4-4.svg
  11. 8 0
      src/assets/tradeTool/tool-4.svg
  12. 9 0
      src/assets/tradeTool/tool-5-5.svg
  13. 10 0
      src/assets/tradeTool/tool-5.svg
  14. 10 0
      src/assets/tradeTool/tool-6-6.svg
  15. 10 0
      src/assets/tradeTool/tool-6.svg
  16. 7 0
      src/assets/tradeTool/tool-7-7.svg
  17. 7 0
      src/assets/tradeTool/tool-7.svg
  18. 7 0
      src/assets/tradeTool/tool-8-8.svg
  19. 7 0
      src/assets/tradeTool/tool-8.svg
  20. BIN
      src/assets/tradeTool/tradeToolBac.png
  21. 2 1
      src/permission.js
  22. 6 1
      src/router/index.js
  23. 3 2
      src/store/modules/user.js
  24. 4 0
      src/views/businessManage/tradeRelations/importer/components/BasicInfo.vue
  25. 0 59
      src/views/login/component/pageFooter.vue
  26. 12 4
      src/views/login/component/pageHead.vue
  27. 11 10
      src/views/login/components/AboutUs.vue
  28. 143 0
      src/views/login/components/TradeTool.vue
  29. 103 18
      src/views/login/index.vue
  30. 1 1
      src/views/myAccounts/payment/component/list.vue
  31. 10 1
      src/views/myAccounts/payment/view.vue
  32. 1 1
      src/views/myAccounts/receive/view.vue
  33. 10 9
      src/views/myApplication/tax/list.vue
  34. 5 5
      src/views/myApplication/tax/view.vue
  35. BIN
      test1.7z
  36. BIN
      test4.7z

BIN
src/assets/aboutUs/blackTip.png


+ 3 - 0
src/assets/login1/emailIcon.svg

@@ -0,0 +1,3 @@
+<svg width="23" height="19" viewBox="0 0 23 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.29974 0H20.7003C21.9568 0 22.9842 1.05214 23 2.34772L11.5066 8.97953L0.0105371 2.35331C0.0210742 1.05493 1.04055 0 2.29974 0ZM0.0105371 4.89131L0 16.6243C0 17.9311 1.03528 19 2.29974 19H20.7003C21.9647 19 23 17.9311 23 16.6243V4.88571L11.7753 11.2097C11.6041 11.3077 11.3959 11.3077 11.2247 11.2097L0.0105371 4.89131Z" fill="white"/>
+</svg>

Datei-Diff unterdrückt, da er zu groß ist
+ 3 - 0
src/assets/login1/telIcon.svg


Datei-Diff unterdrückt, da er zu groß ist
+ 8 - 0
src/assets/tradeTool/tool-1-1.svg


Datei-Diff unterdrückt, da er zu groß ist
+ 8 - 0
src/assets/tradeTool/tool-1.svg


Datei-Diff unterdrückt, da er zu groß ist
+ 8 - 0
src/assets/tradeTool/tool-2-2.svg


Datei-Diff unterdrückt, da er zu groß ist
+ 8 - 0
src/assets/tradeTool/tool-2.svg


Datei-Diff unterdrückt, da er zu groß ist
+ 7 - 0
src/assets/tradeTool/tool-3-3.svg


Datei-Diff unterdrückt, da er zu groß ist
+ 7 - 0
src/assets/tradeTool/tool-3.svg


Datei-Diff unterdrückt, da er zu groß ist
+ 8 - 0
src/assets/tradeTool/tool-4-4.svg


Datei-Diff unterdrückt, da er zu groß ist
+ 8 - 0
src/assets/tradeTool/tool-4.svg


Datei-Diff unterdrückt, da er zu groß ist
+ 9 - 0
src/assets/tradeTool/tool-5-5.svg


Datei-Diff unterdrückt, da er zu groß ist
+ 10 - 0
src/assets/tradeTool/tool-5.svg


Datei-Diff unterdrückt, da er zu groß ist
+ 10 - 0
src/assets/tradeTool/tool-6-6.svg


Datei-Diff unterdrückt, da er zu groß ist
+ 10 - 0
src/assets/tradeTool/tool-6.svg


Datei-Diff unterdrückt, da er zu groß ist
+ 7 - 0
src/assets/tradeTool/tool-7-7.svg


Datei-Diff unterdrückt, da er zu groß ist
+ 7 - 0
src/assets/tradeTool/tool-7.svg


Datei-Diff unterdrückt, da er zu groß ist
+ 7 - 0
src/assets/tradeTool/tool-8-8.svg


Datei-Diff unterdrückt, da er zu groß ist
+ 7 - 0
src/assets/tradeTool/tool-8.svg


BIN
src/assets/tradeTool/tradeToolBac.png


+ 2 - 1
src/permission.js

@@ -14,7 +14,8 @@ const whiteList = [
   '/login/qualificationsHonors',
   '/login/aboutUs',
   '/login/contactUs',
-  '/login/register'
+  '/login/register',
+  '/login/tradeTool'
 ] // no redirect whitelist
 
 router.beforeEach(async(to, from, next) => {

+ 6 - 1
src/router/index.js

@@ -50,7 +50,8 @@ export const constantRoutes = [
       },
       {
         path: 'aboutUs',
-        component: () => import('@/views/login/components/AboutUsTemp.vue')
+        // component: () => import('@/views/login/components/AboutUsTemp.vue')
+        component: () => import('@/views/login/components/AboutUs.vue')
       },
       {
         path: 'contactUs',
@@ -59,6 +60,10 @@ export const constantRoutes = [
       {
         path: 'register',
         component: () => import('@/views/login/components/register.vue')
+      },
+      {
+        path: 'tradeTool',
+        component: () => import('@/views/login/components/TradeTool.vue')
       }
     ]
   },

+ 3 - 2
src/store/modules/user.js

@@ -81,10 +81,10 @@ const mutations = {
     state.enterpriseInfo.purchaseFunction = info
   },
   SET_APPLY_TAX_REBATE: (state, info) => { // 退税
-    state.enterpriseInfo.purchaseFunction = info
+    state.showApplyTaxRebateBtn = info
   },
   SET_TAX_REBATE: (state, info) => { // 退税
-    state.enterpriseInfo.purchaseFunction = info
+    state.showTaxRebateBtn = info
   }
 }
 
@@ -128,6 +128,7 @@ const actions = {
     return new Promise((resolve, reject) => {
       getCertificationStatus().then(response => {
         const { data } = response
+        console.log(data,'data')
         const { certificationStatus, showAllFunctions, showApplyTaxRebateBtn, showTaxRebateBtn } = data
         commit('SET_AUTH_STATUS', certificationStatus)
         commit('SET_SHOW_ALLMENU', showAllFunctions ? 'show' : 'hide')

+ 4 - 0
src/views/businessManage/tradeRelations/importer/components/BasicInfo.vue

@@ -280,11 +280,15 @@ export default {
           if (data.tradingLife) {
             this.ruleForm.tradingLife1 = data.tradingLife.slice(0, data.tradingLife.length - 1)
             this.ruleForm.tradeTimeUnit = data.tradingLife.slice(-1)
+            this.ruleForm.tradeTime = this.ruleForm.tradingLife1 + this.ruleForm.tradeTimeUnit
           }
           if (data.periodToBeApplied) {
             this.ruleForm.periodToBeApplied1 = data.periodToBeApplied.slice(0, data.periodToBeApplied.length - 1)
             this.ruleForm.applyTimeUnit = data.periodToBeApplied.slice(-1)
+            this.ruleForm.applyTime = this.ruleForm.periodToBeApplied1 + this.ruleForm.applyTimeUnit
           }
+          this.ruleForm.tradeForOneYear = this.ruleForm.tradingAmountPastYearCurrency + this.ruleForm.tradingAmountPastYear
+          this.ruleForm.applyMoney = this.ruleForm.amountToBeAppliedCurrency + this.ruleForm.amountToBeApplied
         }
       })
     },

+ 0 - 59
src/views/login/component/pageFooter.vue

@@ -1,59 +0,0 @@
-<template>
-  <div class="page-foot">
-    <div>
-      
-    </div>
-    <div></div>
-    <div></div>
-    <div v-if="notHomepagePath.includes($route.path)" class="bottom-cont">
-      <div class="bt-l">
-        <div class="bt-l-orange" @click="handleJumpFiling">© 陕ICP备2024033180号-1</div>
-        <template v-if="!isMobileTerminal">
-          <div class="bt-l-orange" @click="handleClickProtocol">用户协议</div>
-          <div
-            class="bt-l-orange"
-            @click="handleJumpInkasso"
-          >长安银科官网:www.changan-inkasso.com</div>
-        </template>
-        <div v-if="isMobileTerminal">服务邮箱:citp@changan-inkasso.com</div>
-        <div v-if="isMobileTerminal">服务电话:029-86689192</div>
-      </div>
-      <div v-if="!isMobileTerminal" class="bt-m">
-        <div class="case-cont" @click="handleJumpCase">陕公网安备61019102000586号</div>
-        <div>服务邮箱:citp@changan-inkasso.com</div>
-        <div>服务电话:029-86689192</div>
-      </div>
-      <div class="bt-r">
-        <div class="qrocde" />
-        <div class="qrcode-desc">关注长银</div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'Login',
-  components: {},
-  data() {
-    return {
-      menuList: ['服务商入驻', '入驻教程', '关于我们', '服务条款', '隐私条款', '常见问题']
-    }
-  },
-  methods: {}
-}
-</script>
-
-<style lang="scss" scoped>
-.page-foot {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  height: 190px;
-  background-color: #32373E;
-  color: #FFFFFF;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-around;
-}
-</style>

+ 12 - 4
src/views/login/component/pageHead.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="page-head">
-    <div>
-      <el-image :src="require('../../../assets/login1/comLogo.svg')" style="width: 136px; height: 42px;" @click="toNet" />
+    <div style="display: flex;">
+      <div class="head-log" />
       <div v-for="(item, index) in bannerList" :key="index" style="display: inline-block;" :class="activeIndex === index ? 'active-menu' : ''" @click="toPage(index)">
         <span v-if="index !== 1">{{ item }}</span>
         <el-dropdown v-else trigger="click" @command="toProduct">
@@ -67,8 +67,16 @@ export default {
   justify-content: space-between;
   flex-direction: row;
   line-height: 70px;
-  .el-image {
-    vertical-align: middle;
+  white-space: nowrap;
+  z-index: 999;
+  .head-log {
+    display: inline-block;
+    width: 136px;
+    height: 100%;
+    background-image: url('../../../assets/login1/comLogo.svg');
+    background-size: 100% 42px;
+    background-position: center;
+    background-repeat: no-repeat;
     cursor: pointer;
   }
   span {

+ 11 - 10
src/views/login/components/AboutUs.vue

@@ -3,7 +3,7 @@
     <div class="top-banner" />
     <div class="banner-desc" v-html="bannnerDesc" />
     <div class="line-cont line-cont-orange">
-      <div class="line" />
+      <!-- <div class="line" /> -->
       <div class="line-desc">发展历程</div>
     </div>
 
@@ -113,7 +113,7 @@ export default {
 <style lang="scss" scoped>
 .time-line {
   ::v-deep .el-timeline-item__tail {
-    border-color: #FE7D0B;
+    border-color: #32373E;
   }
   ::v-deep .el-timeline-item__content {
     padding-left: 80px;
@@ -123,7 +123,8 @@ export default {
     width: 14px;
     height: 14px;
     border-radius: 50%;
-    background-color: #FE7D0B;
+    background-color: #32373E;
+    left: -2px;
     // box-shadow: 4px 4px 2px rgba(254, 125, 11, .2);
   }
   .time-stamp {
@@ -136,7 +137,7 @@ export default {
     line-height: 24px;
     color: #fff;
     text-align: center;
-    background-image: url('../../../assets/aboutUs/tip.png');
+    background-image: url('../../../assets/aboutUs/blackTip.png');
   }
   .timp-span {
     color: #333;
@@ -194,16 +195,16 @@ export default {
       margin: 0 auto 20px;
     }
     .line-desc {
-      font-size: 16px;
-      font-weight: 600;
-      color: #2C4270;
+      font-size: 30px;
+      font-weight: 700;
+      color: #131820;
     }
   }
   .line-cont-orange {
     padding: 90px 0 75px;
-    .line-desc {
-      color: #FE7D0B;
-    }
+    // .line-desc {
+    //   color: #FE7D0B;
+    // }
   }
   .time-line {
     width: 50%;

+ 143 - 0
src/views/login/components/TradeTool.vue

@@ -0,0 +1,143 @@
+<template>
+  <div class="about-cont">
+    <div class="top-banner" />
+    <p>外贸工具</p>
+    <div class="tool-area">
+      <div
+        v-for="(item, index) in toolList"
+        :key="item.name"
+        :style="{backgroundImage: activeIndex !== index ? `url(${item.icon})` : `url(${item.activeIcon})`}"
+        @mouseenter="activeIndex = index"
+        @mouseout="activeIndex = ''"
+      >
+        <p>{{ item.name }}</p>
+        <p>{{ item.desc }}</p>
+        <div class="area-item-mask" />
+      </div>
+    </div>
+    <div class="net-area">
+      {{ activeIndex }}
+      <div v-for="item in netList" :key="item">
+        <p>{{ item }}</p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      toolList: [
+        { name: '商品HS编码', desc: '为平台店铺卖家提供综合服务', icon: require('@/assets/tradeTool/tool-1.svg'), activeIcon: require('@/assets/tradeTool/tool-1-1.svg') },
+        { name: '汇率牌价查询', desc: '为出口商客户提供贸易管理', icon: require('@/assets/tradeTool/tool-2.svg'), activeIcon: require('@/assets/tradeTool/tool-2-2.svg') },
+        { name: '国别代码查询', desc: '为客户匹配多元化融资支持', icon: require('@/assets/tradeTool/tool-3.svg'), activeIcon: require('@/assets/tradeTool/tool-3-3.svg') },
+        { name: '出口退税率查询', desc: '为进口商提供核额评估服务', icon: require('@/assets/tradeTool/tool-4.svg'), activeIcon: require('@/assets/tradeTool/tool-4-4.svg') },
+        { name: 'CIF价格计算', desc: '为平台店铺卖家提供综合服务', icon: require('@/assets/tradeTool/tool-5.svg'), activeIcon: require('@/assets/tradeTool/tool-5-5.svg') },
+        { name: 'FOB价格计算', desc: '为出口商客户提供贸易管理', icon: require('@/assets/tradeTool/tool-6.svg'), activeIcon: require('@/assets/tradeTool/tool-6-6.svg') },
+        { name: '通关状态查询', desc: '为客户匹配多元化融资支持', icon: require('@/assets/tradeTool/tool-7.svg'), activeIcon: require('@/assets/tradeTool/tool-7-7.svg') },
+        { name: '海关政策查询', desc: '为进口商提供核额评估服务', icon: require('@/assets/tradeTool/tool-8.svg'), activeIcon: require('@/assets/tradeTool/tool-8-8.svg') }
+      ],
+      netList: ['海关单一窗口', '电子税务局网站', '中国海关总署', '中国商务部'],
+      activeIndex: ''
+    }
+  },
+  methods: {}
+}
+</script>
+
+<style lang="scss" scoped>
+@media screen and (min-width: 1930px) {
+  .about-cont {
+    .top-banner {
+      height: 730px !important;
+      background-size: cover !important;
+    }
+    .time-line {
+      width: 56% !important;
+      margin: 0 auto;
+    }
+  }
+}
+.about-cont {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  background-color: #fff;
+  .top-banner {
+    display: flex;
+    justify-content: flex-end;
+    width: 100%;
+    height: 630px;
+    background: url('../../../assets/tradeTool/tradeToolBac.png') no-repeat center;
+  }
+  .tool-area {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    justify-content: center;
+    div {
+      background-color: #73CBDD;
+      background-repeat: no-repeat;
+      background-position: center 50px;
+      background-size: 51px 53px;
+      width: 276px;
+      height: 276px;
+      margin-right: 32px;
+      margin-bottom: 30px;
+      margin-top: 50px;
+      border-radius: 17px;
+      position: relative;
+      p {
+        color: #575757;
+        font-weight: 400;
+        font-size: 15px;
+        text-align: center;
+        margin-top: 10px;
+      }
+      p:first-child {
+        color: #131820;
+        font-weight: 700;
+        font-size: 16px;
+        margin-top: 148px;
+      }
+      .area-item-mask {
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        left: 0;
+        top: 0;
+        z-index: 800;
+        background-color: transparent;
+      }
+    }
+    div:hover {
+      background-color: #131820;
+      p {
+        color: #DCDCDC;
+      }
+      p:first-child {
+        color: #D8D8D8;
+      }
+      .area-item-mask {
+        background-color: transparent;
+      }
+    }
+  }
+}
+
+/* 移动端样式 */
+@media screen and (max-width: 768px) {
+  .about-cont {
+    position: relative;
+    width: 100%;
+    padding: 0 0 270px;
+    margin-top: 60px;
+    .top-banner {
+      width: 100%;
+      height: 124px;
+      background-size: cover;
+    }
+  }
+}
+</style>

+ 103 - 18
src/views/login/index.vue

@@ -1,9 +1,45 @@
 <template>
   <div class="login-container">
-    <page-head @changeMenu="toOtherPage" @btnClick="loginClick" />
+    <div class="login-nav">
+      <div class="logo-cont" @click="clickLogo">
+        <svg-icon icon-class="logo" style="width: 136px; height: 42px;" />
+      </div>
+      <template v-if="!isMobileTerminal">
+        <div class="nav-desc">
+          <div v-for="item in bannerList" :key="item.order" :style="item.isActice ? 'color: #FE7D0B': ''" @click="clickNav(item.order)">
+            {{ item.name }}
+          </div>
+        </div>
+      </template>
+      <div v-if="isMobileTerminal" class="mobile-btn">
+        <img
+          v-if="!showCloseIcon"
+          src="@/assets/login/mobile_1.png"
+          :style="iconAnimate1"
+          @click="mobileIconClick"
+        >
+        <img
+          v-if="showCloseIcon"
+          src="@/assets/login/mobile_2.png"
+          :style="iconAnimate2"
+          @click="mobileIconClick"
+        >
+      </div>
+      <div v-if="!isMobileTerminal && $route.path !== '/login/register'">
+        <el-button type="primary" round @click="loginClick('login')">登 录</el-button>
+        <el-button type="text" @click="loginClick('register')">注册</el-button>
+      </div>
+    </div>
     <div v-if="showBackToTop && !isMobileTerminal" class="back-to-top" @click="backTotop">
       <i class="el-icon-top" />
     </div>
+    <template v-if="isMobileTerminal">
+      <div v-if="showCloseIcon" class="nav-desc-mobile">
+        <div v-for="item in bannerMobileList" :key="item.order" :style="item.isActice ? 'color: #FE7D0B': ''" @click="clickNav(item.order)">
+          {{ item.name }}
+        </div>
+      </div>
+    </template>
     <router-view :key="key" />
     <div v-if="loginStatus" class="login-modal" />
     <transition mode="out-in">
@@ -95,8 +131,7 @@ export default {
     RegisterProtocal: () => import('./components/RegisterProtocal'),
     PrivacyProtocal: () => import('./components/PrivacyProtocal'),
     HomeBottom: () => import('./components/HomeBottom'),
-    ChangePassword: () => import('./components/ChangePassword'),
-    PageHead: () => import('./component/pageHead.vue')
+    ChangePassword: () => import('./components/ChangePassword')
   },
   data() {
     return {
@@ -105,7 +140,7 @@ export default {
       protocolStatus: '',
       bannerList: [
         {
-          name: '跨境通',
+          name: '首页',
           isActice: true,
           order: 0,
           path: '/login/tradeSinceLink'
@@ -117,15 +152,21 @@ export default {
           path: '/login/qualificationsHonors'
         },
         {
-          name: '关于我们',
+          name: '外贸工具',
           isActice: false,
           order: 2,
+          path: '/login/tradeTool'
+        },
+        {
+          name: '关于我们',
+          isActice: false,
+          order: 3,
           path: '/login/aboutUs'
         },
         {
           name: '联系我们',
           isActice: false,
-          order: 3,
+          order: 4,
           path: '/login/contactUs'
         }
       ],
@@ -143,21 +184,27 @@ export default {
           path: '/login/qualificationsHonors'
         },
         {
-          name: '关于我们',
+          name: '外贸工具',
           isActice: false,
           order: 2,
+          path: '/login/tradeTool'
+        },
+        {
+          name: '关于我们',
+          isActice: false,
+          order: 3,
           path: '/login/aboutUs'
         },
         {
           name: '联系我们',
           isActice: false,
-          order: 3,
+          order: 4,
           path: '/login/contactUs'
         },
         {
           name: '立即注册',
           isActice: false,
-          order: 4,
+          order: 5,
           path: '/login/register'
         }
       ],
@@ -167,7 +214,7 @@ export default {
       iconAnimate1: {},
       iconAnimate2: {},
       homepagePath: '/login/tradeSinceLink',
-      notHomepagePath: ['/login/qualificationsHonors', '/login/aboutUs', '/login/contactUs']
+      notHomepagePath: ['/login/qualificationsHonors', '/login/tradeTool', '/login/aboutUs', '/login/contactUs']
     }
   },
   computed: {
@@ -177,7 +224,8 @@ export default {
   },
   watch: {
     $route: {
-      handler(val) {
+      handler(val, v) {
+        console.log(val, v)
         let findIdx = -1
         this.isMobile()
         if (this.isMobileTerminal) {
@@ -212,13 +260,6 @@ export default {
     window.removeEventListener('resize', this.isMobile)
   },
   methods: {
-    toOtherPage(val) {
-      console.log(val, 'val')
-    },
-    loginClick(type) {
-      this.loginStatus = true
-      this.loginType = type
-    },
     preventDefault(e) {
       e.preventDefault()
     },
@@ -240,6 +281,10 @@ export default {
     mobileIconClick() {
       this.showCloseIcon = !this.showCloseIcon
     },
+    loginClick(type) {
+      this.loginStatus = true
+      this.loginType = type
+    },
     protocol(type) {
       this.protocolStatus = type
     },
@@ -260,6 +305,7 @@ export default {
           element.isActice = false
         })
         this.bannerList[idx].isActice = true
+        console.log(this.bannerList[idx].path, 'click')
         this.$router.push({
           path: this.bannerList[idx].path
         })
@@ -303,6 +349,11 @@ export default {
     .login-nav {
       padding: 0 !important;
       justify-content: center !important;
+      .nav-desc {
+        flex: initial !important;
+        width: 44% !important;
+        padding-left: 6% !important;
+      }
     }
   }
 }
@@ -312,6 +363,11 @@ export default {
     .login-nav {
       padding: 0 !important;
       justify-content: center !important;
+      .nav-desc {
+        flex: initial !important;
+        width: 62% !important;
+        padding-left: 6% !important;
+      }
     }
   }
 }
@@ -377,6 +433,22 @@ export default {
     justify-content: space-between;
     align-items: center;
     overflow: hidden;
+    .logo-cont {
+      cursor: pointer;
+    }
+    .nav-desc {
+      flex: 1;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      font-size: 16px;
+      color: #E6E6E6;
+      padding-left: 8%;
+      div {
+        cursor: pointer;
+        margin-right: 8%;
+      }
+    }
     .nav-btn {
       flex-basis: 100px;
     }
@@ -529,6 +601,19 @@ export default {
       align-items: center;
       overflow: hidden;
     }
+    .nav-desc {
+      flex: initial;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      font-size: 16px;
+      color: #E6E6E6;
+      padding-left: 8%;
+      div {
+        cursor: pointer;
+        margin-right: 8%;
+      }
+    }
     .nav-desc-mobile {
       position: fixed;
       top: 60px;

+ 1 - 1
src/views/myAccounts/payment/component/list.vue

@@ -66,7 +66,7 @@
       :columns="columns"
       :data="tableData"
       :count="count"
-      parent-component="ExportTax"
+      parent-component="MyPayment"
     />
 
     <cy-dialog ref="editDialog" title="付款" :width="'600px'" :top="'13vh'">

+ 10 - 1
src/views/myAccounts/payment/view.vue

@@ -16,6 +16,13 @@
       <el-form-item label="应付金额">
         <el-input :value="ruleForm.payableAccountInfo.paymentAmount ? ruleForm.payableAccountInfo.paymentCurrency + ' ' + formatMoney(ruleForm.payableAccountInfo.paymentAmount) : ''" :disabled="disabled" />
       </el-form-item>
+      <el-form-item :label="ruleForm.payableAccountInfo.paymentType === '1' ? '技术服务合同' : '出口退税服务合同'">
+        <cy-upload
+          :file-data="ruleForm.contactFileId ? [ruleForm.contactFileId] : []"
+          :upload-from-orange-status="true"
+          disabled
+        />
+      </el-form-item>
       <el-form-item label="支付状态">
         <el-input :value="codeToName(constant.payable_accounts_payment_status, ruleForm.payableAccountInfo.status, 'dictValue', 'dictLabel')" :disabled="disabled" />
       </el-form-item>
@@ -57,7 +64,8 @@ export default {
     return {
       ruleForm: {
         payableAccountInfo: {},
-        payableAccountsFile: null
+        payableAccountsFile: null,
+        contactFileId: null
       },
       rules: {
 
@@ -166,6 +174,7 @@ export default {
       const { id } = this.$route.query
       detail({ id: id }).then(res => {
         const { data } = res
+        this.ruleForm.contactFileId = data.contactFileId
         this.ruleForm.payableAccountInfo = data.payableAccountInfo || {}
         this.ruleForm.payableAccountsFile = data.payableAccountsFile
       })

+ 1 - 1
src/views/myAccounts/receive/view.vue

@@ -53,7 +53,7 @@
           <el-input :value="ruleForm.billingDisbursement.importerEnterpriseName" :disabled="disabled" />
         </el-form-item>
         <!-- <el-form-item v-if="exportType === 'proxy_export'" label="代理公司名称"> -->
-        <el-form-item label="代理公司名称">
+        <el-form-item v-if="$store.state.user.enterpriseInfo.exportType === 'proxy_export'" label="代理公司名称">
           <el-input :value="ruleForm.billingDisbursement.agencyEnterpriseName" :disabled="disabled" />
         </el-form-item>
         <cy-info-title>销售合同项下已收款的订单列表</cy-info-title>

+ 10 - 9
src/views/myApplication/tax/list.vue

@@ -5,9 +5,10 @@
       <div class="right">
         <el-date-picker
           v-model="applyDate"
-          type="daterange"
+          type="monthrange"
           range-separator="至"
-          value-format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyyMM"
+          :unlink-panels="true"
           start-placeholder="申报年月日期范围"
           end-placeholder="申报年月日期范围"
         />
@@ -45,13 +46,11 @@
         <div class="right-btn">
           <el-button type="primary" @click="fetchData('reset')">重置</el-button>
           <el-button type="primary" @click="fetchData('search')">查询</el-button>
+          <el-button v-if="$store.state.user.showApplyTaxRebateBtn" type="primary" @click="exportTax(1)">申请出口退税</el-button>
+          <el-button v-if="$store.state.user.showTaxRebateBtn" type="primary" @click="exportTax(2)">出口退税</el-button>
         </div>
       </div>
     </div>
-    <div style="text-align: right; margin-top: 10px;">
-      <el-button v-if="$store.state.user.showApplyTaxRebateBtn" type="primary" @click="exportTax(1)">申请出口退税</el-button>
-      <el-button v-if="$store.state.user.showTaxRebateBtn" type="primary" @click="exportTax(2)">出口退税</el-button>
-    </div>
     <cy-comm-table
       ref="commTable"
       v-loading="loading"
@@ -130,7 +129,10 @@ export default {
         {
           label: '出口数量',
           showTooltip: true,
-          prop: 'exportQuantity'
+          prop: 'exportQuantity',
+          render: (h, row) => {
+            return <div>{ row.exportQuantity }</div>
+          }
         },
         {
           label: '出口日期',
@@ -226,8 +228,7 @@ export default {
       }
       getList(params).then(({ data }) => {
         this.loading = false
-        // this.tableData = data.rows
-        this.tableData = [{id: 1}]
+        this.tableData = data.rows
         this.count = Number(data.records)
       })
     },

+ 5 - 5
src/views/myApplication/tax/view.vue

@@ -29,13 +29,13 @@
       <el-form-item label="销售订单ID">
         <el-input :value="ruleForm.salesOrderNo" :disabled="disabled" />
       </el-form-item>
-      <el-form-item label="销售合同编号">
+      <!-- <el-form-item label="销售合同编号">
         <el-input :value="ruleForm.salesContractNo" :disabled="disabled" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="进口商名称">
         <el-input :value="ruleForm.importerName" :disabled="disabled" />
       </el-form-item>
-      <el-form-item label="代理公司名称">
+      <el-form-item v-if="$store.state.user.enterpriseInfo.exportType === 'proxy_export'" label="代理公司名称">
         <el-input :value="ruleForm.agencyName" :disabled="disabled" />
       </el-form-item>
       <el-form-item label="出口发票号码">
@@ -62,7 +62,7 @@
       <cy-info-title>出口明细</cy-info-title>
       <div style="width: 100%; margin-top: 15px;" class="table-box">
         <el-table :data="exportDetailList" style="width: 100%;">
-          <el-table-column label="申报序号" type="declarationSerialNo" width="50" />
+          <!-- <el-table-column label="申报序号" prop="declarationSerialNo" :show-overflow-tooltip="true" /> -->
           <el-table-column label="HS编码" prop="hsCode" :show-overflow-tooltip="true" />
           <el-table-column label="报关品名" prop="exportCommodityName" :show-overflow-tooltip="true" />
           <el-table-column label="法定计量单位" prop="measurementUnit" :show-overflow-tooltip="true" />
@@ -83,7 +83,7 @@
         <cy-info-title>进货明细</cy-info-title>
         <div style="width: 100%; margin-top: 15px;" class="table-box">
           <el-table :data="purchaseDetailList" style="width: 100%;">
-            <el-table-column label="采购订单ID" type="purchaseOrderNo" width="50" />
+            <!-- <el-table-column label="采购订单ID" prop="purchaseOrderNo" :show-overflow-tooltip="true" /> -->
             <el-table-column label="发票类型" prop="voucherTypeName" :show-overflow-tooltip="true" />
             <el-table-column label="发票号码" prop="purchaseVoucherNo" :show-overflow-tooltip="true" />
             <el-table-column label="开票日期" prop="invoiceDate" :show-overflow-tooltip="true" />

BIN
test1.7z


BIN
test4.7z