问题处理

src/axios/module/myManage.js

@@ -58,6 +58,14 @@ const tycpdmfirmupdateSystem = (params = {}) => {
 const tycpdmfirmReturnFile = (params = {}) => {
     return `${hostUrl}/office/tycpdmfirm/api/returnFile?status=${params.status}&fileType=${params.fileType}&id=${params.id}`
 }
+// 个人中心首页 业务大厅页面跳转
+const redirectYWDT = (params = {}) => {
+    return POST(`${Prefix}/office/tycpdmfirm/authApi/redirectBusinessHall`, params)
+}
+// 个人中心首页 GDS页面跳转
+const redirectGDS = (params = {}) => {
+    return POST(`${Prefix}/office/tycpdmfirm/authApi/redirectGDS`, params)
+}
 // 个人中心首页 LGN页面跳转
 const redirectGLN = () => {
     return POST(`${Prefix}/office/tycpdmfirm/authApi/redirectGLN`)
@@ -92,6 +100,8 @@ export default {
     tycpdmfirmChangeAuditList,
     tycpdmfirmupdateSystem,
     tycpdmfirmReturnFile,
+    redirectYWDT,
+    redirectGDS,
     redirectGLN,
     updateTycpdmFirmInfo,
     tycpdmFirmInfoNoAuth,

src/components/layout/topBanner.vue

@@ -56,9 +56,9 @@ export default {
   },
   methods: {
     toAdmin() {
-      if (this.user.userType === 3 && this.user.levels === null) {
+      if ((this.user.userType === 1 && this.user.isXT !== 1) || (this.user.userType === 2 && this.user.isXT !== 1) || (this.user.userType === 3 && this.user.levels === null)) {
         this.$router.push({path: '/MyManage/UnVerify/index'})
-      } else if (this.user.userType === 2) {
+      } else if (this.user.isXT === 1) {
         this.$router.push({path: '/MyManage/SystemMember/index'})
       } else if (this.user.levels === 0) {
         this.$router.push({path: '/MyManage/admin/check'})

src/views/MyManage/Admin/certificationDetail.vue

@@ -34,7 +34,7 @@
           <div class="row">
             <div class="detail-cell col-lg-6" v-for="item in handlerInfoFields">
               <div class="label" :class="{required:item.required}">{{ item.label }}</div>
-              <div class="value" :class="{'gs-clickable':item.type==='file'}">{{ item.value }}</div>
+              <div class="value" :class="{'gs-clickable':item.type==='file'}" @click="checkField(item)">{{ item.value }}</div>
             </div>
           </div>
         </div>
@@ -395,7 +395,7 @@ export default {
           value: ''
         },
         {
-          key: '',
+          key: 'firmbusinesslicensefile',
           label: '上传实名认证扫描件',
           value: '查看实名认证注册登记表',
           type: 'file'
@@ -431,6 +431,14 @@ export default {
         }
         this.showImage(form)
       }
+      if (item.key === 'firmbusinesslicensefile') {
+        const form = {
+          status: this.status,
+          fileType: '2', //1.第一步文件 2.第二步文件
+          id: this.id
+        }
+        this.showImage(form)
+      }
     },
     showImage(form) {
       const result = this.$api.myManage.tycpdmfirmReturnFile(form)
@@ -492,7 +500,7 @@ export default {
 
       const filterFields = ['firmbusinesslicensefile', 'firmArchivesfile']
       this.entInfoFields.forEach(item => (item.key && filterFields.indexOf(item.key) < 0) && (item.value = this.detailInfo[item.key]))
-      this.handlerInfoFields.forEach(item => item.key && (item.value = this.detailInfo[item.key]))
+      this.handlerInfoFields.forEach(item => (item.key && filterFields.indexOf(item.key) < 0) && (item.value = this.detailInfo[item.key]))
       this.businessFields.forEach(item => item.key && (item.value = this.detailInfo[item.key]))
     }
   },

src/views/MyManage/Admin/check.vue

@@ -32,7 +32,7 @@
         </div>
       </div>
     </div>
-    <CheckSearchTable v-if="query.status" :query="query"></CheckSearchTable>
+    <CheckSearchTable v-if="query.status" :query="query" @refresh="getTotalCount"></CheckSearchTable>
   </div>
 </template>
 

src/views/MyManage/Admin/checkSearchTable.vue

@@ -2,7 +2,7 @@
   <div class="gs-ac-search-table">
     <div v-show="!checkDetail" class="card_wrapper">
       <div class="title">{{ status[query.status] }}
-        <span class="back_btn" @click="$router.push({path:''})">返回</span>
+        <span class="back_btn" @click="$emit('refresh');$router.push({path:''})">返回</span>
       </div>
       <div class="body" style="max-height: 100vh;">
         <div class="gs-ac-search">

src/views/MyManage/UnVerify/index.vue

@@ -14,7 +14,7 @@
         <ul>
           <li>
             <p class="content-title">商品条码相关业务</p>
-            <p>请直接登录<a href="#">网上业务大厅</a>办理商品条码在</p>
+            <p>请直接登录<a @click="redirectYWDT">网上业务大厅</a>办理商品条码在</p>
           </li>
           <!-- 厂商实名认证已认证 -->
           <li v-if="loginInfo.isQY === 1">
@@ -26,12 +26,10 @@
               >您已成为中国物品编码中心实名认证企业！
             </p>
             <p style="padding-left:24px">
-              您可以——前往<a href="http://v3.gds.org.cn/index.aspx" target="_blank"
-                >中国商品信息服务平台</a
-              >
-              办理<a href="http://v3.gds.org.cn/index.aspx" target="_blank"
-                >“通报进口商品信息” “开通条码微站” “使用数据总资产服务”！</a
-              >
+              您可以——前往
+              <a @click="redirectGDS">中国商品信息服务平台</a>
+              办理
+              <a @click="redirectGDS">“通报进口商品信息” “开通条码微站” “使用数据总资产服务”！</a>
             </p>
             <p v-if="loginInfo.isXT === 2" style="padding-left:24px">
               您可以——前往<a @click="redirectGLN">购买GLN</a
@@ -155,6 +153,24 @@ export default {
     }
   },
   methods: {
+    async redirectYWDT() {
+      const params = {userType: this.loginInfo.userType, id: this.loginInfo.id}
+      const result = await this.$api.myManage.redirectYWDT(params)
+      if (result.success) {
+        window.open(result.data, '_black')
+      } else {
+        this.$message.error(result.returnMsg)
+      }
+    },
+    async redirectGDS() {
+      const params = {userType: this.loginInfo.userType, id: this.loginInfo.id}
+      const result = await this.$api.myManage.redirectGDS(params)
+      if (result.success) {
+        window.open(result.data, '_black')
+      } else {
+        this.$message.error(result.returnMsg)
+      }
+    },
     async redirectGLN() {
       const result = await this.$api.myManage.redirectGLN()
       if (result.success) {

src/views/MyManage/UnVerify/vendor.vue

@@ -477,22 +477,17 @@ export default {
       const tycpdmFirmInfo = result.data.data
       if (tycpdmFirmInfo) { // tycpdmFirmInfo不为null则已完成第一步填写实名信息
         if (tycpdmFirmInfo.logoutFlag === null) { // logoutFlag如果为null表示未提交书面材料
-          await this.$router.replace({path: '/MyManage/UnVerify/uploadvendor'})
+          this.form.fid = tycpdmFirmInfo.fid
+          this.form.id = tycpdmFirmInfo.id
+          this.status = result.data.status
+          this.initFormData(tycpdmFirmInfo)
+          // await this.$router.replace({path: '/MyManage/UnVerify/uploadvendor'}) // 第二步没有提交是可以修改第一步的实名信息的
         } else {
           if (this.$route.query.status !== 'modify' && tycpdmFirmInfo.logoutFlag !== 1) await this.$router.replace({path: '/MyManage/UnVerify/vendorStatus'})
           this.form.fid = tycpdmFirmInfo.fid
           this.form.id = tycpdmFirmInfo.id
           this.status = result.data.status
           this.initFormData(tycpdmFirmInfo)
-          // if (this.loginInfo.userType === 3 && tycpdmFirmInfo.logoutFlag === 1) {
-          //   await this.$alert('您的厂商实名认证审核通过，请重新登录', '', {
-          //     confirmButtonText: '确定',
-          //     showClose: false,
-          //     callback: () => {
-          //       this.$router.replace({path: '/login'})
-          //     }
-          //   })
-          // }
         }
       } else {
         this.status = 1

src/views/MyManage/comps/TJDmSelect.vue

@@ -124,7 +124,7 @@ export default {
       }
       if (code.length >= 4 || (code.length === 5 && code.slice(-1) === '0')) {
         _level = 3
-        if (code.length === 4) {
+        if (!(code.length === 5 && code.slice(-1) === '0')) {
           threeLevelCode = code.substr(0, 4)
         } else {
           threeLevelCode = code.substr(0, 5)
@@ -144,9 +144,9 @@ export default {
           return item[1] === fourLevelCode
         })
       }
-      console.log(oneLevelCode, twoLevelCode, threeLevelCode, fourLevelCode, _level)
+      // console.log(oneLevelCode, twoLevelCode, threeLevelCode, fourLevelCode, _level)
       this.level = _level
-      console.log(code, level, index)
+      // console.log(code, level, index)
     }
   },
   mounted() {

src/views/MyManage/comps/userInfo.vue

@@ -62,10 +62,16 @@ export default {
           this.userType = '条码成员'
           break
         case 3:
+          switch (this.loginInfo.isXT) {
+            case 1:
+              this.userType = '系统成员'
+              break
+            default:
               this.userType = '官网用户'
               break
           }
       }
+    }
   },
   mounted() {
     this.getMemberInfo()

src/views/User/login.vue

@@ -124,17 +124,18 @@ export default {
               localStorage.setItem('TOKEN', res.data.token)
               const memberInfo = await this.$api.myManage.memberInfo({id: res.data.id})
               console.log(memberInfo)
-              localStorage.setItem('loginInfo', JSON.stringify({...res.data, ...memberInfo.data}))
-              if (res.data.userType === 3 && res.data.levels === null) {
+              const loginInfo = res.data
+              localStorage.setItem('loginInfo', JSON.stringify({...memberInfo.data, ...loginInfo}))
+              if ((loginInfo.userType === 1 && loginInfo.isXT !== 1) || (loginInfo.userType === 2 && loginInfo.isXT !== 1) || (loginInfo.userType === 3 && loginInfo.levels === null)) {
                 localStorage.setItem('gs-user', JSON.stringify({type: 'unVerify'}))
                 this.$router.push({path: '/MyManage/UnVerify/index'})
-              } else if (res.data.userType === 2) {
+              } else if (loginInfo.isXT === 1) {
                 localStorage.setItem('gs-user', JSON.stringify({type: 'verify'}))
                 this.$router.push({path: '/MyManage/SystemMember/index'})
-              } else if (res.data.levels === 0) {
+              } else if (loginInfo.levels === 0) {
                 localStorage.setItem('gs-user', JSON.stringify({type: 'admin'}))
                 this.$router.push({path: '/MyManage/admin/check'})
-              } else if (String(res.data.levels).length === 4) {
+              } else if (String(loginInfo.levels).length === 4) {
                 localStorage.setItem('gs-user', JSON.stringify({type: 'adminBranch'}))
                 this.$router.push({path: '/MyManage/admin/check'})
               }