Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-test

src/views/notice/index.vue

@@ -39,8 +39,8 @@ export default {
       let arr = await this.query({ skip, limit, ...info });
       this.$set(this, `noticeInfo`, arr.data[0]);
     },
-    clickk() {
-      this.$router.push({ path: '/notice/productForm', query: { id: 1 } });
+    click(id) {
+      this.$router.push({ path: '/notice/productForm', query: { id: id } });
     },
   },
   computed: {

src/views/notice/productForm.vue

@@ -1,10 +1,17 @@
 <template>
   <div id="productForm">
     <el-row>
-      <div class="w_1200">
+      <!-- <div class="w_1200">
         <el-tabs v-model="activeName">
-          <el-tab-pane label="技术成果信息征集" name="first"></el-tab-pane>
-          <el-tab-pane label="科技需求信息征集" name="second"></el-tab-pane>
+          <el-tab-pane label="技术需求信息征集" name="first">
+            <el-col :span="24">
+              列表
+            </el-col>
+            <el-col :span="24">
+              添加
+            </el-col>
+          </el-tab-pane>
+          <el-tab-pane label="科技成果信息征集" name="second"></el-tab-pane>
         </el-tabs>
         <el-col :span="24">
           <el-col :span="24">
@@ -114,45 +121,63 @@
             <el-button type="primary" @click="isenableBtn()">保存</el-button>
           </el-col>
         </el-col>
-      </div>
+      </div> -->
+      <el-col :span="24">
+        <div class="w_1200">
+          <el-col :span="24" class="top">
+            <el-col :span="24" class="search">
+              查询
+            </el-col>
+            <el-col :span="24" class="list">
+              <el-table :data="list" style="width: 100%" border>
+                <el-table-column prop="date" label="名称" align="center"> </el-table-column>
+                <el-table-column label="产品类型" align="center">
+                  <template v-slot="scoped">
+                    {{ `${scoped.row.type}` == `0` ? '技术' : `${scoped.row.type}` == `1` ? '产品' : `${scoped.row.type}` == `2` ? '商务' : '' }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="field" label="所属领域" align="center"> </el-table-column>
+                <el-table-column prop="cooperation" label="合作方式" align="center"> </el-table-column>
+                <el-table-column prop="contacts" label="联系人" align="center"> </el-table-column>
+                <el-table-column prop="phone" label="联系电话" align="center"> </el-table-column>
+              </el-table>
+            </el-col>
+          </el-col>
+          <el-col :span="24" class="down">
+            <el-tabs v-model="activeName" type="card">
+              <el-tab-pane label="技术需求" name="first">
+                <el-col :span="24">
+                  <el-col :span="24">
+                    <h3>企业信息</h3>
+                  </el-col>
+                  <el-col :span="24">
+                    <h3>技术需求</h3>
+                  </el-col>
+                </el-col>
+              </el-tab-pane>
+              <el-tab-pane label="科技成果" name="second">科技成果</el-tab-pane>
+            </el-tabs>
+          </el-col>
+        </div>
+      </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: notice } = createNamespacedHelpers('notice');
 export default {
   name: 'productForm',
   props: {},
   components: {},
   data: function() {
     return {
-      activeName: 'second',
-      form: {},
+      list: [],
+      activeName: 'first',
     };
   },
   created() {},
-  methods: {
-    async isenableBtn() {
-      let arr = await this.query();
-      let data = arr.data.filter(i => i.isenable == '1');
-      if (data.length > 0 && this.noticeInfo.isenable == '1') {
-        alert('已有信息启用');
-      } else {
-        console.log(this.noticeInfo);
-        let res = await this.update(this.noticeInfo);
-        if (this.$checkRes(res)) {
-          this.$message({
-            message: '添加信息成功',
-            type: 'success',
-          });
-        }
-        this.handleClose();
-      }
-      this.search();
-    },
-  },
+  methods: {},
   computed: {
     ...mapState(['user']),
     pageTitle() {
@@ -167,7 +192,16 @@ export default {
 
 <style lang="less" scoped>
 .w_1200 {
-  width: 80%;
+  width: 60%;
   margin: 0 auto;
 }
+.top {
+  .search {
+  }
+  .list {
+  }
+}
+.down {
+  margin: 15px 0;
+}
 </style>

src/views/superAdminCenter/enterpriseProduct/parts/one.vue

@@ -4,7 +4,7 @@
       <el-col :span="24">
         <el-table :data="list" style="width: 100%" border>
           <el-table-column prop="name" label="产品名称" align="center"> </el-table-column>
-          <el-table-column prop="totaltype" label="产品类型 " align="center">
+          <el-table-column label="产品类型 " align="center">
             <template v-slot="scoped">
               {{ `${scoped.row.type}` === `0` ? '技术' : `${scoped.row.type}` === `1` ? '产品' : `${scoped.row.type}` === `2` ? '服务' : '' }}
             </template>