3333

src/components/layout/LayoutHeader.vue

@@ -47,7 +47,7 @@
       </div>
       <div class="toolbar-items">
         <a href="javascript:;" @click="logout">
-          <div style="padding: 0px 30px 2px 6px;color: rgb(89 89 89);">
+          <div style="padding: 0px 10px 2px 6px;color: rgb(89 89 89);">
             <span>
               <a-icon type="poweroff" style="margin-right: 4px" />
             </span>

src/views/components/common/documentView.vue

@@ -73,9 +73,6 @@ export default {
   align-items: center;
   > div:nth-child(1) {
     max-width: calc(100% - 20px);
-    // overflow: hidden;
-    // white-space: nowrap;
-    // text-overflow: ellipsis;
   }
   .ant-tag-blue {
     background: none !important;

src/views/components/common/fileLoad.vue

@@ -127,11 +127,10 @@ export default {
   width: 100%;
   .file-lay {
     display: flex;
-    justify-content: center;
     align-items: center;
-    margin: 0 8px;
+    margin: 0 0;
     > div:nth-child(1) {
-      max-width: calc(100% - 0px);
+      max-width: calc(100% - 22px);
     }
   }
   .visually-hidden {

src/views/components/common/upLoad.vue

@@ -4,7 +4,7 @@
       <div>
         <document-view :fileUrl="file.downloadUrl" :fileName="file.fileName" :imageArray="[file.downloadUrl]"></document-view>
       </div>
-      <a-icon type="delete" class="hover-pointer d-icon" @click="deletefile(file)" style="margin: 0px 2px;" />
+      <a-icon type="delete" class="hover-pointer d-icon" @click="deletefile(file)" style="margin: 0px 4px;" />
     </div>
     <div v-else>
       <a-form-model-item :prop="name+'downloadUrl'" :rules="{required: isRequired, message: message,trigger: 'blur',}">
@@ -165,9 +165,9 @@ export default {
     display: flex;
     justify-content: center;
     align-items: center;
-    margin: 0 8px;
+    margin: 0 0px;
     > div:nth-child(1) {
-      max-width: calc(100% - 0px);
+      max-width: calc(100% - 22px);
     }
   }
   .visually-hidden {

src/views/evaluation/components/scoreEdit.vue

 <template>
   <div style="height:75vh;overflow:auto" class="app-content">
     <a-form-model ref="form" :rules="rules" class="from-table  font-line-space">
-      <table class="tab-content" border="1" style="width: 98%">
+      <table class="tab-content" border="1" style="width: 100%">
         <tr v-for="(item,index) in fromList" :key="'tr1'+index">
           <td :rowspan="item.row1" v-if="item.row1>0">{{ item.title1 }}</td>
           <td :rowspan="item.row2" v-if="item.row2>0">{{ item.title2  }}</td>
@@ -9,7 +9,9 @@
           <td>{{ item.title }}</td>
           <td>{{ item.score }}</td>
           <td>{{ item.meaning }}</td>
-          <td :rowspan="item.row3" v-if="item.row3>0"><a-input  :maxLength="50" style="width: 80%;" /></td>
+          <td :rowspan="item.row3" v-if="item.row3>0">
+            <a-input :maxLength="50" style="width: 80%;" />
+          </td>
         </tr>
       </table>
     </a-form-model>
@@ -352,33 +354,26 @@ export default {
 </script>
 <style scoped lang="less">
 .app-content {
-  ::v-deep.ant-spin-nested-loading .ant-spin-container {
-    height: 100%;
+  td:first-child {
+    width: 5%;
   }
-  .table-content {
-    height: calc(100% - 40px);
-    border-width: 0px 1px 1px 1px;
-    border-style: solid;
-    border-color: #e8e8e8;
-
-    // border:1px solid #e8e8e8;
-
-    padding: 6px 6px;
+  td:nth-child(2) {
+    width: 15%;
+  }
+  td:nth-child(3) {
+    width: 10%;
+  }
+  td:nth-child(4) {
+    width: 10%;
+  }
+  td:nth-child(5) {
+    width: 10%;
   }
-  padding: 0;
-  ::v-deep.ant-tabs .ant-tabs-bar {
-    margin: 0 !important;
+  td:nth-child(6) {
+    width: 40%;
   }
-  ::v-deep
-    .ant-tabs
-    .ant-tabs-bar
-    .ant-tabs-nav-container
-    .ant-tabs-nav-wrap
-    .ant-tabs-nav-scroll
-    .ant-tabs-nav
-    .ant-tabs-tab {
-    min-width: 160px !important;
-    text-align: center;
+  td:nth-child(7) {
+    width: 10%;
   }
 }
 </style>

src/views/query/project/Index.vue

@@ -21,7 +21,7 @@
     <a-divider style="height: 1px; background-color: #e8e8e8;" />
     <div class="submit-btn">
       <a-button type="primary" @click="exportData" icon="download">Excel</a-button>
-      <a-button type="primary" @click="scoreClick" icon="download">评分</a-button>
+      <!-- <a-button type="primary" @click="scoreClick" icon="download">评分</a-button> -->
     </div>
     <a-table :dataSource="tableData" :columns="columns" :scroll="{ x: 'max-content' }" rowKey="id" :pagination="false" :loading="loading">
       <template slot="projName" slot-scope="record">

src/views/report/project/components/edit/projectCreate.vue

@@ -3,7 +3,7 @@
   <div class="app-content" style="height: 76vh;overflow: auto;">
     <a-spin :spinning="loading" style="width: 100%;height: 100%;">
       <div class="page-steps">
-        <a-steps size="small" :current="current">
+        <a-steps size="small" :current="current" @change="onChange">
           <a-step :status="item.status" v-for="(item,index) in stepsArray" :key="index+'stepsArray'" :title="item.title" />
         </a-steps>
       </div>
@@ -69,6 +69,18 @@ export default {
       this.currSteps--;
       this.changeSteps(this.currSteps)
     },
+    onChange (e) {
+      if (e != this.currSteps) {
+        var arr = this.completeStatus.split(',')
+        if (arr[e] == "1") {
+          this.loading = true
+          this.changeSteps(e)
+          this.loading = false
+        } else {
+          this.$message.error('所选步骤没填写完成，请填写当前步骤后点【下一步】跳转！')
+        }
+      }
+    },
     onStepChange (e) {
       this.completeStatus = e.state
       this.changeSteps(e.step)

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

@@ -1025,7 +1025,6 @@ export default {
       if (!!e && e.length == 3) {
         this.formData.totalFunding = e[0]
         this.formData.govFunding = e[1]
-
         this.formData.projectKPI.totalBudget = this.formData.totalFunding
         this.formData.projectKPI.applyFunds = this.formData.govFunding
         this.formData.projectKPI.selfFunds = e[2]

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

@@ -3,7 +3,7 @@
     <a-row>
       <a-col :span="24">
         <div class="main-title">
-          <span>附件信息</span>
+          <span>附件 <span style="color: red;">(注：上传文件后点击请点击下方【保存】或【完成填写】按钮，文件格式 .doc,.docx,.pdf)</span></span>
         </div>
       </a-col>
     </a-row>
@@ -38,12 +38,12 @@
           <div>是否必备材料</div>
         </div>
       </a-col>
-      <a-col :span="10" class="bg-gray">
+      <a-col :span="12" class="bg-gray">
         <div class="special-middle">
           <div>附件上传</div>
         </div>
       </a-col>
-      <a-col :span="4" class="bg-gray">
+      <a-col :span="2" class="bg-gray">
         <div class="special-middle">
           <div>操作</div>
         </div>
@@ -64,12 +64,12 @@
           <div>{{ item.isRequired == true ? "是" : "否" }}</div>
         </div>
       </a-col>
-      <a-col :span="10">
-        <div class="special-middle">
-          <file-load :file.sync="fileList[index]" :index="index" :name="'fileList'" />
+      <a-col :span="12" style="text-align: left;">
+        <div class="special-middle" style="text-align: left;">
+          <file-load :file.sync="fileList[index]" :index="index" :name="'fileList'" :format="['doc', 'docx', 'pdf']"/>
         </div>
       </a-col>
-      <a-col :span="4">
+      <a-col :span="2">
         <div class="special-middle">
           <div v-if="!item.required">
             <a-popconfirm title="确定要删除吗？" ok-text="确定" cancel-text="取消" @confirm="removefileList(item)">