Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-06 9e8d1bd0b6fb495920921214775b84d490e032a3

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

@@ -162,12 +162,15 @@
        <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-form-item label="故障类型" prop="errorTypeList">
          <el-select v-model="reportForm.errorTypeList" multiple>
            <el-option v-for="dict in dict.type.report_error_type" :value="dict.value" :key="dict.value" :label="dict.label" />
          </el-select>
        </el-form-item>
        <el-form-item label="报备时间" prop="daterangeCreateTime">
          <el-date-picker v-model="reportForm.daterangeCreateTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss"
                          range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
          ></el-date-picker>
        </el-form-item>
        <el-form-item label="报备内容" prop="reportContent">
          <editor v-model="reportForm.reportContent" :min-height="192"/>
@@ -178,7 +181,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button @click="reportOpen = false">取 消</el-button>
        <el-button type="primary" @click="submitReportForm">提 交</el-button>
        <el-button type="primary" @click="submitReportForm">提交审核</el-button>
      </div>
    </el-dialog>

@@ -271,7 +274,7 @@
    <el-dialog title="过程图" :visible.sync="flowOpen" width="1200px" append-to-body>
      <div>
        <el-steps :active="ywAuditingList.length != 0 ? 3 : ywHandleList.length != 0 ? 2 : 1" :space="500">
          <el-step title="产生工单">
          <el-step :title="getTitle1()">
            <template slot="description">
              <div>
                <div class="row flow-item-x">
@@ -297,7 +300,7 @@
              </div>
            </template>
          </el-step>
          <el-step title="运维处理">
          <el-step :title="getTitle2()">
            <template slot="description">
              <div style="max-height: 450px;overflow-y: scroll">
                <div v-for="(item, index) in ywHandleList" :key="index">
@@ -444,7 +447,7 @@

export default {
  name: 'Work-order',
  dicts: ['error_type'],
  dicts: ['error_type', 'report_error_type'],
  components: {},
  data() {
    return {
@@ -460,21 +463,32 @@
      },
      ywHandleList: [],
      ywAuditingList: [],
      beforeReportMsg: '',
      afterReportMsg: '',
      reportFormRules: {
        reportContent: [
          { required: true, message: '报备内容不能为空', trigger: 'blur' }
        ],
        reportMaterials: [
          { required: true, message: '报备材料不能为空', trigger: 'blur' }
        ]
        ],
        errorTypeList: [
          { required: true, message: '请选择故障类型', trigger: 'change' }
        ],
        daterangeCreateTime: [
          { required: true, message: '请选择报备时间', trigger: 'change' }
        ],
      },
      reportOpen: false,
      reportForm: {
        reportType: '事后报备',
        pointId: '',
        errorType: '',
        errorTypeList: [],
        reportContent: '',
        reportMaterials: ''
        reportMaterials: '',
        daterangeCreateTime: [],
        beginCreateTime: null,
        endCreateTime: null
      },
      // 过程图
      flowOpen: false,
@@ -565,6 +579,12 @@
    this.getList()
  },
  methods: {
    getTitle1() {
      return '产生工单' + (this.beforeReportMsg ? '(' + this.beforeReportMsg + ')' : '')
    },
    getTitle2() {
      return '运维处理' + (this.afterReportMsg ? '(' + this.afterReportMsg + ')' : '')
    },
    openDrawer(item) {
      this.ywData = {
        content: '',
@@ -596,6 +616,10 @@
    submitReportForm() {
      this.$refs['reportForm'].validate(valid => {
        if (valid) {
          if (this.reportForm.daterangeCreateTime && this.reportForm.daterangeCreateTime.length > 0) {
            this.reportForm.beginCreateTime = this.reportForm.daterangeCreateTime[0]
            this.reportForm.endCreateTime = this.reportForm.daterangeCreateTime[1]
          }
          addReport(this.reportForm).then(response => {
            this.$modal.msgSuccess('成功提交报备')
            this.reportOpen = false
@@ -606,7 +630,7 @@
    },
    // 事后报备按钮
    handleReport(row) {
      this.reportForm.pointId = row.pointId
      this.reportForm.pointId = row.serialNumber
      this.reportForm.source = row.source
      this.reportOpen = true
    },
@@ -642,6 +666,8 @@
        if (response.data) {
          this.ywAuditingList = response.data.auditingList
          this.ywHandleList = response.data.ywList
          this.afterReportMsg = response.data.afterReportMsg
          this.beforeReportMsg = response.data.beforeReportMsg
          this.flowOpen = true
        }
      })