Merge remote-tracking branch 'origin/test' into test

张含笑

2025-05-16 5749d7cd9cb870f3aaceac107048eb75e1d7683f

Merge remote-tracking branch 'origin/test' into test

 src/views/system/user.vue

@@ -363,6 +363,20 @@
                viewDisplay: false,
                rules: [{ required: true, validator: validatePass2, trigger: 'blur' }],
              },
              {
                label: '到期时间',
                prop: 'expireTime',
                type: 'datetime',
                format: 'YYYY-MM-DD HH:mm:ss',
                valueFormat: 'YYYY-MM-DD HH:mm:ss',
                rules: [
                  {
                    required: true,
                    message: '请选择到期时间',
                    trigger: 'blur',
                  },
                ],
              },
            ],
          },
          {

 src/views/tickets/ticket.vue

@@ -453,8 +453,7 @@
              :preview-src-list="getImageList()" :initial-index="currentImageIndex - 1" class="preview-image"
              style="cursor: pointer"> -->
            <el-image v-if="currentReviewImage" :src="getPreviewUrl(currentReviewImage)" fit="fill"
              :initial-index="currentImageIndex - 1" class="preview-image"
              style="cursor: pointer">
              :initial-index="currentImageIndex - 1" class="preview-image" style="cursor: pointer">
              <template #error>
                <div class="image-error">
                  <i class="el-icon-picture-outline"></i>
@@ -869,7 +868,11 @@
    formattedDetailFields () {
      const fields = [
        { label: '工单名称', value: this.currentDetail.orderName },
        { label: '工单类型', value: this.currentDetail.type },
        {
          label: '工单类型',
          // 修改这里：使用 types 数组查找对应的 label
          value: this.types.find(t => t.value === this.currentDetail.type)?.label || this.currentDetail.type || '/'
        },
        { label: '关联任务', value: this.currentDetail.job_name || '/' },
        { label: '任务发起人', value: this.currentDetail.creator },
        { label: '当前状态', value: this.mapStatus(this.currentDetail.status) },
@@ -2432,6 +2435,9 @@

        function closeConfirm () {
          that.reCheckDialog = false
          that.page.currentPage = 1
          that.fetchTableData()
          that.fetchTabCounts()
          loading.close()
        }

@@ -2440,6 +2446,8 @@
          ElMessageBox.confirm(`预计复核执行时间为${res.data.data}`, '提示', {
            confirmButtonText: '确定',
            showCancelButton: false, // 关键配置
            closeOnClickModal: false,
            closeOnPressEscape: false,
            type: 'warning',
          }).then(() => {
            closeConfirm()