1

src/views/dynamic/product.vue

@@ -273,7 +273,7 @@
                     </el-col>
                   </el-col>
                   <el-col :span="24" class="btn">
-                    <el-button type="primary" size="mini" @click="Btn()">保存</el-button>
+                    <el-button type="primary" size="mini" @click="technologyBtn()">保存</el-button>
                   </el-col>
                 </el-col>
               </el-tab-pane>
@@ -418,7 +418,7 @@
                           专利信息：
                         </el-col>
                         <el-col :span="20" class="right">
-                          <el-button type="primary" size="mini" @click="addpatent1()">添加信息</el-button>
+                          <el-button type="primary" size="mini" @click="addpatent()">添加信息</el-button>
                           <el-button type="primary" size="mini" @click="viewpatent()">查看信息</el-button>
                         </el-col>
                       </el-col>
@@ -500,7 +500,7 @@
                     </el-col>
                   </el-col>
                   <el-col :span="24" class="btn">
-                    <el-button type="primary" size="mini" @click="achieveBtn">保存</el-button>
+                    <el-button type="primary" size="mini" @click="achieveBtn()">保存</el-button>
                   </el-col>
                 </el-col>
               </el-tab-pane>
@@ -509,17 +509,6 @@
         </div>
       </el-col>
     </el-row>
-    <el-dialog title="信息预览" :visible.sync="dialogVisible" width="60%" :before-close="handleClose">
-      <span v-if="type == '0'">
-        <techDetail :detailInfo="detailInfo" :displayBtn="displayBtn"></techDetail>
-      </span>
-      <span v-else-if="type == '1'">
-        <achiDetail :detailInfo="detailInfo" :displayBtn="displayBtn"></achiDetail>
-      </span>
-      <span v-else>
-        <busiDetail :detailInfo="detailInfo" :displayBtn="displayBtn"></busiDetail>
-      </span>
-    </el-dialog>
     <el-dialog title="添加信息" :visible.sync="addpatentdialog" width="40%" :before-close="patentdialogclose">
       <el-form ref="addpatentform" :model="addpatentform" label-width="80px" class="addpatentform">
         <el-form-item label="专利名称">
@@ -537,7 +526,7 @@
       </el-form>
     </el-dialog>
     <el-dialog title="查看专利信息" :visible.sync="viewpatentdialog" width="40%" :before-close="viewpatentdialogclose">
-      <el-table :data="addpatent" style="width: 100%" border>
+      <el-table :data="diapatentList" style="width: 100%" border>
         <el-table-column prop="patentinfo" label="专利信息" align="center"> </el-table-column>
         <el-table-column prop="patentstatus" label="专利状态" align="center"> </el-table-column>
         <el-table-column label="操作" align="center">
@@ -553,23 +542,16 @@
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: markettype } = createNamespacedHelpers('markettype');
-const { mapActions: collectproduct } = createNamespacedHelpers('collectproduct');
-const { mapActions: market } = createNamespacedHelpers('market');
 const { mapActions: mapMarketproduct } = createNamespacedHelpers('marketproduct');
-import techDetail from '@/views/market/detail/techDetail.vue';
-import achiDetail from '@/views/market/detail/achiDetail.vue';
-import busiDetail from '@/views/market/detail/busiDetail.vue';
+const { mapActions: market } = createNamespacedHelpers('market');
+const { mapActions: expertsuser } = createNamespacedHelpers('expertsuser');
 export default {
   metaInfo() {
     return { title: this.$route.meta.title };
   },
   name: 'product',
   props: {},
-  components: {
-    techDetail,
-    achiDetail,
-    busiDetail,
-  },
+  components: {},
   data: function() {
     return {
       activeName: 'first',
@@ -583,18 +565,11 @@ export default {
       technologyForm: {},
       // 科技成果
       achieveForm: {},
-      // 信息预览
-      dialogVisible: false,
+      // 专利信息
+      addpatentform: {},
+      diapatentList: [],
       addpatentdialog: false,
       viewpatentdialog: false,
-      //专利信息
-      addpatentform: {},
-      addpatent: [],
-      type: '0',
-      // 信息显示
-      detailInfo: {},
-      // 显示按钮
-      displayBtn: false,
     };
   },
   created() {
@@ -605,6 +580,7 @@ export default {
     ...markettype({ markettypeList: 'query' }),
     ...market(['fetch', 'update']),
     ...mapMarketproduct({ productFetch: 'fetch', productCreate: 'create', productUpdate: 'update' }),
+    ...expertsuser({ expertsuserFetch: 'fetch', expertsuserUpdate: 'update', expertsuserUpgrade: 'upgrade' }),
     // 查询字典表
     async searchtype() {
       // 所属领域;
@@ -654,7 +630,7 @@ export default {
         let res = await this.expertsuserFetch(this.user.userid);
         if (res.errcode === 0) {
           let message = {
-            company: res.data.name,
+            company: res.data.company,
             phone: res.data.phone,
             email: res.data.email,
             qqwx: res.data.qqwx,
@@ -672,45 +648,47 @@ export default {
       data.userid = this.user.uid;
       data.type = '1';
       data.status = '0';
+      data.patent = this.diapatentList;
       let res = await this.productCreate(data);
       if (this.$checkRes(res)) {
         this.$message({
-          message: '草稿创建成功',
+          message: '信息发布成功',
           type: 'success',
         });
         window.location.reload();
       } else {
-        this.$message.error('信息发布成功');
+        this.$message.error('信息发布失败');
       }
     },
     // 技术需求提交
-    async Btn() {
+    async technologyBtn() {
       const data = this.technologyForm;
       data.userid = this.user.uid;
-      data.patent = this.addpatent;
       data.type = '0';
       data.status = '0';
       let res = await this.productCreate(data);
       if (this.$checkRes(res)) {
         this.$message({
-          message: '草稿创建成功',
+          message: '信息发布成功',
           type: 'success',
         });
         window.location.reload();
       } else {
-        this.$message.error('信息发布成功');
+        this.$message({
+          message: '信息发布失败',
+          type: 'success',
+        });
       }
     },
     // 添加专利信息
-    addpatent1() {
+    addpatent() {
       this.addpatentdialog = true;
     },
-    // patentonSubmit() {
-    //   this.$emit('patentonSubmit', { data: this.addpatentform });
-    //   this.patentdialogclose();
-    // },
-    handleClose() {
-      this.dialogVisible = false;
+    patentonSubmit() {
+      let data = this.addpatentform;
+      this.diapatentList.push(data);
+      this.addpatentform = {};
+      this.patentdialogclose();
     },
     // 取消添加
     patentdialogclose() {
@@ -718,7 +696,6 @@ export default {
     },
     // 查看专利信息
     viewpatent() {
-      // this.$emit('viewpatent');
       this.viewpatentdialog = true;
     },
     // 取消查看专利信息
@@ -727,21 +704,12 @@ export default {
     },
     // 删除
     delAttend(index, val) {
-      this.addpatent.splice(index, 1);
+      this.diapatentList.splice(index, 1);
       this.$message({
         message: '删除专利信息成功',
         type: 'success',
       });
-      this.viewpatentdialogclose = false;
-    },
-    patentonSubmit({ data }) {
-      this.addpatentform = {};
-      this.addpatent.push(data);
-      this.$message({
-        message: '专利信息添加成功',
-        type: 'success',
-      });
-      this.patentdialogclose();
+      this.viewpatentdialogclose();
     },
   },
   computed: {