Merge remote-tracking branch 'origin/master'

xiangpei

2024-03-21 47a9d0b2711203995fd5eeb00df1bebda7d63ad8

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

@@ -78,50 +78,56 @@
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="工单号" align="center" prop="workOrderNo" width="170"/>
      <el-table-column label="工单来源" align="center" prop="source" width="170"/>
      <el-table-column label="是否报备" align="center" width="170">
        <template slot-scope="scope">
          <el-tag>已报备(事前)</el-tag>
        </template>
      </el-table-column>
      <el-table-column label="故障类型" align="center" prop="errorType" width="170"/>
      <el-table-column label="运维单位" align="center" prop="unitName" width="150"/>
      <el-table-column label="运维人员" align="center" prop="ywPeopleName" />
      <el-table-column label="运维处理时间" align="center" prop="ywHandleTime" width="180"/>
      <el-table-column label="处理结束时间" align="center" prop="ywHandleTime" width="180"/>
      <el-table-column label="运维结果" align="center" prop="ywResult" />
      <el-table-column label="运维情况" align="center" prop="ywCondition" width="150"/>
      <el-table-column label="运维检测结果" align="center" prop="ywCheckResult" width="230"/>

      <el-table-column label="运维检测结果" align="center" prop="ywCheckResult" width="200"/>
      <el-table-column label="审核通过时间" align="center" prop="ywHandleTime" width="200"/>
      <el-table-column label="创建时间" align="center" prop="createTime" width="180"/>

      <el-table-column label="操作" fixed="right" width="150"  align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
<!--          <el-button-->
<!--            size="mini"-->
<!--            type="text"-->
<!--            icon="el-icon-edit"-->
<!--            @click="handleUpdate(scope.row)"-->
<!--            v-hasPermi="['x:work-order:edit']"-->
<!--          >修改</el-button>-->
          <el-button
            size="mini"
            type="text"
            @click="handleAuditing(scope.row)"
            v-hasPermi="['work:order:audit']"
          >审核</el-button>
          <el-button
            size="mini"
            type="text"
            @click="handleYwCondition(scope.row)"
          >运维情况</el-button>
          <el-button
            size="mini"
            type="text"
            @click="handleYwResult(scope.row)"
          >运维结果</el-button>
<!--          <el-button-->
<!--            size="mini"-->
<!--            type="text"-->
<!--            @click="handleYwResult(scope.row)"-->
<!--          >运维结果</el-button>-->
          <el-button
            size="mini"
            type="text"
            @click="handleCheckResult(scope.row)"
            v-hasPermi="['work:order:result']"
          >检测结果</el-button>
          <el-button
            size="mini"
            type="text"
            @click="handleFlow(scope.row)"
          >过程图</el-button>
          <el-button
            size="mini"
            type="text"
            @click="handleReport(scope.row)"
          >事后报备</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -133,6 +139,35 @@
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />

    <!-- 事后报备 -->
    <el-dialog title="事后报备" :visible.sync="reportOpen" width="600px" append-to-body>
      <el-form ref="reportForm" :model="reportForm" :rules="reportFormRules" label-width="80px">
        <el-form-item label="点位" prop="pointId">
          <el-input v-model="reportForm.pointId" disabled />
        </el-form-item>
        <el-form-item label="报备类型">
          <el-input v-model="reportForm.reportType" disabled />
        </el-form-item>
        <el-form-item label="故障类型" prop="errorType">
          <el-select v-model="reportForm.errorType">
            <el-option label="市政施工" value="市政施工"/>
            <el-option label="设备故障" value="设备故障"/>
            <el-option label="设备遗失" value="设备遗失"/>
          </el-select>
        </el-form-item>
        <el-form-item label="报备内容" prop="reportContent">
          <editor v-model="reportForm.reportContent" :min-height="192"/>
        </el-form-item>
        <el-form-item label="上报材料" prop="reportMaterials">
          <file-upload v-model="reportForm.reportMaterials"/>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitReportForm">提 交</el-button>
        <el-button @click="reportOpen = false">取 消</el-button>
      </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">
@@ -247,7 +282,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitYwResult">确 定</el-button>
        <el-button @click="cancelYwResult">取 消</el-button>
        <el-button @click="cancelCheckResult">取 消</el-button>
      </div>
    </el-dialog>

@@ -280,9 +315,9 @@


    <!-- 过程图 -->
    <el-dialog title="过程图" :visible.sync="flowOpen" width="900px" append-to-body>
    <el-dialog title="过程图" :visible.sync="flowOpen" width="1200px" :close-on-click-modal="false" append-to-body>
      <div>
        <el-steps :active="1">
        <el-steps :active="2" :space="500">
          <el-step title="产生工单">
            <template slot="description">
              <div>
@@ -296,6 +331,9 @@
                  运维单位：{{flowForm.unitName}}
                </div>
                <div class="flow-item-x">
                  创建时间：{{flowForm.createTime}}
                </div>
                <div class="flow-item-x">
                  处理期限：<el-tag type="danger" size="small">12小时</el-tag>
                </div>
              </div>
@@ -303,21 +341,8 @@
          </el-step>
          <el-step title="运维处理">
            <template slot="description">
              <div style="margin-bottom: 8px;padding: 0 3px; background-color: #d9d9d9;display: flex;flex-direction: row;align-items: center">
                <div style="flex: 2">
                  <div class="flow-item-x">
                    运维状态：<el-tag type="danger" size="small">处理中</el-tag>
                  </div>
                  <div class="flow-item-x">
                    运维人员：<el-tag type="danger" size="small">{{flowForm.ywPeopleName}}</el-tag>
                  </div>
                </div>
                <div style="flex: 1">
                  {{flowForm.ywHandleTime}}
                </div>
              </div>
              <div style="margin-bottom: 8px;padding: 0 3px;background-color: #d9d9d9;display: flex;flex-direction: row;align-items: center">
                <div style="flex: 2">
              <div class="y-item">
                <div class="y-item-1">
                  <div class="flow-item-x">
                    运维状态：<el-tag type="danger" size="small">结果上报</el-tag>
                  </div>
@@ -325,8 +350,31 @@
                    运维人员：<el-tag type="danger" size="small">{{flowForm.ywPeopleName}}</el-tag>
                  </div>
                </div>
                <div style="flex: 1">
                  {{flowForm.ywHandleTime}}
                <div class="y-item-2">
                  <div >
                    {{flowForm.ywHandleTime}}
                  </div>
                  <div >
                    第几次：1
                  </div>
                </div>
              </div>
              <div class="y-item">
                <div class="y-item-1">
                  <div class="flow-item-x">
                    运维状态：<el-tag type="danger" size="small">结果上报</el-tag>
                  </div>
                  <div class="flow-item-x">
                    运维人员：<el-tag type="danger" size="small">{{flowForm.ywPeopleName}}</el-tag>
                  </div>
                </div>
                <div class="y-item-2">
                  <div >
                    {{flowForm.ywHandleTime}}
                  </div>
                  <div >
                    第几次：2
                  </div>
                </div>
              </div>

@@ -334,7 +382,42 @@
          </el-step>
          <el-step title="结果审核">
            <template slot="description">
              暂时不能审核
              <div class="y-item">
                <div class="y-item-1">
                  <div class="flow-item-x">
                    审核结果：<el-tag type="danger" size="small">驳回</el-tag>
                  </div>
                  <div class="flow-item-x">
                    审核说明：<el-tag type="danger" size="small">未成功处理</el-tag>
                  </div>
                </div>
                <div class="y-item-2">
                  <div >
                    {{flowForm.ywHandleTime}}
                  </div>
                  <div >
                    第几次：1
                  </div>
                </div>
              </div>
              <div class="y-item">
                <div class="y-item-1">
                  <div class="flow-item-x">
                    审核状态：<el-tag type="info" size="small">审核中</el-tag>
                  </div>
                  <div class="flow-item-x">
                    审核说明：
                  </div>
                </div>
                <div class="y-item-2">
                  <div >
                    {{flowForm.ywHandleTime}}
                  </div>
                  <div >
                    第几次：2
                  </div>
                </div>
              </div>
            </template>
          </el-step>
        </el-steps>
@@ -347,6 +430,20 @@
.flow-item-x {
  margin: 5px 0;
}
.y-item {
  margin-bottom: 8px;
  padding: 0 3px;
  background-color: #d9d9d9;
  display: flex;
  flex-direction: row;
  align-items: center
}
.y-item-2 {
  flex: 1;
}
.y-item-1 {
  flex: 2;
}
</style>
<script>
import { listWorkOrder, getWorkOrder, delWorkOrder, addWorkOrder, updateWorkOrder,auditing, ywCondition } from "@/api/platform/work-order";
@@ -356,6 +453,22 @@
  },
  data() {
    return {
      reportFormRules: {
        reportContent: [
          { required: true, message: "报备内容不能为空", trigger: "blur" }
        ],
        reportMaterials: [
          { required: true, message: "上报材料不能为空", trigger: "blur" }
        ],
      },
      reportOpen: false,
      reportForm: {
        reportType: "事后报备",
        pointId: "琼于镇3街1号摄像头",
        errorType: "",
        reportContent: "",
        reportMaterials: ""
      },
      // 过程图
      flowOpen: false,
      flowForm: {},
@@ -440,6 +553,23 @@
    this.getList();
  },
  methods: {
    // 报备
    submitReportForm() {
      this.$refs["reportForm"].validate(valid => {
        if (valid) {
          addReport(this.form).then(response => {
            this.$modal.msgSuccess("成功提交报备");
            this.open = false;
            this.getList();
          });
        }
      });
    },
    // 事后报备按钮
    handleReport(row) {
      this.reportForm.pointId = row.source;
      this.reportOpen = true;
    },
    // 审核按钮
    handleAuditing(row) {
      this.auditingForm = row;