处理工单下发代码冲突

黄何裕

2024-07-22 d60f2ca80ddbe1846fb7ad9fd1f1e2fb01c372fe

处理工单下发代码冲突

 src/components/ThemePicker/index.vue

@@ -15,7 +15,7 @@
  data() {
    return {
      chalk: '', // content of theme-chalk css
      theme: ''
      theme: "#409EFF"
    }
  },
  computed: {

 src/layout/components/Settings/index.vue

@@ -7,16 +7,16 @@
            <h3 class="drawer-title">主题风格设置</h3>
          </div>
          <div class="setting-drawer-block-checbox">
            <div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-dark')">
              <img src="@/assets/images/dark.svg" alt="dark">
              <div v-if="sideTheme === 'theme-dark'" class="setting-drawer-block-checbox-selectIcon" style="display: block;">
                <i aria-label="图标: check" class="anticon anticon-check">
                  <svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true" focusable="false" class="">
                    <path d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"/>
                  </svg>
                </i>
              </div>
            </div>
<!--            <div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-dark')">-->
<!--              <img src="@/assets/images/dark.svg" alt="dark">-->
<!--              <div v-if="sideTheme === 'theme-dark'" class="setting-drawer-block-checbox-selectIcon" style="display: block;">-->
<!--                <i aria-label="图标: check" class="anticon anticon-check">-->
<!--                  <svg viewBox="64 64 896 896" data-icon="check" width="1em" height="1em" :fill="theme" aria-hidden="true" focusable="false" class="">-->
<!--                    <path d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"/>-->
<!--                  </svg>-->
<!--                </i>-->
<!--              </div>-->
<!--            </div>-->
            <div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-light')">
              <img src="@/assets/images/light.svg" alt="light">
              <div v-if="sideTheme === 'theme-light'" class="setting-drawer-block-checbox-selectIcon" style="display: block;">

 src/store/modules/settings.js

@@ -5,8 +5,8 @@
const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
const state = {
  title: '',
  theme: storageSetting.theme || '#409EFF',
  sideTheme: storageSetting.sideTheme || sideTheme,
  theme: '#409EFF',
  sideTheme: "#409EFF",
  showSettings: showSettings,
  topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,
  tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,

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

@@ -13,9 +13,31 @@
      </el-col>
    </el-row>

    <el-row class="op-warp" type="flex" justify="left" >
      <el-col :span="24">
        <el-button size="mini" type="primary" @click="selectedDistribute" class="op">下发选中工单</el-button>
    <el-row class="op-warp">
      <el-row v-show="showSearch">
        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
          <el-form-item label="关键词" prop="keyword">
            <el-input
              v-model="queryParams.menuName"
              placeholder="关键词搜索"
              clearable
              @keyup.enter.native="page"
            />
          </el-form-item>
          <el-form-item label="下发状态" prop="status">
            <el-select v-model="queryParams.status" placeholder="下发状态" clearable>
              <el-option label="未下发" value="WAIT_DISTRIBUTE"/>
              <el-option label="已下发" value="DISTRIBUTED"/>
            </el-select>
          </el-form-item>
          <el-form-item>
            <el-button type="primary" icon="el-icon-search" size="small" @click="page">搜索</el-button>
          </el-form-item>
        </el-form>
      </el-row>

      <el-row>
        <el-button size="small" type="info" @click="selectedDistribute" class="op">下发选中工单</el-button>
        <el-popconfirm
          @confirm="allDistribute"
          title="确定要下发所有工单吗？"
@@ -64,15 +86,9 @@
          </el-form>
          <el-button slot="reference" type="primary" size="mini">快捷下发</el-button>
        </el-popover>
        <el-button
          type="primary"
          plain
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
        >手动新增工单</el-button>
        <el-button icon="el-icon-refresh" circle @click="page"></el-button>
      </el-col>
        <el-button size="small" type="success" @click="handleAdd">手动新增工单</el-button>
        <right-toolbar :showSearch.sync="showSearch" @queryTable="page"></right-toolbar>
      </el-row>
    </el-row>

    <el-row class="content-warp" type="flex" justify="left">
@@ -153,6 +169,7 @@
  name: 'index',
  data() {
    return {
      showSearch: true,
      selectedIdsDistributeForm: {
        ids: [],
        unitId: null
@@ -207,6 +224,8 @@
      },
      queryParams: {
        unitId: null,
        keyword: '',
        status: 'WAIT_DISTRIBUTE',
        pageNum: 1,
        pageSize: 10,
      },

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

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <el-form-item label="工单号" prop="workOrderNo">
        <el-input
          v-model="queryParams.workOrderNo"
@@ -12,13 +12,13 @@
      </el-form-item>
      <el-form-item label="故障类型" prop="workOrderNo">
        <el-select v-model="queryParams.errorType" placeholder="故障类型" clearable @clear="handleQuery">
          <el-option v-for="item, index in errorTypeOptions" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
          <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="status">
        <el-select v-model="queryParams.status" placeholder="审核状态" @change="handleQuery">
          <el-option label="已下发" value="DISTRIBUTED"></el-option>
          <el-option label="运维已处理" value="YW_HANDLE"></el-option>
      <el-form-item label="工单状态" prop="status">
        <el-select v-model="queryParams.status" placeholder="工单状态" @change="handleQuery">
          <el-option label="待处理" value="DISTRIBUTED"></el-option>
          <el-option label="待审核" value="YW_HANDLE"></el-option>
          <el-option label="审核通过" value="AUDITING_SUCCESS"></el-option>
          <el-option label="审核不通过" value="AUDITING_FAIL"></el-option>
        </el-select>
@@ -79,7 +79,6 @@
                size="mini"
                type="text"
                @click="handleAuditing(item)"
                v-hasPermi="['work:order:audit']"
              >审核</el-button>
              <el-button
                size="mini"
@@ -140,33 +139,37 @@
      </div>
    </el-dialog>

    <el-dialog title="工单审核" :visible.sync="auditingOpen" width="500px" append-to-body>
      <el-form ref="auditingForm" :model="auditingForm" :rules="auditingRules" label-width="80px">
        <el-form-item label="工单号" prop="workOrderNo">
          <el-input v-model="auditingForm.workOrderNo" disabled  />
        </el-form-item>
        <el-form-item label="运维单位" prop="unitName">
          <el-input v-model="auditingForm.unitName" disabled  />
        </el-form-item>
        <el-form-item label="运维人员" prop="ywPeopleName">
          <el-input v-model="auditingForm.ywPeopleName" disabled />
        </el-form-item>
        <div v-for="obj, index in ywConditions" :key="index">
          <el-form-item :label="'现场情况' + (index + 1)" v-if="obj.ywCondition">
            <span v-html="obj.ywCondition"></span>
          </el-form-item>
          <el-form-item label="佐证材料" v-if="obj.ywProofMaterials">
            <el-link v-for="item in obj.ywProofMaterials != null ? obj.ywProofMaterials.split(',') : obj.ywProofMaterials" :underline="false" :key="item.id" @click="handleDownload(item)">{{ item.substring(item.lastIndexOf("/") + 1) }}</el-link>
          </el-form-item>
        </div>
        <el-form-item label="审核结果" prop="auditingResult">
          <el-radio v-model="auditingForm.auditingResult" label="AUDITING_SUCCESS">通过</el-radio>
          <el-radio v-model="auditingForm.auditingResult" label="AUDITING_FAIL">驳回</el-radio>
        </el-form-item>
        <el-form-item label="审核备注" prop="auditingRemark">
          <el-input v-model="auditingForm.auditingRemark" type="textarea" maxlength="30" show-word-limit/>
        </el-form-item>
      </el-form>
    <el-dialog title="工单审核" :visible.sync="auditingOpen" width="1000px" append-to-body>
      <el-row :gutter="20">
        <el-col :span="10">
          <el-form ref="auditingForm" :model="auditingForm" :rules="auditingRules" label-width="80px">
            <el-form-item label="工单号" prop="workOrderNo">
              <el-input v-model="auditingForm.workOrderNo" disabled  />
            </el-form-item>
            <el-form-item label="运维单位" prop="unitName">
              <el-input v-model="auditingForm.unitName" disabled  />
            </el-form-item>
            <el-form-item label="审核结果" prop="auditingResult">
              <el-radio v-model="auditingForm.auditingResult" label="AUDITING_SUCCESS">通过</el-radio>
              <el-radio v-model="auditingForm.auditingResult" label="AUDITING_FAIL">驳回</el-radio>
            </el-form-item>
            <el-form-item label="审核备注" prop="auditingRemark">
              <el-input v-model="auditingForm.auditingRemark" type="textarea" maxlength="30" show-word-limit/>
            </el-form-item>
          </el-form>
        </el-col>
        <el-col :span="14" style="max-height: 500px; overflow-y: scroll">
          <el-timeline>
            <el-timeline-item v-for="(condition, index) in ywConditions" :key="index" :timestamp="condition.commitUserName + '___' + condition.createTime" placement="top">
              <el-card>
                <div v-html="condition.ywCondition"></div>
                <el-link type="primary" v-for="item in condition.ywProofMaterials != null ? condition.ywProofMaterials.split(',') : condition.ywProofMaterials" :underline="false" :key="item.id" @click="handleDownload(item)">{{ item.substring(item.lastIndexOf("/") + 1) }}</el-link>
              </el-card>
            </el-timeline-item>
          </el-timeline>
        </el-col>
      </el-row>

      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitAuditing">确 定</el-button>
        <el-button @click="cancelAuditing">取 消</el-button>
@@ -242,46 +245,50 @@
          </el-step>
          <el-step title="运维处理">
            <template slot="description">
              <div class="y-item" v-for="(item, index) in ywHandleList" :key="index">
                <div class="y-item-1">
                  <div class="flow-item-x">
                    现场情况：
                    <!-- <el-tooltip class="item" effect="dark" :content="item.ywCondition" placement="top"> -->
                    <span v-html="item.ywCondition"></span>
                    <!-- </el-tooltip> -->
              <div style="max-height: 450px;overflow-y: scroll">
                <div class="y-item" v-for="(item, index) in ywHandleList" :key="index">
                  <div class="y-item-1">
                    <div class="flow-item-x">
                      现场情况：
                      <!-- <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>
                    </div> -->
                  </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>
                  </div> -->
                </div>
                <div class="y-item-2">
                  <div >
                    {{ parseTime(item.createTime) }}
                  </div>
                  <div >
                    第{{ index + 1 }}次
                  <div class="y-item-2">
                    <div >
                      {{ parseTime(item.createTime) }}
                    </div>
                    <div >
                      第{{ index + 1 }}次
                    </div>
                  </div>
                </div>
              </div>
            </template>
          </el-step>
          <el-step title="结果审核">
          <el-step title="审核结果">
            <template slot="description">
              <div class="y-item" v-for="(item, index) in ywAuditingList" :key="index">
                <div class="y-item-1">
                  <div class="flow-item-x">
                    审核结果：<el-tag :type="item.result == '审核通过' ? 'success' : 'danger'" size="small">{{ item.result }}</el-tag>
              <div style="max-height: 450px;overflow-y: scroll">
                <div class="y-item" v-for="(item, index) in ywAuditingList" :key="index">
                  <div class="y-item-1">
                    <div class="flow-item-x">
                      审核结果：<el-tag :type="item.result == '审核通过' ? 'success' : 'danger'" size="small">{{ item.result }}</el-tag>
                    </div>
                    <div class="flow-item-x">
                      审核说明：<span v-html="item.remark"></span>
                    </div>
                  </div>
                  <div class="flow-item-x">
                    审核说明：<span v-html="item.remark"></span>
                  </div>
                </div>
                <div class="y-item-2">
                  <div >
                    {{ parseTime(item.createTime) }}
                  </div>
                  <div >
                    第{{ index + 1 }}次
                  <div class="y-item-2">
                    <div >
                      {{ parseTime(item.createTime) }}
                    </div>
                    <div >
                      第{{ index + 1 }}次
                    </div>
                  </div>
                </div>
              </div>
@@ -508,7 +515,7 @@
          this.ywAuditingList = response.data;
        }
      });
      getYwConditionList(row.id).then(response => {
      getYwCondition(row.id).then(response => {
        if (response.data) {
          this.ywHandleList = response.data;
        }