设备借出归还审批流程调整

zhaowei

2 天以前 926cbd6186778da6379d1c12ec149f82e5151e20

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

@@ -28,7 +28,7 @@
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :guitter="24">
        <a-row :gutter="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 />
@@ -52,15 +52,83 @@
            </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;"> 管理员确认

        <div>
          <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"
            <a-col :span="12">
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="审批类型">
                <j-dict-select-tag type="radio" v-model="model.useApprovalDealType" dictCode="approved_rejected"
                                   placeholder="请选择处理类型" disabled/>
              </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>
            </a-col>
          </a-row>
        </div>

        <div>
          <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="审批类型">
                <j-dict-select-tag type="radio" v-model="model.leanOutApprovalDealType" dictCode="approved_rejected"
                                   placeholder="请选择处理类型" disabled/>
              </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.confirmComment"
                            :disabled="disableSubmit || completionDisable" />
                <a-textarea placeholder="请输入确认意见" v-model="model.leanOutApprovalComment" disabled/>
              </a-form-model-item>
            </a-col>
          </a-row>
        </div>

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

        <div v-if="borrowConfirmApprovalDisable">
          <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="useConfirmDealType"
                                 label="审批类型">
                <j-dict-select-tag type="radio" v-model="model.useConfirmDealType" dictCode="approved_rejected"
                                   placeholder="请选择处理类型"
                                   :disabled="disableSubmit||model.leanStatus!=='WAIT_CONFIRM_BORROW'"/>
              </a-form-model-item>
            </a-col>
            <a-col :span="12">
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="useConfirmComment"
                                 label="确认意见">
                <a-textarea placeholder="请输入意见" v-model="model.useConfirmComment"
                            :disabled="disableSubmit||model.leanStatus!=='WAIT_CONFIRM_BORROW'"/>
              </a-form-model-item>
            </a-col>
          </a-row>
@@ -111,16 +179,16 @@
      spinning: false,
      imageSrc: null,
      validatorRules: {
        approvalDealType: [
          leanOutConfirmDealType: [
          { required: true, message: '请选择通过或驳回!' }
        ],
        approvalComment: [
          { required: true, message: '请输入审批意见!' }
          leanOutConfirmComment: [
            { required: true, message: '请输入确认意见!' }
        ],
        returnComment: [
          { required: true, message: '请输入归还备注!' }
          useConfirmDealType: [
            { required: true, message: '请选择通过或驳回!' }
        ],
        confirmComment: [
          useConfirmComment: [
          { required: true, message: '请输入确认意见!' }
        ]
      },
@@ -136,17 +204,11 @@
    this.loadAllProductionTree()
  },
  computed: {
    approvalDisable: function() {
      return ['WAIT_APPROVAL', 'WAIT_RETURN', 'WAIT_CONFIRM', 'COMPLETE'].includes(this.model.leanStatus)
      returnConfirmApprovalDisable: function() {
        return ['WAIT_CONFIRM_RETURN', ' WAIT_CONFIRM_BORROW', 'COMPLETE'].includes(this.model.leanStatus)
    },
    returnDisable: function() {
      borrowConfirmApprovalDisable: 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: {
@@ -160,7 +222,7 @@
      this.model.userId = item.assignee
      this.model.instanceId = item.procInstId
      this.model.values = item.variables
      this.spinning = false;
        this.spinning = false
    },

    recordDetail(record) {