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

zhaowei

16 小时以前 8905bdd0a74c4bd6cabc206c36a299341488041e

 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>