Merge remote-tracking branch 'origin/master'

src/axios/module/myManage.js

@@ -58,6 +58,10 @@ const tycpdmfirmupdateSystem = (params = {}) => {
 const tycpdmfirmReturnFile = (params = {}) => {
     return `${hostUrl}/office/tycpdmfirm/api/returnFile?status=${params.status}&fileType=${params.fileType}&id=${params.id}`
 }
+// 获取认证图片是否存在接口
+const tycpdmfirmReturnFileIsExistence = (params = {}) => {
+    return POST(`${hostUrl}/office/tycpdmfirm/authApi/returnFileUrl`, params)
+}
 // 个人中心首页 业务大厅页面跳转
 const redirectYWDT = (params = {}) => {
     return POST(`${Prefix}/office/tycpdmfirm/authApi/redirectBusinessHall`, params)
@@ -100,6 +104,7 @@ export default {
     tycpdmfirmChangeAuditList,
     tycpdmfirmupdateSystem,
     tycpdmfirmReturnFile,
+    tycpdmfirmReturnFileIsExistence,
     redirectYWDT,
     redirectGDS,
     redirectGLN,

src/views/Business/Faq.vue

@@ -187,7 +187,7 @@ export default {
     async getFaqListByTypeName() {
       const params = {
         typeName: this.search.typeName,
-        name: this.search.name,
+        cxnr: this.search.name,
         pageNo: this.pageParams.currPage,
         pageSize: this.pageParams.pageSize,
       };

src/views/MyManage/Admin/certificationDetail.vue

@@ -501,7 +501,15 @@ 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 && filterFields.indexOf(item.key) < 0) && (item.value = this.detailInfo[item.key]))
+      this.handlerInfoFields.forEach(item => {
+        if (item.key && filterFields.indexOf(item.key) < 0) {
+          if (item.key === 'contactmanctqh') {
+            item.value = this.detailInfo[item.key] + '-' + this.detailInfo['contactmantele']
+          } else {
+            item.value = this.detailInfo[item.key]
+          }
+        }
+      })
       this.businessFields.forEach(item => item.key && (item.value = this.detailInfo[item.key]))
     }
   },

src/views/MyManage/Admin/checkSearchTable.vue

@@ -200,6 +200,7 @@ export default {
     handleBack() {
       this.checkDetail = null
       this.getAuditList()
+      this.$emit('refresh')
     },
     handleEntNameCheck(row) {
       console.log(row)

src/views/MyManage/SystemMember/companyInfo.vue

@@ -339,8 +339,8 @@ export default {
       this.branchList.length > 0 && (this.form.branchCode = this.branchList[0].value)
     },
     async getTycpdmFirmInfo() {
-      const result = await this.$api.myManage.tycpdmFirmInfo({userName: this.memberInfo.username})
-      const tycpdmFirmInfo = result.data.data
+      const result = await this.$api.myManage.tycpdmFirmInfoNoAuth({name: this.memberInfo.username})
+      const tycpdmFirmInfo = result.data
       this.initFormData(tycpdmFirmInfo)
     },
     async getMemberInfo() {

src/views/MyManage/SystemMember/index.vue

@@ -91,7 +91,8 @@ export default {
   name: "index",
   data() {
     return {
-      loginInfo: {}
+      loginInfo: {},
+      isShowGDS: false
     }
   },
   methods: {
@@ -105,7 +106,7 @@ export default {
       }
     },
     async redirectGDS() {
-      const params = {userType: this.loginInfo.userType, id: this.loginInfo.id}
+      const params = {userType: this.loginInfo.userType, id: this.loginInfo.id, carno: this.loginInfo.carno}
       const result = await this.$api.myManage.redirectGDS(params)
       if (result.success) {
         window.open(result.data, '_black')
@@ -114,8 +115,13 @@ export default {
       }
     }
   },
+  initIsShowGDS() {
+    if (this.loginInfo.carno) this.isShowGDS = true // 有条码卡号可以进行GDS跳转
+    if (this.loginInfo.isQY) this.isShowGDS = true // 官网用户已进行实名厂商认证可以进行GDS跳转
+  },
   mounted() {
     this.loginInfo = JSON.parse(localStorage.getItem('loginInfo'))
+    this.initIsShowGDS()
   }
 }
 </script>

src/views/MyManage/UnVerify/index.vue

@@ -14,7 +14,7 @@
         <ul>
           <li>
             <p class="content-title">商品条码相关业务</p>
-            <p>请直接登录<a @click="redirectYWDT">网上业务大厅</a>办理商品条码在</p>
+            <p>请直接登录<a @click="redirectYWDT">网上业务大厅</a>办理商品条码</p>
           </li>
           <!-- 厂商实名认证已认证 -->
           <li v-if="loginInfo.isQY === 1">
@@ -25,7 +25,7 @@
               <i class="bi bi-check-circle-fill"></i
               >您已成为中国物品编码中心实名认证企业！
             </p>
-            <p style="padding-left:24px">
+            <p v-if="isShowGDS" style="padding-left:24px">
               您可以——前往
               <a @click="redirectGDS">中国商品信息服务平台</a>
               办理
@@ -49,7 +49,7 @@
             <p class="list-cnt">
               快速申请、维护GLN信息，并对外提供GLN信息查询验证。帮助企业在EDI、GDSN、海关、追溯等应用场景中，有效识别企业主体与地理位置等信息。
             </p>
-            <div class="list-img row">
+            <div v-if="!tycpdmFirmInfo || (tycpdmFirmInfo.logoutFlag === -1 || tycpdmFirmInfo.logoutFlag === null)" class="list-img row">
               <div class="img-p col-lg-4">
                 <a href="/MyManage/UnVerify/vendor">
                   <img src="../../../assets/image/mymanage/tx.png" alt="" />
@@ -57,13 +57,13 @@
                 </a>
               </div>
               <div class="img-p  col-lg-4">
-                <a href="/MyManage/UnVerify/uploadvendor">
+                <a href="/MyManage/UnVerify/vendor">
                   <img src="../../../assets/image/mymanage/tj.png" alt="" />
                   <p>提交书面材料</p>
                 </a>
               </div>
               <div class="img-p  col-lg-4">
-                <a href="/MyManage/UnVerify/shvendor">
+                <a href="/MyManage/UnVerify/vendor">
                   <img src="../../../assets/image/mymanage/sh.png" alt="" />
                   <p>审核状态</p>
                 </a>
@@ -142,6 +142,9 @@ export default {
   name: "index",
   data () {
     return {
+      isShowGDS: false,
+      memberInfo: {},
+      tycpdmFirmInfo: {},
       loginInfo: {
         carno: '', // 条码卡号
         id: 16, // 用户ID
@@ -163,7 +166,7 @@ export default {
       }
     },
     async redirectGDS() {
-      const params = {userType: this.loginInfo.userType, id: this.loginInfo.id}
+      const params = {userType: this.loginInfo.userType, id: this.loginInfo.id, carno: this.loginInfo.carno}
       const result = await this.$api.myManage.redirectGDS(params)
       if (result.success) {
         window.open(result.data, '_black')
@@ -178,10 +181,24 @@ export default {
       } else {
         this.$message.error(result.returnMsg)
       }
+    },
+    initIsShowGDS() {
+      if (this.loginInfo.carno) this.isShowGDS = true // 有条码卡号可以进行GDS跳转
+      if (this.loginInfo.isQY) this.isShowGDS = true // 官网用户已进行实名厂商认证可以进行GDS跳转
+    },
+    async getTycpdmFirmInfo() {
+      const result = await this.$api.myManage.tycpdmFirmInfoNoAuth({name: this.memberInfo.username})
+      this.tycpdmFirmInfo = result.data
+    },
+    async getMemberInfo() {
+      this.memberInfo = (await this.$api.myManage.memberInfo({id: this.loginInfo.id})).data
+      await this.getTycpdmFirmInfo()
     }
   },
   mounted() {
     this.loginInfo = JSON.parse(localStorage.getItem('loginInfo'))
+    this.initIsShowGDS()
+    this.getMemberInfo()
   }
 }
 </script>

src/views/MyManage/UnVerify/uploadvendor.vue

@@ -17,14 +17,19 @@
           <div class="uploadcss">
             <span class="icon ">上传加盖公章的《实名认证注册登记表》影印件：</span>
             <span class="btn " >
-              <el-button type="primary" @click="uploadEvent" style="width: 110px">上传</el-button>查看实名认证历史上传文件
+              <el-button type="primary" @click="uploadEvent" style="width: 110px">上传</el-button><span @click="showImage">查看实名认证历史上传文件</span>
               <p style="margin-top:10px;">支持png，bmp，jpg格式，大小不限</p>
             </span>
           </div>
         </div>
     </div>
+    <el-image
+        id="image"
+        style="width: 10px; height: 10px;opacity: 0;"
+        :src="imagePreview.url"
+        :preview-src-list="imagePreview.srcList">
+    </el-image>
   </div>
-
 </template>
 
 <script>
@@ -35,7 +40,11 @@ export default {
       uploading: false,
       loginInfo: {},
       memberInfo: {},
-      tycpdmFirmInfo: {}
+      tycpdmFirmInfo: {},
+      imagePreview: {
+        url: '',
+        srcList: []
+      }
     }
   },
   methods: {
@@ -78,6 +87,22 @@ export default {
         inputObj.click()
       }).catch(() => {});
     },
+    async showImage() {
+      const form = {
+        status: this.tycpdmFirmInfo.status,
+        fileType: '2', //1.第一步文件 2.第二步文件
+        id: this.tycpdmFirmInfo.status === 1 ? this.tycpdmFirmInfo.fid : this.tycpdmFirmInfo.id
+      }
+      const isExistence = await this.$api.myManage.tycpdmfirmReturnFileIsExistence(form)
+      if (isExistence.data === '不存在') {
+        this.$message.error('文件不存在')
+      } else {
+        const result = this.$api.myManage.tycpdmfirmReturnFile(form)
+        this.imagePreview.url = result
+        this.imagePreview.srcList = [result]
+        if (document.getElementById('image')) document.getElementById('image').click()
+      }
+    },
     async getTycpdmFirmInfo() {
       const result = await this.$api.myManage.tycpdmFirmInfo({userName: this.memberInfo.username})
       this.tycpdmFirmInfo = result.data.data

src/views/MyManage/UnVerify/vendor.vue

@@ -65,7 +65,7 @@
                               required: true,
                               message: '不能为空',
                           }]">
-                <el-select v-model="form.branchCode" placeholder="请选择所属分支机构" >
+                <el-select v-model="form.branchCode" :disabled="status === 2" placeholder="请选择所属分支机构" >
                   <el-option v-for="item in branchList" :label="item.label" :value="item.value" :key="item.value"></el-option>
                 </el-select>
               </el-form-item>
@@ -205,7 +205,7 @@
                           }]">
                 <el-input v-model='form.firmBusinessLicenseFile' autocomplete='off' style="display:none"></el-input>
                 <el-button @click="uploadEvent" type="primary" style="width: 110px;height: 36px;">上传</el-button><br/>
-                <span style="margin-right: 15px;cursor: pointer;color: #0D6EFD;">查看历史上传文件</span>
+                <span @click="showImage" style="margin-right: 15px;cursor: pointer;color: #0D6EFD;">查看历史上传文件</span>
                 <el-popover
                     placement="bottom"
                     width="300"
@@ -316,6 +316,7 @@ export default {
       uploadTipVisible: false,
       loginInfo: {},
       memberInfo: {},
+      tycpdmFirmInfo: {},
       imagePreview: {
         url: '',
         srcList: []
@@ -445,11 +446,12 @@ export default {
       this.$refs['ruleForm'].validate((valid) => {
         if (valid) {
           console.log(this.form)
-          this.form.political = this.form.political[this.form.political.length - 1]
-          this.form.contactmanTele = this.form.contactmanCtqh.substr(this.form.contactmanCtqh.indexOf('-')+1)
-          this.form.contactmanCtqh = this.form.contactmanCtqh.substr(0, this.form.contactmanCtqh.indexOf('-'))
           this.form.status = this.status
-          this.saveTycpdmFirmInfo()
+          const _form = JSON.parse(JSON.stringify(this.form))
+          _form.political = this.form.political[this.form.political.length - 1]
+          _form.contactmanTele = this.form.contactmanCtqh.substr(this.form.contactmanCtqh.indexOf('-')+1)
+          _form.contactmanCtqh = this.form.contactmanCtqh.substr(0, this.form.contactmanCtqh.indexOf('-'))
+          this.saveTycpdmFirmInfo(_form)
         } else {
           return false;
         }
@@ -505,9 +507,25 @@ export default {
       }
       inputObj.click()
     },
-    async saveTycpdmFirmInfo() {
+    async showImage() {
+      const form = {
+        status: this.status,
+        fileType: '1', //1.第一步文件 2.第二步文件
+        id: this.status === 1 ? this.tycpdmFirmInfo.fid : this.tycpdmFirmInfo.id
+      }
+      const isExistence = await this.$api.myManage.tycpdmfirmReturnFileIsExistence(form)
+      if (isExistence.data === '不存在') {
+        this.$message.error('文件不存在')
+      } else {
+        const result = this.$api.myManage.tycpdmfirmReturnFile(form)
+        this.imagePreview.url = result
+        this.imagePreview.srcList = [result]
+        if (document.getElementById('image')) document.getElementById('image').click()
+      }
+    },
+    async saveTycpdmFirmInfo(form) {
       let _form = {}
-      Object.keys(this.form).forEach(key => { _form[key.toLowerCase()] = this.form[key] })
+      Object.keys(form).forEach(key => { _form[key.toLowerCase()] = form[key] })
       _form['baseUser'] = this.memberInfo.username
       const result = await this.$api.myManage.saveTycpdmFirmInfo(_form)
       if (result.success) {
@@ -520,6 +538,7 @@ export default {
     async getTycpdmFirmInfo() {
       const result = await this.$api.myManage.tycpdmFirmInfo({userName: this.memberInfo.username})
       const tycpdmFirmInfo = result.data.data
+      this.tycpdmFirmInfo = tycpdmFirmInfo
       if (tycpdmFirmInfo) { // tycpdmFirmInfo不为null则已完成第一步填写实名信息
         if (tycpdmFirmInfo.logoutFlag === -1) { // logoutFlag如果为null表示未提交书面材料
           this.form.fid = tycpdmFirmInfo.fid

src/views/MyManage/comps/userInfo.vue

@@ -49,8 +49,13 @@ export default {
   methods: {
     async getMemberInfo() {
       this.memberInfo = (await this.$api.myManage.memberInfo({id: this.loginInfo.id})).data
+      if (this.loginInfo.userType === 1) {
+        this.userName = this.loginInfo.username
+        this.phone = this.loginInfo.phone
+      } else {
         this.userName = this.memberInfo.username
         this.phone = this.memberInfo.phone
+      }
       if (this.loginInfo.carno) {
         this.nocardNo = '已申请条码卡'
         this.cardNo = this.loginInfo.carno

src/views/MyManage/index.vue

@@ -199,13 +199,13 @@ export default {
               id: uuid("gs_nav"),
               name: "企业实名认证",
               index: 0,
-              link: "/MyManage/admin/check?menu=1",
+              link: "/MyManage/admin/check?type=new&status=3",
             },
             {
               id: uuid("gs_nav"),
               name: "企业实名认证变更",
               index: 1,
-              link: "/MyManage/admin/check?menu=2",
+              link: "/MyManage/admin/check?type=change&status=3",
             },
           ],
         }