guhongwei 5 лет назад
Родитель
Сommit
0191af32e0

+ 1 - 0
src/components/trial/index.vue

@@ -33,6 +33,7 @@
             </span>
             <span v-else-if="display === 'third'">
               <userAudit
+                v-on="$listeners"
                 :alreadyList="alreadyList"
                 :alreadyListTotal="alreadyListTotal"
                 :notList="notList"

+ 6 - 6
src/layout/trial/userAdmin.vue

@@ -9,7 +9,7 @@
           <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="待审用户" name="first">
               <el-col :span="24" class="userList" v-for="(item, index) in userList" :key="index">
-                <el-col :span="20" class="name"> 登录名称:{{ item.name }} </el-col>
+                <el-col :span="20" class="name"> 登录名称:登录名称 </el-col>
                 <el-col :span="4" class="date">
                   2020-02-06
                 </el-col>
@@ -18,8 +18,8 @@
                     <el-image style="width:110px;height:110px;" :src="item.img_path"></el-image>
                   </el-col>
                   <el-col :span="17" class="leftInfo">
-                    <p>{{ item.role }}</p>
-                    <p>类别:{{ item.is_qy }}</p>
+                    <p>{{ item.name }}</p>
+                    <p>类别:{{ item.role }}</p>
                     <p>电话:{{ item.phone }}</p>
                   </el-col>
                 </el-col>
@@ -40,7 +40,7 @@
             </el-tab-pane>
             <el-tab-pane label="已审用户" name="second">
               <el-col :span="24" class="userList" v-for="(item, index) in adminList" :key="index">
-                <el-col :span="20" class="name"> 登录名称:{{ item.name }} </el-col>
+                <el-col :span="20" class="name"> 登录名称:登录名称 </el-col>
                 <el-col :span="4" class="date">
                   2020-02-06
                 </el-col>
@@ -49,8 +49,8 @@
                     <el-image style="width:110px;height:110px;" :src="item.img_path"></el-image>
                   </el-col>
                   <el-col :span="17" class="leftInfo">
-                    <p>{{ item.role }}</p>
-                    <p>类别:{{ item.is_qy }}</p>
+                    <p>{{ item.name }}</p>
+                    <p>类别:{{ item.role }}</p>
                     <p>电话:{{ item.phone }}</p>
                   </el-col>
                 </el-col>

+ 40 - 25
src/layout/trial/userAudit.vue

@@ -9,14 +9,16 @@
                 <el-tab-pane label="已经审核信息" name="first">
                   <el-col :span="24" class="list" v-for="(item, index) in alreadyList" :key="index">
                     <el-col :span="20" class="name"> 信息号:123 </el-col>
-                    <el-col :span="4" class="date">2020-02-06</el-col>
+                    <el-col :span="4" class="date">{{
+                      item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || ''
+                    }}</el-col>
                     <el-col :span="9" class="left">
                       <el-col :span="8" style="margin:0 10px 0 0;">
-                        <el-image style="width:110px;height:110px;" :src="item.image"></el-image>
+                        <el-image style="width:110px;height:110px;" :src="item.url"></el-image>
                       </el-col>
                       <el-col :span="15" class="leftInfo">
                         <p>{{ item.name }}</p>
-                        <p>类别:{{ item.totaltype }}</p>
+                        <p>类别:{{ item.totaltype === 0 ? '技术' : item.totaltype === 1 ? '产品' : '服务' }}</p>
                         <p style="color:red;">¥{{ item.price }}{{ item.priceunit }}</p>
                       </el-col>
                     </el-col>
@@ -25,8 +27,8 @@
                       <p>申请内容</p>
                     </el-col>
                     <el-col :span="4" class="left right">
-                      <el-link :underline="false">徹底刪除</el-link><br />
-                      <el-link :underline="false">查看详情</el-link>
+                      <el-link :underline="false" @click="handleDelete(item)">徹底刪除</el-link><br />
+                      <el-link :underline="false" @click="handleDelete(item)">查看详情</el-link>
                     </el-col>
                   </el-col>
                   <el-col :span="24" class="page">
@@ -43,14 +45,16 @@
                 <el-tab-pane label="审核中信息" name="second">
                   <el-col :span="24" class="list" v-for="(item, index) in notList" :key="index">
                     <el-col :span="20" class="name"> 信息号:123 </el-col>
-                    <el-col :span="4" class="date">2020-02-06</el-col>
+                    <el-col :span="4" class="date">{{
+                      item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || ''
+                    }}</el-col>
                     <el-col :span="9" class="left">
                       <el-col :span="8" style="margin:0 10px 0 0;">
-                        <el-image style="width:110px;height:110px;" :src="item.image"></el-image>
+                        <el-image style="width:110px;height:110px;" :src="item.url"></el-image>
                       </el-col>
                       <el-col :span="15" class="leftInfo">
                         <p>{{ item.name }}</p>
-                        <p>类别:{{ item.totaltype }}</p>
+                        <p>类别:{{ item.totaltype === 0 ? '技术' : item.totaltype === 1 ? '产品' : '服务' }}</p>
                         <p style="color:red;">¥{{ item.price }}{{ item.priceunit }}</p>
                       </el-col>
                     </el-col>
@@ -59,7 +63,7 @@
                       <p>申请内容</p>
                     </el-col>
                     <el-col :span="4" class="left right">
-                      <el-link :underline="false">徹底刪除</el-link>
+                      <el-link :underline="false" @click="handleDelete(item)">徹底刪除</el-link>
                     </el-col>
                   </el-col>
                   <el-col :span="24" class="page">
@@ -76,14 +80,16 @@
                 <el-tab-pane label="审核完成信息" name="third">
                   <el-col :span="24" class="list" v-for="(item, index) in JiaoyiList" :key="index">
                     <el-col :span="20" class="name"> 信息号:123 </el-col>
-                    <el-col :span="4" class="date">2020-02-06</el-col>
+                    <el-col :span="4" class="date">{{
+                      item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || ''
+                    }}</el-col>
                     <el-col :span="9" class="left">
                       <el-col :span="8" style="margin:0 10px 0 0;">
-                        <el-image style="width:110px;height:110px;" :src="item.image"></el-image>
+                        <el-image style="width:110px;height:110px;" :src="item.url"></el-image>
                       </el-col>
                       <el-col :span="15" class="leftInfo">
                         <p>{{ item.name }}</p>
-                        <p>类别:{{ item.totaltype }}</p>
+                        <p>类别:{{ item.totaltype === 0 ? '技术' : item.totaltype === 1 ? '产品' : '服务' }}</p>
                         <p style="color:red;">¥{{ item.price }}{{ item.priceunit }}</p>
                       </el-col>
                     </el-col>
@@ -92,7 +98,7 @@
                       <p>申请内容</p>
                     </el-col>
                     <el-col :span="4" class="left right">
-                      <el-link :underline="false">徹底刪除</el-link>
+                      <el-link :underline="false" @click="handleDelete(item)">徹底刪除</el-link>
                     </el-col>
                   </el-col>
                   <el-col :span="24" class="page">
@@ -115,14 +121,16 @@
                 <el-tab-pane label="已经审核信息" name="first">
                   <el-col :span="24" class="list" v-for="(item, index) in alreadyTwoList" :key="index">
                     <el-col :span="20" class="name"> 信息号:123 </el-col>
-                    <el-col :span="4" class="date">2020-02-06</el-col>
+                    <el-col :span="4" class="date">{{
+                      item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || ''
+                    }}</el-col>
                     <el-col :span="9" class="left">
                       <el-col :span="8" style="margin:0 10px 0 0;">
-                        <el-image style="width:110px;height:110px;" :src="item.image"></el-image>
+                        <el-image style="width:110px;height:110px;" :src="item.url"></el-image>
                       </el-col>
                       <el-col :span="15" class="leftInfo">
                         <p>{{ item.name }}</p>
-                        <p>类别:{{ item.totaltype }}</p>
+                        <p>类别:{{ item.totaltype === 0 ? '技术' : item.totaltype === 1 ? '产品' : '服务' }}</p>
                         <p style="color:red;">¥{{ item.price }}{{ item.priceunit }}</p>
                       </el-col>
                     </el-col>
@@ -131,7 +139,7 @@
                       <p>申请内容</p>
                     </el-col>
                     <el-col :span="4" class="left right">
-                      <el-link :underline="false">徹底刪除</el-link><br />
+                      <el-link :underline="false" @click="handleDelete(item)">徹底刪除</el-link><br />
                       <el-link :underline="false">查看详情</el-link>
                     </el-col>
                   </el-col>
@@ -149,14 +157,16 @@
                 <el-tab-pane label="审核中信息" name="second">
                   <el-col :span="24" class="list" v-for="(item, index) in notTwoList" :key="index">
                     <el-col :span="20" class="name"> 信息号:123 </el-col>
-                    <el-col :span="4" class="date">2020-02-06</el-col>
+                    <el-col :span="4" class="date">{{
+                      item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || ''
+                    }}</el-col>
                     <el-col :span="9" class="left">
                       <el-col :span="8" style="margin:0 10px 0 0;">
-                        <el-image style="width:110px;height:110px;" :src="item.image"></el-image>
+                        <el-image style="width:110px;height:110px;" :src="item.url"></el-image>
                       </el-col>
                       <el-col :span="15" class="leftInfo">
                         <p>{{ item.name }}</p>
-                        <p>类别:{{ item.totaltype }}</p>
+                        <p>类别:{{ item.totaltype === 0 ? '技术' : item.totaltype === 1 ? '产品' : '服务' }}</p>
                         <p style="color:red;">¥{{ item.price }}{{ item.priceunit }}</p>
                       </el-col>
                     </el-col>
@@ -165,7 +175,7 @@
                       <p>申请内容</p>
                     </el-col>
                     <el-col :span="4" class="left right">
-                      <el-link :underline="false">徹底刪除</el-link>
+                      <el-link :underline="false" @click="handleDelete(item)">徹底刪除</el-link>
                     </el-col>
                   </el-col>
                   <el-col :span="24" class="page">
@@ -182,14 +192,16 @@
                 <el-tab-pane label="审核完成信息" name="third">
                   <el-col :span="24" class="list" v-for="(item, index) in JiaoyiTwoList" :key="index">
                     <el-col :span="20" class="name"> 信息号:123 </el-col>
-                    <el-col :span="4" class="date">2020-02-06</el-col>
+                    <el-col :span="4" class="date">{{
+                      item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || ''
+                    }}</el-col>
                     <el-col :span="9" class="left">
                       <el-col :span="8" style="margin:0 10px 0 0;">
-                        <el-image style="width:110px;height:110px;" :src="item.image"></el-image>
+                        <el-image style="width:110px;height:110px;" :src="item.url"></el-image>
                       </el-col>
                       <el-col :span="15" class="leftInfo">
                         <p>{{ item.name }}</p>
-                        <p>类别:{{ item.totaltype }}</p>
+                        <p>类别:{{ item.totaltype === 0 ? '技术' : item.totaltype === 1 ? '产品' : '服务' }}</p>
                         <p style="color:red;">¥{{ item.price }}{{ item.priceunit }}</p>
                       </el-col>
                     </el-col>
@@ -198,7 +210,7 @@
                       <p>申请内容</p>
                     </el-col>
                     <el-col :span="4" class="left right">
-                      <el-link :underline="false">徹底刪除</el-link>
+                      <el-link :underline="false" @click="handleDelete(item)">徹底刪除</el-link>
                     </el-col>
                   </el-col>
                   <el-col :span="24" class="page">
@@ -270,6 +282,9 @@ export default {
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
     },
+    handleDelete(item) {
+      this.$emit('deletes', { item });
+    },
   },
 };
 </script>

+ 2 - 2
src/store/enterpriseproject.js

@@ -9,8 +9,8 @@ const state = () => ({});
 const mutations = {};
 
 const actions = {
-  async query({ commit }, { skip = 0, limit, column_id, ...info } = {}) {
-    const res = await this.$axios.$get(`${api.columnInfo}`, { skip, limit, column_id, ...info });
+  async query({ commit }, { skip = 0, limit, ...info } = {}) {
+    const res = await this.$axios.$get(`${api.columnInfo}`, { skip, limit, ...info });
     return res;
   },
   async create({ commit }, payload) {

+ 33 - 0
src/views/trial/index.vue

@@ -22,6 +22,7 @@
       :notTwoListTotal="notTwoListTotal"
       :JiaoyiTwoList="JiaoyiTwoList"
       :JiaoyiTwoListTotal="JiaoyiTwoListTotal"
+      @deletes="deleteAlready"
     ></trial-detail>
   </div>
 </template>
@@ -30,6 +31,8 @@
 import trialDetail from '@/components/trial/index.vue';
 import { createNamespacedHelpers, mapGetters } from 'vuex';
 const { mapActions: mapSite } = createNamespacedHelpers('site');
+const { mapActions: mapProduct } = createNamespacedHelpers('enterpriseproject');
+const { mapActions: mapMarketUser } = createNamespacedHelpers('market');
 export default {
   name: 'index',
   props: {},
@@ -159,10 +162,14 @@ export default {
   }),
   created() {
     this.searchSite();
+    this.searchInfo();
+    this.searchUser();
   },
   computed: {},
   methods: {
     ...mapSite(['showInfo']),
+    ...mapProduct({ ProductQuery: 'query', ProductFetch: 'fetch', ProductDelete: 'delete' }),
+    ...mapMarketUser({ userQuery: 'query', userFetch: 'fetch', userDelete: 'delete' }),
     // 查询站点信息
     async searchSite() {
       let res = await this.showInfo();
@@ -187,6 +194,32 @@ export default {
         this.display = 'fivth';
       }
     },
+    async searchInfo({ skip = 0, limit = 3, ...info } = {}) {
+      const res = await this.ProductQuery({ skip, limit, ...info });
+      this.$set(this, `alreadyList`, res.data);
+      this.$set(this, `alreadyListTotal`, res.total);
+      this.$set(this, `notList`, res.data);
+      this.$set(this, `notListTotal`, res.total);
+      this.$set(this, `JiaoyiList`, res.data);
+      this.$set(this, `JiaoyiListTotal`, res.total);
+      this.$set(this, `alreadyTwoList`, res.data);
+      this.$set(this, `alreadyTwoListTotal`, res.total);
+      this.$set(this, `notTwoList`, res.data);
+      this.$set(this, `notTwoListTotal`, res.total);
+      this.$set(this, `JiaoyiTwoList`, res.data);
+      this.$set(this, `JiaoyiTwoListTotal`, res.total);
+    },
+    async deleteAlready({ item }) {
+      console.log(item);
+      console.log(item.id);
+      this.$message('刪除成功');
+    },
+    async searchUser({ skip = 0, limit = 3, ...info } = {}) {
+      const res = await this.userQuery({ skip, limit, ...info });
+      console.log(res);
+      this.$set(this, `userList`, res.data);
+      this.$set(this, `userListTotal`, res.total);
+    },
   },
 };
 </script>