Quellcode durchsuchen

更新企业相关

wuhongyuq vor 5 Jahren
Ursprung
Commit
ffc3933cd0

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

@@ -90,17 +90,17 @@ export default {
   overflow: hidden;
 }
 .main {
-  height: 740px;
+  height: 900px;
   overflow: hidden;
   margin: 10px 0;
 }
 .left {
-  height: 740px;
+  height: 900px;
   margin: 0 10px 0 0;
 }
 .leftDiao {
   background: #fff;
-  height: 370px;
+  height: 550px;
   overflow: hidden;
 }
 .leftTop {
@@ -111,7 +111,7 @@ export default {
 }
 .right {
   width: 940px;
-  height: 740px;
+  height: 900px;
   background: #fff;
   overflow: hidden;
 }

+ 3 - 3
src/components/enterprise/enterprisefabu.vue

@@ -25,7 +25,7 @@
             </el-col>
           </el-col>
           <el-col :span="19" class="right">
-            <contextfabus v-on="$listeners" :columnName="columnName" :recruitData="recruitData"></contextfabus>
+            <contextfabuxx v-on="$listeners" :columnName="columnName" :recruitData="recruitData"></contextfabuxx>
           </el-col>
         </div>
       </el-col>
@@ -45,7 +45,7 @@ import menuInfo from '@/layout/index/menuInfo.vue';
 import foot from '@/layout/index/foot.vue';
 import examine from '@/layout/personCenter/question.vue';
 import mainMenu from '@/layout/enterprise/mainMenu.vue';
-import contextfabus from '@/layout/enterprise/contextfabus.vue';
+import contextfabuxx from '@/layout/enterprise/contextfabuxx.vue';
 export default {
   name: 'adviserList',
   props: {
@@ -62,7 +62,7 @@ export default {
     foot, //底部
     examine, //网上调查
     mainMenu, //分类导航
-    contextfabus, //列表
+    contextfabuxx, //列表
   },
   data: () => ({}),
   created() {},

+ 7 - 7
src/components/enterprise/enterprisexx.vue

@@ -25,7 +25,7 @@
             </el-col>
           </el-col>
           <el-col :span="19" class="right">
-            <contextfabuxx v-on="$listeners" :columnName="columnName" :recruitData="recruitData"></contextfabuxx>
+            <contextdetail v-on="$listeners" :columnName="columnName" :recruitData="recruitData"></contextdetail>
           </el-col>
         </div>
       </el-col>
@@ -45,7 +45,7 @@ import menuInfo from '@/layout/index/menuInfo.vue';
 import foot from '@/layout/index/foot.vue';
 import examine from '@/layout/personCenter/question.vue';
 import mainMenu from '@/layout/enterprise/mainMenu.vue';
-import contextfabuxx from '@/layout/enterprise/contextfabuxx.vue';
+import contextdetail from '@/layout/enterprise/contextdetail.vue';
 export default {
   name: 'adviserList',
   props: {
@@ -62,7 +62,7 @@ export default {
     foot, //底部
     examine, //网上调查
     mainMenu, //分类导航
-    contextfabuxx, //列表
+    contextdetail, //列表
   },
   data: () => ({}),
   created() {},
@@ -90,17 +90,17 @@ export default {
   overflow: hidden;
 }
 .main {
-  height: 900px;
+  height: 1300px;
   overflow: hidden;
   margin: 10px 0;
 }
 .left {
-  height: 900px;
+  height: 1300px;
   margin: 0 10px 0 0;
 }
 .leftDiao {
   background: #fff;
-  height: 530px;
+  height: 930px;
   overflow: hidden;
 }
 .leftTop {
@@ -111,7 +111,7 @@ export default {
 }
 .right {
   width: 940px;
-  height: 900px;
+  height: 1300px;
   background: #fff;
   overflow: hidden;
 }

+ 98 - 116
src/layout/enterprise/context.vue

@@ -1,48 +1,62 @@
 <template>
   <div id="recruitLists">
     <el-row>
-      <el-col :span="24" class="list">
+      <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" class="tit">
-          <el-col> 我的订购</el-col>
-        </el-col>
-        <el-col :span="24" class="fbList">
-          <el-col class="fbListTop">信息号 <el-col class="fbListTopR"> </el-col></el-col>
-          <el-col class="fbListCenter">
-            <el-col class="fbListCenterL">图片</el-col>
-            <el-col :span="24" class="fbListCenterC">
-              <el-col class="listName">名字</el-col>
-              <el-col class="listName">类别</el-col>
-              <el-col class="listMoney">名字</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">
+                  <el-col :span="24" class="listName">
+                    <p>产品{{ item.name }}</p></el-col
+                  >
+                  <el-col :span="24" class="listName">
+                    <p>类别{{ item.totaltype === '0' ? '技术' : item.totaltype === '1' ? '产品' : item.totaltype === '2' ? '服务' : '错误' }}</p></el-col
+                  >
+
+                  <el-col :span="24" class="listMoney">
+                    <p>{{ item.price }}/{{ item.priceunit === '0' ? '套' : item.priceunit === '1' ? '件' : item.priceunit === '2' ? '元' : '其他' }}</p></el-col
+                  >
+                </el-col>
+                <el-col :span="6" class="fbListCenterTwo">
+                  <el-col :span="24">交易说明:</el-col>
+                </el-col>
 
-            <el-col :span="24" class="fbListCenterTwo">
-              <el-col :span="24" class="faTop">交易说明</el-col>
-              <el-col :span="24" class="faTxt"> 我要买</el-col>
+                <el-col :span="6" class="fbListCenterR">
+                  <el-col :span="24" class="bainji">
+                    <el-col :span="24"> {{ item.state }}</el-col>
+                  </el-col>
+                </el-col>
+              </el-col>
             </el-col>
-            <el-col :span="24" class="fbListCenterR"> </el-col>
           </el-col>
-          <el-col :span="24"> </el-col>
-          <el-col v-for="(item, index) in recruitData" :key="index" @click="$emit('fetch', item.id)">
-            <el-col :span="21" class="title textOver">{{ item.name }}</el-col>
-            <el-col :span="3" class="date">
-              {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
-            </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-table :data="recruitData" style="width: 100%" border>
-            <el-table-column label="名称" align="center">
-              <template slot-scope="scoped">
-                <el-tooltip effect="dark" content="点击显示详情" placement="left">
-                  <el-col :span="24" @click.native="clickDetailcm(scoped.row)">{{ scoped.row.name }}</el-col>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-            <el-table-column prop="infotype" label="信息类型" align="center"> </el-table-column>
-            <el-table-column prop="user_name" label="发布人" align="center"> </el-table-column>
-          </el-table> -->
         </el-col>
       </el-col>
     </el-row>
@@ -78,46 +92,14 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.list {
-  height: 740px;
-
-  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 30px 0 30px;
-  line-height: 50px;
-  width: 890px;
-  height: 80px;
-  border-bottom: 1px solid #ccc;
-  background-color: #ffffff;
-  color: #215299;
-}
-.fbList {
-  width: 888px;
+.xqborder {
+  width: 889px;
   height: 183px;
   border: 1px solid #ccc;
-  margin: 20px 0 0 20px;
+  margin-top: 20px;
 }
-
 .fbListTop {
+  width: 885px;
   height: 43px;
   margin-left: 1px;
   background: #fafafa;
@@ -133,23 +115,10 @@ export default {
   margin: 20px 0 0 12px;
 }
 
-.fbListTopR {
-  float: right;
-}
-
-.fbListCenterL {
-  width: 100px;
-  height: 100px;
-  background-color: #ffffff;
-}
-.listName {
-  width: 196px;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-  height: 30px;
-  font-size: 16px;
-  color: #555555;
+.fimage {
+  width: 110px;
+  height: 119px;
+  float: left;
 }
 .fbListCenterC {
   width: 196px;
@@ -161,14 +130,25 @@ export default {
   white-space: nowrap;
   overflow: hidden;
 }
+
+.fbListCenterR {
+  border-left: 1px solid #ccc;
+  width: 125px;
+  height: 100px;
+  float: left;
+}
+.listName {
+  width: 196px;
+
+  height: 30px;
+  font-size: 16px;
+  color: #555555;
+}
 .listMoney {
   height: 30px;
   font-size: 16px;
   color: #fe0000;
   width: 196px;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
 }
 
 .fbListCenterTwo {
@@ -179,40 +159,42 @@ export default {
   background: #fafafa;
   height: 100px;
 }
-.faTop {
-  padding-left: 10px;
-  width: 374px;
-  font-size: 14px;
-  height: 35px;
-  line-height: 35px;
-  color: #215299;
+.bainji {
+  padding: 0 0 0 20px;
 }
-
-.faTxt {
-  padding-left: 10px;
-  width: 374px;
-  height: 55px;
-  font-size: 14px;
-  word-break: break-all;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 3;
+.list {
+  height: 740px;
+  padding: 0 20px 0 20px;
   overflow: hidden;
 }
-.fbListCenterR {
-  border-left: 1px solid #ccc;
-  width: 125px;
-  height: 100px;
+.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);
 }
 
-.fbListCenterR {
-  margin-left: 20px;
-  font-size: 14px;
+.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;
-  float: left;
 }
+
 .page {
   padding: 11px 0 0 0;
   text-align: center;

+ 140 - 0
src/layout/enterprise/contextdetail.vue

@@ -0,0 +1,140 @@
+<template>
+  <div id="recruitLists">
+    <el-row>
+      <el-col :span="24" class="list">
+        <el-col :span="24" class="topTitle">
+          <el-col class="rightTopL"> </el-col>
+        </el-col>
+
+        <el-col :span="24" class="tit">
+          <el-col> 查看申请</el-col>
+          <el-col :span="24">
+            <p>
+              <span>名称:{{ recruitData.name }}</span>
+              <span class="shenhe">审核状态: {{ recruitData.state }}</span>
+              <!-- {{ recruitData.state === 0 ? '待审核' : recruitData.state === 1 ? '通过审核' : recruitData.state === 2 ? '审核拒绝' : '其他' }} -->
+            </p>
+            <el-col :span="24"> <span class="tupian">产品图片</span> <el-image style="width:100px;height:100px" :src="recruitData.url"></el-image></el-col>
+
+            <p>
+              <span>单价: {{ recruitData.price }}</span>
+            </p>
+            <p>
+              <span>单位: {{ recruitData.priceunit == 0 ? '公斤' : recruitData.priceunit == 1 ? '件' : recruitData.priceunit == 2 ? '套' : 'qita' }}</span>
+            </p>
+            <p>
+              <span> 应用领域:{{ recruitData.field }}</span>
+            </p>
+            <p>
+              <span>市场前景: {{ recruitData.prospect }}</span>
+            </p>
+            <p>
+              <span>电子合同: {{ recruitData.contract }}</span>
+            </p>
+            <p>
+              <span>参数名称{{ recruitData.arg_name }}</span>
+            </p>
+            <p>
+              <span>内容:{{ recruitData.memo }}</span>
+            </p>
+            <p>
+              <span>交易方式:{{ recruitData.business }}</span>
+            </p>
+
+            <p>
+              <span>服务范围: {{ recruitData.scope }}</span>
+            </p>
+
+            <p>
+              <span>描述: {{ recruitData.description }}</span>
+            </p>
+            <p>
+              <span>知识产权: {{ recruitData.property }}</span>
+            </p>
+            <p>
+              <span>联系人: {{ recruitData.contact_user }}</span>
+            </p>
+
+            <p>
+              <span>联系电话: {{ recruitData.contact_tel }}</span>
+            </p>
+          </el-col>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'recruitLists',
+  props: {
+    recruitData: null,
+    columnName: null,
+    total: null,
+  },
+  components: {},
+  data: () => ({
+    currentPage: 1,
+  }),
+  created() {},
+  computed: {},
+  methods: {
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+    },
+    clickDetailcm(row) {
+      this.$emit('detailcm', { data: row });
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.list {
+  height: 900px;
+}
+.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 {
+  margin: 30px 30px 0 30px;
+  line-height: 55px;
+  width: 870px;
+  height: 55px;
+  border-bottom: 1px solid #ccc;
+  background-color: #ffffff;
+  color: #215299;
+}
+.fbList {
+  width: 888px;
+  height: 183px;
+  border: 1px solid #ccc;
+  margin: 20px 0 0 20px;
+}
+
+.shenhe {
+  padding: 0 0 0 20px;
+  color: #215299;
+}
+.tupian {
+  margin: 0 10px 0 0;
+}
+</style>

+ 174 - 9
src/layout/enterprise/contextfabu.vue

@@ -15,6 +15,17 @@
                   <el-input v-model="form.name" placeholder="请输入名称"></el-input>
                 </el-form-item>
               </el-col>
+              <el-col class="mingcheng" :span="24">
+                <el-form-item label="联系人">
+                  <el-input v-model="form.contact_user" placeholder="请输入联系人"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col class="mingcheng" :span="24">
+                <el-form-item label="联系电话">
+                  <el-input v-model="form.contact_tel" placeholder="请输入联系人电话"></el-input>
+                </el-form-item>
+              </el-col>
+
               <el-col class="mingcheng" :span="24">
                 <el-form-item label="类型">
                   <el-select v-model="form.product_type_id" filterable @change="selectChild">
@@ -74,7 +85,7 @@
                           <el-table-column type="selection" width="45" align="center"></el-table-column>
                           <el-table-column label="序号" type="index" width="60" align="center"></el-table-column>
 
-                          <el-table-column label="产品名称">
+                          <el-table-column label="参数名称">
                             <template slot-scope="scope">
                               <el-input type="input" class="remark" v-model="scope.row.arg_name"></el-input>
                             </template>
@@ -99,24 +110,179 @@
 
               <el-col class="danjia" :span="24">
                 <el-form-item label="单价">
-                  <el-input v-model="form.userid" placeholder="请输入单价"></el-input>
+                  <el-input v-model="form.price" placeholder="请输入单价"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col class="danjia" :span="24">
+                <el-form-item label="用户id">
+                  <el-input v-model="form.userid" placeholder="请输入用户id"></el-input>
                 </el-form-item>
               </el-col>
+
               <el-col class="mingcheng" :span="24">
                 <el-form-item label="单位">
-                  <el-input v-model="form.priceunit" placeholder="请输入单位"></el-input>
+                  <el-select v-model="form.priceunit" placeholder="请选择活动区域">
+                    <el-option label="公斤" value="0"></el-option>
+                    <el-option label="件" value="1"></el-option>
+                    <el-option label="套" value="1"></el-option>
+                  </el-select>
                 </el-form-item>
               </el-col>
 
               <el-col class="mingcheng" :span="24">
                 <el-form-item label="交易方式">
-                  <el-select v-model="form.business" placeholder="请选择交易方式">
-                    <el-option label="公用" value="0"></el-option>
-                    <el-option label="转让" value="1"></el-option>
-                    <el-option label="竞价" value="2"></el-option>
+                  <el-radio-group v-model="form.business">
+                    <el-radio label="公用" value="0"></el-radio>
+                    <el-radio label="转让" value="1"></el-radio>
+                    <el-radio label="竞价" value="2"></el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col class="mingcheng" :span="24">
+                <el-form-item label="研发阶段">
+                  <el-select v-model="form.phase" placeholder="请选择研发阶段">
+                    <el-option label="阶段成果" value="1"></el-option>
+                    <el-option label="最终成果" value="2"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+
+              <el-col class="mingcheng" :span="24">
+                <el-form-item label="简介">
+                  <el-input type="textarea" v-model="form.introduction"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col class="mingcheng" :span="24">
+                <el-form-item>
+                  <el-button type="primary" @click="onSubmit" size="mini">{{ isNew ? '创建' : '发布' }}</el-button>
+                </el-form-item>
+              </el-col>
+            </el-form>
+          </el-tab-pane>
+          <el-tab-pane label="供给发布" name="second">
+            <el-form ref="form" :model="form" label-width="80px">
+              <el-form-item label="类别">
+                <el-select v-model="form.totaltype" placeholder="请选择类别" @change="selectType" prop="totaltype">
+                  <el-option v-for="(item, index) in typeList" :key="index" :value="item.value" :label="item.name"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-col class="mingcheng" :span="24">
+                <el-form-item label="名称">
+                  <el-input v-model="form.name" placeholder="请输入名称"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col class="mingcheng" :span="24">
+                <el-form-item label="类型">
+                  <el-select v-model="form.product_type_id" filterable @change="selectChild">
+                    <el-option v-for="(item, index) in columnList" :key="index" :value="item.id" :label="item.name"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col class="mingcheng" :span="24">
+                <el-form-item label="产品图片" prop="url">
+                  <upload :limit="1" :data="form.url" type="url" :url="'/files/links/upload'" @upload="uploadSuccess"></upload>
+                </el-form-item>
+              </el-col>
+              <el-col class="mingcheng" :span="24">
+                <el-form-item label="应用领域" prop="1" v-if="form.totaltype === '1' ? form.totaltype === '2' : 'qiya'">
+                  <el-input v-model="form.field" placeholder="请输入应用领域"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col class="mingcheng" :span="24">
+                <el-form-item label="服务范围" prop="2" v-if="form.totaltype === '0' ? form.totaltype === '1' : 'qiya'">
+                  <el-input type="textarea" v-model="form.scope"></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col class="mingcheng" :span="24">
+                <el-form-item label="市场前景">
+                  <el-input v-model="form.prospect" placeholder="请输入市场前景"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col class="mingcheng" :span="24">
+                <el-form-item label="电子合同">
+                  <el-input v-model="form.contract" placeholder="请输入电子合同"></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col class="mingcheng" :span="24">
+                <el-form-item label="描述">
+                  <el-input v-model="form.description" placeholder="请输入描述"></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col class="mingcheng" :span="24">
+                <el-form-item label="知识产权">
+                  <el-input v-model="form.property" placeholder="请输入知识产权"></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col class="mingcheng" :span="24">
+                <el-form-item label="产品参数" prop="2" v-if="form.totaltype === '1' ? form.totaltype === '2' : 'qiya'">
+                  <template>
+                    <div class="tableDate">
+                      <div class="button" style="width:6%;float:right;">
+                        <P><el-button class="el-icon-plus" @click.prevent="addRow()"></el-button></P>
+                        <p><el-button class="el-icon-minus" @click.prevent="delData()"></el-button></p>
+                      </div>
+                      <div class="table">
+                        <el-table :data="tableData" ref="table" tooltip-effect="dark" border stripe style="width: 93%" @selection-change="selectRow">
+                          <el-table-column type="selection" width="45" align="center"></el-table-column>
+                          <el-table-column label="序号" type="index" width="60" align="center"></el-table-column>
+
+                          <el-table-column label="参数名称">
+                            <template slot-scope="scope">
+                              <el-input type="input" class="remark" v-model="scope.row.arg_name"></el-input>
+                            </template>
+                          </el-table-column>
+
+                          <el-table-column label="内容">
+                            <template slot-scope="scope">
+                              <el-input type="textarea" class="remark" v-model="scope.row.memo"></el-input>
+                            </template>
+                          </el-table-column>
+                        </el-table>
+                      </div>
+                    </div>
+                  </template>
+                </el-form-item>
+                <el-col class="mingcheng" :span="24">
+                  <el-form-item label="市场前景" prop="2" v-if="form.totaltype === '2'">
+                    <el-input type="textarea" v-model="form.prospect"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-col>
+
+              <el-col class="danjia" :span="24">
+                <el-form-item label="单价">
+                  <el-input v-model="form.price" placeholder="请输入单价"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col class="danjia" :span="24">
+                <el-form-item label="用户id">
+                  <el-input v-model="form.userid" placeholder="请输入用户id"></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col class="mingcheng" :span="24">
+                <el-form-item label="单位">
+                  <el-select v-model="form.priceunit" placeholder="请选择活动区域">
+                    <el-option label="公斤" value="0"></el-option>
+                    <el-option label="件" value="1"></el-option>
+                    <el-option label="套" value="1"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
+
+              <el-col class="mingcheng" :span="24">
+                <el-form-item label="交易方式">
+                  <el-radio-group v-model="form.business">
+                    <el-radio label="公用" value="0"></el-radio>
+                    <el-radio label="转让" value="1"></el-radio>
+                    <el-radio label="竞价" value="2"></el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
               <el-col class="mingcheng" :span="24">
                 <el-form-item label="研发阶段">
                   <el-select v-model="form.phase" placeholder="请选择研发阶段">
@@ -138,7 +304,6 @@
               </el-col>
             </el-form>
           </el-tab-pane>
-          <el-tab-pane label="供给发布" name="second">配置管理</el-tab-pane>
         </el-tabs>
       </template>
     </el-col>
@@ -189,7 +354,7 @@ export default {
     },
     async selectType(item, totaltype) {
       if (totaltype !== 'into') {
-        delete this.form.url;
+        // delete this.form.url;
         delete this.form.content_id;
       }
       let result;

+ 5 - 6
src/layout/enterprise/contextfabus.vue

@@ -94,19 +94,18 @@ export default {
   width: 130px;
   height: 60px;
   float: left;
-  color: rgb(255, 255, 255);
+  color: #ffffff;
   font-size: 18px;
   text-align: center;
   font-family: 微软雅黑, Tahoma, Arial, Helvetica, STHeiti;
-  background: rgb(33, 82, 153);
+  background: #215299;
 }
 
 .tit {
-  background-color: #ffffff;
-  padding: 30px 30px 0 30px;
-  line-height: 50px;
+  padding: 30px 0 0 0;
+  line-height: 51px;
   width: 890px;
-  height: 80px;
+
   border-bottom: 1px solid #ccc;
   background-color: #ffffff;
   color: #215299;

+ 424 - 167
src/layout/enterprise/contextfabuxx.vue

@@ -1,56 +1,397 @@
 <template>
   <div id="recruitLists">
     <el-row>
-      <el-col :span="24" class="list">
-        <el-col :span="24" class="topTitle">
-          <el-col>
-            <template>
-              <el-col class="sd">
-                <el-tabs v-model="activeName" @tab-click="handleClick">
-                  <el-tab-pane label="我的需求" name="first">
-                    <template>
-                      <el-col class="xx">
-                        <el-tabs v-model="activeName1" @tab-click="handleClick">
-                          <el-tab-pane label="我的供给" name="first1">
-                            <el-col :span="24" class="fbList">
-                              <el-col :span="12">
-                                <el-col class="fbListTop">信息号 <span>信息发布</span></el-col></el-col
-                              >
-                              <el-col class="fbListCenter">
-                                <el-col class="fbListCenterL">图片</el-col>
-                                <el-col :span="24" class="fbListCenterC">
-                                  <el-col class="listName">名字</el-col>
-                                  <el-col class="listName">类别</el-col>
-                                  <el-col class="listMoney">名字</el-col>
-                                </el-col>
-
-                                <el-col :span="24" class="fbListCenterTwo">
-                                  <el-col :span="24" class="faTop">交易说明</el-col>
-                                  <el-col :span="24" class="faTxt"> 我要买</el-col>
-                                </el-col>
-                                <el-col :span="24" class="fbListCenterR"> </el-col>
-                              </el-col>
-                              <el-col :span="24"> </el-col>
-                              <!-- <el-col v-for="(item, index) in recruitData" :key="index" @click="$emit('fetch', item.id)">
-                            <el-col :span="21" class="title textOver">{{ item.name }}</el-col>
-                            <el-col :span="3" class="date">
-                              {{ item.meta && item.meta.createdAt ? new Date(item.meta.createdAt).toLocaleDateString() : '' || '' }}
-                            </el-col>
-                          </el-col> -->
-                            </el-col></el-tab-pane
-                          >
-                          <el-tab-pane label="已经审核" name="second1">配置管理</el-tab-pane>
-                          <el-tab-pane label="未审核" name="third1">角色管理</el-tab-pane>
-                        </el-tabs>
+      <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-button type="text" size="small" @click="$router.push({ path: '/enterprise/enterprisefabu' })">
+                信息发布
+              </el-button> -->
+              <el-tabs v-model="activeNameFirst" @tab-click="handleClickFirst">
+                <el-tab-pane label="已经审核" name="first">
+                  <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>
-                    </template>
-                  </el-tab-pane>
-                  <el-tab-pane label="交易成功" name="second">配置管理</el-tab-pane>
-                </el-tabs>
-              </el-col>
-            </template>
-          </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.image.url"></el-image>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterC">
+                          <el-col :span="24" class="listName">
+                            <p>产品{{ item.name }}</p></el-col
+                          >
+                          <el-col :span="24" class="listName">
+                            <p>
+                              类别{{ item.totaltype === '0' ? '技术' : item.totaltype === '1' ? '产品' : item.totaltype === '2' ? '服务' : '错误' }}
+                            </p></el-col
+                          >
+
+                          <el-col :span="24" class="listMoney">
+                            <p>
+                              {{ item.price }}/{{ item.priceunit === '0' ? '套' : item.priceunit === '1' ? '件' : item.priceunit === '2' ? '元' : '其他' }}
+                            </p></el-col
+                          >
+                        </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">
+                              <el-button type="text" size="small" @click="$router.push({ path: '/enterprise/enterprisexuqiu', query: { id: item.id } })"
+                                >编辑</el-button
+                              ></el-col
+                            >
+
+                            <el-col :span="24">
+                              <el-button type="text" size="small" @click="$router.push({ path: '/enterprise/enterprisexx', query: { id: item.id } })">
+                                查看申请</el-button
+                              ></el-col
+                            >
+                            <el-col :span="24"> <el-button type="text" size="small" @click="handleDelete(item)">彻底删除</el-button></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-tab-pane>
+                <el-tab-pane label="审核中" name="second">
+                  <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.image.url"></el-image>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterC">
+                          <el-col :span="24" class="listName">
+                            <p>产品{{ item.name }}</p></el-col
+                          >
+                          <el-col :span="24" class="listName">
+                            <p>
+                              类别{{ item.totaltype === '0' ? '技术' : item.totaltype === '1' ? '产品' : item.totaltype === '2' ? '服务' : '错误' }}
+                            </p></el-col
+                          >
+
+                          <el-col :span="24" class="listMoney">
+                            <p>
+                              {{ item.price }}/{{ item.priceunit === '0' ? '套' : item.priceunit === '1' ? '件' : item.priceunit === '2' ? '元' : '其他' }}
+                            </p></el-col
+                          >
+                        </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">
+                              <el-button type="text" size="small" @click="$router.push({ path: '/enterprise/enterprisexuqiu', query: { id: item.id } })"
+                                >编辑</el-button
+                              ></el-col
+                            >
+                            <el-col :span="24"> <el-button type="text" size="small" @click="handleDelete(item)">彻底删除</el-button></el-col>
+                            <!-- <el-col :span="24">
+                              <el-button type="text" size="small" @click="$router.push({ path: '/enterprise/enterprisexx', query: { id: item.id } })">
+                                <i class="el-icon-share"></i></el-button
+                            ></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-tab-pane>
+
+                <el-tab-pane label="交易成功" name="thirth">
+                  <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.image.url"></el-image>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterC">
+                          <el-col :span="24" class="listName">
+                            <p>产品{{ item.name }}</p></el-col
+                          >
+                          <el-col :span="24" class="listName">
+                            <p>
+                              类别{{ item.totaltype === '0' ? '技术' : item.totaltype === '1' ? '产品' : item.totaltype === '2' ? '服务' : '错误' }}
+                            </p></el-col
+                          >
+
+                          <el-col :span="24" class="listMoney">
+                            <p>
+                              {{ item.price }}/{{ item.priceunit === '0' ? '套' : item.priceunit === '1' ? '件' : item.priceunit === '2' ? '元' : '其他' }}
+                            </p></el-col
+                          >
+                        </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">
+                              <el-button type="text" size="small" @click="$router.push({ path: '/enterprise/enterprisexuqiu', query: { id: item.id } })"
+                                ><i class="el-icon-edit"></i></el-button
+                            ></el-col> -->
+                            <el-col :span="24"> <el-button type="text" size="small" @click="handleDelete(item)">彻底删除</el-button></el-col>
+                            <!-- <el-col :span="24">
+                              <el-button type="text" size="small" @click="$router.push({ path: '/enterprise/enterprisexx', query: { id: item.id } })">
+                                <i class="el-icon-share"></i></el-button
+                            ></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-tab-pane>
+              </el-tabs>
+            </el-row>
+          </el-tab-pane>
+          <el-tab-pane label="我的供给" name="second">
+            <el-row style="padding: 0 20px;">
+              <!-- <el-button type="text" size="small" @click="$router.push({ path: '/enterprise/enterprisefabu' })">
+                信息发布
+              </el-button> -->
+              <el-tabs v-model="activeNameFirst" @tab-click="handleClickFirst">
+                <el-tab-pane label="已经审核" name="first">
+                  <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.image.url"></el-image>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterC">
+                          <el-col :span="24" class="listName">
+                            <p>产品{{ item.name }}</p></el-col
+                          >
+                          <el-col :span="24" class="listName">
+                            <p>
+                              类别{{ item.totaltype === '0' ? '技术' : item.totaltype === '1' ? '产品' : item.totaltype === '2' ? '服务' : '错误' }}
+                            </p></el-col
+                          >
+
+                          <el-col :span="24" class="listMoney">
+                            <p>
+                              {{ item.price }}/{{ item.priceunit === '0' ? '套' : item.priceunit === '1' ? '件' : item.priceunit === '2' ? '元' : '其他' }}
+                            </p></el-col
+                          >
+                        </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">
+                              <el-button type="text" size="small" @click="$router.push({ path: '/enterprise/enterprisexuqiu', query: { id: item.id } })"
+                                >编辑</el-button
+                              ></el-col
+                            >
+
+                            <el-col :span="24">
+                              <el-button type="text" size="small" @click="$router.push({ path: '/enterprise/enterprisexx', query: { id: item.id } })">
+                                查看申请</el-button
+                              ></el-col
+                            >
+                            <el-col :span="24"> <el-button type="text" size="small" @click="handleDelete(item)">彻底删除</el-button></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-tab-pane>
+                <el-tab-pane label="审核中" name="second">
+                  <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.image.url"></el-image>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterC">
+                          <el-col :span="24" class="listName">
+                            <p>产品{{ item.name }}</p></el-col
+                          >
+                          <el-col :span="24" class="listName">
+                            <p>
+                              类别{{ item.totaltype === '0' ? '技术' : item.totaltype === '1' ? '产品' : item.totaltype === '2' ? '服务' : '错误' }}
+                            </p></el-col
+                          >
+
+                          <el-col :span="24" class="listMoney">
+                            <p>
+                              {{ item.price }}/{{ item.priceunit === '0' ? '套' : item.priceunit === '1' ? '件' : item.priceunit === '2' ? '元' : '其他' }}
+                            </p></el-col
+                          >
+                        </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">
+                              <el-button type="text" size="small" @click="$router.push({ path: '/enterprise/enterprisexuqiu', query: { id: item.id } })"
+                                >编辑</el-button
+                              ></el-col
+                            >
+                            <el-col :span="24"> <el-button type="text" size="small" @click="handleDelete(item)">彻底删除</el-button></el-col>
+                            <!-- <el-col :span="24">
+                              <el-button type="text" size="small" @click="$router.push({ path: '/enterprise/enterprisexx', query: { id: item.id } })">
+                                <i class="el-icon-share"></i></el-button
+                            ></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-tab-pane>
+
+                <el-tab-pane label="交易成功" name="thirth">
+                  <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.image.url"></el-image>
+                        </el-col>
+                        <el-col :span="6" class="fbListCenterC">
+                          <el-col :span="24" class="listName">
+                            <p>产品{{ item.name }}</p></el-col
+                          >
+                          <el-col :span="24" class="listName">
+                            <p>
+                              类别{{ item.totaltype === '0' ? '技术' : item.totaltype === '1' ? '产品' : item.totaltype === '2' ? '服务' : '错误' }}
+                            </p></el-col
+                          >
+
+                          <el-col :span="24" class="listMoney">
+                            <p>
+                              {{ item.price }}/{{ item.priceunit === '0' ? '套' : item.priceunit === '1' ? '件' : item.priceunit === '2' ? '元' : '其他' }}
+                            </p></el-col
+                          >
+                        </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">
+                              <el-button type="text" size="small" @click="$router.push({ path: '/enterprise/enterprisexuqiu', query: { id: item.id } })"
+                                ><i class="el-icon-edit"></i></el-button
+                            ></el-col> -->
+                            <el-col :span="24"> <el-button type="text" size="small" @click="handleDelete(item)">彻底删除</el-button></el-col>
+                            <!-- <el-col :span="24">
+                              <el-button type="text" size="small" @click="$router.push({ path: '/enterprise/enterprisexx', query: { id: item.id } })">
+                                <i class="el-icon-share"></i></el-button
+                            ></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-tab-pane>
+              </el-tabs>
+            </el-row>
+          </el-tab-pane>
+        </el-tabs>
       </el-col>
     </el-row>
   </div>
@@ -67,72 +408,41 @@ export default {
   components: {},
   data: () => ({
     currentPage: 1,
-    activeName: 'second',
-    activeName1: 'second1',
+    activeName: 'first',
+    activeNameFirst: 'first',
   }),
   created() {},
   computed: {},
   methods: {
+    handleDelete(item) {
+      this.$emit('delete', { item });
+    },
+
     handleClick(tab, event) {
       console.log(tab, event);
     },
+    handleClickFirst(tab, event) {
+      console.log(tab, event);
+    },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
     },
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
     },
-    clickDetailcm(row) {
-      this.$emit('detailcm', { data: row });
-    },
   },
 };
 </script>
 
 <style lang="less" scoped>
-.list {
-  height: 740px;
-
-  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 30px 0 30px;
-  line-height: 50px;
-  width: 890px;
-  height: 80px;
-  border-bottom: 1px solid #ccc;
-  background-color: #ffffff;
-  color: #215299;
-}
-.el-tabs__item.is-active {
-  color: #ffffff;
-}
-.fbList {
-  width: 888px;
-  height: 227px;
+.xqborder {
+  width: 889px;
+  height: 183px;
   border: 1px solid #ccc;
-  margin: 20px 0 0 20px;
+  margin-top: 20px;
 }
-
 .fbListTop {
+  width: 885px;
   height: 43px;
   margin-left: 1px;
   background: #fafafa;
@@ -148,30 +458,10 @@ export default {
   margin: 20px 0 0 12px;
 }
 
-.fbListTopR {
-  float: right;
-}
-/deep/.sd.el-tabs__item.is-active {
-  color: #ffffff;
-  background-color: #215299;
-}
-/deep/.xx.el-tabs__item.is-active {
-  background-color: #ffffff;
-}
-
-.fbListCenterL {
-  width: 100px;
-  height: 100px;
-  background-color: #ffffff;
-}
-.listName {
-  width: 196px;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-  height: 44px;
-  font-size: 16px;
-  color: #555555;
+.fimage {
+  width: 110px;
+  height: 119px;
+  float: left;
 }
 .fbListCenterC {
   width: 196px;
@@ -183,29 +473,27 @@ export default {
   white-space: nowrap;
   overflow: hidden;
 }
+
+.fbListCenterR {
+  border-left: 1px solid #ccc;
+  width: 125px;
+  height: 100px;
+  float: left;
+}
+.listName {
+  width: 196px;
+
+  height: 30px;
+  font-size: 16px;
+  color: #555555;
+}
 .listMoney {
   height: 30px;
   font-size: 16px;
   color: #fe0000;
   width: 196px;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
 }
 
-/deep/.el-tabs__item {
-  padding: 0 20px;
-  height: 46px;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  line-height: 40px;
-  display: inline-block;
-  list-style: none;
-  font-size: 14px;
-  font-weight: 500;
-  color: #303133;
-  position: relative;
-}
 .fbListCenterTwo {
   width: 385px;
   float: left;
@@ -214,39 +502,8 @@ export default {
   background: #fafafa;
   height: 100px;
 }
-.faTop {
-  padding-left: 10px;
-  width: 374px;
-  font-size: 14px;
-  height: 35px;
-  line-height: 35px;
-  color: #215299;
-}
-
-.faTxt {
-  padding-left: 10px;
-  width: 374px;
-  height: 55px;
-  font-size: 14px;
-  word-break: break-all;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 3;
-  overflow: hidden;
-}
-.fbListCenterR {
-  border-left: 1px solid #ccc;
-  width: 125px;
-  height: 100px;
-  float: left;
-}
-
-.fbListCenterR {
-  margin-left: 20px;
-  font-size: 14px;
-  color: #215299;
-  float: left;
+.bainji {
+  padding: 0 0 0 20px;
 }
 .page {
   padding: 11px 0 0 0;

+ 1 - 0
src/store/marketproduct.js

@@ -25,6 +25,7 @@ const actions = {
     const res = await this.$axios.$post(`${api.newsInfo}/update/${id}`, data);
     return res;
   },
+
   async delete({ commit }, payload) {
     const res = await this.$axios.$delete(`${api.newsInfo}/${payload}`);
     return res;

+ 3 - 1
src/views/enterprise/enterprisedg.vue

@@ -6,6 +6,7 @@
       :liebiaoList="liebiaoList"
       @onsave="onsaveClick"
       :columnName="columnName"
+      :total="total"
     ></enterprisedg-detail>
   </div>
 </template>
@@ -27,6 +28,7 @@ export default {
     liebiaoList: [{ name: '基本信息' }, { name: '消息管理' }, { name: '我的发布' }, { name: '我的订购' }, { name: '注销账号' }],
     columnName: '',
     recruitData: [],
+    total: 1,
   }),
   created() {
     this.searchSite();
@@ -48,7 +50,7 @@ export default {
     },
     // 查询科技政务栏目
 
-    async searchColumn({ skip = 0, limit = 10, column_id } = {}) {
+    async searchColumn({ skip = 0, limit = 3, column_id } = {}) {
       const res = await this.recruitList({ skip, limit, column_id: this.$route.query.id });
       console.log();
       if (this.$checkRes(res)) {

+ 37 - 5
src/views/enterprise/enterprisefabu.vue

@@ -1,12 +1,19 @@
 <template>
   <div id="adviserList">
-    <enterprisexx-detail :info="info" :liebiaoList="liebiaoList" @onsave="onsaveClick"></enterprisexx-detail>
+    <enterprisefabu-detail
+      :info="info"
+      :liebiaoList="liebiaoList"
+      @delete="deleteData"
+      @onsave="onsaveClick"
+      :recruitData="recruitData"
+      :total="total"
+    ></enterprisefabu-detail>
     <!-- @detailcm="clickDetailcm" -->
   </div>
 </template>
 
 <script>
-import enterprisexxDetail from '@/components/enterprise/enterprisexx.vue';
+import enterprisefabuDetail from '@/components/enterprise/enterprisefabu.vue';
 import { createNamespacedHelpers, mapGetters } from 'vuex';
 const { mapActions: mapSite } = createNamespacedHelpers('site');
 const { mapActions: mapRecruit } = createNamespacedHelpers('market');
@@ -15,22 +22,24 @@ export default {
   name: 'adviserList',
   props: {},
   components: {
-    enterprisexxDetail,
+    enterprisefabuDetail,
   },
   data: () => ({
+    total: 1,
     info: {},
     liebiaoList: [{ name: '基本信息' }, { name: '消息管理' }, { name: '我的发布' }, { name: '我的订购' }, { name: '注销账号' }],
-    columnName: '',
     recruitData: [],
   }),
   created() {
     this.searchSite();
+    this.searchInfo();
+    this.searchInfo();
   },
   computed: {},
   methods: {
     ...mapSite(['showInfo']),
     ...mapRecruit({ columnList: 'query', columnInfo: 'fetch' }),
-    ...marketproduct({ columnList: 'query', columnInfo: 'fetch', marketcerate: 'create' }),
+    ...marketproduct({ productList: 'query', columnInfo: 'fetch', marketcerate: 'create', productdeltet: 'delete' }),
     // 查询站点信息
     async searchSite() {
       let res = await this.showInfo();
@@ -41,7 +50,30 @@ export default {
         this.$message.error(res.errmsg ? res.errmsg : 'error');
       }
     },
+    async deleteData({ item }) {
+      console.log(item.id);
+      // const res = await this.productdeltet(item.id);
+      // this.$checkRes(res, '删除成功', '删除失败');
+      this.$message('删除成功');
+    },
+
+    // async searchInfo({ ...info } = {}) {
+    //   const res = await this.productList({ ...info });
+    //   for (const val of res.data) {
+    //     if (val.site === 'jyzd') {
+    //       console.log(val.id);
+    //       this.$set(this, `canmouId`, val.id);
+    //       this.searchCanmou();
+    //     }
+    //   }
+    // },
 
+    async searchInfo({ skip = 0, limit = 3, ...info } = {}) {
+      const res = await this.productList({ skip, limit, ...info });
+      if (this.$checkRes(res)) {
+        this.$set(this, `recruitData`, res.data);
+      }
+    },
     async onsaveClick({ id }) {
       console.log(id);
       if (id === '基本信息') {

+ 5 - 4
src/views/enterprise/enterprisexuqiu.vue

@@ -51,13 +51,14 @@ export default {
   methods: {
     ...mapSite(['showInfo']),
 
-    ...marketproduct({ list: 'query', columnInfo: 'fetch', marketcerate: 'create' }),
+    ...marketproduct({ list: 'query', columnInfo: 'fetch', marketcerate: 'create', marketupdate: 'update' }),
     ...mapColumn({ queryList: 'query' }),
     async search() {
       this.loading = false;
       if (this.$route.query.id) {
         const res = await this.columnInfo(this.id);
         this.$set(this, `form`, res.data);
+        console.log(res.data);
       }
       this.loading = true;
     },
@@ -93,17 +94,17 @@ export default {
     },
     async onsaveClicks(form) {
       let data = this.form;
-      console.log(data);
       let res;
       let msg;
       if (data.id) {
-        res = await this.columnInfo(data);
+        res = await this.marketupdate(data);
+        console.log(res);
         msg = `${this.keyWord}修改成功`;
       } else {
         res = await this.marketcerate(data);
         msg = `${this.keyWord}添加成功`;
       }
-      if (this.$checkRes(res, msg)) this.$router.push({ path: '/policy/index' });
+      if (this.$checkRes(res, msg)) this.$router.push({ path: '/enterprise/enterprisefabu' });
     },
   },
 };

+ 9 - 1
src/views/enterprise/enterprisexx.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="adviserList">
-    <enterprisexx-detail :info="info" :liebiaoList="liebiaoList" @onsave="onsaveClick"></enterprisexx-detail>
+    <enterprisexx-detail :info="info" :liebiaoList="liebiaoList" :recruitData="recruitData" @onsave="onsaveClick"></enterprisexx-detail>
     <!-- @detailcm="clickDetailcm" -->
   </div>
 </template>
@@ -10,6 +10,7 @@ import enterprisexxDetail from '@/components/enterprise/enterprisexx.vue';
 import { createNamespacedHelpers, mapGetters } from 'vuex';
 const { mapActions: mapSite } = createNamespacedHelpers('site');
 const { mapActions: mapRecruit } = createNamespacedHelpers('market');
+const { mapActions: mappproduct } = createNamespacedHelpers('marketproduct');
 export default {
   name: 'adviserList',
   props: {},
@@ -24,12 +25,19 @@ export default {
   }),
   created() {
     this.searchSite();
+    this.searchInfo();
   },
   computed: {},
   methods: {
     ...mapSite(['showInfo']),
     ...mapRecruit({ columnList: 'query', columnInfo: 'fetch' }),
+    ...mappproduct({ columnList: 'query', columnInfo: 'fetch' }),
+    async searchInfo() {
+      let detailId = this.$route.query.id;
+      const res = await this.columnInfo(detailId);
 
+      this.$set(this, `recruitData`, res.data);
+    },
     // 查询站点信息
     async searchSite() {
       let res = await this.showInfo();