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

src/views/components/common/documentView.vue

 <template>
-  <div>
-    <a-tag :color="enums.fileColor[getFileExtension(fileName).toLowerCase()]">{{ fileName }}</a-tag>
-    <a-button v-show="isOpen" shape="circle" size="small" icon="search" @click="FileView()" />
+  <div class="file_view">
+    <a-tag :color="enums.fileColor[getFileExtension(fileName).toLowerCase()]" class="file_name" :title=" fileName">{{ fileName }}</a-tag>
+    <a-button v-show="isOpen" shape="circle" size="small" icon="search" @click="FileView()" class="btn" />
     <a-modal v-model="visibleFileView" :title="'[' + fileName + '] 文件查看'" width="1000px" :dialog-style="{ top: '10%' }" :footer="null" destroyOnClose>
       <preview-file v-model="fileUrl" :fileName="fileName"></preview-file>
     </a-modal>
-    <a class="ant-dropdown-link" style="margin-left:6px" :href="fileUrl" :download="fileName">
+    <a class="ant-dropdown-link dlw" style="margin-left:6px" :href="fileUrl" :download="fileName">
       <a-icon type="download" />
     </a>
   </div>
@@ -64,3 +64,24 @@ export default {
   }
 };
 </script>
+<style scoped lang="less">
+.file_view {
+  position: relative;
+  .file_name {
+    max-width: calc(100% - 55px);
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    display: inline-block;
+    vertical-align: bottom;
+  }
+  .btn {
+    position: absolute;
+    right: 26px;
+  }
+  .dlw {
+    position: absolute;
+    right: 10px;
+  }
+}
+</style>

src/views/components/common/fileLoad.vue

@@ -131,17 +131,7 @@ export default {
   line-height: 30px;
 
   .file-box {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
     margin: 0 8px;
-
-    > div:nth-child(1) {
-      max-width: 90%;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
   }
   .visually-hidden {
     display: none !important;

src/views/login/login.vue

@@ -59,7 +59,7 @@
             <a href="#" @click="clickRegister" style="margin-right: 32px;">注册</a>
             <a href="#" @click="clickReset">忘记密码?</a>
           </div>
-          <div class="link_foot"><span>技术支持：</span><span>QQ:855831766</span><span style="margin-left:10px">联系电话:15598366392</span></div>
+          <!-- <div class="link_foot"><span>技术支持：</span><span>QQ:855831766</span><span style="margin-left:10px">联系电话:15598366392</span></div> -->
           <!-- <a-button type="primary" @click="ViewEvaluation">查看</a-button> -->
         </div>
       </div>

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

@@ -8,7 +8,7 @@
       </a-col>
     </a-row>
     <a-row type="flex" class="row_center">
-      <a-col :span="4" class="bg-gray">
+      <a-col :span="6" class="bg-gray">
         <div class="special-middle">
           <div class="required">单位政策名称</div>
         </div>
@@ -33,7 +33,7 @@
           <div class="required">主要内容</div>
         </div>
       </a-col>
-      <a-col :span="8" class="bg-gray">
+      <a-col :span="6" class="bg-gray">
         <div class="special-middle">
           <div>附件</div>
         </div>
@@ -45,7 +45,7 @@
       </a-col>
     </a-row>
     <a-row v-for="(item, index) in managementRuleList" :key="'managementRuleList'+index" type="flex" class="row_center">
-      <a-col :span="4">
+      <a-col :span="6">
         <a-form-model-item :prop="'managementRuleList.' + index + '.policyName'" :rules="{ required: true, message: '*', trigger: 'blur',}">
           <a-input v-model="item.policyName" :maxLength="100" placeholder="单位政策名称" style="width:85%" />
         </a-form-model-item>
@@ -70,7 +70,7 @@
           <a-input v-model="item.mainContent" placeholder="主要内容" :maxLength="100" style="width:85%" />
         </a-form-model-item>
       </a-col>
-      <a-col :span="8">
+      <a-col :span="6">
         <div class="special-middle">
           <file-load :file.sync="managementRuleList[index]" :index="index" :name="'managementRuleList'" />
         </div>

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

@@ -208,6 +208,8 @@
 
 <script>
 
+import { isEmptyParams, checkEmail, checkPhone, checkIdentitytionId, personBirthday, personGender } from "@/views/utils/common"
+import { isIdentityId } from '@/views/utils/validate'
 import { getType } from '@/views/utils/auth'
 import paraMultiSelect from '@/views/components/common/paraMultiSelect'
 import paraSelect from '@/views/components/common/paraSelect'
@@ -225,16 +227,37 @@ export default {
         sex: [{ required: true, message: '*', trigger: 'change' },],
         birthday: [{ required: true, message: '*', trigger: 'change' },],
         certificateType: [{ required: true, message: '*', trigger: 'change' },],
-        certId: [{ required: true, message: '*', trigger: 'blur' },],
+        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()
+            }
+          }
+        }],
         nation: [{ required: true, message: '*', trigger: 'change' },],
         country: [{ required: true, message: '*', trigger: 'blur' },],
         workUnit: [{ required: true, message: '*', trigger: 'blur' },],
         title: [{ required: true, message: '*', trigger: 'change' },],
         degree: [{ required: true, message: '*', trigger: 'change' },],
-        email: [{ required: true, message: '*', trigger: 'blur' },],
-        mobile: [{ required: true, message: '*', trigger: 'blur' },],
-        telephone: [{ required: true, message: '*', trigger: 'blur' },],
-        fax: [{ required: true, message: '*', trigger: 'blur' },],
+        email: [
+          { required: true, message: '请填写电子邮箱(项目联系人)', trigger: 'blur' },
+          { required: true, validator: checkEmail, trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: '*', trigger: 'blur' },
+          { required: true, validator: checkPhone, trigger: 'blur' }
+        ],
+        telephone: [{ required: false, message: '*', trigger: 'blur' },],
+        fax: [{ required: false, message: '*', trigger: 'blur' },],
         projWork: [{ required: true, message: '*', trigger: 'blur' },],
         forMonths: [{ required: true, message: '*', trigger: 'blur' },],
         spec: [{ required: true, message: '*', trigger: 'change' },],

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

@@ -48,7 +48,7 @@
         </a-col>
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>组织机构代码/统一社会信用代码</div>
+            <div class="required">组织机构代码/统一社会信用代码</div>
           </div>
         </a-col>
         <a-col :span="8">
@@ -64,7 +64,7 @@
       <a-row type="flex">
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>通讯地址</div>
+            <div class="required">通讯地址</div>
           </div>
         </a-col>
         <a-col :span="20">
@@ -80,7 +80,7 @@
       <a-row type="flex">
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>注册所在地</div>
+            <div class="required">注册所在地</div>
           </div>
         </a-col>
         <a-col :span="8">
@@ -94,7 +94,7 @@
         </a-col>
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>邮编</div>
+            <div class="required">邮编</div>
           </div>
         </a-col>
         <a-col :span="8">
@@ -110,7 +110,7 @@
       <a-row type="flex">
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>法定代表人</div>
+            <div class="required">法定代表人</div>
           </div>
         </a-col>
         <a-col :span="8">
@@ -124,7 +124,7 @@
         </a-col>
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>职工总数</div>
+            <div class="required">职工总数</div>
           </div>
         </a-col>
         <a-col :span="8">
@@ -140,7 +140,7 @@
       <a-row type="flex">
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>其中专科以上人员</div>
+            <div class="required">其中专科以上人员</div>
           </div>
         </a-col>
         <a-col :span="8">
@@ -154,7 +154,7 @@
         </a-col>
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>研究开发人员</div>
+            <div class="required">研究开发人员</div>
           </div>
         </a-col>
         <a-col :span="8">
@@ -170,7 +170,7 @@
       <a-row type="flex">
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>开户银行</div>
+            <div class="required">开户银行</div>
           </div>
         </a-col>
         <a-col :span="8">
@@ -184,7 +184,7 @@
         </a-col>
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>银行账号</div>
+            <div class="required">银行账号</div>
           </div>
         </a-col>
         <a-col :span="8">
@@ -197,10 +197,10 @@
           </div>
         </a-col>
       </a-row>
-      <a-row type="flex">
+      <!-- <a-row type="flex">
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>开户银行地址</div>
+            <div class="required">开户银行地址</div>
           </div>
         </a-col>
         <a-col :span="8">
@@ -214,7 +214,7 @@
         </a-col>
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>银行联行号</div>
+            <div class="required">银行联行号</div>
           </div>
         </a-col>
         <a-col :span="8">
@@ -226,11 +226,11 @@
             </div>
           </div>
         </a-col>
-      </a-row>
+      </a-row> -->
       <a-row type="flex">
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>上年度研发经费支出总额(单位:万元)</div>
+            <div class="required">上年度研发经费支出总额(单位:万元)</div>
           </div>
         </a-col>
         <a-col :span="20">
@@ -246,7 +246,7 @@
       <a-row type="flex">
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>上年度是否填报了研发活动情况</div>
+            <div class="required">上年度是否填报了研发活动情况</div>
           </div>
         </a-col>
         <a-col :span="20">
@@ -262,7 +262,7 @@
       <a-row type="flex">
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>上一年度填报的研发投入总数(单位:万元)</div>
+            <div class="required">上一年度填报的研发投入总数(单位:万元)</div>
           </div>
         </a-col>
         <a-col :span="20">
@@ -278,7 +278,7 @@
       <a-row type="flex">
         <a-col :span="4" class="bg-gray">
           <div class="special-middle">
-            <div>上一年度填报的研发人员数</div>
+            <div class="required">上一年度填报的研发人员数</div>
           </div>
         </a-col>
         <a-col :span="20">
@@ -722,8 +722,8 @@ export default {
         researchPersonnel: [{ required: true, message: '请填写研究开发人员', trigger: 'blur' },],
         depositBank: [{ required: true, message: '请填写开户银行', trigger: 'blur' },],
         bankAccount: [{ required: true, message: '请填写银行账号', trigger: 'blur' },],
-        depositBankAddress: [{ required: true, message: '请填写开户银行地址', trigger: 'blur' },],
-        interbankNumber: [{ required: true, message: '请填写开户银行地址', trigger: 'blur' },],
+        depositBankAddress: [{ required: false, message: '请填写开户银行地址', trigger: 'blur' },],
+        interbankNumber: [{ required: false, message: '请填写开户银行地址', trigger: 'blur' },],
         researchTotal: [{ required: true, message: '请填写上年度研发经费支出总额', trigger: 'blur' },],
         isResearchActive: [{ required: true, message: '请选择上年度是否填报了研发活动情况', trigger: 'change' },],
         researchCount: [{ required: true, message: '请填写上一年度填报的研发投入总数', trigger: 'blur' },],

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

@@ -185,10 +185,24 @@
       </a-col>
       <a-col :span="4" class="bg-gray">
         <div class="special-middle">
-          <div>上年度研发经费支出总额(单位:万元)</div>
+          <div>银行联行号</div>
         </div>
       </a-col>
       <a-col :span="8">
+        <div class="special-middle">
+          <div>
+            {{ value.interbankNumber }}
+          </div>
+        </div>
+      </a-col>
+    </a-row>
+    <a-row type="flex">
+      <a-col :span="4" class="bg-gray">
+        <div class="special-middle">
+          <div>上年度研发经费支出总额(单位:万元)</div>
+        </div>
+      </a-col>
+      <a-col :span="20">
         <div class="special-middle">
           <div>
             {{ value.researchTotal }}
@@ -202,7 +216,7 @@
           <div>上年度是否填报了研发活动情况</div>
         </div>
       </a-col>
-      <a-col :span="8">
+      <a-col :span="20">
         <div class="special-middle">
           <div>
             {{ value.isResearchActive }}
@@ -619,7 +633,7 @@
     <!-- 设备费-购置设备预算明细表 -->
     <equipments-info :equipments.sync="value.equipments" />
     <!-- 设备费-购置设备预算明细表 -->
-    <unit-payment-info :unitPayment.sync="value.unitPayment"/>
+    <unit-payment-info :unitPayment.sync="value.unitPayment" />
     <!-- 项目绩效目标表v-if="value.projState >= 50" -->
     <project-kpi v-if="value.projectKPI" :projectKPI.sync="value.projectKPI" />
 

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

@@ -8,7 +8,7 @@
       </a-col>
     </a-row>
     <a-row type="flex" class="row_center">
-      <a-col :span="2" class="bg-gray">
+      <a-col :span="4" class="bg-gray">
         <div class="special-middle">
           <div class="required">课题名称</div>
         </div>
@@ -48,7 +48,7 @@
           <div>合作单位</div>
         </div>
       </a-col>
-      <a-col :span="6" class="bg-gray">
+      <a-col :span="4" class="bg-gray">
         <div class="special-middle">
           <div>附件</div>
         </div>
@@ -60,7 +60,7 @@
       </a-col>
     </a-row>
     <a-row v-for="(item, index) in projectSubList" :key="'projectSubList'+index" type="flex" class="row_center">
-      <a-col :span="2">
+      <a-col :span="4">
         <a-form-model-item :prop="'projectSubList.' + index + '.projName'" :rules="{ required: true, message: '*', trigger: 'blur',}">
           <a-input v-model="item.projName" :maxLength="100" placeholder="课题名称" style="width:85%" />
         </a-form-model-item>
@@ -100,7 +100,7 @@
           <a-input v-model="item.cooperativeUnits" :maxLength="100" placeholder="合作单位" style="width:85%" />
         </a-form-model-item>
       </a-col>
-      <a-col :span="6">
+      <a-col :span="4">
         <div class="special-middle">
           <file-load :file.sync="projectSubList[index]" :index="index" :name="'projectSubList'" />
         </div>

static/css/common.less

@@ -164,9 +164,10 @@
         display: flex;
         justify-content: space-between;
         align-items: center;
+        text-align: left;
 
         >div:nth-child(1) {
-            max-width: 90%;
+            width: 90%;
             overflow: hidden;
             text-overflow: ellipsis;
             white-space: nowrap;