zhaowei
2025-04-08 08bd5d49d05951435f10fe61bfe72c90bdfbb435
故障保修页面完成基础功能并与后端联调
已添加1个文件
已修改3个文件
570 ■■■■ 文件已修改
src/views/eam/equipment/modules/EamEquipmentModal.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/repair/EamReportRepairList.vue 231 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/repair/modules/EamReportRepairModal.vue 281 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/repair/modules/ImagesPreviewModal.vue 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/equipment/modules/EamEquipmentModal.vue
@@ -81,7 +81,7 @@
            </a-row>
          </a-col>
          <a-col :span="6">
            <j-image-upload text="设备图片" biz="eam_equipment_image" v-model="model.equipmentImage"></j-image-upload>
            <j-image-upload text="设备图片" bizPath="eam_equipment_image" v-model="model.equipmentImage"></j-image-upload>
          </a-col>
        </a-row>
src/views/eam/repair/EamReportRepairList.vue
@@ -5,37 +5,59 @@
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="故障开始时间">
              <a-input placeholder="请输入故障开始时间" v-model="queryParam.faultStartTime"></a-input>
            <a-form-item label="设备编号">
              <a-input placeholder="请输入设备编号" v-model="queryParam.equipmentId"/>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="单据状态">
              <a-select placeholder="请选择单据状态" v-model="queryParam.reportStatus" allow-clear>
                <a-select-option v-for="item in report_repair_status_list" :key="item.value">{{ item.label }}
                </a-select-option>
              </a-select>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="故障简称">
              <!--              <a-select placeholder="请选择故障简称" v-model="queryParam.faultName" allow-clear>-->
              <!--                <a-select-option v-for="item in faultReasonList" :key="item.faultName">-->
              <!--                  {{ item.faultName }}-->
              <!--                </a-select-option>-->
              <!--              </a-select>-->
              <a-input placeholder="请输入故障简称" v-model="queryParam.faultName" allow-clear/>
            </a-form-item>
          </a-col>
          <!--            <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
          <!--              <a-form-item label="故障分类">-->
          <!--                <a-input placeholder="请输入故障分类" v-model="queryParam.faultType"></a-input>-->
          <!--              </a-form-item>-->
          <!--            </a-col>-->
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="故障时间">
              <a-range-picker showTime v-model="faultTimeRange" value-format="YYYY-MM-DD HH:mm:ss"
                              @change="handleTimeRangeChange"
                              style="width: 100%"/>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="是否停机">
              <a-radio-group v-model="queryParam.breakdownFlag">
                <a-radio v-for="item in breakdown_flag_list" :value="item.value">{{ item.label }}</a-radio>
              </a-radio-group>
            </a-form-item>
          </a-col>
          <template v-if="toggleSearchStatus">
            <a-col :xl="6" :lg="7" :md="8" :sm="24">
              <a-form-item label="是否停机">
                <a-input placeholder="请输入是否停机" v-model="queryParam.breakdownFlag"></a-input>
              </a-form-item>
            </a-col>
            <a-col :xl="6" :lg="7" :md="8" :sm="24">
              <a-form-item label="设备ID">
                <a-input placeholder="请输入设备ID" v-model="queryParam.equipmentId"></a-input>
              </a-form-item>
            </a-col>
            <a-col :xl="6" :lg="7" :md="8" :sm="24">
              <a-form-item label="故障分类">
                <a-input placeholder="请输入故障分类" v-model="queryParam.faultType"></a-input>
              </a-form-item>
            </a-col>
          </template>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
              <a @click="handleToggleSearch" style="margin-left: 8px">
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
              </a>
              <a-button @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
              <!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
              <!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
              <!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
              <!--              </a>-->
            </span>
          </a-col>
@@ -54,12 +76,12 @@
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="batchDel">
            <a-icon type="delete" />
            åˆ é™¤
            <a-icon type="delete"/>
            ä½œåºŸ
          </a-menu-item>
        </a-menu>
        <a-button style="margin-left: 8px"> æ‰¹é‡æ“ä½œ
          <a-icon type="down" />
          <a-icon type="down"/>
        </a-button>
      </a-dropdown>
    </div>
@@ -85,20 +107,28 @@
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        @change="handleTableChange">
        <span slot="action" slot-scope="text, record">
        <template slot="imageFiles" slot-scope="text, record" v-if="text">
          <a @click="handlePreviewImages(record)">预览</a>
        </template>
        <span slot="action" slot-scope="text, record" v-if="record.reportStatus=='WAIT_REPAIR'">
          <a @click="handleEdit(record)">编辑</a>
          <a-divider type="vertical" />
          <a-dropdown>
            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
            <a-menu slot="overlay">
              <a-menu-item>
                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                  <a>删除</a>
                </a-popconfirm>
              </a-menu-item>
            </a-menu>
          </a-dropdown>
          <a-divider type="vertical"/>
          <a-popconfirm title="确定作废吗?" @confirm="() => handleDelete(record.id)">
            <a>作废</a>
          </a-popconfirm>
          <!--          <a-dropdown>-->
          <!--            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>-->
          <!--            <a-menu slot="overlay">-->
          <!--              <a-menu-item>-->
          <!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
          <!--                  <a>删除</a>-->
          <!--                </a-popconfirm>-->
          <!--              </a-menu-item>-->
          <!--            </a-menu>-->
          <!--          </a-dropdown>-->
        </span>
      </a-table>
@@ -106,7 +136,10 @@
    <!-- table区域-end -->
    <!-- è¡¨å•区域 -->
    <eamReportRepair-modal ref="modalForm" @ok="modalFormOk"></eamReportRepair-modal>
    <eamReportRepair-modal ref="modalForm" :breakdownFlagList="breakdown_flag_list" :faultReasonList="faultReasonList"
                           @ok="modalFormOk"/>
    <!-- å›¾ç‰‡é¢„览弹窗 -->
    <images-preview-modal ref="imagesPreviewModalRef" :imageListUrl="currentImageListUrl"/>
  </a-card>
</template>
@@ -114,11 +147,18 @@
import '@/assets/less/TableExpand.less'
import EamReportRepairModal from './modules/EamReportRepairModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api'
import ImagesPreviewModal from '@views/eam/repair/modules/ImagesPreviewModal.vue'
import { getAction } from '@/api/manage'
export default {
  name: 'EamReportRepairList',
  mixins: [JeecgListMixin],
  components: {
    ImagesPreviewModal,
    LxSearchEquipmentSelect,
    EamReportRepairModal
  },
  data() {
@@ -137,39 +177,53 @@
          }
        },
        {
          title: '故障开始时间',
          title: '设备编号',
          align: 'center',
          dataIndex: 'faultStartTime'
          dataIndex: 'equipmentId_dictText',
          width: 200
        },
        {
          title: '是否停机',
          title: '状态',
          align: 'center',
          dataIndex: 'breakdownFlag'
          dataIndex: 'reportStatus_dictText',
          width: 100
        },
        {
          title: '设备ID',
          title: '故障简称',
          align: 'center',
          dataIndex: 'equipmentId'
          dataIndex: 'faultName',
          width: 100
        },
        {
          title: '故障分类',
          align: 'center',
          dataIndex: 'faultType'
          dataIndex: 'faultType_dictText',
          width: 100
        },
        {
          title: '故障描述',
          align: 'center',
          dataIndex: 'faultDescription'
          dataIndex: 'faultDescription',
          width: 200
        },
        {
          title: '报修状态',
          title: '故障开始时间',
          align: 'center',
          dataIndex: 'reportStatus'
          dataIndex: 'faultStartTime',
          width: 200
        },
        {
          title: '照片文件ids;id以逗号分隔',
          title: '是否停机',
          align: 'center',
          dataIndex: 'imageFiles'
          dataIndex: 'breakdownFlag_dictText',
          width: 100
        },
        {
          title: '报修图片',
          align: 'center',
          dataIndex: 'imageFiles',
          scopedSlots: { customRender: 'imageFiles' },
          width: 100
        },
        {
          title: '备注',
@@ -180,15 +234,22 @@
          title: '操作',
          dataIndex: 'action',
          align: 'center',
          scopedSlots: { customRender: 'action' }
          scopedSlots: { customRender: 'action' },
          width: 150
        }
      ],
      breakdown_flag_list: [],
      report_repair_status_list: [],
      faultTimeRange: [],
      faultReasonList: [],
      currentImageListUrl: '',
      url: {
        list: '/eam/eamReportRepair/list',
        delete: '/eam/eamReportRepair/delete',
        deleteBatch: '/eam/eamReportRepair/deleteBatch',
        delete: '/eam/eamReportRepair/abolish',
        deleteBatch: '/eam/eamReportRepair/abolishBatch',
        exportXlsUrl: 'eam/eamReportRepair/exportXls',
        importExcelUrl: 'eam/eamReportRepair/importExcel'
        importExcelUrl: 'eam/eamReportRepair/importExcel',
        faultReasonList: '/eam/equipmentFaultReason/list'
      }
    }
  },
@@ -197,7 +258,65 @@
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
    }
  },
  methods: {}
  created() {
    this.initDictData('breakdown_flag')
    this.initDictData('report_repair_status')
    this.getFaultReasonListByApi()
  },
  methods: {
    /**
     * èŽ·å–æ•°æ®å­—å…¸å€¼
     * @param dictCode æ•°æ®å­—典对应记录编码
     */
    initDictData(dictCode) {
      // //优先从缓存中读取字典配置
      if (getDictItemsFromCache(dictCode)) {
        this[dictCode + '_list'] = getDictItemsFromCache(dictCode)
        return
      }
      //根据字典Code, åˆå§‹åŒ–字典数组
      ajaxGetDictItems(dictCode, null).then((res) => {
        if (res.success) {
          this[dictCode + '_list'] = res.result
          return
        }
      })
    },
    // è°ƒç”¨æŽ¥å£èŽ·å–æ•…éšœåŽŸå› åˆ—è¡¨
    getFaultReasonListByApi() {
      const that = this
      getAction(this.url.faultReasonList)
        .then(res => {
          console.log('res', res)
          that.faultReasonList = res.result.records
        })
    },
    /**
     * æ•…障时间选择器变化时触发
     * @param valueArray
     */
    handleTimeRangeChange(valueArray) {
      this.queryParam.startTime = valueArray[0]
      this.queryParam.endTime = valueArray[1]
    },
    /**
     * é¢„览图片
     * @param imageFiles è¡¨æ ¼è¡Œå›¾ç‰‡åœ°å€
     */
    handlePreviewImages({ imageFiles }) {
      this.currentImageListUrl = imageFiles
      this.$refs.imagesPreviewModalRef.visible = true
    },
    searchReset() {
      this.queryParam = {}
      this.faultTimeRange = []
      this.loadData(1)
    }
  }
}
</script>
<style scoped>
src/views/eam/repair/modules/EamReportRepairModal.vue
@@ -6,39 +6,78 @@
    :confirmLoading="confirmLoading"
    switchFullscreen
    @ok="handleOk"
    @cancel="handleCancel"
    @cancel="close"
    :mask-closable="false"
    cancelText="关闭">
    <a-spin :spinning="confirmLoading">
      <a-form-model ref="form" :model="model" :rules="validatorRules">
      <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
        <a-row>
          <a-col :span="12">
            <a-form-model-item prop="equipmentId" label="设备编号">
              <lx-search-equipment-select placeholder="请输入设备编号或名称搜索" v-model="model.equipmentId"/>
            </a-form-model-item>
          </a-col>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag" label="删除标记">
          <a-input-number v-model="model.delFlag"/>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="faultStartTime" label="故障开始时间">
          <a-input placeholder="请输入故障开始时间" v-model="model.faultStartTime" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="breakdownFlag" label="是否停机">
          <a-input placeholder="请输入是否停机" v-model="model.breakdownFlag" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="设备ID">
          <a-input placeholder="请输入设备ID" v-model="model.equipmentId" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="faultType" label="故障分类">
          <a-input placeholder="请输入故障分类" v-model="model.faultType" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="faultDescription" label="故障描述">
          <a-input placeholder="请输入故障描述" v-model="model.faultDescription" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="reportStatus" label="报修状态">
          <a-input placeholder="请输入报修状态" v-model="model.reportStatus" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageFiles" label="照片文件ids;id以逗号分隔">
          <a-input placeholder="请输入照片文件ids;id以逗号分隔" v-model="model.imageFiles" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark" label="备注">
          <a-input placeholder="请输入备注" v-model="model.remark" />
        </a-form-model-item>
          <a-col :span="12">
            <a-form-model-item prop="faultName" label="故障简称">
              <a-select placeholder="请选择故障简称" v-model="model.faultName" @change="handleFaultNameChange">
                <a-select-option v-for="item in faultReasonList" :key="item.faultName">
                  {{ item.faultName }}
                </a-select-option>
              </a-select>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="故障分类">
              <a-input placeholder="请输入故障分类" v-model="model.faultType_dictText" readOnly/>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="故障描述">
              <a-input placeholder="请输入故障描述" v-model="model.faultDescription" readOnly/>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item prop="faultStartTime" label="故障开始时间">
              <a-date-picker showTime placeholder="请选择故障开始时间" v-model="model.faultStartTime"
                             :allow-clear="false" value-format="YYYY-MM-DD HH:mm:ss"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item prop="breakdownFlag" label="是否停机">
              <a-radio-group v-model="model.breakdownFlag">
                <a-radio v-for="item in breakdownFlagList" :value="item.value">{{ item.label }}</a-radio>
              </a-radio-group>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="24">
            <a-form-model-item prop="imageFiles" label="报修图片" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
              <j-image-upload v-model="model.imageFiles" :is-multiple="true" :number="3"/>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="24">
            <a-form-model-item prop="remark" label="备注" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
              <a-textarea placeholder="请输入备注" v-model="model.remark"/>
            </a-form-model-item>
          </a-col>
        </a-row>
        <!--        <a-form-model-item  prop="reportStatus" label="报修状态">-->
        <!--          <a-input placeholder="请输入报修状态" v-model="model.reportStatus" />-->
        <!--        </a-form-model-item>-->
      </a-form-model>
    </a-spin>
@@ -46,88 +85,122 @@
</template>
<script>
  import { httpAction } from '@/api/manage'
  import moment from "moment"
import { httpAction } from '@/api/manage'
import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
  export default {
    name: "EamReportRepairModal",
    data () {
      return {
        title:"操作",
        visible: false,
        model: {},
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 },
        },
        confirmLoading: false,
        validatorRules:{
        },
        url: {
          add: "/eam/eamReportRepair/add",
          edit: "/eam/eamReportRepair/edit",
        },
export default {
  name: 'EamReportRepairModal',
  components: { LxSearchEquipmentSelect },
  props: {
    breakdownFlagList: {
      type: Array
    },
    faultReasonList: {
      type: Array
    }
  },
  data() {
    return {
      title: '操作',
      visible: false,
      model: {},
      labelCol: {
        xs: { span: 24 },
        sm: { span: 8 }
      },
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 12 }
      },
      labelColLong: {
        xs: { span: 24 },
        sm: { span: 4 }
      },
      wrapperColLong: {
        xs: { span: 24 },
        sm: { span: 18 }
      },
      confirmLoading: false,
      validatorRules: {
        faultStartTime: [
          { required: true, message: '请选择故障开始时间' }
        ],
        breakdownFlag: [
          { required: true, message: '请选择是否停机' }
        ],
        equipmentId: [
          { required: true, message: '请输入设备编号或名称搜索' }
        ],
        faultName: [
          { required: true, message: '请选择故障简称' }
        ]
      },
      url: {
        add: '/eam/eamReportRepair/add',
        edit: '/eam/eamReportRepair/edit'
      }
    }
  },
  created() {
  },
  methods: {
    add() {
      //初始化默认值
      this.edit({
        breakdownFlag: this.breakdownFlagList.find(item => item.label === '是').value
      })
    },
    created () {
    edit(record) {
      this.model = Object.assign({}, record)
      this.visible = true
    },
    methods: {
      add () {
        //初始化默认值
        this.edit({});
      },
      edit (record) {
        this.model = Object.assign({}, record);
        this.visible = true;
      },
      close () {
        this.$emit('close');
        this.visible = false;
        this.$refs.form.clearValidate();
      },
      handleOk () {
        const that = this;
        // è§¦å‘表单验证
         this.$refs.form.validate(valid => {
          if (valid) {
            that.confirmLoading = true;
            let httpurl = '';
            let method = '';
            if(!this.model.id){
              httpurl+=this.url.add;
              method = 'post';
            }else{
              httpurl+=this.url.edit;
               method = 'put';
            }
            httpAction(httpurl,this.model,method).then((res)=>{
              if(res.success){
                that.$message.success(res.message);
                that.$emit('ok');
              }else{
                that.$message.warning(res.message);
              }
            }).finally(() => {
              that.confirmLoading = false;
              that.close();
            })
          }else{
             return false;
    handleFaultNameChange(value) {
      const faultReasonItem = this.faultReasonList.find(item => item.faultName === value)
      this.model.faultType = faultReasonItem.faultCategory
      this.model.faultType_dictText = faultReasonItem.faultCategory_dictText
      this.model.faultDescription = faultReasonItem.faultDescription
    },
    handleOk() {
      const that = this
      // è§¦å‘表单验证
      console.log('model---------------', that.model)
      this.$refs.form.validate(valid => {
        if (valid) {
          that.confirmLoading = true
          let httpUrl = ''
          let method = ''
          if (!this.model.id) {
            httpUrl += this.url.add
            method = 'post'
          } else {
            httpUrl += this.url.edit
            method = 'put'
          }
        })
      },
      handleCancel () {
        this.close()
      },
          httpAction(httpUrl, this.model, method).then((res) => {
            if (res.success) {
              that.$message.success(res.message)
              that.$emit('ok')
            } else {
              that.$message.warning(res.message)
            }
          }).finally(() => {
            that.confirmLoading = false
            that.close()
          })
        } else {
          return false
        }
      })
    },
    close() {
      this.$emit('close')
      this.visible = false
      this.$refs.form.clearValidate()
    }
  }
}
</script>
<style lang="less" scoped>
src/views/eam/repair/modules/ImagesPreviewModal.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,56 @@
<template>
  <a-modal title="预览" :visible="visible" width="50%" :footer="null" @cancel="visible=false">
    <template v-for="(item,index) in imageListUrl.split(',')">
      <img :src="getImageItemUrl(item)" width="100%;"/>
      <a-divider v-if="index+1<imageListUrl.split(',').length" style="margin:20px 0;background-color: #000"></a-divider>
    </template>
  </a-modal>
</template>
<script>
export default {
  name: 'ImagesPreviewModal',
  props: {
    imageListUrl: {
      type: String,
      default: ''
    }
  },
  data() {
    return {
      visible: false
    }
  },
  methods: {
    getImageItemUrl(imageItemSrcSuffix) {
      return `${window._CONFIG['domianURL']}/${imageItemSrcSuffix}`
    }
  }
}
</script>
<style scoped lang="less">
/deep/ .ant-modal {
  height: 70%;
  overflow: hidden;
  .ant-modal-content {
    height: 100%;
    display: flex;
    flex-direction: column;
    overflow: hidden;
    ::-webkit-scrollbar {
      width: 8px;
      height: 8px;
    }
    .ant-modal-body {
      flex: 1;
      overflow: auto;
    }
  }
}
</style>