guhongwei 4 years ago
parent
commit
7ec07ee384

+ 22 - 9
src/views/technical/detail/expdetail.vue

@@ -2,14 +2,19 @@
   <div id="expdetail">
     <el-row>
       <el-col :span="24" class="main">
-        <el-tabs v-model="active" type="card">
-          <el-tab-pane label="调研调查信息" name="first">
-            <questionInfo :info="detailinfo"></questionInfo>
-          </el-tab-pane>
-          <el-tab-pane label="项目征集信息" name="second">
-            <projectForm :form="form" @onSubmit="onSubmit"></projectForm>
-          </el-tab-pane>
-        </el-tabs>
+        <el-col :span="24" class="title">
+          吉林省科技发展计划高新技术领域项目建议书
+        </el-col>
+        <el-col :span="24" class="list">
+          <el-tabs v-model="active" type="card">
+            <el-tab-pane label="通知正文" name="first">
+              <questionInfo :info="detailinfo"></questionInfo>
+            </el-tab-pane>
+            <el-tab-pane label="信息填报" name="second">
+              <projectForm :form="form" @onSubmit="onSubmit"></projectForm>
+            </el-tab-pane>
+          </el-tabs>
+        </el-col>
       </el-col>
     </el-row>
   </div>
@@ -59,4 +64,12 @@ export default {
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.main {
+  .title {
+    font-size: 25px;
+    margin: 40px 0;
+    text-align: center;
+  }
+}
+</style>

+ 31 - 33
src/views/technical/detail/parts/projectForm.vue

@@ -35,48 +35,51 @@
               </el-form-item>
             </el-col>
             <el-col :span="12" class="langSelect">
-              <el-form-item prop="field">
+              <el-form-item prop="techol_stage">
                 <el-col :span="21" slot="label">
-                  领域分类
+                  技术阶段
                 </el-col>
                 <el-col :span="24">
-                  <el-select v-model="form.field" filterable>
-                    <el-option v-for="(item, index) in fieldList" :key="index" :value="item.name" :label="item.name"></el-option>
+                  <el-select v-model="form.techol_stage" filterable>
+                    <el-option v-for="(item, index) in techolstageList" :key="index" :value="item.name" :label="item.name"></el-option>
                   </el-select>
                 </el-col>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item prop="scale">
+            <el-col :span="12" class="langSelect">
+              <el-form-item prop="techol_level">
                 <el-col :span="21" slot="label">
-                  市场预估
+                  技术水平
                 </el-col>
                 <el-col :span="24">
-                  <el-input v-model="form.scale" placeholder="关键技术所支撑的产品市场规模(亿元/年)"></el-input>
+                  <el-select v-model="form.techol_level" filterable>
+                    <el-option v-for="(item, index) in techollevelList" :key="index" :value="item.name" :label="item.name"></el-option>
+                  </el-select>
                 </el-col>
               </el-form-item>
             </el-col>
-            <el-col :span="12" class="langSelect">
-              <el-form-item prop="techol_stage">
+            <el-col :span="24" class="langSelect">
+              <el-form-item prop="field">
                 <el-col :span="21" slot="label">
-                  技术阶段
+                  领域分类
                 </el-col>
                 <el-col :span="24">
-                  <el-select v-model="form.techol_stage" filterable>
-                    <el-option v-for="(item, index) in techolstageList" :key="index" :value="item.name" :label="item.name"></el-option>
+                  <el-select v-model="form.field" filterable>
+                    <el-option v-for="(item, index) in fieldList" :key="index" :value="item.name" :label="item.name"></el-option>
                   </el-select>
                 </el-col>
               </el-form-item>
             </el-col>
-            <el-col :span="12" class="langSelect">
-              <el-form-item prop="techol_level">
+            <el-col :span="24">
+              <el-form-item prop="scale">
                 <el-col :span="21" slot="label">
-                  技术水平
+                  市场预估
                 </el-col>
-                <el-col :span="24">
-                  <el-select v-model="form.techol_level" filterable>
-                    <el-option v-for="(item, index) in techollevelList" :key="index" :value="item.name" :label="item.name"></el-option>
-                  </el-select>
+                <el-col :span="12">
+                  <el-input type="number" v-model.number="form.scale" placeholder="请输入市场预估值"></el-input>
+                </el-col>
+                <el-col :span="12" style="padding:0 10px;color:#ff0000;font-weight:bold;">
+                  关键技术所支撑的产品市场规模(亿元/年)
                 </el-col>
               </el-form-item>
             </el-col>
@@ -260,6 +263,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24" class="btn">
+              <el-button type="danger" size="mini" @click="resetBtn">取消</el-button>
               <el-button type="primary" size="mini" @click="onSubmit">保存</el-button>
             </el-col>
           </el-col>
@@ -271,7 +275,6 @@
 
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: markettype } = createNamespacedHelpers('markettype');
 export default {
   name: 'projectForm',
   props: {
@@ -281,24 +284,18 @@ export default {
   data: function() {
     return {
       rules: {},
-      // 所属领域
-      fieldList: [],
+      // 领域分类
+      fieldList: [{ name: '新材料' }, { name: '先进制造' }, { name: '光电子' }, { name: '新一代信息技术' }, { name: '先进技术' }],
       techolstageList: [{ name: '理论研究' }, { name: '小试' }, { name: '中试' }, { name: '规模化试制' }, { name: '其他' }],
       // 项目技术水平
       techollevelList: [{ name: '国际领先' }, { name: '国际先进' }, { name: '国内领先' }, { name: '国内先进' }],
     };
   },
-  async created() {
-    await this.searchOther();
-  },
+  created() {},
   methods: {
-    ...markettype(['query']),
-    async searchOther() {
-      // 所属领域;
-      let res = await this.query({ category: '01' });
-      if (this.$checkRes(res)) {
-        this.$set(this, `fieldList`, res.data);
-      }
+    // 取消添加
+    resetBtn() {
+      this.$emit('resetBtn');
     },
     // 保存
     onSubmit() {
@@ -332,6 +329,7 @@ export default {
       width: 268px;
     }
     /deep/.langInfo .el-form-item__label {
+      height: 112px;
       padding: 35px 0;
     }
     /deep/.langSelect .el-select {

+ 1 - 1
src/views/technical/detail/parts/questionInfo.vue

@@ -19,7 +19,7 @@
           <p v-html="info.content"></p>
         </el-col>
         <el-col :span="24" class="link" v-if="info.file_path">
-          <el-link :href="info.file_path" :underline="false">附件下载</el-link>
+          <el-link :href="info.file_path" :underline="false">附件:2022年度吉林省科技发展计划高新技术领域项目建议书编写提纲。</el-link>
         </el-col>
       </el-col>
     </el-row>

+ 2 - 2
src/views/userCenter/projectInfo/index.vue

@@ -23,10 +23,10 @@
               </el-col>
               <el-col :span="24" class="form">
                 <el-tabs v-model="formActive" type="card">
-                  <el-tab-pane label="调研调查信息" name="first">
+                  <el-tab-pane label="通知正文" name="first">
                     <questionInfo :info="info"></questionInfo>
                   </el-tab-pane>
-                  <el-tab-pane label="项目征集信息" name="second">
+                  <el-tab-pane label="信息填报" name="second">
                     <projectForm :form="form" @resetBtn="back" @onSubmit="onSubmit"></projectForm>
                   </el-tab-pane>
                 </el-tabs>

+ 27 - 34
src/views/userCenter/projectInfo/parts/projectForm.vue

@@ -35,48 +35,51 @@
               </el-form-item>
             </el-col>
             <el-col :span="12" class="langSelect">
-              <el-form-item prop="field">
+              <el-form-item prop="techol_stage">
                 <el-col :span="21" slot="label">
-                  领域分类
+                  技术阶段
                 </el-col>
                 <el-col :span="24">
-                  <el-select v-model="form.field" filterable>
-                    <el-option v-for="(item, index) in fieldList" :key="index" :value="item.name" :label="item.name"></el-option>
+                  <el-select v-model="form.techol_stage" filterable>
+                    <el-option v-for="(item, index) in techolstageList" :key="index" :value="item.name" :label="item.name"></el-option>
                   </el-select>
                 </el-col>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item prop="scale">
+            <el-col :span="12" class="langSelect">
+              <el-form-item prop="techol_level">
                 <el-col :span="21" slot="label">
-                  市场预估
+                  技术水平
                 </el-col>
                 <el-col :span="24">
-                  <el-input v-model="form.scale" placeholder="关键技术所支撑的产品市场规模(亿元/年)"></el-input>
+                  <el-select v-model="form.techol_level" filterable>
+                    <el-option v-for="(item, index) in techollevelList" :key="index" :value="item.name" :label="item.name"></el-option>
+                  </el-select>
                 </el-col>
               </el-form-item>
             </el-col>
-            <el-col :span="12" class="langSelect">
-              <el-form-item prop="techol_stage">
+            <el-col :span="24" class="langSelect">
+              <el-form-item prop="field">
                 <el-col :span="21" slot="label">
-                  技术阶段
+                  领域分类
                 </el-col>
                 <el-col :span="24">
-                  <el-select v-model="form.techol_stage" filterable>
-                    <el-option v-for="(item, index) in techolstageList" :key="index" :value="item.name" :label="item.name"></el-option>
+                  <el-select v-model="form.field" filterable>
+                    <el-option v-for="(item, index) in fieldList" :key="index" :value="item.name" :label="item.name"></el-option>
                   </el-select>
                 </el-col>
               </el-form-item>
             </el-col>
-            <el-col :span="12" class="langSelect">
-              <el-form-item prop="techol_level">
+            <el-col :span="24">
+              <el-form-item prop="scale">
                 <el-col :span="21" slot="label">
-                  技术水平
+                  市场预估
                 </el-col>
-                <el-col :span="24">
-                  <el-select v-model="form.techol_level" filterable>
-                    <el-option v-for="(item, index) in techollevelList" :key="index" :value="item.name" :label="item.name"></el-option>
-                  </el-select>
+                <el-col :span="12">
+                  <el-input type="number" v-model.number="form.scale" placeholder="请输入市场预估值"></el-input>
+                </el-col>
+                <el-col :span="12" style="padding:0 10px;color:#ff0000;font-weight:bold;">
+                  关键技术所支撑的产品市场规模(亿元/年)
                 </el-col>
               </el-form-item>
             </el-col>
@@ -272,7 +275,6 @@
 
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions: markettype } = createNamespacedHelpers('markettype');
 export default {
   name: 'projectForm',
   props: {
@@ -282,25 +284,15 @@ export default {
   data: function() {
     return {
       rules: {},
-      // 所属领域
-      fieldList: [],
+      // 领域分类
+      fieldList: [{ name: '新材料' }, { name: '先进制造' }, { name: '光电子' }, { name: '新一代信息技术' }, { name: '先进技术' }],
       techolstageList: [{ name: '理论研究' }, { name: '小试' }, { name: '中试' }, { name: '规模化试制' }, { name: '其他' }],
       // 项目技术水平
       techollevelList: [{ name: '国际领先' }, { name: '国际先进' }, { name: '国内领先' }, { name: '国内先进' }],
     };
   },
-  async created() {
-    await this.searchOther();
-  },
+  created() {},
   methods: {
-    ...markettype(['query']),
-    async searchOther() {
-      // 所属领域;
-      let res = await this.query({ category: '01' });
-      if (this.$checkRes(res)) {
-        this.$set(this, `fieldList`, res.data);
-      }
-    },
     // 取消添加
     resetBtn() {
       this.$emit('resetBtn');
@@ -337,6 +329,7 @@ export default {
       width: 268px;
     }
     /deep/.langInfo .el-form-item__label {
+      height: 112px;
       padding: 35px 0;
     }
     /deep/.langSelect .el-select {

+ 6 - 2
src/views/userCenter/projectInfo/parts/questionInfo.vue

@@ -18,8 +18,8 @@
         <el-col :span="24" class="content">
           <p v-html="info.content"></p>
         </el-col>
-        <el-col :span="24" class="link">
-          <el-link :href="info.file_path" :underline="false">附件下载</el-link>
+        <el-col :span="24" class="link" v-if="info.file_path">
+          <el-link :href="info.file_path" :underline="false">附件:2022年度吉林省科技发展计划高新技术领域项目建议书编写提纲。</el-link>
         </el-col>
       </el-col>
     </el-row>
@@ -52,6 +52,7 @@ export default {
     font-size: 25px;
     padding: 15px 0;
     text-align: center;
+    color: #005293;
   }
   .other {
     text-align: center;
@@ -73,6 +74,9 @@ export default {
   }
   .content {
     margin: 0 0 15px 0;
+    p {
+      font-size: 18px;
+    }
   }
   .link {
     margin: 0 0 15px 0;