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

src/views/evaluation/components/score.vue

@@ -373,10 +373,7 @@ export default {
     height: calc(100% - 40px);
     border-width: 0px 1px 1px 1px;
     border-style: solid;
-    border-color: #e8e8e8;
-
-    // border:1px solid #e8e8e8;
-
+    border: 1px solid #f0f0f0;
     padding: 6px 6px;
   }
   padding: 0;

src/views/evaluation/components/technologyEvalucation.vue

@@ -213,14 +213,14 @@ export default {
 table,
 tr,
 td {
-  border: 1px solid #080808;
+  border: 1px solid #f0f0f0;
   font-size: 10pt;
   text-align: left;
   line-height: 25px;
   height: 25px;
 }
 .bg-title {
-  background-color: #f5f5f5;
+  background-color: #f8fafc;
   font-weight: bold;
   text-align: center;
 }

src/views/evaluation/index.vue

@@ -5,7 +5,7 @@
         <a-input placeholder="项目名称" v-model="searchForm.projName" :maxLength="100" style="width: 160px" />
       </a-form-item>
       <a-form-item>
-        <a-input placeholder="项目编号" v-model="searchForm.projNo" :maxLength="100" style="width: 160px" />
+        <a-input placeholder="申请编号" v-model="searchForm.appNo" :maxLength="100" style="width: 160px" />
       </a-form-item>
       <a-form-item>
         <a-button type="primary" icon="search" @click="search">搜索</a-button>
@@ -68,11 +68,11 @@ export default {
   data () {
     return {
       form: this.$form.createForm(this, { name: 'advanced_search' }),
-      searchForm: { projName: null, projNo: null, assignYear: null, personId: null, projType: getType() },
+      searchForm: { projName: null, appNo: null, assignYear: null, personId: null, projType: getType() },
       tableData: [],
       columns: [
         { title: "项目名称", scopedSlots: { customRender: 'projectName', colName: 'projName' }, align: 'left' },
-        { title: '项目编号', dataIndex: 'projNo', align: 'center' },
+        { title: '申请编号', dataIndex: 'appNo', align: 'center' },
         { title: '评分', dataIndex: 'totalScore', align: 'center' },
         { title: '评审状态', scopedSlots: { customRender: 'expertEvaluation', colName: 'gradeScore' }, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'option' }, align: 'center', fixed: 'right', width: 120, },