youhua

src/views/reportManagement/testPresentation.vue

@@ -1,102 +1,87 @@
 <template>
-  <div class="eleStyle">
-    <el-container class="header_sty">
-      <el-header class="public_header">
-        <el-tabs v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane label="测试日报" name="first" />
-          <el-tab-pane label="准出报告" name="second" />
-          <el-tab-pane label="提测报告" name="third" />
-        </el-tabs>
-      </el-header>
-
-      <el-main class="public_main report-Layout">
-        <div class="Layout_space_between distance">
-          <div class="Layout_space_between">
-            <span style="width: 100px;">{{ title }}</span>
-            <el-input v-if="history" v-model="state" size="medium" filterable placeholder="报告名称搜索" style="width:100%;" @change="getList(state)" />
-            <el-input v-if="!history" v-model="state" size="medium" filterable placeholder="报告名称搜索" style="width:100%;" @change="gethistoryData(state)" />
-          </div>
-          <div class="Layout_space_between">
-            <el-button v-if="!history" type="primary" size="medium" @click="returnNewest">返回最新</el-button>
-            <!-- <el-button v-if="history" type="text" @click="gethistoryData">查看老数据</el-button> -->
-            <el-button v-if="history" type="primary" size="medium" @click="getQueryData">新建{{ title }}</el-button>
-          </div>
+  <el-container class="Qz_rpeortPage_style">
+    <el-header class="Qz_report_header">
+      <el-tabs v-model="activeName" class="Qz_report_tabs" @tab-click="handleClick">
+        <el-tab-pane v-for="item in reportTypeList" :key="item.label" :label="item.label" :name="item.name" />
+      </el-tabs>
+      <div class="Layout_space_between Qz_report_query">
+        <div class="Layout_space_between">
+          <span style="width: 100px;">{{ title }}</span>
+          <el-input v-if="history" v-model="state" size="medium" filterable placeholder="报告名称搜索" style="width:100%;" @change="history ? getList(state) : gethistoryData(state)" />
         </div>
-        <el-table v-loading="loading" :data="tableData" size="medium" :header-cell-style="{ background: '#F2F3F6', color: '#333' }" border style="width: 100%" :show-overflow-tooltip="true">
-          <el-table-column label="报告名称" min-width="280" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <a v-if="title === '测试日报' || title === '准出报告'" href="javascript:void(0)" style="color:#20a0ff" @click="history ? toReportView(scope.row) : OldDaily(scope.row)">{{ scope.row.reportName }}</a>
-              <div v-if="title === '准出报告' && scope.row.passStatus === 1" class="passStatus1">不通过</div>
-              <a v-if="title === '提测报告'" href="javascript:void(0)" style="color:#20a0ff" @click="history ? toReportView(scope.row) : OldDaily(scope.row)">{{ history ? scope.row.reportName : scope.row.name }}</a>
-              <div v-if="title === '提测报告' && scope.row.returnReason" style="color: red;" class="breakText1">打回报告：{{ scope.row.returnReason }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="状态" min-width="150">
-            <template slot-scope="scope">{{ scope.row.statusString }}</template>
-          </el-table-column>
-          <el-table-column label="报告人" min-width="180">
-            <template slot-scope="scope">
-              <div v-if="history">
-                <div v-if="title === '测试日报' || title === '准出报告'">{{ scope.row.reportorObject.name ===null ? '' : scope.row.reportorObject.name }}</div>
-                <div v-if="title === '提测报告'">{{ scope.row.reportorObject.name }}</div>
-              </div>
-              <div v-if="!history">
-                <div v-if="title === '测试日报' || title === '准出报告'">{{ scope.row.ownner }}</div>
-                <div v-if="title === '提测报告'">{{ scope.row.submitter }}</div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="创建时间" min-width="280">
-            <template slot-scope="scope">{{ scope.row.gmtCreate }}</template>
-          </el-table-column>
-          <el-table-column v-if="history" label="操作" align="center" fixed="right" min-width="230">
-            <template slot-scope="scope">
-              <div v-if="title === '测试日报'">
-                <span v-if="scope.row.status === 0 ? true : false" class="didi-hover" @click="dailyButtom(3,scope.row)">发送</span>
-                <span v-if="scope.row.status === 0 ? true : false" style="margin: 0 30px;" class="didi-hover" @click="dailyButtom(2,scope.row)">编辑</span>
+        <div class="Layout_space_between">
+          <el-button v-if="!history" type="primary" size="medium" @click="returnNewest">返回最新</el-button>
+          <!-- <el-button v-if="history" type="text" @click="gethistoryData">查看老数据</el-button> -->
+          <el-button v-if="history" type="primary" size="medium" @click="getQueryData">新建{{ title }}</el-button>
+        </div>
+      </div>
+    </el-header>
+
+    <el-main class="Qz_report_main">
+      <el-table v-loading="loading" :data="tableData" size="small" :header-cell-style="{'color':'rgba(74,74,74,1)','font-size':'14px','font-weight':'500' }" :cell-style="{ 'font-size':'14px','color':'rgba(102,102,102,1)' }" style="width: 100%" :show-overflow-tooltip="true">
+        <el-table-column label="报告名称" min-width="280" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <a v-if="title === '测试日报' || title === '准出报告'" href="javascript:void(0)" style="color:#20a0ff" @click="history ? toReportView(scope.row) : OldDaily(scope.row)">{{ scope.row.reportName }}</a>
+            <div v-if="title === '准出报告' && scope.row.passStatus === 1" class="passStatus1">不通过</div>
+            <a v-if="title === '提测报告'" href="javascript:void(0)" style="color:#20a0ff" @click="history ? toReportView(scope.row) : OldDaily(scope.row)">{{ history ? scope.row.reportName : scope.row.name }}</a>
+            <div v-if="title === '提测报告' && scope.row.returnReason" style="color: red;" class="breakText1">打回报告：{{ scope.row.returnReason }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="150">
+          <template slot-scope="scope">{{ scope.row.statusString }}</template>
+        </el-table-column>
+        <el-table-column label="报告人" min-width="180">
+          <template slot-scope="scope">
+            <div v-if="history">
+              <div v-if="title === '测试日报' || title === '准出报告'">{{ scope.row.reportorObject.name ===null ? '' : scope.row.reportorObject.name }}</div>
+              <div v-if="title === '提测报告'">{{ scope.row.reportorObject.name }}</div>
+            </div>
+            <div v-if="!history">
+              <div v-if="title === '测试日报' || title === '准出报告'">{{ scope.row.ownner }}</div>
+              <div v-if="title === '提测报告'">{{ scope.row.submitter }}</div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" min-width="280">
+          <template slot-scope="scope">{{ scope.row.gmtCreate }}</template>
+        </el-table-column>
+        <el-table-column v-if="history" label="操作" align="center" fixed="right" min-width="230">
+          <template slot-scope="scope">
+            <div v-if="title === '测试日报'">
+              <span v-if="scope.row.status === 0 ? true : false" class="didi-hover" @click="dailyButtom(3,scope.row)">发送</span>
+              <span v-if="scope.row.status === 0 ? true : false" style="margin: 0 30px;" class="didi-hover" @click="dailyButtom(2,scope.row)">编辑</span>
+              <span v-if="scope.row.status === 0 ? true : false" class="didi-hover" @click="report_click(4,scope.row )">删除</span>
+              <span v-if="scope.row.status === 3 ? true : false" class="didi-hover" @click="dailyButtom(4,scope.row)">复制</span>
+            </div>
+            <div v-if="title === '准出报告'">
+              <div v-if="scope.row.status === 3 ? false : true">
+                <span v-if="scope.row.status === 0 ? true : false" class="didi-hover" @click="clientButtom(3,scope.row)">发送</span>
+                <span v-if="scope.row.status === 0 ? true : false" style="margin: 0 30px;" class="didi-hover" @click="clientButtom(2, scope.row)">编辑</span>
                 <span v-if="scope.row.status === 0 ? true : false" class="didi-hover" @click="report_click(4,scope.row )">删除</span>
-                <span v-if="scope.row.status === 3 ? true : false" class="didi-hover" @click="dailyButtom(4,scope.row)">复制</span>
-              </div>
-              <div v-if="title === '准出报告'">
-                <div v-if="scope.row.status === 3 ? false : true">
-                  <span v-if="scope.row.status === 0 ? true : false" class="didi-hover" @click="clientButtom(3,scope.row)">发送</span>
-                  <span v-if="scope.row.status === 0 ? true : false" style="margin: 0 30px;" class="didi-hover" @click="clientButtom(2, scope.row)">编辑</span>
-                  <span v-if="scope.row.status === 0 ? true : false" class="didi-hover" @click="report_click(4,scope.row )">删除</span>
-                </div>
               </div>
-              <div v-if="title === '提测报告'">
-                <div v-if="scope.row.status === 1 ? false : true">
-                  <span v-if="scope.row.status === 3 ? true : false" class="didi-hover" @click="report_click(1,scope.row)">通过</span>
-                  <span v-if="scope.row.status === 3 ? true : false" style="margin-left: 30px;" class="didi-hover" @click="report_click(2,scope.row)">打回</span>
-                  <span v-if="scope.row.status === 0 ? true : false" class="didi-hover" @click="report_click(5,scope.row)">发送</span>
-                  <span v-if="scope.row.status === 0 ? true : false" style="margin: 0 30px;" class="didi-hover" @click="report_click(6,scope.row)">编辑</span>
-                  <span v-if="scope.row.status === 0 ? true : false" class="didi-hover" @click="report_click(4,scope.row )">删除</span>
-                  <span v-if="scope.row.status === 2 ? true : false" class="didi-hover" @click="report_click(3,scope.row)">重新提测</span>
-                </div>
+            </div>
+            <div v-if="title === '提测报告'">
+              <div v-if="scope.row.status === 1 ? false : true">
+                <span v-if="scope.row.status === 3 ? true : false" class="didi-hover" @click="report_click(1,scope.row)">通过</span>
+                <span v-if="scope.row.status === 3 ? true : false" style="margin-left: 30px;" class="didi-hover" @click="report_click(2,scope.row)">打回</span>
+                <span v-if="scope.row.status === 0 ? true : false" class="didi-hover" @click="report_click(5,scope.row)">发送</span>
+                <span v-if="scope.row.status === 0 ? true : false" style="margin: 0 30px;" class="didi-hover" @click="report_click(6,scope.row)">编辑</span>
+                <span v-if="scope.row.status === 0 ? true : false" class="didi-hover" @click="report_click(4,scope.row )">删除</span>
+                <span v-if="scope.row.status === 2 ? true : false" class="didi-hover" @click="report_click(3,scope.row)">重新提测</span>
               </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-main>
-      <el-footer class="public_footer">
-        <el-pagination v-if="history" style="margin-top:30px;" align="center" :current-page="curIndex" :page-sizes="[5, 10, 20]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
-        <el-pagination v-if="!history" style="margin-top:30px;" align="center" :current-page="curIndex" :page-sizes="[5, 10, 20]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange1" @current-change="handleCurrentChange1" />
-      </el-footer>
-    </el-container>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination align="right" :current-page="curIndex" :page-sizes="[15, 20, 30]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange()" @current-change="handleCurrentChange()" />
+    </el-main>
+
     <!-- 日报/准出/提测选择任务 -->
     <el-dialog title="选择任务" :visible.sync="centerDialogVisible" width="30%" center>
       <div class="Layout_space_between">
         <div style="width:100px;">选择任务 :</div>
-        <el-select
-          v-model="queryData.code"
-          filterable
-          :remote="true"
-          :remote-method="debounceQuery"
-          placeholder="请选择任务"
-          size="mini"
-          style="width:100%;"
-        >
-          <el-option v-for="item in restaurants" :key="item.id" :label="item.name" :value="item.id">
+        <el-select v-model="queryData.code" filterable :remote="true" :remote-method="debounceQuery" placeholder="请选择任务" style="width:100%;">
+          <el-option v-for="(item, index) in restaurants" :key="index" :label="item.name" :value="item.id">
             <div class="belong-task">
               <div class="task-id">{{ item.taskId }}</div>
               <div class="modules-name">
@@ -152,7 +137,7 @@
       @confirm="checklistConfirm"
       @cancel="checklistCancel"
     />
-  </div>
+</el-container>
 </template>
 
 <script>
@@ -186,6 +171,7 @@ export default {
   },
   data() {
     return {
+      reportTypeList: [{ label: '测试日报', name: 'first' }, { label: '准出报告', name: 'second' }, { label: '提测报告', name: 'third' }],
       activeName: 'first',
       title: '测试日报', // 报告title
       history: true, // 新老数据
@@ -201,7 +187,7 @@ export default {
       report_data: {}, // 当前点击数据
       userData: { id: '', ename: this.userInformation, name: this.userNames },
       loading: true,
-      pageSize: 10,
+      pageSize: 15,
       curIndex: 1,
       total: 0,
       state: '',
@@ -218,7 +204,7 @@ export default {
       dialogDaily: false,
       dialogClient: false,
       indexPage: {
-        pageSize: 10,
+        pageSize: 15,
         curIndex: 1
       },
       goDataReport: -1,
@@ -569,19 +555,11 @@ export default {
     },
     handleSizeChange(size) { // 分页
       this.pageSize = size
-      this.getList()
+      this.history ? this.getList() : this.gethistoryData()
     },
     handleCurrentChange(curIndex) { // 分页
       this.curIndex = curIndex
-      this.getList()
-    },
-    handleSizeChange1(size) { // used 分页
-      this.pageSize = size
-      this.gethistoryData()
-    },
-    handleCurrentChange1(curIndex) { // used 分页
-      this.curIndex = curIndex
-      this.gethistoryData()
+      this.history ? this.getList() : this.gethistoryData()
     },
     checklistConfirm() {
       this.checklistStopVisible = false
@@ -613,24 +591,27 @@ export default {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.eleStyle {
+.Qz_rpeortPage_style {
   width: 100%;
   height:100%;
-  background:#F2F3F6;
-  display: inline-block;
-}
-.header_sty {
   font-size: 14px;
-  background:#ffffff;
-  margin: 0 10px 10px;
-  border-radius: 4px;
-  overflow: hidden;
-}
-.distance {
-  margin-bottom: 20px;
-}
-.report-Layout {
-  min-height: calc(100vh - 164px)
+  display: inline-block;
+  .Qz_report_header {
+    height: auto !important;
+    background:#ffffff;
+    margin: 0 10px 10px;
+    border-radius: 4px;
+    padding-bottom: 10px;
+    .Qz_report_tabs {
+      padding-top: 10px;
+    }
+  }
+  .Qz_report_main {
+    min-height: calc(100vh - 130px);
+    margin: 10px;
+    background: #FFF;
+    border-radius: 4px;
+  }
 }
 .tips-report {
   font-size: 12px;
@@ -665,6 +646,7 @@ export default {
 </style>
 <style lang="stylus">
 .el-tabs__nav-wrap::after {
-    background-color: #FFF !important;
+    background-color: #DCDFE6 !important;
+    height: 1px;
     }
 </style>