Merge remote-tracking branch 'origin/master'

fuliqi

2024-07-17 c842728cb2b4c74d5213360da344ebda01da328f

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/system/work-order/index.vue

 src/views/system/work-order/index.vue

@@ -200,8 +200,8 @@
    <el-dialog title="运维批量审核" :visible.sync="batchAuditingVisible" width="500px" append-to-body>
      <el-form ref="batchAuditingWorkOrder" :model="batchAuditingWorkOrder" label-width="80px" :rules="batchAuditingRules">
        <el-form-item label="故障类型" prop="errorType">
          <el-select v-model="batchAuditingWorkOrder.errorType" placeholder="故障类型">
            <el-option v-for="item, index in errorTypeOptions" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
          <el-select v-model="batchAuditingWorkOrder.errorTypes" multiple placeholder="故障类型">
            <el-option v-for="(item, index) in errorTypeOptions" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="审核说明" prop="auditingRemark">
@@ -209,8 +209,8 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="batchAuditing('AUDITING_SUCCESS')">审 核</el-button>
        <el-button type="danger" @click="batchAuditing('AUDITING_FAIL')">驳 回</el-button>
        <el-button type="primary" @click="batchAuditing('AUDITING_SUCCESS')" size="small">通 过</el-button>
        <el-button type="danger" @click="batchAuditing('AUDITING_FAIL')" size="small">驳 回</el-button>
      </div>
    </el-dialog>

@@ -246,10 +246,9 @@
                <div class="y-item-1">
                  <div class="flow-item-x">
                    现场情况：
                    <div v-html="item.ywCondition"></div>
<!--                    <el-tooltip class="item" effect="dark" :content="item.ywCondition" placement="top">-->
<!--                      <el-tag size="small" class="line-limit-length">{{ item.ywCondition }}</el-tag>-->
<!--                    </el-tooltip>-->
                    <!-- <el-tooltip class="item" effect="dark" :content="item.ywCondition" placement="top"> -->
                    <span v-html="item.ywCondition"></span>
                    <!-- </el-tooltip> -->
                  </div>
                  <!-- <div class="flow-item-x">
                    <el-tag size="small" v-for="file in item.ywProofMaterials != null ? item.ywProofMaterials.split(',') : item.ywProofMaterials" :key="file" @click="handleDownload(file)">{{ file.substring(file.lastIndexOf("/") + 1) }}</el-tag>
@@ -260,7 +259,7 @@
                    {{ parseTime(item.createTime) }}
                  </div>
                  <div >
                    第几次：{{ index + 1 }}
                    第{{ index + 1 }}次
                  </div>
                </div>
              </div>
@@ -274,7 +273,7 @@
                    审核结果：<el-tag :type="item.result == '审核通过' ? 'success' : 'danger'" size="small">{{ item.result }}</el-tag>
                  </div>
                  <div class="flow-item-x">
                    审核说明：<el-tag size="small" v-if="item.remark">{{ item.remark }}</el-tag>
                    审核说明：<span v-html="item.remark"></span>
                  </div>
                </div>
                <div class="y-item-2">
@@ -282,7 +281,7 @@
                    {{ parseTime(item.createTime) }}
                  </div>
                  <div >
                    第几次：{{ index + 1 }}
                    第{{ index + 1 }}次
                  </div>
                </div>
              </div>
@@ -326,7 +325,11 @@
      errorTypeOptions: [],
      ywConditions: [],
      batchAuditingVisible: false,
      batchAuditingWorkOrder: {},
      batchAuditingWorkOrder: {
        errorTypes: [],
        auditingRemark: '',
        auditingResult: ''
      },
      ywHandleList: [],
      ywAuditingList: [],
      reportFormRules: {
@@ -426,8 +429,8 @@
      },
      // 批量审核校验
      batchAuditingRules: {
        errorType: [
          { required: true, message: "请选择故障类型", trigger: "blur" }
        errorTypes: [
          { required: true, message: "请选择故障类型", trigger: "change" }
        ],
      }
    };