设备处置流程方面的问题修改

qushaowei

3 天以前 0af7ddaab76e430d586eed37897df96be09ba220

 src/views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue

@@ -9,70 +9,155 @@
    @ok="handleOk"
    @cancel="handleCancel"
    centered
    cancelText="关闭">
    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-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
              :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
              :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 :gutter="24">
          <a-col :span="12">
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="newDepartId_dictText" label="调入部门">
              <a-input v-model="model.newDepartId_dictText" disabled />
            <a-form-model-item
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="newDepartId_dictText"
              label="调入部门"
            >
              <a-input
                v-model="model.newDepartId_dictText"
                disabled
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldDepartId_dictText" label="调出部门">
              <a-input v-model="model.oldDepartId_dictText" disabled />
            <a-form-model-item
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="oldDepartId_dictText"
              label="调出部门"
            >
              <a-input
                v-model="model.oldDepartId_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="reportUser_dictText" label="申请人">
              <a-input v-model="model.reportUser_dictText" disabled />
            <a-form-model-item
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="reportUser_dictText"
              label="申请人"
            >
              <a-input
                v-model="model.reportUser_dictText"
                disabled
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="transferReason" label="变动原因">
              <a-input v-model="model.transferReason" disabled />
            <a-form-model-item
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="transferReason"
              label="变动原因"
            >
              <a-input
                v-model="model.transferReason"
                disabled
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="24">
            <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" prop="remark" label="备注">
              <a-textarea v-model="model.remark" disabled />
            <a-form-model-item
              :labelCol="labelColLong"
              :wrapperCol="wrapperColLong"
              prop="remark"
              label="备注"
            >
              <a-textarea
                v-model="model.remark"
                disabled
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <div v-if="approvalDisable">
          <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 管理员封存审核
          <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="approvalDealType" label="审批类型">
                <j-dict-select-tag type="radio" v-model="model.approvalDealType" dictCode="approved_rejected"
                                   placeholder="请选择处理类型" :disabled="disableSubmit || initialAcceptanceDisable" />
              <a-form-model-item
                :labelCol="labelCol"
                :wrapperCol="wrapperCol"
                prop="approvalDealType"
                label="审批类型"
              >
                <j-dict-select-tag
                  type="radio"
                  v-model="model.approvalDealType"
                  dictCode="approved_rejected"
                  placeholder="请选择处理类型"
                  :disabled="disableSubmit || initialAcceptanceDisable"
                />
              </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"
                            :disabled="disableSubmit || returnDisable" />
              <a-form-model-item
                :labelCol="labelCol"
                :wrapperCol="wrapperCol"
                prop="approvalComment"
                label="审批意见"
              >
                <a-textarea
                  placeholder="请输入意见"
                  v-model="model.approvalComment"
                  :disabled="disableSubmit || returnDisable"
                />
              </a-form-model-item>
            </a-col>
          </a-row>
@@ -154,8 +239,8 @@
    this.loadAllProductionTree()
  },
  computed: {
    approvalDisable: function() {
      return ['WAIT_CHECK'].includes(this.model.transferStatus)
    approvalDisable: function () {
      return ['WAIT_SUBMIT', 'WAIT_APPROVAL', 'WAIT_RETURN', 'WAIT_CONFIRM', 'COMPLETE',].includes(this.model.transferStatus)
    },
  },
  methods: {
@@ -231,5 +316,4 @@
</script>

<style lang="less" scoped>

</style>