1

src/layout/userCenter/menuInfo.vue

@@ -47,7 +47,7 @@
             <el-menu-item index="6">
               <template slot="title">
                 <i class="el-icon-s-order"></i>
-                <span>项目征集管理</span>
+                <span>调查调研</span>
               </template>
             </el-menu-item>
             <el-menu-item index="7">

src/views/userCenter/projectInfo/index.vue

@@ -2,7 +2,7 @@
   <div id="index">
     <el-row>
       <el-col :span="24" class="main">
-        <el-col :span="24" class="leftTop"> <span>|</span> <span>项目征集管理</span> </el-col>
+        <el-col :span="24" class="leftTop"> <span>|</span> <span>调查调研</span> </el-col>
         <el-col :span="24" class="info">
           <span v-if="display == 'list'">
             <el-col :span="24" class="list">
@@ -19,8 +19,8 @@
                   ></data-table>
                   <el-row v-else>
                     <el-col :span="24" style="text-align:right; padding:15px">
-                      <el-button type="primary" size="mini" @click="toAdd" style="margin-right:20px">添加</el-button>
-                      <el-button type="primary" size="mini" @click="tabs = 'first'">返回</el-button>
+                      <el-button type="primary" size="mini" @click="toAdd" style="margin-right:20px">再次填报</el-button>
+                      <el-button type="primary" size="mini" @click="tabs = 'first'">返回列表</el-button>
                     </el-col>
                     <el-col :span="24">
                       <data-table
@@ -30,6 +30,7 @@
                         :total="solicTotal"
                         @query="getSolicList"
                         @edit="toSolicEdit"
+                        @view="toSolicView"
                       ></data-table>
                     </el-col>
                   </el-row>
@@ -45,16 +46,13 @@
               <el-col :span="24" class="btn">
                 <el-button type="primary" size="mini" @click="back">返回列表</el-button>
               </el-col>
-              <el-col :span="24" class="title">
-                吉林省科技发展计划高新技术领域项目建议书
-              </el-col>
               <el-col :span="24" class="form">
                 <el-tabs v-model="formActive" type="card">
                   <el-tab-pane label="通知正文" name="first">
                     <questionInfo :info="info"></questionInfo>
                   </el-tab-pane>
                   <el-tab-pane label="信息填报" name="second">
-                    <projectForm :form="form" @resetBtn="back" @onSubmit="onSubmit"></projectForm>
+                    <projectForm :form="form" :show="show" @resetBtn="back" @onSubmit="onSubmit"></projectForm>
                   </el-tab-pane>
                 </el-tabs>
               </el-col>
@@ -130,12 +128,19 @@ export default {
           method: 'edit',
           display: i => i.status === '0',
         },
+        {
+          label: '填报详情',
+          method: 'view',
+          display: i => i.status === '1',
+        },
       ],
       // 添加，修改
       formActive: 'first',
       // 调研调查信息
       info: {},
       form: {},
+      // 是否显示按钮
+      show: true,
     };
   },
   async created() {
@@ -156,12 +161,14 @@ export default {
     },
     toAdd({ data }) {
       this.display = 'detail';
+      this.$set(this, 'show', true);
       if (data) this.$set(this, 'info', data);
       this.form.question_id = _.get(data, '_id', this.info._id);
       this.form.user_id = this.user.userid;
     },
     async toEdit({ data }) {
       this.display = 'detail';
+      this.$set(this, 'show', true);
       this.$set(this, 'info', data);
     },
     async toGetList({ data }) {
@@ -180,6 +187,11 @@ export default {
       this.$set(this, 'form', data);
       this.display = 'detail';
     },
+    toSolicView({ data }) {
+      this.$set(this, 'show', false);
+      this.$set(this, 'form', data);
+      this.display = 'detail';
+    },
     // 提交保存
     async onSubmit({ data }) {
       const dup = _.cloneDeep(data);
@@ -230,11 +242,6 @@ export default {
         text-align: right;
         margin: 0 0 10px 0;
       }
-      .title {
-        font-size: 25px;
-        margin: 40px 0;
-        text-align: center;
-      }
     }
   }
 }

src/views/userCenter/projectInfo/parts/projectForm.vue

@@ -245,7 +245,7 @@
               </el-col>
             </el-col>
           </el-col>
-          <el-col :span="24" class="btn">
+          <el-col :span="24" class="btn" v-show="show">
             <el-button type="danger" size="mini" @click="resetBtn">取消</el-button>
             <el-button type="primary" size="mini" @click="onSubmit('0')">保存</el-button>
             <el-button type="success" size="mini" @click="onSubmit('1')">提交</el-button>
@@ -262,6 +262,7 @@ export default {
   name: 'projectForm',
   props: {
     form: { type: Object },
+    show: { type: Boolean },
   },
   components: {},
   data: function() {
@@ -283,41 +284,6 @@ export default {
     onSubmit(status) {
       this.$emit('onSubmit', { data: { ...this.form, status } });
     },
-    // onSubmit(status) {
-    //   if (status == '0') {
-    //     this.$alert(
-    //       '<strong><p>1：用户</p><p>当您进行项目征集时，系统会自动提取项目负责人和联系电话进行平台用户注册，您可用【联系电话】和【初始密码(111111)】进行登录。</p><p>2：保存按钮</p><p>保存按钮，是您填写的信息处于草稿状态，您可到个人中心查看并进行修改与提交。</p></strong>',
-    //       '信息提示',
-    //       {
-    //         dangerouslyUseHTMLString: true,
-    //         showConfirmButton: true,
-    //         showCancelButton: true,
-    //         confirmButtonText: '确定',
-    //         cancelButtonText: '取消',
-    //       }
-    //     )
-    //       .then(() => {
-    //         this.$emit('onSubmit', { data: { ...this.form, status } });
-    //       })
-    //       .catch(() => {});
-    //   } else {
-    //     this.$alert(
-    //       '<strong><p>1：用户</p><p>当您进行项目征集时，系统会自动提取项目负责人和联系电话进行平台用户注册，您可用【联系电话】和【初始密码(111111)】进行登录。</p><p>2：提交按钮</p><p>提交按钮，是您填写的信息处于已发布状态，已发布状态下的项目征集信息是不允许修改的，请您谨慎填写。您也可到个人中心查看提交记录。</p></strong>',
-    //       '信息提示',
-    //       {
-    //         dangerouslyUseHTMLString: true,
-    //         showConfirmButton: true,
-    //         showCancelButton: true,
-    //         confirmButtonText: '确定',
-    //         cancelButtonText: '取消',
-    //       }
-    //     )
-    //       .then(() => {
-    //         this.$emit('onSubmit', { data: { ...this.form, status } });
-    //       })
-    //       .catch(() => {});
-    //   }
-    // },
   },
   computed: {
     ...mapState(['user']),