guhongwei преди 5 години
родител
ревизия
c7c0db4f55

+ 9 - 20
src/layout/enterpriseTrans/detail.vue

@@ -1,33 +1,25 @@
 <template>
 <template>
-  <div id="columnDetail">
+  <div id="detail">
     <el-row>
     <el-row>
       <el-col :span="24">
       <el-col :span="24">
-        <el-col :span="24" class="top">
-          <el-col :span="12" class="topTitle"> </el-col>
-          <el-col :span="12" class="topBtn"> </el-col>
-        </el-col>
         <el-col :span="24" class="messgae">
         <el-col :span="24" class="messgae">
           <el-form ref="form" :model="form" label-width="120px">
           <el-form ref="form" :model="form" label-width="120px">
+            <el-form-item label="产品名称">
+              <el-input v-model="form.product_name" :disabled="true"></el-input>
+            </el-form-item>
             <el-form-item label=" 营销人名称">
             <el-form-item label=" 营销人名称">
               <el-input v-model="form.market_username" :disabled="true"></el-input>
               <el-input v-model="form.market_username" :disabled="true"></el-input>
             </el-form-item>
             </el-form-item>
             <el-form-item label="购买人名称">
             <el-form-item label="购买人名称">
               <el-input v-model="form.username" :disabled="true"></el-input>
               <el-input v-model="form.username" :disabled="true"></el-input>
             </el-form-item>
             </el-form-item>
-            <el-form-item label="商品名称">
-              <el-input v-model="form.product_name" :disabled="true"></el-input>
-            </el-form-item>
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.result">
-                <el-radio :label="1" name="1">审核通过</el-radio>
-                <el-radio :label="2" name="2">审核拒绝</el-radio>
-              </el-radio-group>
+            <el-form-item label="审核">
+              <el-radio v-model="form.status" label="0">待审核</el-radio>
+              <el-radio v-model="form.status" label="1">审核通过</el-radio>
             </el-form-item>
             </el-form-item>
-
-            <el-form-item label="审核说明">
+            <el-form-item label="描述">
               <el-input v-model="form.description"></el-input>
               <el-input v-model="form.description"></el-input>
             </el-form-item>
             </el-form-item>
-
             <el-form-item>
             <el-form-item>
               <el-button type="primary" @click="onSubmit()">提交</el-button>
               <el-button type="primary" @click="onSubmit()">提交</el-button>
             </el-form-item>
             </el-form-item>
@@ -40,7 +32,7 @@
 
 
 <script>
 <script>
 export default {
 export default {
-  name: 'columnDetail',
+  name: 'detail',
   props: {
   props: {
     form: null,
     form: null,
   },
   },
@@ -52,9 +44,6 @@ export default {
     onSubmit() {
     onSubmit() {
       this.$emit('submitDate', { data: this.form, id: this.form.id });
       this.$emit('submitDate', { data: this.form, id: this.form.id });
     },
     },
-    returnBtn() {
-      this.$router.push({ path: '/personnel/column' });
-    },
   },
   },
 };
 };
 </script>
 </script>

+ 0 - 117
src/layout/enterpriseTrans/enterprise.vue

@@ -1,117 +0,0 @@
-<template>
-  <div id="column">
-    <el-row>
-      <el-col :span="24" class="info">
-        <el-col :span="24" class="top">
-          <el-col :span="12" class="topTitle">
-            <span>审核信息列表</span>
-          </el-col>
-        </el-col>
-        <el-col :span="24" class="list">
-          <template>
-            <el-table :data="recruitInfo" style="width: 100%">
-              <el-table-column prop="name" label="产品名称" align="center"> </el-table-column>
-
-              <el-table-column prop="totaltype" label="产品类型 " align="center">
-                <template v-slot="scoped">
-                  {{
-                    `${scoped.row.totaltype}` === `0` ? '技术' : `${scoped.row.totaltype}` === `1` ? '产品' : `${scoped.row.totaltype}` === `2` ? '服务' : ''
-                  }}
-                </template>
-              </el-table-column>
-              <el-table-column prop="state" label="状态" align="center">
-                <template v-slot="scoped">
-                  {{ `${scoped.row.status}` === `0` ? '审核中' : `${scoped.row.status}` === `1` ? '审核通过' : '审核拒绝' }}
-                </template>
-              </el-table-column>
-              <el-table-column label="操作" align="center">
-                <template slot-scope="scoped">
-                  <el-tooltip content="审核通过" placement="bottom" effect="light">
-                    <el-button type="text" size="small" @click="handleEdit(scoped.row)" v-if="scoped.row.status == '0'"
-                      ><i class="el-icon-check"></i
-                    ></el-button>
-                  </el-tooltip>
-                  <el-tooltip content="审核拒绝" placement="bottom" effect="light">
-                    <el-button type="text" size="small" @click="handleshibai(scoped.row)" v-if="scoped.row.status == '0'"
-                      ><i class="el-icon-close"></i
-                    ></el-button>
-                  </el-tooltip>
-                  <el-tooltip content="删除" placement="bottom" effect="light">
-                    <el-button type="text" size="small" @click="handleDelete(scoped.row)"><i class="el-icon-delete"></i></el-button>
-                  </el-tooltip>
-                </template>
-              </el-table-column>
-            </el-table>
-            <el-col :span="24" class="page">
-              <el-pagination
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
-                :current-page="currentPage"
-                layout="total, prev, pager, next, jumper"
-                :total="total"
-                :page-size="pageSize"
-              >
-              </el-pagination>
-            </el-col>
-          </template>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'column',
-  props: {
-    recruitInfo: null,
-    total: null,
-  },
-  components: {},
-  data: () => ({
-    currentPage: 0,
-    pageSize: 10,
-  }),
-  created() {},
-  computed: {},
-  methods: {
-    addData() {
-      this.$router.push({ path: '/personnel/recruitDetail' });
-    },
-    handleDelete(item) {
-      this.$emit('delete', item);
-    },
-    handleEdit(row) {
-      this.$emit('edit', { data: row });
-    },
-    handleshibai(row) {
-      this.$emit('shibai', { data: row });
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
-    },
-    handleCurrentChange(currentPage) {
-      console.log(currentPage);
-      this.$emit('handleCurrentChange', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.top {
-  padding: 15px 0;
-  border-bottom: 1px solid #cccc;
-}
-.top .topTitle {
-  padding: 0 10px;
-}
-.top .topAdd {
-  padding: 0 10px 0 0;
-  text-align: right;
-}
-.page {
-  padding: 20px 0;
-  text-align: center;
-}
-</style>

+ 0 - 60
src/layout/enterpriseTrans/jiaoyidetail.vue

@@ -1,60 +0,0 @@
-<template>
-  <div id="columnDetail">
-    <el-row>
-      <el-col :span="24">
-        <el-col :span="24" class="top">
-          <el-col :span="12" class="topTitle"> </el-col>
-          <el-col :span="12" class="topBtn"> </el-col>
-        </el-col>
-        <el-col :span="24" class="messgae">
-          <el-form ref="form" :model="form" label-width="120px">
-            <el-form-item label="审核">
-              <el-radio-group v-model="form.status">
-                <el-radio :label="2" name="2">交易成功</el-radio>
-                <el-radio :label="3" name="3">交易取消</el-radio>
-              </el-radio-group>
-            </el-form-item>
-
-            <el-form-item>
-              <el-button type="primary" @click="onSubmit(form)">提交</el-button>
-            </el-form-item>
-          </el-form>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'columnDetail',
-  props: {
-    form: null,
-  },
-  components: {},
-  data: () => ({}),
-  created() {},
-  computed: {},
-  methods: {
-    onSubmit() {
-      this.$emit('submitDate', { data: this.form, id: this.form.id });
-    },
-    returnBtn() {
-      this.$router.push({ path: '/personnel/column' });
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.top {
-  padding: 15px 0;
-}
-.top .topTitle {
-  text-align: left;
-}
-.top .topBtn {
-  text-align: right;
-  padding: 0 5px;
-}
-</style>

+ 0 - 145
src/layout/enterpriseTrans/transaction copy.vue

@@ -1,145 +0,0 @@
-<template>
-  <div id="column">
-    <el-row>
-      <el-col :span="24" class="info">
-        <el-col :span="24" class="top">
-          <el-col :span="12" class="topTitle">
-            <span>审核信息列表</span>
-          </el-col>
-        </el-col>
-        <el-col :span="24" class="list">
-          <template>
-            <el-table :data="recruitInfo" style="width: 100%">
-              <el-table-column prop="username" label="购买人名称" align="center"> </el-table-column>
-              <el-table-column prop="market_username" label="营销人名称" align="center"> </el-table-column>
-              <el-table-column prop="product_name" label="商品名称 " align="center"> </el-table-column>
-              <el-table-column prop="state" label="状态" align="center">
-                <template v-slot="scoped">
-                  {{
-                    `${scoped.row.status}` === `0`
-                      ? '未交易'
-                      : `${scoped.row.status}` === `1`
-                      ? '交易中'
-                      : `${scoped.row.status}` === `2`
-                      ? '交易成功'
-                      : `${scoped.row.status}` === `3`
-                      ? '交易失败'
-                      : ''
-                  }}
-                </template>
-              </el-table-column>
-              <el-table-column label="操作" align="center">
-                <template slot-scope="scoped">
-                  <el-tooltip content="审核" placement="bottom" effect="light">
-                    <el-button
-                      v-if="scoped.row.status == 1"
-                      type="text"
-                      size="small"
-                      @click="
-                        $router.push({
-                          path: '/enterprise/jiaoyidetail',
-                          query: {
-                            id: scoped.row.id,
-                          },
-                        })
-                      "
-                      ><i class="el-icon-edit"></i
-                    ></el-button>
-                  </el-tooltip>
-
-                  <el-tooltip content="发起交易" placement="bottom" effect="light">
-                    <el-button
-                      v-if="scoped.row.status == 0"
-                      type="text"
-                      size="small"
-                      @click="
-                        $router.push({
-                          path: '/enterprise/detail',
-                          query: {
-                            id: scoped.row.id,
-                            name: scoped.row.product_name,
-                            oneid: scoped.row.username,
-                            twoid: scoped.row.market_username,
-                          },
-                        })
-                      "
-                      ><i class="el-icon-edit"></i
-                    ></el-button>
-                  </el-tooltip>
-
-                  <el-tooltip content="删除" placement="bottom" effect="light">
-                    <el-button type="text" size="small" @click="handleDelete(scoped.row)"><i class="el-icon-delete"></i></el-button>
-                  </el-tooltip>
-                </template>
-              </el-table-column>
-            </el-table>
-            <el-col :span="24" class="page">
-              <el-pagination
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
-                :current-page="currentPage"
-                layout="total, prev, pager, next, jumper"
-                :total="total"
-                :page-size="pageSize"
-              >
-              </el-pagination>
-            </el-col>
-          </template>
-        </el-col>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'column',
-  props: {
-    recruitInfo: null,
-    total: null,
-  },
-  components: {},
-  data: () => ({
-    currentPage: 0,
-    pageSize: 10,
-  }),
-  created() {},
-  computed: {},
-  methods: {
-    addData() {
-      this.$router.push({ path: '/personnel/recruitDetail' });
-    },
-    handleDelete(item) {
-      this.$emit('delete', item);
-    },
-    handleEdit(row) {
-      this.$emit('edit', { data: row });
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
-    },
-    handleCurrentChange(currentPage) {
-      console.log(currentPage);
-      this.$emit('handleCurrentChange', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.top {
-  padding: 15px 0;
-  border-bottom: 1px solid #cccc;
-}
-.top .topTitle {
-  padding: 0 10px;
-}
-.top .topAdd {
-  padding: 0 10px 0 0;
-  text-align: right;
-}
-.page {
-  padding: 20px 0;
-  text-align: center;
-}
-</style>

+ 12 - 42
src/layout/enterpriseTrans/transaction.vue

@@ -10,9 +10,9 @@
         <el-col :span="24" class="list">
         <el-col :span="24" class="list">
           <template>
           <template>
             <el-table :data="recruitInfo" style="width: 100%">
             <el-table :data="recruitInfo" style="width: 100%">
+              <el-table-column prop="product_name" label="商品名称 " align="center"> </el-table-column>
               <el-table-column prop="username" label="购买人名称" align="center"> </el-table-column>
               <el-table-column prop="username" label="购买人名称" align="center"> </el-table-column>
               <el-table-column prop="market_username" label="营销人名称" align="center"> </el-table-column>
               <el-table-column prop="market_username" label="营销人名称" align="center"> </el-table-column>
-              <el-table-column prop="product_name" label="商品名称 " align="center"> </el-table-column>
               <el-table-column prop="state" label="状态" align="center">
               <el-table-column prop="state" label="状态" align="center">
                 <template v-slot="scoped">
                 <template v-slot="scoped">
                   {{
                   {{
@@ -24,52 +24,22 @@
                       ? '交易成功'
                       ? '交易成功'
                       : `${scoped.row.status}` === `3`
                       : `${scoped.row.status}` === `3`
                       ? '交易失败'
                       ? '交易失败'
-                      : ''
+                      : `${scoped.row.status}` === `4`
+                      ? '合同待审核'
+                      : '未识别'
                   }}
                   }}
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
               <el-table-column label="操作" align="center">
               <el-table-column label="操作" align="center">
                 <template slot-scope="scoped">
                 <template slot-scope="scoped">
-                  <el-tooltip content="审核" placement="bottom" effect="light">
-                    <el-button
-                      v-if="scoped.row.status == 1"
-                      type="text"
-                      size="small"
-                      @click="
-                        $router.push({
-                          path: '/enterpriseTrans/jiaoyidetail',
-                          query: {
-                            id: scoped.row.id,
-                          },
-                        })
-                      "
-                      ><i class="el-icon-edit"></i
-                    ></el-button>
-                  </el-tooltip>
-
-                  <el-tooltip content="发起交易" placement="bottom" effect="light">
-                    <el-button
-                      v-if="scoped.row.status == 0"
-                      type="text"
-                      size="small"
-                      @click="
-                        $router.push({
-                          path: '/enterpriseTrans/detail',
-                          query: {
-                            id: scoped.row.id,
-                            name: scoped.row.product_name,
-                            oneid: scoped.row.username,
-                            twoid: scoped.row.market_username,
-                          },
-                        })
-                      "
-                      ><i class="el-icon-edit"></i
-                    ></el-button>
-                  </el-tooltip>
-
-                  <el-tooltip content="删除" placement="bottom" effect="light">
-                    <el-button type="text" size="small" @click="handleDelete(scoped.row)"><i class="el-icon-delete"></i></el-button>
-                  </el-tooltip>
+                  <el-button
+                    v-if="scoped.row.status == 4"
+                    type="primary"
+                    size="mini"
+                    @click="$router.push({ path: '/enterpriseTrans/detail', query: { id: scoped.row.id } })"
+                    >审核
+                  </el-button>
+                  <el-button type="danger" size="mini" @click="handleDelete(scoped.row)">删除</el-button>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
             </el-table>
             </el-table>

+ 1 - 0
src/router/index.js

@@ -105,6 +105,7 @@ const routes = [
   //科技超市发起交易审核详情
   //科技超市发起交易审核详情
   {
   {
     path: '/enterpriseTrans/detail',
     path: '/enterpriseTrans/detail',
+    meta: { title: '产品供求交易状态审核管理' },
     component: () => import('../views/enterpriseTrans/detail.vue'),
     component: () => import('../views/enterpriseTrans/detail.vue'),
   },
   },
   //技术培训
   //技术培训

+ 2 - 0
src/store/index.js

@@ -5,6 +5,7 @@ import * as ustate from '@common/store/user/state';
 import * as umutations from '@common/store/user/mutations';
 import * as umutations from '@common/store/user/mutations';
 import tranaudit from './tranaudit';
 import tranaudit from './tranaudit';
 import transaction from './transaction';
 import transaction from './transaction';
+import productpact from './productpact';
 import market from './market';
 import market from './market';
 import liveTechnicalColumn from './liveTechnicalColumn';
 import liveTechnicalColumn from './liveTechnicalColumn';
 import liveTechnicalNews from './liveTechnicalNews';
 import liveTechnicalNews from './liveTechnicalNews';
@@ -28,6 +29,7 @@ export default new Vuex.Store({
     login,
     login,
     tranaudit, //交易审核表
     tranaudit, //交易审核表
     transaction, //交易记录表
     transaction, //交易记录表
+    productpact, //电子合同
     market, //产品信息表
     market, //产品信息表
     liveTechnicalColumn, //技术培训类别
     liveTechnicalColumn, //技术培训类别
     liveTechnicalNews, //技术培训内容
     liveTechnicalNews, //技术培训内容

+ 47 - 0
src/store/productpact.js

@@ -0,0 +1,47 @@
+import Vue from 'vue';
+import Vuex from 'vuex';
+import _ from 'lodash';
+Vue.use(Vuex);
+const api = {
+  productpactInfo: `/api/market/productpact`,
+  findpactInfo: `/api/market/productpact/findpact`,
+};
+const state = () => ({});
+const mutations = {};
+
+const actions = {
+  async query({ commit }, { skip = 0, limit, ...info } = {}) {
+    const res = await this.$axios.$get(api.productpactInfo, {
+      skip,
+      limit,
+      ...info,
+    });
+    return res;
+  },
+  async create({ commit }, payload) {
+    const res = await this.$axios.$post(`${api.productpactInfo}`, payload);
+    return res;
+  },
+  async fetch({ commit }, payload) {
+    const res = await this.$axios.$get(`${api.productpactInfo}/${payload}`);
+    return res;
+  },
+  async findpact({ commit }, payload) {
+    const res = await this.$axios.$get(`${api.findpactInfo}/${payload}`);
+    return res;
+  },
+  async update({ commit }, { id, ...data }) {
+    const res = await this.$axios.$post(`${api.productpactInfo}/update/${id}`, data);
+    return res;
+  },
+  async delete({ commit }, payload) {
+    const res = await this.$axios.$delete(`${api.productpactInfo}/${payload}`);
+    return res;
+  },
+};
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+};

+ 35 - 62
src/views/enterpriseTrans/detail.vue

@@ -1,11 +1,11 @@
 <template>
 <template>
-  <div id="columnDetail">
+  <div id="detail">
     <el-row>
     <el-row>
       <el-col :span="24" class="top">
       <el-col :span="24" class="top">
-        <topInfo :topTitle="topTitle"></topInfo>
+        <topInfo :topTitle="pageTitle"></topInfo>
       </el-col>
       </el-col>
       <el-col :span="24" class="main">
       <el-col :span="24" class="main">
-        <detail :form="form" @submitDate="onSubmit"></detail>
+        <detailInfo :form="form" @submitDate="onSubmit"></detailInfo>
       </el-col>
       </el-col>
     </el-row>
     </el-row>
   </div>
   </div>
@@ -13,86 +13,59 @@
 
 
 <script>
 <script>
 import topInfo from '@/layout/public/top.vue';
 import topInfo from '@/layout/public/top.vue';
-import detail from '@/layout/enterpriseTrans/detail.vue';
+import detailInfo from '@/layout/enterpriseTrans/detail.vue';
 import { createNamespacedHelpers, mapState } from 'vuex';
 import { createNamespacedHelpers, mapState } from 'vuex';
-const { mapActions: tranaudit } = createNamespacedHelpers('tranaudit');
+const { mapActions: productpact } = createNamespacedHelpers('productpact');
 const { mapActions: transaction } = createNamespacedHelpers('transaction');
 const { mapActions: transaction } = createNamespacedHelpers('transaction');
-
 export default {
 export default {
-  name: 'columnDetail',
+  name: 'detail',
   props: {},
   props: {},
   components: {
   components: {
-    detail,
+    detailInfo,
     topInfo,
     topInfo,
   },
   },
   data: () => ({
   data: () => ({
-    topTitle: '审核',
     form: {},
     form: {},
-    acc: {},
-    xinxi: {},
   }),
   }),
   created() {
   created() {
     this.search();
     this.search();
   },
   },
-  computed: {
-    ...mapState(['user']),
-
-    id() {
-      return this.$route.query.id;
-    },
-    oneid() {
-      return this.$route.query.oneid;
-    },
-    twoid() {
-      return this.$route.query.twoid;
-    },
-    name() {
-      return this.$route.query.name;
-    },
-    keyWord() {
-      let meta = this.$route.meta;
-      let main = meta.title || '';
-      return main;
-    },
-  },
   methods: {
   methods: {
-    ...tranaudit(['fetch', 'create', 'update', 'query']),
     ...transaction({ transactionsfetch: 'fetch', transactionslist: 'query', transactionupdate: 'update' }),
     ...transaction({ transactionsfetch: 'fetch', transactionslist: 'query', transactionupdate: 'update' }),
+    ...productpact({ transactionQuery: 'query', productpactFetch: 'findpact', productpactUpdate: 'update' }),
     async search() {
     async search() {
-      console.log(this.id);
-      console.log(this.oneid);
-      console.log(this.twoid);
-      console.log(this.name);
-      let transaction_id = this.id;
-      const ress = await this.transactionsfetch(transaction_id);
-      console.log(ress.data);
-      this.$set(this, `form`, ress.data);
-      this.$set(this, `xinxi`, ress.data);
+      const res = await this.productpactFetch(this.id);
+      if (this.$checkRes(res)) {
+        this.$set(this, `form`, res.data);
+      }
     },
     },
     async onSubmit() {
     async onSubmit() {
-      let acc = {};
-      acc.username = this.oneid;
-      acc.market_username = this.twoid;
-      acc.product_name = this.name;
-      acc.transaction_id = this.id;
-      acc.id = this.id;
-      acc.userid = this.user.uid;
-      acc.result = this.form.result;
-      acc.description = this.form.description;
-      console.log(acc);
-      if (this.form.result == '1') {
-        this.xinxi.status = '1';
-        console.log(this.xinxi);
-        let res = await this.transactionupdate(this.xinxi);
-        this.$checkRes(res, '审核成功', '审核失败');
-      } else if (this.form.result == '2') {
-        this.xinxi.status = '3';
-        let res = await this.transactionupdate(this.xinxi);
-        this.$checkRes(res, '审核成功', '审核失败');
+      const res = await this.productpactUpdate(this.form);
+      if (this.$checkRes(res)) {
+        this.form.status = '2';
+        this.form.id = this.form.transaction_id;
+        const arr = await this.transactionupdate(this.form);
+        if (this.$checkRes(arr)) {
+          this.$message({
+            message: '审核通过',
+            type: 'success',
+          });
+        }
       }
       }
-      this.$router.push({ path: '/enterprise/transaction' });
     },
     },
   },
   },
+  computed: {
+    ...mapState(['user']),
+    id() {
+      return this.$route.query.id;
+    },
+    pageTitle() {
+      return `${this.$route.meta.title}`;
+    },
+  },
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
 };
 };
 </script>
 </script>
 
 

+ 11 - 3
src/views/enterpriseTrans/index.vue

@@ -2,7 +2,7 @@
   <div id="recruit">
   <div id="recruit">
     <el-row>
     <el-row>
       <el-col :span="24" class="top">
       <el-col :span="24" class="top">
-        <topInfo :topTitle="topTitle"></topInfo>
+        <topInfo :topTitle="pageTitle"></topInfo>
       </el-col>
       </el-col>
       <el-col :span="24" class="main">
       <el-col :span="24" class="main">
         <transaction :recruitInfo="recruitInfo" :total="total" @delete="deleteData" @edit="edit" @handleCurrentChange="handleCurrentChange"></transaction>
         <transaction :recruitInfo="recruitInfo" :total="total" @delete="deleteData" @edit="edit" @handleCurrentChange="handleCurrentChange"></transaction>
@@ -14,7 +14,7 @@
 <script>
 <script>
 import topInfo from '@/layout/public/top.vue';
 import topInfo from '@/layout/public/top.vue';
 import transaction from '@/layout/enterpriseTrans/transaction.vue';
 import transaction from '@/layout/enterpriseTrans/transaction.vue';
-import { createNamespacedHelpers, mapGetters } from 'vuex';
+import { createNamespacedHelpers, mapGetters, mapState } from 'vuex';
 const { mapActions: product } = createNamespacedHelpers('market');
 const { mapActions: product } = createNamespacedHelpers('market');
 const { mapActions: tranaudit } = createNamespacedHelpers('tranaudit');
 const { mapActions: tranaudit } = createNamespacedHelpers('tranaudit');
 const { mapActions: transactions } = createNamespacedHelpers('transaction');
 const { mapActions: transactions } = createNamespacedHelpers('transaction');
@@ -35,7 +35,6 @@ export default {
   created() {
   created() {
     this.search();
     this.search();
   },
   },
-  computed: {},
   methods: {
   methods: {
     ...product(['query', 'delete', 'fetch', 'update']),
     ...product(['query', 'delete', 'fetch', 'update']),
     ...tranaudit({ tranauditList: 'query', tranauditListupdate: 'update' }),
     ...tranaudit({ tranauditList: 'query', tranauditListupdate: 'update' }),
@@ -68,6 +67,15 @@ export default {
       this.search();
       this.search();
     },
     },
   },
   },
+  computed: {
+    ...mapState(['user']),
+    pageTitle() {
+      return `${this.$route.meta.title}`;
+    },
+  },
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
 };
 };
 </script>
 </script>
 
 

+ 0 - 82
src/views/enterpriseTrans/jiaoyidetail.vue

@@ -1,82 +0,0 @@
-<template>
-  <div id="columnDetail">
-    <el-row>
-      <el-col :span="24" class="top">
-        <topInfo :topTitle="topTitle"></topInfo>
-      </el-col>
-      <el-col :span="24" class="main">
-        <jiaoyidetail :form="form" @submitDate="onSubmit"></jiaoyidetail>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import topInfo from '@/layout/public/top.vue';
-import jiaoyidetail from '@/layout/enterpriseTrans/jiaoyidetail.vue';
-import { createNamespacedHelpers, mapState } from 'vuex';
-const { mapActions: transaction } = createNamespacedHelpers('transaction');
-export default {
-  name: 'columnDetail',
-  props: {},
-  components: {
-    jiaoyidetail,
-    topInfo,
-  },
-  data: () => ({
-    topTitle: '交易',
-    form: {},
-    xinxi: {},
-  }),
-  created() {
-    this.search();
-  },
-  computed: {
-    ...mapState(['user']),
-
-    id() {
-      return this.$route.query.id;
-    },
-    oneid() {
-      return this.$route.query.oneid;
-    },
-    twoid() {
-      return this.$route.query.twoid;
-    },
-    name() {
-      return this.$route.query.name;
-    },
-    keyWord() {
-      let meta = this.$route.meta;
-      let main = meta.title || '';
-      return main;
-    },
-  },
-  methods: {
-    ...transaction({ transactionsfetch: 'fetch', transactionslist: 'query', transactionupdate: 'update' }),
-    async search() {
-      let transaction_id = this.id;
-      const res = await this.transactionsfetch(transaction_id);
-      console.log(res.data);
-      this.$set(this, `form`, res.data);
-    },
-    async onSubmit({ data }) {
-      console.log(data);
-      console.log(data.status);
-
-      let res = await this.transactionupdate(data);
-      this.$checkRes(res, '审核成功', '审核失败');
-      this.$router.push({ path: '/enterprise/transaction' });
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.main {
-  padding: 20px;
-  margin: 10px 20px;
-  border: 1px solid #ccc;
-  width: 96%;
-}
-</style>

+ 3 - 2
src/views/user/index.vue

@@ -62,8 +62,9 @@ export default {
       const resTwo = await this.exportuserQuery({ skip, limit, ...info });
       const resTwo = await this.exportuserQuery({ skip, limit, ...info });
       var newData = res.data.concat(resTwo.data);
       var newData = res.data.concat(resTwo.data);
       if (this.$checkRes(newData)) {
       if (this.$checkRes(newData)) {
-        this.$set(this, `list`, newData);
-        this.$set(this, `total`, newData.length);
+        var arr = newData.filter(item => item.pid == undefined && item.status != '3');
+        this.$set(this, `list`, arr);
+        this.$set(this, `total`, arr.length);
       }
       }
     },
     },
     toEdit({ data }) {
     toEdit({ data }) {