Merge branch 'dev' of http://172.16.90.250:3000/forest/forest-web into dev

config/dev.env.js

@@ -6,7 +6,7 @@ module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://172.16.90.3:9098/forest-admin"'//邱波电脑
   // BASE_API: '"http://172.16.90.64:9098/forest-admin"'
-  BASE_API: '"http://172.16.90.102:9098/forest-admin"'//邱波
-  // BASE_API: '"http://172.16.90.8:9098/forest-admin"'//东东
+  // BASE_API: '"http://172.16.90.102:9098/forest-admin"'//邱波
+  BASE_API: '"http://172.16.90.8:9098/forest-admin"'//东东
   // BASE_API: '"http://172.16.90.43:9098/forest-admin"'//东东
 })

src/api/share.js

@@ -7,9 +7,9 @@ export function getShareCodeList(data) {
   })
 }
 
-export function createShareCode(id) {
+export function createShareCode(id,compName) {
   return request({
-    url:'/comp/share/add?compId='+id,
+    url:'/comp/share/add?compId='+id+'&compName='+compName,
     method:'get',
     // data:data
   })

src/views/ums/company/index.vue

@@ -229,7 +229,7 @@
       },
       handleInvite(index, row){
         console.log('row',row);
-        this.$router.push({path:'/ums/inviteCode',query:{id:row.id}});
+        this.$router.push({path:'/ums/inviteCode',query:{id:row.id,compName:row.compName}});
       },
       handleDelete(index, row) {
         this.$confirm('是否要删除该供应商?', '提示', {

src/views/ums/company/invite/invite.vue

@@ -23,6 +23,9 @@
         <el-table-column label="创建人" show-overflow-tooltip align="center">
           <template slot-scope="scope">{{ scope.row.createName }}</template>
         </el-table-column>
+        <el-table-column label="创建时间" show-overflow-tooltip align="center">
+          <template slot-scope="scope">{{ scope.row.createTime.substring(0,10) }}</template>
+        </el-table-column>
         <el-table-column label="邀请码" show-overflow-tooltip align="center">
           <template slot-scope="scope">{{ scope.row.shareCode }}</template>
         </el-table-column>
@@ -112,7 +115,7 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
-        createShareCode(this.$route.query.id).then((response) => {
+        createShareCode(this.$route.query.id,this.$route.query.compName).then((response) => {
           this.$message({
             type: "success",
             message: "生成成功!",