fix：放大全屏；样式，顺序调整

aba74067 · yangzhi · b357dd51 · aba74067
Commit aba74067 authored Aug 17, 2023 by yangzhi
Hide whitespace changes
Inline Side-by-side

Showing with 50 additions and 21 deletions

src/views/taskManage/index.vue
+50 -21

No files found.
--- a/src/views/taskManage/index.vue
+++ b/src/views/taskManage/index.vue
@@ -109,7 +109,7 @@
            ></el-option>
          </el-select>
        </el-form-item>
-        <el-form-item label='验收人'>
+        <el-form-item label='验收人' v-if="!(statusCode=== 'PRE_HANDLING'||statusCode==='TO_BE_ASSIGN')">
          <el-select
            style='width: 120px'
            placeholder='请选择'
@@ -202,11 +202,11 @@
    </div>
    <!-- 详情 -->
    <el-dialog
-      title='详情'
      :close-on-click-modal='false'
      :visible.sync='detailVisible'
      class='dialogDetail'
-      width='1300px'
+      :class="[dialogFullScreen ? 'fullscreen' : 'no_fullscreen']"
+      :fullscreen='dialogFullScreen'
      @close='getlist()'
    >
      <!-- <div class="step-bar">
@@ -259,6 +259,15 @@
          <span>已归档</span>
        </div>
      </div> -->
+      <template slot='title'>
+        <div class='custom_dialog_header'>
+          <span class='el_dialog_title'>详情</span>
+          <div class='custom_dialog_menu' @click='dialogFullScreen = !dialogFullScreen'
+               style='text-align: right;margin-top: 11px'>
+            <i class='el-icon-full-screen'></i>
+          </div>
+        </div>
+      </template>
      <div class='content' v-loading='detailLoading'>
        <div class='detail_list'>
          <div class='item_wrap'>
@@ -334,7 +343,9 @@
              v-model='detail.remark'
              placeholder='备注'
            ></el-input>
-            <el-button type='success' size='mini' @click='saveRemark' v-if='detail.remark' style='margin-left: 8px'>保存</el-button>
+            <el-button type='success' size='mini' @click='saveRemark' v-if='detail.remark' style='margin-left: 8px'>
+              保存
+            </el-button>
          </ul>
        </div>
        <div class='record'>
@@ -815,6 +826,7 @@ export default {
      commentsVisible: false,
      detail: {},
      detailVisible: false,
+      dialogFullScreen: false,
      taskTypes: [],
      treeData: [],
      defaultProps: {
@@ -891,11 +903,6 @@ export default {
          ),
        },
        {
-          label: '工单编号',
-          key: 'orderNo',
-          width: 110,
-        },
-        {
          label: '工单模块',
          key: 'moduleName',
          width: 110,
@@ -909,7 +916,7 @@ export default {
        {
          label: '优先级',
          key: 'priorityStatus',
-          width: 120,
+          width: 70,
          render: item => {
            if (item.orderStatus === 'TO_BE_ASSIGN') {
              item.priorityStatus = item.priorityStatus
@@ -975,13 +982,9 @@ export default {
          width: 80,
        },
        {
-          label: '验收人',
-          key: 'acceptanceUserName',
-          width: 80,
-        },
-        {
          label: '验收意见',
          key: 'acceptanceContent',
+          show: this.statusCode === 'ACCEPTANCEING',
          width: 80,
        },
        {
@@ -1026,6 +1029,23 @@ export default {
          width: 130,
        },
        {
+          label: '验收人',
+          key: 'acceptanceUserName',
+          show: !(this.statusCode === 'PRE_HANDLING' || this.statusCode === 'TO_BE_ASSIGN'),
+          width: 80,
+        },
+        {
+          label: '验收意见',
+          show: !(this.statusCode === 'PRE_HANDLING' || this.statusCode === 'TO_BE_ASSIGN' || this.statusCode === 'ACCEPTANCEING'),
+          key: 'acceptanceContent',
+          width: 80,
+        },
+        {
+          label: '工单编号',
+          key: 'orderNo',
+          width: 110,
+        },
+        {
          label: '工单状态',
          key: 'orderStatusTxt',
          width: 80,
@@ -1242,43 +1262,44 @@ export default {
    cellClassName({
                    row,
                    columnIndex,
+                    column,
                  }) {
      if (
        (row.orderStatus === 'TO_BE_ASSIGN' ||
          row.orderStatus === 'TO_BE_CONFIRMED' ||
          row.orderStatus === 'IN_PROGRESS') &&
-        columnIndex === 4
+        column.field === 'orderTypeTxt'
      ) {
        return 'order-blue'
      }
      if (
        row.orderStatus === 'PRE_HANDLING' &&
-        columnIndex === 4 &&
+        column.field === 'orderTypeTxt' &&
        row.sign === 1
      ) {
        return 'order-red'
      }
      if (
        row.orderStatus === 'PRE_HANDLING' &&
-        columnIndex === 4 &&
+        column.field === 'orderTypeTxt' &&
        row.sign === 0
      ) {
        return 'order-green'
      }
-      if (columnIndex === 4) {
+      if (column.field === 'orderTypeTxt') {
        return 'order-grey'
      }
    },
    cellStyle({
                row,
-                columnIndex,
+                column,
              }) {
      if (
        (row.orderStatus === 'PRE_HANDLING' ||
          row.orderStatus === 'TO_BE_ASSIGN' ||
          row.orderStatus === 'TO_BE_CONFIRMED' ||
          row.orderStatus === 'IN_PROGRESS') &&
-        columnIndex === 15
+        column.field === 'expectCompleteTime'
      ) {
        if (row.columnRenderColor) {
          return {
@@ -2018,6 +2039,14 @@ export default {
  }
 }
+.fullscreen {
+  width: 100%;
+}
+.no_fullscreen {
+  //width: 1300px;
+}
 .detail_list {
  &::v-deep {
    table {