设备归还修改

cuikaidong

21 小时以前 3de531b7986ebec5b022d2360fbb930aa54a1a80

设备归还修改

 src/views/eam/dispose/EamEquipmentLeanOutList.vue

@@ -145,7 +145,14 @@
              </a-menu>
            </a-dropdown>
          </template>
          <template v-else>
           <template v-if="record.leanStatus === 'WAIT_RETURN'">
             <a-popconfirm title='确定归还吗?' @confirm='() => equipmentReturn(record.id)'>
              <a>归还</a>
            </a-popconfirm>
             <a-divider type='vertical' />
              <a @click='handleDetail(record)'>详情</a>
          </template>
          <template v-if="record.leanStatus !== 'WAIT_RETURN' && record.leanStatus !== 'WAIT_SUBMIT'">
            <a
              href="javascript:;"
              @click="handleDetail(record)"
@@ -291,11 +298,37 @@
        delete: '/eam/eamEquipmentLeanOut/delete',
        deleteBatch: '/eam/eamEquipmentLeanOut/deleteBatch',
        submit: '/eam/eamEquipmentLeanOut/submit',
        equipmentReturn: '/eam/eamEquipmentLeanOut/equipmentReturn',
      }
    }
  },
  computed: {},
  methods: {
    equipmentReturn(id) {
      if (!this.url.equipmentReturn) {
        this.$message.error('请设置url.submit属性!')
        return
      }
      let that = this
      getAction(that.url.equipmentReturn, { id: id }).then((res) => {
        if (res.success) {
          //重新计算分页问题
          that.reCalculatePage(1)
          // that.$message.success(res.message);
          that.$notification.success({
            message: '消息',
            description: res.message
          })
          that.loadData()
        } else {
          // that.$message.warning(res.message);
          that.$notification.warning({
            message: '消息',
            description: res.message
          })
        }
      })
    },
    handleSubmit(id) {
      if (!this.url.submit) {
        this.$message.error('请设置url.submit属性!')

 src/views/eam/repair/modules/EamReportRepairList/EamReportRepairModal.vue

@@ -19,7 +19,7 @@
          </a-col>

          <a-col :span="12">
            <a-form-model-item prop="faultName" label="故障简称">
            <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 }}

 src/views/flowable/workflow/FlowTodo.vue

@@ -242,6 +242,10 @@
      ref='equipmentLeanOutApprovalModelRef'
      @searchReset='searchReset'
    />
    <equipment-return-approval-modal
      ref='equipmentReturnApprovalModelRef'
      @searchReset='searchReset'
    />

    <second-maintenance-approval-modal
      ref='secondMaintenanceApprovalModal'
@@ -307,6 +311,7 @@
import AssignEquipmentFileStreamHandle from '@views/flowable/workflow/assignEquipmentFileStream/AssignEquipmentFileStreamHandle.vue'
import OutBoundOrderHandle from '@views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue'
import EquipmentLeanOutApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutApprovalModal.vue'
import EquipmentReturnApprovalModal from '@views/flowable/workflow/leanOut/EquipmentReturnApprovalModal.vue'
import SecondMaintenanceApprovalModal from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue'
import ThirdMaintenanceApprovalModal from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue'
import EquipmentSealUpApprovalModal from '@views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue'
@@ -334,6 +339,7 @@
    RepairOrderApprovalModal,
    InspectionOrderHandle,
    EquipmentLeanOutApprovalModal,
    EquipmentReturnApprovalModal,
    SecondMaintenanceApprovalModal,
    ThirdMaintenanceApprovalModal,
    OutBoundOrderHandle,
@@ -512,6 +518,9 @@
        case 'equipment_lean_out':
          this.handleEquipmentLeanOut(item)
          break
        case 'equipment_return':
          this.handleEquipmentReturn(item)
          break
        case 'second_maintenance':
          this.handleSecondMaintenance(item)
          break
@@ -666,6 +675,12 @@
      this.$refs.equipmentLeanOutApprovalModelRef.handleDetail(item)
      this.$refs.equipmentLeanOutApprovalModelRef.disableSubmit = false
    },
    handleEquipmentReturn(item) {
      this.$refs.equipmentReturnApprovalModelRef.visible = true
      this.$refs.equipmentReturnApprovalModelRef.title = item.name
      this.$refs.equipmentReturnApprovalModelRef.handleDetail(item)
      this.$refs.equipmentReturnApprovalModelRef.disableSubmit = false
    },
    handleSecondMaintenance(item) {
      if (item && item.dataId) {
        this.selectSecondMaintenanceData = Object.assign({}, item)

 src/views/flowable/workflow/leanOut/EquipmentLeanOutApprovalModal.vue

@@ -52,7 +52,7 @@
            </a-form-model-item>
          </a-col>
        </a-row>
        <div v-if="approvalDisable">
        <div v-if="confirmDisable">
          <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> ç®¡ç†å‘˜å®¡æ‰¹
          </a-divider>
          <a-row :gutter="24">
@@ -63,26 +63,26 @@
              </a-form-model-item>
            </a-col>
            <a-col :span="12">
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalComment" label="审批意见">
                <a-textarea placeholder="请输入意见" v-model="model.approvalComment"
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalComment" label="确认意见">
                <a-textarea placeholder="请输入确认意见" v-model="model.confirmComment"
                            :disabled="disableSubmit || returnDisable" />
              </a-form-model-item>
            </a-col>
          </a-row>
        </div>
        <div v-if="returnDisable">
          <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> å½’还信息
          </a-divider>
          <a-row :gutter="24">
            <a-col :span="24">
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="returnComment"
                                 label="归还备注">
                <a-textarea placeholder="请输入归还备注" v-model="model.returnComment"
                            :disabled="disableSubmit || confirmDisable" />
              </a-form-model-item>
            </a-col>
          </a-row>
        </div>
<!--        <div v-if="returnDisable">-->
<!--          <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> å½’还信息-->
<!--          </a-divider>-->
<!--          <a-row :gutter="24">-->
<!--            <a-col :span="24">-->
<!--              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="returnComment"-->
<!--                                 label="归还备注">-->
<!--                <a-textarea placeholder="请输入归还备注" v-model="model.returnComment"-->
<!--                            :disabled="disableSubmit || confirmDisable" />-->
<!--              </a-form-model-item>-->
<!--            </a-col>-->
<!--          </a-row>-->
<!--        </div>-->
        <div v-if="confirmDisable">
          <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> ç®¡ç†å‘˜ç¡®è®¤
          </a-divider>

 src/views/flowable/workflow/leanOut/EquipmentReturnApprovalModal.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,226 @@
<template>
  <j-modal
    :title="title"
    :width="800"
    :visible="visible"
    :confirmLoading="confirmLoading"
    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
    switchFullscreen
    @ok="handleOk"
    @cancel="handleCancel"
    centered
    cancelText="关闭">

    <a-spin :spinning="spinning">
      <a-form-model ref="form" :model="model" :rules="validatorRules">
        <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> å€Ÿç”¨ä¿¡æ¯
        </a-divider>
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code" label="单据号">
              <a-input v-model="model.code" disabled />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="设备编码">
              <lx-search-equipment-select placeholder="请输入设备编号或名称搜索"
                                          v-model="model.equipmentId" disabled></lx-search-equipment-select>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :guitter="24">
          <a-col :span="12">
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanDepartId_dictText" label="借入车间">
              <a-input v-model="model.leanDepartId_dictText" disabled />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanPerson_dictText" label="借用人">
              <a-input v-model="model.leanPerson_dictText" disabled />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanReason" label="借用原因">
              <a-textarea v-model="model.leanReason" disabled />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark" label="备注">
              <a-textarea v-model="model.remark" disabled />
            </a-form-model-item>
          </a-col>
        </a-row>
        <div v-if="confirmDisable">
          <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> ç®¡ç†å‘˜ç¡®è®¤
          </a-divider>
          <a-row :gutter="24">
            <a-col :span="24">
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="confirmComment"
                                 label="确认意见">
                <a-textarea placeholder="请输入意见" v-model="model.confirmComment"
                            :disabled="disableSubmit || completionDisable" />
              </a-form-model-item>
            </a-col>
          </a-row>
        </div>
      </a-form-model>
    </a-spin>
  </j-modal>
</template>

<script>
import { getAction, httpAction } from '@/api/manage'
import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'

export default {
  name: 'EquipmentLeanOutApprovalModal',
  components: {
    LxSearchEquipmentSelect
  },
  props: {
    selectShenpiData: {
      type: Object
    }
  },
  data() {
    return {
      title: '操作',
      visible: false,
      editable: false,
      model: {},
      treeData: [],
      labelCol: {
        xs: { span: 24 },
        sm: { span: 5 }
      },
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 18 }
      },
      labelColLong: {
        xs: { span: 24 },
        sm: { span: 2 }
      },
      wrapperColLong: {
        xs: { span: 24 },
        sm: { span: 21 }
      },
      confirmLoading: false,
      spinning: false,
      imageSrc: null,
      validatorRules: {
        approvalDealType: [
          { required: true, message: '请选择通过或驳回!' }
        ],
        approvalComment: [
          { required: true, message: '请输入审批意见!' }
        ],
        returnComment: [
          { required: true, message: '请输入归还备注!' }
        ],
        confirmComment: [
          { required: true, message: '请输入确认意见!' }
        ]
      },
      url: {
        queryById: '/eam/eamEquipmentLeanOut/queryById',
        approval: '/eam/eamEquipmentLeanOut/approval',
        loadProductionOptions: '/mdc/mdcProduction/loadProductionTreeOptions'
      },
      disableSubmit: false
    }
  },
  created() {
    this.loadAllProductionTree()
  },
  computed: {
    approvalDisable: function() {
      return ['WAIT_APPROVAL', 'WAIT_RETURN', 'WAIT_CONFIRM', 'COMPLETE'].includes(this.model.leanStatus)
    },
    returnDisable: function() {
      return ['WAIT_RETURN', 'WAIT_CONFIRM', 'COMPLETE'].includes(this.model.leanStatus)
    },
    confirmDisable: function() {
      return ['WAIT_CONFIRM', 'COMPLETE'].includes(this.model.leanStatus)
    },
    completionDisable: function() {
      return ['COMPLETE'].includes(this.model.leanStatus)
    }
  },
  methods: {
    async handleDetail(item) {
      this.initParams()
      this.model = {}
      let res = await getAction(this.url.queryById, { id: item.dataId })
      this.model = Object.assign({}, res.result)
      this.model.dataId = item.dataId
      this.model.taskId = item.id
      this.model.userId = item.assignee
      this.model.instanceId = item.procInstId
      this.model.values = item.variables
      this.spinning = false;
    },

    recordDetail(record) {
      console.log('record', record)
      this.initParams()
      this.model = Object.assign({}, record)
    },

    initParams() {
      this.visible = true
      this.spinning = true
    },

    async handleOk() {
      const that = this
      // è§¦å‘表单验证
      this.$refs.form.validate(valid => {
        if (valid) {
          that.confirmLoading = that.spinning = true
          let httpurl = this.url.approval
          let method = 'put'
          httpAction(httpurl, this.model, method).then((res) => {
            if (res.success) {
              that.$message.success(res.message)
              that.$emit('searchReset')
              that.close()
            } else {
              that.$message.warning(res.message)
            }
          }).finally(() => {
            that.confirmLoading = that.spinning = false
          })
        } else {
          return false
        }
      })
    },
    handleCancel() {
      this.close()
    },

    close() {
      this.$emit('close')
      this.visible = false
      this.$refs.form.clearValidate()
    },
    loadAllProductionTree() {
      //加载车间选择树
      getAction(this.url.loadProductionOptions).then(res => {
        if (res.success) {
          this.treeData = [...res.result]
        } else {
          that.$message.warning(res.message)
        }
      })
    }
  }
}
</script>

<style lang="less" scoped>

</style>