Merge branch 'V1.0.14' of http://39.99.141.0:10000/fjnx/soc_web into V1.0.14

src/views/core/task/dialog.info.vue

@@ -31,13 +31,44 @@
           <el-descriptions-item labelClassName="gx_info_label" label="登记人">
            {{ formData.retrievalUserName}}
           </el-descriptions-item>
-          <el-descriptions-item labelClassName="gx_info_label" label="调阅开始时间">
-           {{ formData.startTime}}
-          </el-descriptions-item>
-          <el-descriptions-item labelClassName="gx_info_label" label="调阅结束时间">
-           {{ formData.endTime}}
-          </el-descriptions-item>
+<!--          <el-descriptions-item labelClassName="gx_info_label" label="调阅开始时间">-->
+<!--           {{ formData.startTime}}-->
+<!--          </el-descriptions-item>-->
+<!--          <el-descriptions-item labelClassName="gx_info_label" label="调阅结束时间">-->
+<!--           {{ formData.endTime}}-->
+<!--          </el-descriptions-item>-->
         </el-descriptions>
+
+        <div class="extend_mod" style="margin-top: -21px">
+          <el-form :model="formData"
+                   size="small"
+                   ref="form"
+                   label-position="right"
+                   label-width="120px"
+                   label-suffix=":">
+
+            <el-table :data="formData.timeList"
+                      v-loading="loading"
+                      :highlight-current-row="false"
+                      class="time-table"
+                      @selection-change="handleSelectionChange"
+                      border=""
+                      :header-cell-style="table_style"
+
+            >
+              <el-table-column label="序号" type="index" width="100" align="center">
+              </el-table-column>
+
+              <el-table-column label="调阅开始时间-调阅结束时间" align="center">
+                <template slot-scope="scope">
+                  <span style=" font-size: 16px;">{{scope.row}}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form>
+        </div>
+
+
         <el-form
           :model="formData"
           size="small"
@@ -45,6 +76,7 @@
           label-position="right"
           label-width="120px"
           label-suffix=":"
+          style="margin-top:16px;"
         >
           <!-- <el-row>
             <el-col :span="12">
@@ -183,6 +215,10 @@ export default {
         "min-width": "300px",
         "word-break": "break-all",
       },
+      table_style: {
+        color: "#333",
+        fontWeight: "normal"
+      },
       id: params ? params.id : null,
       isShow: false,
       formData: this.reset(),
@@ -208,6 +244,7 @@ export default {
         startTime: null,
         endTime: null,
         taskDataVoList: [],
+        timeList:[],
         ...other,
       };
     },
@@ -238,7 +275,30 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .edu-training-edit {
+  .margin-top {
+    margin-bottom: 0;
+  }
+}
+
+.time-table {
+
+  // 禁用hover效果
+  .el-table__body tr.el-table__row:hover td {
+
+    background-color: transparent !important;
+  }
+
+  // 禁用选中行效果
+  .el-table__body tr.el-table__row.current-row td {
+    background-color: transparent !important;
+  }
+}
+.edu-training-edit ::v-deep .el-table__header th .cell {
+  font-weight: normal !important;
+}
+.edu-training-edit ::v-deep .el-table .el-table__header .el-table__header-wrapper th .el-table__cell .cell {
+  font-weight: normal !important;
 }
 </style>