Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/views/audit/project/audit.vue

@@ -2,15 +2,23 @@
 <template>
   <div class="app-content" style="height: 76vh;overflow: auto;">
     <a-spin :spinning="loading" style="width: 100%;height: 100%;">
-      <div class="page-content" ref="main">
+      <div class="page-content">
+        <div style=" width: 100%;height: 50px;">
+          <a-tabs type="card" hideAdd size="small" @change="callback">
+            <a-tab-pane :key="item.key" :tab="item.title" v-for="(item) in tabsData">
+            </a-tab-pane>
+          </a-tabs>
+        </div>
+        <div style="width: 100%;height: calc(100% - 50px);overflow: auto;" ref="main">
           <div class="x_modal_content">
-          <project-info v-model="projectInfo" v-if="projType" />
-          <project-info-Key v-model="projectInfo" v-else />
+            <project-info v-model="projectInfo" :tabsData.sync="tabsData" v-if="projType" />
+            <project-info-Key v-model="projectInfo" :tabsData.sync="tabsData" v-else />
             <a-form-model ref="form" :model="auditObj" :rules="rules" class="from-table font-line-space">
               <audit-edit :auditObj.sync="auditObj" />
             </a-form-model>
           </div>
         </div>
+      </div>
       <div class="page-footer">
         <a-button type="primary" @click="submit" style="margin-left:16px;">提交</a-button>
       </div>
@@ -32,6 +40,20 @@ export default {
   },
   data () {
     return {
+      tabsData: [
+        { title: '全部', key: '0', isShow: true },
+        { title: '基本情况', key: '1', isShow: true },
+        { title: '项目人员情况', key: '2', isShow: true },
+        { title: '项目可行性研究情况', key: '3', isShow: true },
+        { title: '项目实施目标', key: '4', isShow: true },
+        { title: '项目考核指标', key: '5', isShow: true },
+        { title: '项目经费', key: '6', isShow: true },
+        { title: '项目绩效目标表', key: '7', isShow: true },
+        { title: '项目课题设置', key: '8', isShow: true },
+        { title: '附件清单', key: '9', isShow: true },
+        { title: '单位科研项目及资金管理制度', key: '10', isShow: true },
+        // { title: '诚信承诺书', key: '11', isShow: true },
+      ],
       projectInfo: {
         id: null,
         organizationCode: null,
@@ -146,7 +168,18 @@ export default {
     },
     changeScroll () {
       this.$refs.main.scrollTop = document.getElementsByClassName('x_modal_content')[0].offsetHeight
-    }
+    },
+    callback (key) {
+      var index = parseInt(key)
+      this.tabsData.forEach(e => {
+        if (key == '0')
+          e.isShow = true
+        else
+          e.isShow = false
+      })
+      this.tabsData[0].isShow = true;
+      this.tabsData[index].isShow = true;
+    },
   },
 }
 </script>

src/views/report/project/Index.vue

@@ -77,7 +77,7 @@
         <a-form-item>
           <a-button type="primary" icon="search" @click="search">搜索</a-button>
           <a-button icon="reload" style="margin-left: 10px" @click="reset" class="bt-normal">重置</a-button>
-          <a-button type="primary" style="margin-left: 10px" @click="FileDownload" icon="download">项目合同书模板下载</a-button>
+          <!-- <a-button type="primary" style="margin-left: 10px" @click="FileDownload" icon="download">项目合同书模板下载</a-button> -->
           <!-- <a-button icon="primary" style="margin-left: 10px" @click="FileView">查看</a-button> -->
         </a-form-item>
       </a-form>

src/views/report/project/components/memberEdit.vue

@@ -228,21 +228,22 @@ export default {
         birthday: [{ required: true, message: '*', trigger: 'change' },],
         certificateType: [{ required: true, message: '*', trigger: 'change' },],
         certId: [{ required: true, message: '*', trigger: 'blur' },
-        {
-          validator: (rule, value, callback) => {
-            if (value == '' || value == undefined) {
-              callback()
-            }
-            var errorMsg = isIdentityId(value);
-            if (errorMsg != "") {
-              callback(new Error(errorMsg));
-            } else {
-              this.memObject.sex = personGender(value)
-              this.memObject.birthday = personBirthday(value) + ' 00:00:00'
-              callback()
-            }
-          }
-        }],
+        // {
+        //   validator: (rule, value, callback) => {
+        //     if (value == '' || value == undefined) {
+        //       callback()
+        //     }
+        //     var errorMsg = isIdentityId(value);
+        //     if (errorMsg != "") {
+        //       callback(new Error(errorMsg));
+        //     } else {
+        //       this.memObject.sex = personGender(value)
+        //       this.memObject.birthday = personBirthday(value) + ' 00:00:00'
+        //       callback()
+        //     }
+        //   }
+        // }
+        ],
         nation: [{ required: true, message: '*', trigger: 'change' },],
         country: [{ required: true, message: '*', trigger: 'blur' },],
         workUnit: [{ required: true, message: '*', trigger: 'blur' },],

src/views/report/project/components/projectInfo.vue

@@ -679,6 +679,9 @@ import documentView from '@/views/components/common/documentView'
 import AuditList from '@/views/audit/components/auditInfo'
 import { toTextarea } from '@/views/utils/common'
 
+
+
+
 export default {
   components: {
     projectMemberInfo, cooperativeUnitsInfo, budgetInfo, fundPlanInfo, equipmentsInfo, unitPaymentInfo, projectKpi, projectSubInfo, managementRuleInfo, fileInfo, AuditList, documentView
@@ -703,6 +706,21 @@ export default {
     },
   },
   created () {
+    if (!!!this.tabsData || this.tabsData.length == 0)
+      this.tabsData = [
+        { title: '全部', key: '0', isShow: true },
+        { title: '基本情况', key: '1', isShow: true },
+        { title: '项目人员情况', key: '2', isShow: true },
+        { title: '项目可行性研究情况', key: '3', isShow: true },
+        { title: '项目实施目标', key: '4', isShow: true },
+        { title: '项目考核指标', key: '5', isShow: true },
+        { title: '项目经费', key: '6', isShow: true },
+        { title: '项目绩效目标表', key: '7', isShow: true },
+        { title: '项目课题设置', key: '8', isShow: true },
+        { title: '附件清单', key: '9', isShow: true },
+        { title: '单位科研项目及资金管理制度', key: '10', isShow: true },
+        { title: '诚信承诺书', key: '11', isShow: true },
+      ]
   },
   mounted () {
   },

src/views/report/project/components/projectView.vue

@@ -2,14 +2,18 @@
 <template>
   <div class="app-content layoutEmbedded" style="height: 76vh;overflow: auto;">
     <a-spin :spinning="loading" style="width: 100%;height: 100%;">
+      <div class="page-content">
         <a-tabs type="card" hideAdd size="small" @change="callback">
           <a-tab-pane :key="item.key" :tab="item.title" v-for="(item) in tabsData">
           </a-tab-pane>
         </a-tabs>
+      </div>
+      <div class="page-footer">
         <!-- 申报项目详情 -->
         <!-- <a-button type="primary" @click="onExport">导出</a-button> -->
-      <project-info v-model="projectInfo" :tabsData="tabsData" v-if="projType" />
-      <project-info-Key v-model="projectInfo" :tabsData="tabsData" v-else />
+        <project-info v-model="projectInfo" :tabsData.sync="tabsData" v-if="projType" />
+        <project-info-Key v-model="projectInfo" :tabsData.sync="tabsData" v-else />
+      </div>
     </a-spin>
   </div>
 </template>
@@ -60,12 +64,12 @@ export default {
         { title: '项目可行性研究情况', key: '3', isShow: true },
         { title: '项目实施目标', key: '4', isShow: true },
         { title: '项目考核指标', key: '5', isShow: true },
-        { title: '项目经费', key: '6' },
+        { title: '项目经费', key: '6', isShow: true },
         { title: '项目绩效目标表', key: '7', isShow: true },
-        { title: '项目课题设置', key: '8' },
-        { title: '附件清单', key: '9' },
+        { title: '项目课题设置', key: '8', isShow: true },
+        { title: '附件清单', key: '9', isShow: true },
         { title: '单位科研项目及资金管理制度', key: '10', isShow: true },
-        { title: '诚信承诺书', key: '11', isShow: true },
+        // { title: '诚信承诺书', key: '11', isShow: true },
       ],
       projectInfo: {
         id: null,
@@ -171,10 +175,24 @@ export default {
       })
       this.tabsData[0].isShow = true;
       this.tabsData[index].isShow = true;
-      console.log(this.tabsData);
     },
   },
 }
 </script>
+<style scoped lang="less">
+::v-deep .ant-spin-container {
+  width: 100%;
+  height: 100%;
+}
+.page-content {
+  width: 100%;
+  height: 50px;
+}
+.page-footer {
+  width: 100%;
+  height: calc(100% - 50px);
+  overflow: auto;
+}
+</style>