Merge remote-tracking branch 'origin/develop' into develop

src/dashoo.cn/frontend_web/src/pages/select/companyselect/index.vue

@@ -127,7 +127,11 @@
              <span style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
+        <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center">
+          <template slot-scope="scope">
+            <el-link type="primary" @click="openCompanyInfo(scope.row)">{{scope.row.SupplierName}}</el-link>
+          </template>
+        </el-table-column>
         <el-table-column label="准入类别" prop="SupplierTypeCode" align="center">
           <template slot-scope="scope">
               {{transferStr(scope.row.SupplierTypeCode)}}
@@ -1708,6 +1712,22 @@ export default {
         return val
       }
     },
+    openCompanyInfo (row) {
+      if (!row.CertId) {
+        this.$message({
+          type: 'warning',
+          message: '企业未准入，无法显示详细信息'
+        })
+        return false
+      }
+      if (row.SupplierTypeCode === '01') { //物资类
+        this.$router.push('/oilsupplier/supplier/' + row.Id + '/goodsedit?certid=' + row.CertId + '&showcy=true')
+      } else if (row.SupplierTypeCode === '02') { //服务类
+        this.$router.push('/oilsupplier/supplier/' + row.Id + '/techedit?certid=' + row.CertId + '&showcy=true')
+      } else if (row.SupplierTypeCode === '03') { //物资类
+        this.$router.push('/oilsupplier/supplier/' + row.Id + '/basisedit?certid=' + row.CertId + '&showcy=true')
+      }
+    },
     GetorgOptions () {
       let _this = this
       this.$axios.get('/register/orgloginlist').then(res => {
@@ -1981,7 +2001,7 @@ export default {
         .getbaseinfo(params, this.$axios)
         .then(res => {
           this.ssList = res.data.items
-          console.log(res,"预留接口 公司基本信息和准入")
+          // console.log(res,"预留接口 公司基本信息和准入")
         })
         .catch(err => {
           console.error(err)