增加实名认证注册登记表页面

完善个人中心页面跳转逻辑

src/axios/parameter.js

@@ -69,7 +69,7 @@ export function handleResponseSuccess(res = {}) {
         success: true,
         returnCode: res.code || ResponseCode.success,
         returnMsg: res.msg,
-        data: res.data || res.page || res.member || null
+        data: res.data || res.page || null
     }
 }
 

src/router/index.js

@@ -550,7 +550,7 @@ const routes = [
                         },
                         component: () => import("@/views/News/Notice.vue"),
                     },
-                    
+
                     {
                         path: "/News/FoodSafety",
                         name: "FoodSafety",
@@ -1117,6 +1117,14 @@ const routes = [
         component: () => import("@/views/User/index"),
     },
     {
+        path: "/MyManage/UnVerify/realNameTable",
+        name: "realNameTable",
+        meta: {
+            name: "实名认证注册登记表",
+        },
+        component: () => import("@/views/MyManage/UnVerify/realNameTable.vue"),
+    },
+    {
         path: "/404",
         name: "404",
         component: () => import("@/views/User/404"),

src/views/MyManage/UnVerify/calibration.vue

@@ -300,8 +300,8 @@ export default {
   },
   methods: {
     register() {
-      this.$router.push({path:'/UnVerify/uploadcalibration'})
-
+      this.$router.push({path:'/MyManage/UnVerify/uploadcalibration'})
+      // this.$router.replace({path: '/MyManage/UnVerify/calibrationstatus'})
     },
 
 

src/views/MyManage/UnVerify/calibrationstatus.vue

@@ -13,7 +13,7 @@
         <div class="cnt">
           <div class="fail" v-if="result">
             <img src="../../../assets/image/mymanage/fail.png" alt="">
-            <span>很抱歉！您未通过中国物品编码中心实名认证。一下为您所在的  <a href="#"  target="_blank">分支机构</a> 审核意见：</span>
+            <span>很抱歉！您未通过中国物品编码中心检测校准申请。以下为您所在的  <a href="#"  target="_blank">分支机构</a> 审核意见：</span>
             <p>{{opinion}}</p>
             <p class="btn-p">
               <el-button type="primary" style="width: 192px">重新修改企业资料</el-button>
@@ -21,7 +21,7 @@
           </div>
           <div class="success" v-else>
             <img src="../../../assets/image/mymanage/continue.png" alt="">
-            <span>您好！实名认证资料正在审核中！</span>
+            <span>您好！检测校准申请正在审核中！</span>
 
           </div>
 

src/views/MyManage/UnVerify/realNameTable.vue

+<template>
+  <div class="box">
+    <div id="wrapper" class="wrapper">
+      <div id="header" class="header">
+        <h1>实名认证注册登记表</h1>
+        <hr/>
+        <p class="witness">中国物品编码中心制</p>
+      </div>
+      <div id="bodyer" class="bodyer">
+        <div class="article">
+          <h2>一、企业基本信息表 （由企业填写）</h2>
+          <table width="100%" border="1" cellspacing="1" cellpadding="2">
+            <tbody>
+            <tr>
+              <th width="15%" rowspan="2">企业名称 </th>
+              <th width="6%">中文：</th>
+              <td colspan="5"></td>
+            </tr>
+            <tr>
+              <th>英文：</th>
+              <td colspan="5"></td>
+            </tr>
+            <tr>
+              <th rowspan="2">注册地址 </th>
+              <th>中文：</th>
+              <td colspan="3"></td>
+              <th width="10%">邮政编码 </th>
+              <td></td>
+            </tr>
+            <tr>
+              <th>英文：</th>
+              <td colspan="5"></td>
+            </tr>
+            <tr>
+              <th rowspan="2">办公地址 </th>
+              <th>中文：</th>
+              <td colspan="3">{{tycpdmFirmInfo.address}}</td>
+              <th>邮政编码 </th>
+              <td></td>
+            </tr>
+            <tr>
+              <th>英文： </th>
+              <td colspan="5">{{tycpdmFirmInfo.address1}}</td>
+            </tr>
+            <tr>
+              <th rowspan="2">营业执照注册号</th>
+              <td width="20%" colspan="2" rowspan="2"></td>
+              <th width="16%">注册地行政区划代码 </th>
+              <td colspan="3"></td>
+            </tr>
+            <tr>
+              <th>注册资金(万元 )</th>
+              <td width="20%"></td>
+              <th width="10%">货币种类 </th>
+              <td>人民币</td>
+            </tr>
+            <tr>
+              <th>企业类别 </th>
+              <td colspan="2"></td>
+              <th>经济类型代码 </th>
+              <td></td>
+              <th>国民经济行业分类代码</th>
+              <td></td>
+            </tr>
+            <tr>
+              <th rowspan="2">组织机构代码 </th>
+              <td colspan="2" rowspan="2"></td>
+              <th rowspan="2">法定代表人</th>
+              <td rowspan="2">{{tycpdmFirmInfo.leader}}</td>
+              <th>手机 </th>
+              <td></td>
+            </tr>
+            <tr>
+              <th>电话 </th>
+              <td></td>
+            </tr>
+            <tr>
+              <th rowspan="2">联系人 </th>
+              <td colspan="2" rowspan="2"></td>
+              <th>联系电话 </th>
+              <td></td>
+              <th width="6%">手机 </th>
+              <td></td>
+            </tr>
+            <tr>
+              <th>电子邮箱 </th>
+              <td></td>
+              <th>传 真 </th>
+              <td></td>
+            </tr>
+            <tr>
+              <th>企业网站 </th>
+              <td colspan="6"></td>
+            </tr>
+            <tr>
+              <th colspan="7"><h2>填表人签章：</h2>
+              </th>
+            </tr>
+            <tr>
+              <th height="150">法定代表人签章</th>
+              <td colspan="3">&nbsp;</td>
+              <th>企 业（公章）</th>
+              <td colspan="2" align="center">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 年 &nbsp;&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;&nbsp; 日 </td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
+        <br>
+        <br>
+        <div class="article">
+          <h2>二、编码机构审核表（以下由中国物品编码中心及其分支机构填写）</h2>
+          <table width="100%" border="1" cellspacing="1" cellpadding="6">
+            <tbody>
+            <tr>
+              <th width="15%">分支机构初审意见</th>
+              <td width="25%">&nbsp;</td>
+              <th width="10%">初审日期</th>
+              <td width="23%" colspan="2" align="center">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 年 &nbsp;&nbsp;&nbsp;&nbsp; 月 &nbsp;&nbsp;&nbsp;&nbsp; 日 </td>
+              <th width="12%">经办人签字</th>
+              <td width="20%">&nbsp;</td>
+            </tr>
+            <tr>
+              <th>备注</th>
+              <td colspan="6">&nbsp;</td>
+            </tr>
+            <tr>
+              <th height="150">分支机构代码章</th>
+              <td colspan="2">&nbsp;</td>
+              <th width="15%">分支机构（公章）</th>
+              <td colspan="3">&nbsp;</td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+      <div id="footer" class="footer"> <button type="button" class="print-button" onclick="window.print();">打印表格</button></div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "realNameTable",
+  data () {
+    return {
+      loginInfo: {},
+      memberInfo: {},
+      tycpdmFirmInfo: {}
+    }
+  },
+  methods: {
+    async getTycpdmFirmInfo() {
+      const result = await this.$api.myManage.tycpdmFirmInfo({userName: 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.getMemberInfo()
+  }
+}
+</script>
+
+<style scoped>
+.box {
+  width: calc(100vw - 8px);
+  height: auto;
+  background-color: #FFF;
+  font-size: 14px;
+  display: block;
+  padding: 8px;
+}
+.wrapper { margin: auto; width: 1000px; }
+hr {
+  border: 1px inset;
+  opacity: 1;
+  display: block;
+  unicode-bidi: isolate;
+  margin-bottom: 17px;
+  margin-block-start: 0.5em;
+  margin-inline-start: auto;
+  margin-inline-end: auto;
+  overflow: hidden;
+}
+h1 {
+  text-align: center;
+  font-size: 2em;
+  margin-block-start: 0.67em;
+  margin-block-end: 0.67em;
+  margin-inline-start: 0px;
+  margin-inline-end: 0px;
+  font-weight: bold;
+}
+h2 {
+  display: block;
+  font-size: 1.5em;
+  margin-block-start: 0.83em;
+  margin-block-end: 0.83em;
+  margin-inline-start: 0px;
+  margin-inline-end: 0px;
+  font-weight: bold;
+}
+.witness { text-align: right; }
+table {
+  width: 100%;
+  border-top-width: 1px;
+  border-right-width: 1px;
+  border-bottom-width: 1px;
+  border-left-width: 1px;
+  -webkit-border-horizontal-spacing: 1px;
+  -webkit-border-vertical-spacing: 1px;
+  display: table;
+  border-collapse: separate;
+  box-sizing: border-box;
+  text-indent: initial;
+  border-color: grey;
+}
+th {
+  display: table-cell;
+  vertical-align: inherit;
+  font-weight: bold;
+  text-align: center;
+}
+th, td { line-height: 2em; font-size: 14px; border-width: 1px; }
+.article { margin: auto; }
+.footer{ margin:3em auto; text-align:center; }
+.print-button{ font-size:26px; font-weight:bold; width:200px; }
+button {
+  appearance: auto;
+  -webkit-writing-mode: horizontal-tb !important;
+  text-rendering: auto;
+  color: black;
+  letter-spacing: normal;
+  word-spacing: normal;
+  line-height: normal;
+  text-transform: none;
+  text-indent: 0px;
+  text-shadow: none;
+  display: inline-block;
+  text-align: center;
+  align-items: flex-start;
+  cursor: default;
+  box-sizing: border-box;
+  background-color: rgb(239, 239, 239);
+  margin: 0em;
+  padding: 1px 6px;
+  border-width: 1px;
+  border-style: outset;
+  border-color: rgb(118, 118, 118);
+  border-image: initial;
+}
+@media print {
+  .article { page-break-inside:avoid; }
+  .footer{ display:none; }
+}
+</style>

src/views/MyManage/UnVerify/uploadvendor.vue

@@ -13,21 +13,16 @@
         <div class="cnt">
           <div>
             <img src="../../../assets/image/mymanage/dayin.png" alt="">
-            <span>您的申请信息已提交！请在线打印 <a href="#"  target="_blank">《实名认证注册登记表》</a>，加盖公章，并上传影印件。</span>
+            <span>您的申请信息已提交！请在线打印<router-link target="_blank" :to="{path:'/MyManage/UnVerify/realNameTable'}">《实名认证注册登记表》</router-link>，加盖公章，并上传影印件。</span>
           </div>
           <div class="uploadcss">
             <span class="icon ">上传加盖公章的《实名认证注册登记表》影印件：</span>
             <span class="btn " >
-              <el-button type="primary" style="width: 110px">上传</el-button>查看检测校准申请历史上传文件
+              <el-button type="primary" style="width: 110px">上传</el-button>查看实名认证历史上传文件
               <p style="margin-top:10px;">支持png，bmp，jpg格式，大小不限</p>
             </span>
-
-
-
           </div>
         </div>
-
-
     </div>
   </div>
 
@@ -43,7 +38,10 @@ export default {
   },
   methods: {
 
-}
+  },
+  mounted() {
+
+  }
 }
 </script>
 

src/views/MyManage/UnVerify/vendor.vue

@@ -371,15 +371,15 @@ export default {
       const tycpdmFirmInfo = (await this.$api.myManage.tycpdmFirmInfo({userName: this.memberInfo.username})).data
       if (tycpdmFirmInfo) { // tycpdmFirmInfo不为null则已完成第一步填写实名信息
         if (tycpdmFirmInfo.logoutFlag === null) { // logoutFlag如果为null表示未提交书面材料
-          this.$router.replace({path: '/MyManage/UnVerify/uploadvendor'})
+          await this.$router.replace({path: '/MyManage/UnVerify/uploadvendor'})
         } else {
-          this.$router.replace({path: '/MyManage/UnVerify/vendorStatus'})
+          await this.$router.replace({path: '/MyManage/UnVerify/vendorStatus'})
         }
       }
     },
     async getMemberInfo() {
       this.memberInfo = (await this.$api.myManage.memberInfo({id: this.loginInfo.id})).data
-      this.getTycpdmFirmInfo()
+      await this.getTycpdmFirmInfo()
     }
   },
   mounted() {

src/views/MyManage/UnVerify/vendorstatus.vue

@@ -13,7 +13,7 @@
         <div class="cnt">
           <div class="fail" v-if="tycpdmFirmInfo.logoutFlag === 2">
             <img src="../../../assets/image/mymanage/fail.png" alt="">
-            <span>很抱歉！您未通过中国物品编码中心实名认证。一下为您所在的  <a href="#"  target="_blank">分支机构</a> 审核意见：</span>
+            <span>很抱歉！您未通过中国物品编码中心实名认证。以下为您所在的  <a href="#"  target="_blank">分支机构</a> 审核意见：</span>
             <p>{{opinion}}</p>
             <p class="btn-p">
               <el-button type="primary" style="width: 192px">重新修改企业资料</el-button>

src/views/User/login.vue

@@ -91,16 +91,9 @@ export default {
       });
     },
     loginByUser() {
-      const loginInfo = {
-        id: 16,
-        isQY: 2,
-        isXT: 2,
-        userType: 3,
-        levels: 0
-      }
-      localStorage.setItem('loginInfo', JSON.stringify(loginInfo))
       this.$refs['userLoginFormRef'].validate((valid) => {
         if (valid) {
+          // 前期静态页面根据输入的固定内容进行相应的页面跳转
           // if (this.userForm.validateCode.toLowerCase() === 'kjjj') {
           //   if (this.userForm.userName === 'test' && this.userForm.password === 'test') {
           //     localStorage.setItem('gs-user', JSON.stringify({type: 'unVerify'}))
@@ -126,6 +119,21 @@ export default {
             if (!res.success) {
               this.userLoginError = res.returnMsg || '用户名或密码不正确！'
               this.showUserLoginError = true;
+            } else {
+              localStorage.setItem('loginInfo', JSON.stringify(res.data))
+              if (res.levels === null) {
+                localStorage.setItem('gs-user', JSON.stringify({type: 'unVerify'}))
+                this.$router.push({path: '/MyManage/UnVerify/index'})
+              } else if (res.levels === 4) {
+                localStorage.setItem('gs-user', JSON.stringify({type: 'verify'}))
+                this.$router.push({path: '/MyManage/SystemMember/index'})
+              } else if (res.levels === 0) {
+                localStorage.setItem('gs-user', JSON.stringify({type: 'admin'}))
+                this.$router.push({path: '/MyManage/admin/check'})
+              } else {
+                this.userLoginError = '用户名或密码不正确！'
+                this.showUserLoginError = true;
+              }
             }
           })
         } else {