wuhongyuq 5 years ago
parent
commit
b9d2d44f84

+ 4 - 2
src/components/enterprise/enterpisedg.vue

@@ -25,7 +25,7 @@
             </el-col>
           </el-col>
           <el-col :span="19" class="right">
-            <context v-on="$listeners" :total="total" :columnName="columnName" :recruitData="recruitData"></context>
+            <context v-on="$listeners" :total="total" :columnName="columnName" :dinggou1="dinggou1" :dinggou2="dinggou2" :dinggou3="dinggou3"></context>
           </el-col>
         </div>
       </el-col>
@@ -52,7 +52,9 @@ export default {
     info: null, //站点信息
     liebiaoList: null, //分类导航
     columnName: null, //栏目名称
-    recruitData: null,
+    dinggou1: null,
+    dinggou2: null,
+    dinggou3: null,
     total: null,
   },
   components: {

+ 10 - 0
src/components/enterprise/enterprisefabu.vue

@@ -34,6 +34,11 @@
               :tatalstatus2="tatalstatus2"
               :tatalstatus1="tatalstatus1"
               :Transactionlist="Transactionlist"
+              :jiaoyilist="jiaoyilist"
+              :jiaoyilist1="jiaoyilist1"
+              :total4="total4"
+              :total5="total5"
+              :total6="total6"
             ></contextfabuxx>
           </el-col>
         </div>
@@ -62,11 +67,16 @@ export default {
     liebiaoList: null, //分类导航
     recruitData: null, //审核中
     total: null, //分页
+    total4: null, //分页
+    total5: null, //分页
+    total6: null, //分页
     shenheList: null, //审核成功
     successlist: null, //交易失败
     tatalstatus2: null, //分页
     tatalstatus1: null, //分页
     Transactionlist: null, //交易中
+    jiaoyilist: null,
+    jiaoyilist1: null,
     // gonggeiData: null,
   },
   components: {

+ 190 - 91
src/layout/enterprise/context.vue

@@ -1,53 +1,144 @@
 <template>
   <div id="recruitLists">
     <el-row>
-      <el-col :span="24" class="lists">
-        <el-col :span="24" class="topTitle">
-          <el-col class="rightTopL"> 我的订购</el-col>
-        </el-col>
-        <el-col :span="24" class="list">
-          <el-col :span="24" class="tit">
-            <el-col> 我的订购</el-col>
-          </el-col>
-          <el-col :span="24" v-for="(item, index) in recruitData" :key="index">
-            <el-col class="xqborder">
-              <el-col :span="24" class="fbListTop">
-                <el-col :span="20"> {{ item.name }} </el-col>
-                <el-col :span="4">
-                  {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
-                </el-col>
-              </el-col>
-              <el-col :span="24" class="fbListCenter">
-                <el-col :span="6" class="fimage">
-                  <el-image style="width:100px;height:100px" :src="item.url"></el-image>
-                </el-col>
-                <el-col :span="6" class="fbListCenterC">
-                  <p class="textOver">产品:{{ item.name }}</p>
-                  <p>类别:{{ item.totaltype === '0' ? '技术' : item.totaltype === '1' ? '产品' : item.totaltype === '2' ? '服务' : 'underdind' }}</p>
-                  <p class="listMoney">{{ item.price }}/{{ item.priceunit }}</p>
-                </el-col>
-                <el-col :span="6" class="fbListCenterTwo">
-                  <el-col :span="24">交易说明:</el-col>
-                </el-col>
-                <el-col :span="6" class="fbListCenterR">
-                  <el-col :span="24" class="bainji">
-                    <el-col :span="24"> {{ item.state }}</el-col>
+      <el-col :span="24">
+        <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+          <el-tab-pane label="我的订购" name="first">
+            <el-row style="padding: 0 20px;">
+              <el-tabs v-model="activeNameFirst" @tab-click="handleClickFirst">
+                <el-tab-pane label="交易中" name="fgrrsss">
+                  <el-col :span="24" v-for="(item, index) in dinggou1" :key="index">
+                    <el-col class="xqborder">
+                      <el-col :span="24" class="fbListTop">
+                        <el-col :span="20"> </el-col>
+                        <el-col :span="4">
+                          {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
+                        </el-col>
+                      </el-col>
+                      <el-col :span="24" class="fbListCenter">
+                        <el-col :span="6" class="fimage">
+                          <el-col :span="24" v-for="(acm, index) in item.image" :key="index">
+                            <el-image style="width:100px;height:100px" :src="acm.url"></el-image>
+                          </el-col>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterC">
+                          <p class="textOver">产品:{{ item.product_name }}</p>
+                          <p>营销人名称:{{ item.market_username }}</p>
+                          <p>购买人名称:{{ item.username }}</p>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterTwo">
+                          <el-col :span="24">说明:{{ item.description }}</el-col>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterR">
+                          <el-col :span="24" class="bainji">
+                            <el-link :underline="false" @click="handleDelete(item)">彻底删除</el-link>
+                          </el-col>
+                        </el-col>
+                      </el-col>
+                    </el-col>
                   </el-col>
-                </el-col>
-              </el-col>
-            </el-col>
-          </el-col>
-          <el-col class="page" :span="24">
-            <el-pagination
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              :current-page="currentPage"
-              layout="total,  prev, pager, next, jumper"
-              :total="total"
-            >
-            </el-pagination>
-          </el-col>
-        </el-col>
+                  <el-col class="page" :span="24">
+                    <el-pagination
+                      @size-change="handleSizeChange"
+                      @current-change="handleCurrentChange"
+                      :current-page="currentPage"
+                      layout="total,  prev, pager, next, jumper"
+                      :total="tatalstatus2"
+                    >
+                    </el-pagination>
+                  </el-col>
+                </el-tab-pane>
+
+                <el-tab-pane label="交易完成" name="fgrraaa">
+                  <el-col :span="24" v-for="(item, index) in dinggou2" :key="index">
+                    <el-col class="xqborder">
+                      <el-col :span="24" class="fbListTop">
+                        <el-col :span="20"> </el-col>
+                        <el-col :span="4">
+                          {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
+                        </el-col>
+                      </el-col>
+                      <el-col :span="24" class="fbListCenter">
+                        <el-col :span="6" class="fimage">
+                          <el-col :span="24" v-for="(acm, index) in item.image" :key="index">
+                            <el-image style="width:100px;height:100px" :src="acm.url"></el-image>
+                          </el-col>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterC">
+                          <p class="textOver">产品:{{ item.product_name }}</p>
+                          <p>营销人名称:{{ item.market_username }}</p>
+                          <p>购买人名称:{{ item.username }}</p>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterTwo">
+                          <el-col :span="24">说明:{{ item.description }}</el-col>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterR">
+                          <el-col :span="24" class="bainji">
+                            <el-link :underline="false" @click="handleDelete(item)">彻底删除</el-link>
+                          </el-col>
+                        </el-col>
+                      </el-col>
+                    </el-col>
+                  </el-col>
+                  <el-col class="page" :span="24">
+                    <el-pagination
+                      @size-change="handleSizeChange"
+                      @current-change="handleCurrentChange"
+                      :current-page="currentPage"
+                      layout="total,  prev, pager, next, jumper"
+                      :total="tatalstatus2"
+                    >
+                    </el-pagination>
+                  </el-col>
+                </el-tab-pane>
+
+                <el-tab-pane label="交易取消" name="fgrr">
+                  <el-col :span="24" v-for="(item, index) in dinggou3" :key="index">
+                    <el-col class="xqborder">
+                      <el-col :span="24" class="fbListTop">
+                        <el-col :span="20"> </el-col>
+                        <el-col :span="4">
+                          {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
+                        </el-col>
+                      </el-col>
+                      <el-col :span="24" class="fbListCenter">
+                        <el-col :span="6" class="fimage">
+                          <el-col :span="24" v-for="(acm, index) in item.image" :key="index">
+                            <el-image style="width:100px;height:100px" :src="acm.url"></el-image>
+                          </el-col>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterC">
+                          <p class="textOver">产品:{{ item.product_name }}</p>
+                          <p>营销人名称:{{ item.market_username }}</p>
+                          <p>购买人名称:{{ item.username }}</p>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterTwo">
+                          <el-col :span="24">说明:{{ item.description }}</el-col>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterR">
+                          <el-col :span="24" class="bainji">
+                            <el-link :underline="false" @click="handleDelete(item)">彻底删除</el-link>
+                          </el-col>
+                        </el-col>
+                      </el-col>
+                    </el-col>
+                  </el-col>
+                  <el-col class="page" :span="24">
+                    <el-pagination
+                      @size-change="handleSizeChange"
+                      @current-change="handleCurrentChange3"
+                      :current-page="currentPage"
+                      layout="total,  prev, pager, next, jumper"
+                      :total="tatalstatus2"
+                    >
+                    </el-pagination>
+                  </el-col>
+                </el-tab-pane>
+              </el-tabs>
+            </el-row>
+          </el-tab-pane>
+        </el-tabs>
+        <el-link :underline="false" class="fabuBtn" @click="messFabu()">信息发布</el-link>
       </el-col>
     </el-row>
   </div>
@@ -60,22 +151,63 @@ export default {
     recruitData: null,
     columnName: null,
     total: null,
+    successlist: null,
+    shenheList: null,
+    tatalstatus2: null,
+    tatalstatus1: null,
+    Transactionlist: null,
+    jiaoyilist1: null,
+    jiaoyilist: null,
+    dinggou1: null,
+    dinggou2: null,
+    dinggou3: null,
+    // gonggeiData: null,
   },
   components: {},
   data: () => ({
-    currentPage: 1,
+    currentPage: 0,
+    activeName: 'fgrrsss',
+    activeNameFirst: 'fgrrsss',
+    pageSize: 3,
   }),
   created() {},
   computed: {},
   methods: {
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
+    handleDelete(item) {
+      this.$emit('delete', { item });
+    },
+    messFabu() {
+      this.$router.push({ path: '/enterprise/enterprisexuqiu' });
     },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
+    handleClick(tab, event) {
+      console.log(tab, event);
     },
-    clickDetailcm(row) {
-      this.$emit('detailcm', { data: row });
+    handleClickFirst(tab, event) {
+      console.log(tab, event);
+    },
+    // handleSizeChange(val) {
+    //   console.log(`每页 ${val} 条`);
+    // },
+    // handleCurrentChange(val) {
+    //   console.log(`当前页: ${val}`);
+    // },
+
+    handleSizeChange(pageSize) {
+      // this.$emit('handleSizeChange', pageSize);
+    },
+    handleCurrentChange(currentPage) {
+      console.log(currentPage);
+      this.$emit('handleCurrentChange', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
+    },
+
+    handleCurrentChange1(currentPage) {
+      console.log(currentPage);
+      this.$emit('handleCurrentChange1', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
+    },
+
+    handleCurrentChange2(currentPage) {
+      console.log(currentPage);
+      this.$emit('handleCurrentChange2', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
     },
   },
 };
@@ -102,13 +234,11 @@ p {
   font-size: 13px;
   color: #888888;
 }
-
 .fbListCenter {
   width: 870px;
   height: 119px;
   margin: 20px 0 0 12px;
 }
-
 .fimage {
   width: 110px;
   height: 119px;
@@ -122,7 +252,6 @@ p {
 .fbListCenterC p {
   padding: 5px 0;
 }
-
 .fbListCenterR {
   border-left: 1px solid #ccc;
   width: 125px;
@@ -131,7 +260,6 @@ p {
 }
 .listName {
   width: 196px;
-
   height: 30px;
   font-size: 16px;
   color: #555555;
@@ -142,7 +270,6 @@ p {
   color: #fe0000;
   width: 196px;
 }
-
 .fbListCenterTwo {
   width: 385px;
   float: left;
@@ -154,41 +281,13 @@ p {
 .bainji {
   padding: 0 0 0 20px;
 }
-.list {
-  height: 740px;
-  padding: 0 20px 0 20px;
-  overflow: hidden;
-}
-.topTitle {
-  height: 60px;
-  width: 950px;
-  line-height: 60px;
-  border-bottom: 1px solid #215299;
-}
-.rightTopL {
-  width: 130px;
-  height: 60px;
-  float: left;
-  color: rgb(255, 255, 255);
-  font-size: 18px;
-  text-align: center;
-  font-family: 微软雅黑, Tahoma, Arial, Helvetica, STHeiti;
-  background: rgb(33, 82, 153);
-}
-
-.tit {
-  background-color: #ffffff;
-  padding: 30px 0 0 0;
-  line-height: 50px;
-  width: 890px;
-  height: 80px;
-  border-bottom: 1px solid #ccc;
-  background-color: #ffffff;
-  color: #215299;
-}
-
 .page {
   padding: 11px 0 0 0;
   text-align: center;
 }
+.fabuBtn {
+  position: absolute;
+  top: 65px;
+  right: 30px;
+}
 </style>

+ 123 - 11
src/layout/enterprise/contextfabuxx.vue

@@ -146,11 +146,11 @@
                   </el-col>
                 </el-tab-pane>
 
-                <el-tab-pane label="交易中" name="fgrr">
+                <el-tab-pane label="交易中" name="fgrrsss">
                   <el-col :span="24" v-for="(item, index) in Transactionlist" :key="index">
                     <el-col class="xqborder">
                       <el-col :span="24" class="fbListTop">
-                        <el-col :span="20"> {{ item.name }} </el-col>
+                        <el-col :span="20"> </el-col>
                         <el-col :span="4">
                           {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
                         </el-col>
@@ -162,16 +162,16 @@
                           </el-col>
                         </el-col>
                         <el-col :span="6" class="fbListCenterC">
-                          <p class="textOver">产品:{{ item.name }}</p>
-                          <p>类别:{{ item.totaltype === '0' ? '技术' : item.totaltype === '1' ? '产品' : item.totaltype === '2' ? '服务' : 'underdind' }}</p>
-                          <p class="listMoney">{{ item.price }}/{{ item.priceunit }}</p>
+                          <p class="textOver">产品:{{ item.product_name }}</p>
+                          <p>营销人名称:{{ item.market_username }}</p>
+                          <p>购买人名称:{{ item.username }}</p>
                         </el-col>
                         <el-col :span="6" class="fbListCenterTwo">
-                          <el-col :span="24">最新申请:</el-col>
+                          <el-col :span="24">说明:{{ item.description }}</el-col>
                         </el-col>
                         <el-col :span="6" class="fbListCenterR">
                           <el-col :span="24" class="bainji">
-                            <el-link :underline="false" @click="handleDelete(item)">彻底删除</el-link>
+                            <el-link :underline="false" @click="deteles(item)">彻底删除</el-link>
                           </el-col>
                         </el-col>
                       </el-col>
@@ -180,10 +180,100 @@
                   <el-col class="page" :span="24">
                     <el-pagination
                       @size-change="handleSizeChange"
-                      @current-change="handleCurrentChange"
+                      @current-change="handleCurrentChange4"
                       :current-page="currentPage"
+                      background
                       layout="total,  prev, pager, next, jumper"
-                      :total="tatalstatus2"
+                      :total="total4"
+                      :page-size="pageSize"
+                    >
+                    </el-pagination>
+                  </el-col>
+                </el-tab-pane>
+
+                <el-tab-pane label="交易完成" name="fgrraaa">
+                  <el-col :span="24" v-for="(item, index) in jiaoyilist1" :key="index">
+                    <el-col class="xqborder">
+                      <el-col :span="24" class="fbListTop">
+                        <el-col :span="20"> </el-col>
+                        <el-col :span="4">
+                          {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
+                        </el-col>
+                      </el-col>
+                      <el-col :span="24" class="fbListCenter">
+                        <el-col :span="6" class="fimage">
+                          <el-col :span="24" v-for="(acm, index) in item.image" :key="index">
+                            <el-image style="width:100px;height:100px" :src="acm.url"></el-image>
+                          </el-col>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterC">
+                          <p class="textOver">产品:{{ item.product_name }}</p>
+                          <p>营销人名称:{{ item.market_username }}</p>
+                          <p>购买人名称:{{ item.username }}</p>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterTwo">
+                          <el-col :span="24">说明:{{ item.description }}</el-col>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterR">
+                          <el-col :span="24" class="bainji">
+                            <el-link :underline="false" @click="deteles(item)">彻底删除</el-link>
+                          </el-col>
+                        </el-col>
+                      </el-col>
+                    </el-col>
+                  </el-col>
+                  <el-col class="page" :span="24">
+                    <el-pagination
+                      @size-change="handleSizeChange"
+                      @current-change="handleCurrentChange5"
+                      :current-page="currentPage"
+                      background
+                      layout="total,  prev, pager, next, jumper"
+                      :total="total5"
+                      :page-size="pageSize"
+                    >
+                    </el-pagination>
+                  </el-col>
+                </el-tab-pane>
+
+                <el-tab-pane label="交易取消" name="fgrr">
+                  <el-col :span="24" v-for="(item, index) in jiaoyilist" :key="index">
+                    <el-col class="xqborder">
+                      <el-col :span="24" class="fbListTop">
+                        <el-col :span="20"> </el-col>
+                        <el-col :span="4">
+                          {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
+                        </el-col>
+                      </el-col>
+                      <el-col :span="24" class="fbListCenter">
+                        <el-col :span="6" class="fimage">
+                          <el-col :span="24" v-for="(acm, index) in item.image" :key="index">
+                            <el-image style="width:100px;height:100px" :src="acm.url"></el-image>
+                          </el-col>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterC">
+                          <p class="textOver">产品:{{ item.product_name }}</p>
+                          <p>营销人名称:{{ item.market_username }}</p>
+                          <p>购买人名称:{{ item.username }}</p>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterTwo">
+                          <el-col :span="24">说明:{{ item.description }}</el-col>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterR">
+                          <el-col :span="24" class="bainji">
+                            <el-link :underline="false" @click="deteles(item)">彻底删除</el-link>
+                          </el-col>
+                        </el-col>
+                      </el-col>
+                    </el-col>
+                  </el-col>
+                  <el-col class="page" :span="24">
+                    <el-pagination
+                      @size-change="handleSizeChange"
+                      @current-change="handleCurrentChange6"
+                      :current-page="currentPage"
+                      layout="total,  prev, pager, next, jumper"
+                      :total="total6"
                     >
                     </el-pagination>
                   </el-col>
@@ -191,6 +281,7 @@
               </el-tabs>
             </el-row>
           </el-tab-pane>
+
           <!-- <el-tab-pane label="我的供给" name="second">
             <el-row style="padding: 0 20px;">
               <el-tabs v-model="activeNameFirst" @tab-click="handleClickFirst">
@@ -346,6 +437,12 @@ export default {
     tatalstatus2: null,
     tatalstatus1: null,
     Transactionlist: null,
+    jiaoyilist1: null,
+    jiaoyilist: null,
+    total4: null,
+    total5: null,
+    total6: null,
+
     // gonggeiData: null,
   },
   components: {},
@@ -358,8 +455,8 @@ export default {
   created() {},
   computed: {},
   methods: {
-    handleDelete(item) {
-      this.$emit('delete', { item });
+    deteles(item) {
+      this.$emit('deletes', { item });
     },
     messFabu() {
       this.$router.push({ path: '/enterprise/enterprisexuqiu' });
@@ -394,6 +491,21 @@ export default {
       console.log(currentPage);
       this.$emit('handleCurrentChange2', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
     },
+
+    handleCurrentChange4(currentPage) {
+      console.log(currentPage);
+      this.$emit('handleCurrentChange4', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
+    },
+
+    handleCurrentChange5(currentPage) {
+      console.log(currentPage);
+      this.$emit('handleCurrentChange5', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
+    },
+
+    handleCurrentChange6(currentPage) {
+      console.log(currentPage);
+      this.$emit('handleCurrentChange6', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
+    },
   },
 };
 </script>

+ 52 - 9
src/views/enterprise/enterprisedg.vue

@@ -1,6 +1,14 @@
 <template>
   <div id="adviserList">
-    <enterprisedg-detail :info="info" :liebiaoList="liebiaoList" :recruitData="recruitData" @onsave="onsaveClick" :total="total"></enterprisedg-detail>
+    <enterprisedg-detail
+      :info="info"
+      :liebiaoList="liebiaoList"
+      :dinggou1="dinggou1"
+      :dinggou2="dinggou2"
+      :dinggou3="dinggou3"
+      @onsave="onsaveClick"
+      :total="total"
+    ></enterprisedg-detail>
   </div>
 </template>
 
@@ -8,7 +16,7 @@
 import enterprisedgDetail from '@/components/enterprise/enterpisedg.vue';
 import { createNamespacedHelpers, mapGetters } from 'vuex';
 const { mapActions: mapSite } = createNamespacedHelpers('site');
-const { mapActions: mapRecruit } = createNamespacedHelpers('enterpriseproject');
+const { mapActions: transaction } = createNamespacedHelpers('transaction');
 export default {
   name: 'adviserList',
   props: {},
@@ -18,17 +26,23 @@ export default {
   data: () => ({
     info: {},
     liebiaoList: [{ name: '基本信息' }, { name: '消息管理' }, { name: '我的发布' }, { name: '我的订购' }, { name: '注销账号' }],
-    recruitData: [],
+
+    dinggou1: [],
+    dinggou2: [],
+    dinggou3: [],
     total: 1,
   }),
   created() {
     this.searchSite();
-    this.searchColumn();
+
+    this.jiaoyi1();
+    this.jiaoyi2();
+    this.jiaoyi3();
   },
   computed: {},
   methods: {
     ...mapSite(['showInfo']),
-    ...mapRecruit({ recruitList: 'query' }),
+    ...transaction({ transactionList: 'query' }),
     // 查询站点信息
     async searchSite() {
       let res = await this.showInfo();
@@ -40,11 +54,40 @@ export default {
       }
     },
     // 查询
-    async searchColumn({ skip = 0, limit = 3, ...info } = {}) {
-      const res = await this.recruitList({ skip, limit, ...info });
+
+    async jiaoyi1({ skip = 0, limit = 3, ...info } = {}) {
+      let status = 1;
+      skip = this.skip;
+      console.log();
+      const res = await this.transactionList({ skip, limit, status, ...info });
+      console.log(res);
+      if (this.$checkRes(res)) {
+        this.$set(this, `dinggou1`, res.data);
+        this.$set(this, `tatalstatus2`, res.total);
+      }
+    },
+
+    async jiaoyi2({ skip = 0, limit = 3, ...info } = {}) {
+      let status = 2;
+      skip = this.skip;
+      console.log();
+      const res = await this.transactionList({ skip, limit, status, ...info });
+      console.log(res);
+      if (this.$checkRes(res)) {
+        this.$set(this, `dinggou2`, res.data);
+        this.$set(this, `jiaoyilist1`, res.total);
+      }
+    },
+
+    async jiaoyi3({ skip = 0, limit = 3, ...info } = {}) {
+      let status = 3;
+      skip = this.skip;
+      console.log();
+      const res = await this.transactionList({ skip, limit, status, ...info });
+      console.log(res);
       if (this.$checkRes(res)) {
-        this.$set(this, `recruitData`, res.data);
-        this.$set(this, `total`, res.total);
+        this.$set(this, `dinggou3`, res.data);
+        this.$set(this, `tatalstatus2`, res.total);
       }
     },
     async onsaveClick({ id }) {

+ 72 - 1
src/views/enterprise/enterprisefabu.vue

@@ -10,11 +10,17 @@
       :shenheList="shenheList"
       :Transactionlist="Transactionlist"
       :total="total"
+      :total4="total4"
+      :total5="total5"
+      :total6="total6"
       :tatalstatus1="tatalstatus1"
       :tatalstatus2="tatalstatus2"
       @handleCurrentChange="handleCurrentChange"
       @handleCurrentChange1="handleCurrentChange1"
       @handleCurrentChange2="handleCurrentChange2"
+      :jiaoyilist="jiaoyilist"
+      :jiaoyilist1="jiaoyilist1"
+      @deteles="deletestate"
     ></enterprisefabu-detail>
   </div>
 </template>
@@ -25,6 +31,8 @@ import { createNamespacedHelpers, mapGetters } from 'vuex';
 const { mapActions: mapSite } = createNamespacedHelpers('site');
 const { mapActions: mapRecruit } = createNamespacedHelpers('market');
 const { mapActions: marketproduct } = createNamespacedHelpers('marketproduct');
+const { mapActions: transaction } = createNamespacedHelpers('transaction');
+
 export default {
   name: 'adviserList',
   props: {},
@@ -39,7 +47,12 @@ export default {
     recruitData: [],
     gonggeiData: [],
     Transactionlist: [],
+    jiaoyilist: [],
+    jiaoyilist1: [],
     total: 1,
+    total4: 1,
+    total5: 1,
+    total6: 1,
     tatalstatus1: 1,
     tatalstatus2: 1,
     skip: '',
@@ -49,12 +62,17 @@ export default {
     this.searchInfo();
     this.searchstatus1();
     this.searchstaus2();
+    this.jiaoyi1();
+    this.jiaoyi2();
+    this.jiaoyi3();
   },
   computed: {},
   methods: {
     ...mapSite(['showInfo']),
     ...mapRecruit({ columnList: 'query', columnInfo: 'fetch' }),
     ...marketproduct({ productList: 'query', columnInfo: 'fetch', marketcerate: 'create', productdeltet: 'delete' }),
+    ...transaction({ list: 'query', columnInfo: 'fetch', marketcerate: 'create', delete: 'delete' }),
+
     // 查询站点信息
     async searchSite() {
       let res = await this.showInfo();
@@ -95,6 +113,43 @@ export default {
         this.$set(this, `tatalstatus2`, res.total);
       }
     },
+
+    async jiaoyi1({ skip = 0, limit = 3, ...info } = {}) {
+      let status = 1;
+      skip = this.skip;
+      console.log();
+      const res = await this.list({ skip, limit, status, ...info });
+      console.log(res);
+      if (this.$checkRes(res)) {
+        this.$set(this, `jiaoyilist`, res.data);
+        this.$set(this, `total4`, res.total);
+      }
+    },
+
+    async jiaoyi2({ skip = 0, limit = 3, ...info } = {}) {
+      let status = 2;
+      skip = this.skip;
+      console.log();
+      const res = await this.list({ skip, limit, status, ...info });
+      console.log(res);
+      if (this.$checkRes(res)) {
+        this.$set(this, `Transactionlist`, res.data);
+        this.$set(this, `total5`, res.total);
+      }
+    },
+
+    async jiaoyi3({ skip = 0, limit = 3, ...info } = {}) {
+      let status = 3;
+      skip = this.skip;
+      console.log();
+      const res = await this.list({ skip, limit, status, ...info });
+      console.log(res);
+      if (this.$checkRes(res)) {
+        this.$set(this, `Transactionlist`, res.data);
+        this.$set(this, `total6`, res.total);
+      }
+    },
+
     //分页
     async handleCurrentChange({ skip, limit, currentPage }) {
       this.$set(this, `skip`, skip);
@@ -111,13 +166,29 @@ export default {
       this.$set(this, `skip`, skip);
       this.searchstaus2();
     },
+    async handleCurrentChange4({ skip, limit, currentPage }) {
+      this.$set(this, `skip`, skip);
+      this.jiaoyi1();
+    },
+    async handleCurrentChange5({ skip, limit, currentPage }) {
+      this.$set(this, `skip`, skip);
+      this.jiaoyi2();
+    },
+    async handleCurrentChange6({ skip, limit, currentPage }) {
+      this.$set(this, `skip`, skip);
+      this.jiaoyi3();
+    },
 
     // 删除信息
     async deleteData({ item }) {
       const res = await this.productdeltet(item.id);
       this.$checkRes(res, '删除成功', '删除失败');
-      this.searchInfo();
     },
+    async deletestate({ item }) {
+      const res = await this.delete(item.id);
+      this.$checkRes(res, '删除成功', '删除失败');
+    },
+
     async onsaveClick({ id }) {
       if (id === '基本信息') {
         this.$router.push({ path: '/enterprise/enterprisejb' });

+ 1 - 0
src/views/supermaket/supermarketlist.vue

@@ -52,6 +52,7 @@ export default {
     ...mapSite(['showInfo']),
     ...mapEnterpriseproject({ list: 'query', fetch: 'fetch' }),
     ...transaction({ transactioncreate: 'create', transactionfetch: 'fetch' }),
+     ...transaction({ transactioncreate: 'create', transactionfetch: 'fetch' }),
     ...tranaudit({ tranauditcreate: 'create' }),
     // 查询站点信息
     async searchSite() {