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

src/views/audit/project/audit.vue

@@ -79,11 +79,14 @@ export default {
         { 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: '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 },
       ],
       formData: {
         id: null,

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

@@ -123,7 +123,7 @@
             </a-col>
             <a-col :span="8">
               <a-form-model-item prop="forMonths">
-                <a-input-number v-model="memObject.forMonths" :min="0" :step="0.1" style="width: 60%" />
+                <a-input-number v-model="memObject.forMonths" :min="0" :max="12" :step="1" style="width: 60%" />
               </a-form-model-item>
             </a-col>
           </a-row>
@@ -141,6 +141,7 @@
 import { isEmptyParams, checkEmail, checkPhone, checkIdentitytionId, personBirthday, personGender } from "@/views/utils/common"
 import { isIdentityId } from '@/views/utils/validate'
 import { getType } from '@/views/utils/auth'
+import { max } from "moment";
 
 
 export default {

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

@@ -183,6 +183,10 @@ export default {
   width: 100%;
   height: 100%;
 }
+::-webkit-scrollbar {
+  width: 8px;
+  height: 6px;
+}
 .page-content {
   width: 100%;
   height: 50px;