合并设备借出与归还流程，增加借出归还列表详情功能

zhaowei

20 小时以前 8905bdd0a74c4bd6cabc206c36a299341488041e

合并设备借出与归还流程，增加借出归还列表详情功能

 src/views/dashboard/modules/TodoList.vue

@@ -73,12 +73,8 @@
      :taskList='selectionRows'
      @searchReset='searchReset'
    />
    <equipment-lean-out-approval-modal
      ref='equipmentLeanOutApprovalModelRef'
      @searchReset='searchReset'
    />
    <equipment-return-approval-modal
      ref='equipmentReturnApprovalModelRef'
    <equipment-lean-out-and-return-approval-modal
      ref='equipmentLeanOutAndReturnModalRef'
      @searchReset='searchReset'
    />

@@ -142,8 +138,7 @@
  import WeekMaintenanceApprovalModal from '@views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue'
  import RepairOrderApprovalModal from '@views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue'
  import InspectionOrderHandle from '@views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue'
  import EquipmentLeanOutApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutApprovalModal.vue'
  import EquipmentReturnApprovalModal from '@views/flowable/workflow/leanOut/EquipmentReturnApprovalModal.vue'
  import EquipmentLeanOutAndReturnApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutAndReturnApprovalModal.vue'
  import SecondMaintenanceApprovalModal
    from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue'
  import ThirdMaintenanceApprovalModal
@@ -175,8 +170,7 @@
      WeekMaintenanceApprovalModal,
      RepairOrderApprovalModal,
      InspectionOrderHandle,
      EquipmentLeanOutApprovalModal,
      EquipmentReturnApprovalModal,
      EquipmentLeanOutAndReturnApprovalModal,
      SecondMaintenanceApprovalModal,
      ThirdMaintenanceApprovalModal,
      OutBoundOrderHandle,
@@ -289,10 +283,8 @@
            this.handleRepairOrder(item)
            break
          case 'equipment_lean_out':
            this.handleEquipmentLeanOut(item)
            break
          case 'equipment_return':
            this.handleEquipmentReturn(item)
            this.handleEquipmentLeanOutAndReturn(item)
            break
          case 'second_maintenance':
            this.handleSecondMaintenance(item)
@@ -442,18 +434,18 @@
        this.$refs.repairOrderApprovalModal.getAllApproveData(record)
        this.$refs.repairOrderApprovalModal.getBasicInformation(record)
      },
      handleEquipmentLeanOut(item) {
        this.$refs.equipmentLeanOutApprovalModelRef.visible = true
        this.$refs.equipmentLeanOutApprovalModelRef.title = item.name
        this.$refs.equipmentLeanOutApprovalModelRef.handleDetail(item)
        this.$refs.equipmentLeanOutApprovalModelRef.disableSubmit = false

      /**
       * è®¾å¤‡å€Ÿå‡ºä¸Žå½’还
       * @param item
       */
      handleEquipmentLeanOutAndReturn(item) {
        this.$refs.equipmentLeanOutAndReturnModalRef.visible = true
        this.$refs.equipmentLeanOutAndReturnModalRef.title = item.name
        this.$refs.equipmentLeanOutAndReturnModalRef.handleDetail(item)
        this.$refs.equipmentLeanOutAndReturnModalRef.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/eam/dispose/EamEquipmentLeanOutList.vue

@@ -26,7 +26,8 @@
          </a-col>
          <a-col :xl="4" :lg="7" :md="8" :sm="24">
            <a-form-item label="借用状态">
              <j-dict-select-tag placeholder="请选择借用状态" dictCode="equipment_lean_out_status" v-model="queryParam.leanStatus"
              <j-dict-select-tag placeholder="请选择借用状态" dictCode="equipment_lean_out_status"
                                 v-model="queryParam.leanStatus"
                                 allow-clear/>
            </a-form-item>
          </a-col>
@@ -58,19 +59,20 @@
        @click="handleAdd"
        type="primary"
        icon="plus"
      >新增</a-button>
      >新增
      </a-button>
      <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>
@@ -81,7 +83,8 @@
        class="ant-alert ant-alert-info"
        style="margin-bottom: 16px;"
      >
        <i class="anticon anticon-info-circle ant-alert-icon"></i> å·²é€‰æ‹© <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
        <i class="anticon anticon-info-circle ant-alert-icon"></i> å·²é€‰æ‹© <a style="font-weight: 600">{{
        selectedRowKeys.length }}</a>项
        <a
          style="margin-left: 24px"
          @click="onClearSelected"
@@ -108,16 +111,16 @@
        >
          <template v-if="record.leanStatus === 'WAIT_SUBMIT'">
            <a @click="handleEdit(record)">编辑</a>
            <a-divider type="vertical" />
            <a-divider type="vertical"/>
            <a-popconfirm
              title="确定提交吗?"
              @confirm="() => handleSubmit(record.id)"
            >
              <a>提交</a>
            </a-popconfirm>
            <a-divider type="vertical" />
            <a-divider type="vertical"/>
            <a-dropdown>
              <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
              <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
              <a-menu slot="overlay">
                <a-menu-item>
                  <a
@@ -136,14 +139,15 @@
              </a-menu>
            </a-dropdown>
          </template>

           <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>
             <a-divider type='vertical'/>
          </template>
          <template v-if="record.leanStatus !== 'WAIT_RETURN' && record.leanStatus !== 'WAIT_SUBMIT'">

          <template v-if="record.leanStatus !== 'WAIT_SUBMIT'">
            <a
              href="javascript:;"
              @click="handleDetail(record)"
@@ -160,164 +164,169 @@
      ref="modalForm"
      @ok="modalFormOk"
    ></eamEquipmentLeanOut-modal>

    <!--审批弹窗-->
    <equipment-lean-out-and-return-approval-modal ref="approvalModal"
                                                  :selectShenpiData="selectRowData"/>
  </a-card>
</template>

<script>
import '@/assets/less/TableExpand.less'
import EamEquipmentLeanOutModal from './modules/EamEquipmentLeanOutModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
import { getAction } from '@api/manage'
  import '@/assets/less/TableExpand.less'
  import EamEquipmentLeanOutModal from './modules/EamEquipmentLeanOutModal'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'
  import { getAction } from '@api/manage'
  import EquipmentLeanOutAndReturnApprovalModal
    from '../../flowable/workflow/leanOut/EquipmentLeanOutAndReturnApprovalModal'

export default {
  name: 'EamEquipmentLeanOutList',
  mixins: [JeecgListMixin],
  components: {
    LxSearchEquipmentSelect,
    EamEquipmentLeanOutModal
  },
  data() {
    return {
      description: '设备借出归还管理页面',
      // è¡¨å¤´
      columns: [
        {
          title: '#',
          dataIndex: '',
          key: 'rowIndex',
          width: 60,
          fixed: 'left',
          align: 'center',
          customRender: function (t, r, index) {
            return parseInt(index) + 1
          }
        },
        {
          title: '设备编号',
          align: 'center',
          dataIndex: 'equipmentCode',
          fixed: 'left',
        },
        {
          title: '设备名称',
          align: 'center',
          dataIndex: 'equipmentName',
          fixed: 'left',
        },
        {
          title: '单据号',
          align: 'center',
          dataIndex: 'code'
        },
        {
          title: '借入车间',
          align: 'center',
          dataIndex: 'leanDepartId_dictText'
        },
        {
          title: '借入人',
          align: 'center',
          dataIndex: 'leanPerson_dictText'
        },
        {
          title: '借用原因',
          align: 'center',
          dataIndex: 'leanReason'
        },
        {
          title: '借用状态',
          align: 'center',
          dataIndex: 'leanStatus_dictText'
        },
        {
          title: '借用开始时间',
          align: 'center',
          dataIndex: 'leanStartTime'
        },
        {
          title: '借用归还时间',
          align: 'center',
          dataIndex: 'leanEndTime'
        },
        {
          title: '备注',
          align: 'center',
          dataIndex: 'remark'
        },
        {
          title: '操作',
          dataIndex: 'action',
          align: 'center',
          fixed: 'right',
          width: 200,
          scopedSlots: { customRender: 'action' }
        }
      ],
      url: {
        list: '/eam/eamEquipmentLeanOut/list',
        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
          })
        }
      })
  export default {
    name: 'EamEquipmentLeanOutList',
    mixins: [JeecgListMixin],
    components: {
      EquipmentLeanOutAndReturnApprovalModal,
      LxSearchEquipmentSelect,
      EamEquipmentLeanOutModal
    },
    handleSubmit(id) {
      if (!this.url.submit) {
        this.$message.error('请设置url.submit属性!')
        return
      }
      let that = this
      getAction(that.url.submit, { 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
          })
    data() {
      return {
        description: '设备借出归还管理页面',
        selectRowData: {},
        // è¡¨å¤´
        columns: [
          {
            title: '#',
            dataIndex: '',
            key: 'rowIndex',
            width: 60,
            fixed: 'left',
            align: 'center',
            customRender: function(t, r, index) {
              return parseInt(index) + 1
            }
          },
          {
            title: '设备编号',
            align: 'center',
            dataIndex: 'equipmentCode',
            fixed: 'left'
          },
          {
            title: '设备名称',
            align: 'center',
            dataIndex: 'equipmentName',
            fixed: 'left'
          },
          {
            title: '单据号',
            align: 'center',
            dataIndex: 'code'
          },
          {
            title: '借入车间',
            align: 'center',
            dataIndex: 'leanDepartId_dictText'
          },
          {
            title: '借入人',
            align: 'center',
            dataIndex: 'leanPerson_dictText'
          },
          {
            title: '借用原因',
            align: 'center',
            dataIndex: 'leanReason'
          },
          {
            title: '借用状态',
            align: 'center',
            dataIndex: 'leanStatus_dictText'
          },
          {
            title: '借用开始时间',
            align: 'center',
            dataIndex: 'leanStartTime'
          },
          {
            title: '借用归还时间',
            align: 'center',
            dataIndex: 'leanEndTime'
          },
          {
            title: '备注',
            align: 'center',
            dataIndex: 'remark'
          },
          {
            title: '操作',
            dataIndex: 'action',
            align: 'center',
            fixed: 'right',
            width: 200,
            scopedSlots: { customRender: 'action' }
          }
        ],
        url: {
          list: '/eam/eamEquipmentLeanOut/list',
          delete: '/eam/eamEquipmentLeanOut/delete',
          deleteBatch: '/eam/eamEquipmentLeanOut/deleteBatch',
          submit: '/eam/eamEquipmentLeanOut/submit',
          equipmentReturn: '/eam/eamEquipmentLeanOut/equipmentReturn'
        }
      })
      }
    },
    computed: {},
    methods: {
      equipmentReturn(id) {
        this.loading = true
        let that = this
        getAction(that.url.equipmentReturn, { id: id }).then((res) => {
          if (res.success) {
            //重新计算分页问题
            that.reCalculatePage(1)
            that.$notification.success({
              message: '消息',
              description: res.message
            })
            that.loadData()
          } else {
            that.$notification.warning({
              message: '消息',
              description: res.message
            })
          }
        })
      },
      handleSubmit(id) {
        this.loading = true
        let that = this
        getAction(that.url.submit, { id: id }).then((res) => {
          if (res.success) {
            //重新计算分页问题
            that.reCalculatePage(1)
            that.$notification.success({
              message: '消息',
              description: res.message
            })
            that.loadData()
          } else {
            that.$notification.warning({
              message: '消息',
              description: res.message
            })
          }
        })
      },

      handleDetail(record) {
        this.selectRowData = Object.assign({}, record)
        this.$refs.approvalModal.recordDetail(record)
        this.$refs.approvalModal.title = '详情'
        this.$refs.approvalModal.disableSubmit = true
      }
    }
  }
}
</script>
<style scoped>
@import '~@assets/less/common.less';
  @import '~@assets/less/common.less';
</style>

 src/views/flowable/workflow/FlowCompleted.vue

@@ -144,11 +144,6 @@
      :selectShenpiData="selectLossBoundOrderData"
      @searchReset="searchReset"
    ></loss-bound-handle>

    <equipment-lean-out-approval-modal
      ref='equipmentLeanOutApprovalModelRef'
      @searchReset='searchReset'
    />
    <equipment-seal-up-approval-modal
      ref='equipmentSealUpApprovalModelRef'
      @searchReset='searchReset'
@@ -166,8 +161,8 @@
      @searchReset='searchReset'
      :selectSparePartApplyData='selectSparePartApplyData'
    ></spare-part-apply-handle>
    <equipment-return-approval-modal
      ref='equipmentReturnApprovalModelRef'
    <equipment-lean-out-and-return-approval-modal
      ref='EquipmentLeanOutAndReturnApprovalModalRef'
      @searchReset='searchReset'
    />
    <inbound-order-handle-xq
@@ -207,12 +202,11 @@
import OutBoundOrderHandle from '@views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue'
import lossBoundHandle from '@views/flowable/workflow/lossBound/lossBoundHandle.vue'
import stocktakingBoundHandle from '@views/flowable/workflow/stocktakingBound/stocktakingBoundHandle.vue'
import EquipmentLeanOutApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutApprovalModal.vue'
import EquipmentSealUpApprovalModal from '@views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue'
import EquipmentTransferApprovalModal from '@views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue'
import EquipmentScrapApprovalModal from '@views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue'
import SparePartApplyHandle from '@views/flowable/workflow/sparePartApply/SparePartApplyHandle.vue'
import EquipmentReturnApprovalModal from '@views/flowable/workflow/leanOut/EquipmentReturnApprovalModal.vue'
import EquipmentLeanOutAndReturnApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutAndReturnApprovalModal.vue'
import GuideCardBatchXq from '@views/flowable/workflow/guideCardBatch/GuideCardBatchXq.vue'
import SecondMaintenanceApprovalModal from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue'
import ThirdMaintenanceApprovalModal from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue'
@@ -231,12 +225,11 @@
    InspectionOrderHandle,
    JDictSelectTag,
    OutBoundOrderHandle,
    EquipmentLeanOutApprovalModal,
    EquipmentSealUpApprovalModal,
    EquipmentTransferApprovalModal,
    EquipmentScrapApprovalModal,
    SparePartApplyHandle,
    EquipmentReturnApprovalModal,
    EquipmentLeanOutAndReturnApprovalModal,
    SecondMaintenanceApprovalModal,
    ThirdMaintenanceApprovalModal,
    InboundOrderHandleXq,
@@ -373,9 +366,6 @@
        case 'equipment_unseal':
          this.handleEquipmentUnSeal(item)
          break
        case 'equipment_lean_out':
          this.handleEquipmentLeanOut(item)
          break
        case 'equipment_transfer':
          this.handleEquipmentTransfer(item)
          break
@@ -385,8 +375,9 @@
        case 'spare_part_apply':
          this.handleSparePartApplyApproval(item)
          break
        case 'equipment_lean_out':
        case 'equipment_return':
          this.handleEquipmentReturn(item)
          this.handleEquipmentLeanOutAndReturn(item)
          break
        case 'toolInStorageApproval':
          this.handleToolInStorage(item)
@@ -411,11 +402,11 @@
      return result
    },

    handleEquipmentReturn(item) {
      this.$refs.equipmentReturnApprovalModelRef.visible = true
      this.$refs.equipmentReturnApprovalModelRef.title = item.name
      this.$refs.equipmentReturnApprovalModelRef.handleDetail(item)
      this.$refs.equipmentReturnApprovalModelRef.disableSubmit = true
    handleEquipmentLeanOutAndReturn(item) {
      this.$refs.EquipmentLeanOutAndReturnApprovalModalRef.visible = true
      this.$refs.EquipmentLeanOutAndReturnApprovalModalRef.title = item.name
      this.$refs.EquipmentLeanOutAndReturnApprovalModalRef.handleDetail(item)
      this.$refs.EquipmentLeanOutAndReturnApprovalModalRef.disableSubmit = true
    },
    handleToolInStorage(item) {
      console.log('item----->', item)
@@ -545,12 +536,6 @@
      this.$refs.lossBoundHandle.clearTableSource()
      this.$refs.lossBoundHandle.getAllApproveData(item)

    },
    handleEquipmentLeanOut(item) {
      this.$refs.equipmentLeanOutApprovalModelRef.visible = false
      this.$refs.equipmentLeanOutApprovalModelRef.disableSubmit = true
      this.$refs.equipmentLeanOutApprovalModelRef.handleDetail(item)
      this.$refs.equipmentLeanOutApprovalModelRef.title = item.name
    },
    handleEquipmentSealUp(item) {
      this.$refs.equipmentSealUpApprovalModelRef.visible = true

 src/views/flowable/workflow/FlowTodo.vue

@@ -238,12 +238,8 @@
      :taskList='selectionRows'
      @searchReset='searchReset'
    />
    <equipment-lean-out-approval-modal
      ref='equipmentLeanOutApprovalModelRef'
      @searchReset='searchReset'
    />
    <equipment-return-approval-modal
      ref='equipmentReturnApprovalModelRef'
    <equipment-lean-out-and-return-approval-modal
      ref='equipmentLeanOutAndReturnModalRef'
      @searchReset='searchReset'
    />

@@ -310,8 +306,7 @@
import GuideCardBatchHandle from '@views/flowable/workflow/guideCardBatch/GuideCardBatchHandle.vue'
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 EquipmentLeanOutAndReturnApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutAndReturnApprovalModal.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'
@@ -338,8 +333,7 @@
    WeekMaintenanceApprovalModal,
    RepairOrderApprovalModal,
    InspectionOrderHandle,
    EquipmentLeanOutApprovalModal,
    EquipmentReturnApprovalModal,
    EquipmentLeanOutAndReturnApprovalModal,
    SecondMaintenanceApprovalModal,
    ThirdMaintenanceApprovalModal,
    OutBoundOrderHandle,
@@ -516,10 +510,8 @@
          this.handleRepairOrder(item)
          break
        case 'equipment_lean_out':
          this.handleEquipmentLeanOut(item)
          break
        case 'equipment_return':
          this.handleEquipmentReturn(item)
          this.handleEquipmentLeanOutAndReturn(item)
          break
        case 'second_maintenance':
          this.handleSecondMaintenance(item)
@@ -669,18 +661,18 @@
      this.$refs.repairOrderApprovalModal.getAllApproveData(record)
      this.$refs.repairOrderApprovalModal.getBasicInformation(record)
    },
    handleEquipmentLeanOut(item) {
      this.$refs.equipmentLeanOutApprovalModelRef.visible = true
      this.$refs.equipmentLeanOutApprovalModelRef.title = item.name
      this.$refs.equipmentLeanOutApprovalModelRef.handleDetail(item)
      this.$refs.equipmentLeanOutApprovalModelRef.disableSubmit = false

    /**
     * è®¾å¤‡å€Ÿå‡ºä¸Žå½’还
     * @param item
     */
    handleEquipmentLeanOutAndReturn(item) {
      this.$refs.equipmentLeanOutAndReturnModalRef.visible = true
      this.$refs.equipmentLeanOutAndReturnModalRef.title = item.name
      this.$refs.equipmentLeanOutAndReturnModalRef.handleDetail(item)
      this.$refs.equipmentLeanOutAndReturnModalRef.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/EquipmentLeanOutAndReturnApprovalModal.vue

ÎļþÃû´Ó src/views/flowable/workflow/leanOut/EquipmentReturnApprovalModal.vue ÐÞ¸Ä
@@ -53,38 +53,43 @@
          </a-col>
        </a-row>

        <div>
        <div v-if="leanOutApprovalDisable">
          <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" label="审批类型">
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="审批类型" prop="useApprovalDealType">
                <j-dict-select-tag type="radio" v-model="model.useApprovalDealType" dictCode="approved_rejected"
                                   placeholder="请选择处理类型" disabled/>
                                   placeholder="请选择处理类型"
                                   :disabled="disableSubmit || model.leanStatus!=='WAIT_APPROVAL_OUT'"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="12">
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="确认意见">
                <a-textarea placeholder="请输入确认意见" v-model="model.useApprovalComment" disabled/>
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="确认意见" prop="useApprovalComment">
                <a-textarea placeholder="请输入确认意见" v-model="model.useApprovalComment"
                            :disabled="disableSubmit || model.leanStatus!=='WAIT_APPROVAL_OUT'"/>
              </a-form-model-item>
            </a-col>
          </a-row>
        </div>

        <div>
        <div v-if="leanInApprovalDisable">
          <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" label="审批类型">
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanOutApprovalDealType"
                                 label="审批类型">
                <j-dict-select-tag type="radio" v-model="model.leanOutApprovalDealType" dictCode="approved_rejected"
                                   placeholder="请选择处理类型" disabled/>
                                   placeholder="请选择处理类型"
                                   :disabled="disableSubmit || model.leanStatus!=='WAIT_APPROVAL_IN'"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="12">
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol"
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanOutApprovalComment"
                                 label="确认意见">
                <a-textarea placeholder="请输入确认意见" v-model="model.leanOutApprovalComment" disabled/>
                <a-textarea placeholder="请输入确认意见" v-model="model.leanOutApprovalComment"
                            :disabled="disableSubmit || model.leanStatus!=='WAIT_APPROVAL_IN'"/>
              </a-form-model-item>
            </a-col>
          </a-row>
@@ -143,7 +148,7 @@
  import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'

  export default {
    name: 'EquipmentLeanOutApprovalModal',
    name: 'EquipmentLeanOutAndReturnApprovalModal',
    components: {
      LxSearchEquipmentSelect
    },
@@ -179,6 +184,18 @@
        spinning: false,
        imageSrc: null,
        validatorRules: {
          useApprovalDealType: [
            { required: true, message: '请选择通过或驳回!' }
          ],
          leanOutApprovalDealType: [
            { required: true, message: '请选择通过或驳回!' }
          ],
          useApprovalComment: [
            { required: true, message: '请输入审批意见!' }
          ],
          leanOutApprovalComment: [
            { required: true, message: '请输入审批意见!' }
          ],
          leanOutConfirmDealType: [
            { required: true, message: '请选择通过或驳回!' }
          ],
@@ -204,6 +221,12 @@
      this.loadAllProductionTree()
    },
    computed: {
      leanOutApprovalDisable: function() {
        return ['WAIT_APPROVAL_OUT', 'WAIT_APPROVAL_IN', 'WAIT_RETURN', 'WAIT_CONFIRM_RETURN', 'WAIT_CONFIRM_BORROW', 'COMPLETE'].includes(this.model.leanStatus)
      },
      leanInApprovalDisable: function() {
        return ['WAIT_APPROVAL_IN', 'WAIT_RETURN', 'WAIT_CONFIRM_RETURN', 'WAIT_CONFIRM_BORROW', 'COMPLETE'].includes(this.model.leanStatus)
      },
      returnConfirmApprovalDisable: function() {
        return ['WAIT_CONFIRM_RETURN', 'WAIT_CONFIRM_BORROW', 'COMPLETE'].includes(this.model.leanStatus)
      },
@@ -229,6 +252,7 @@
        console.log('record', record)
        this.initParams()
        this.model = Object.assign({}, record)
        this.spinning = false
      },

      initParams() {
@@ -275,14 +299,10 @@
          if (res.success) {
            this.treeData = [...res.result]
          } else {
            that.$message.warning(res.message)
            this.$message.warning(res.message)
          }
        })
      }
    }
  }
</script>

<style lang="less" scoped>

</style>

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

ÎļþÒÑɾ³ý

 src/views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue

@@ -183,7 +183,7 @@
import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue'

export default {
  name: 'EquipmentLeanOutApprovalModal',
  name: 'EquipmentSealUpApprovalModal',
  components: {
    LxSearchEquipmentSelect
  },