设备调拨功能调整

Lius

3 天以前 a284da4c7af8db0004b9779753f7d1effaf6254e

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

@@ -21,7 +21,7 @@
        <a-divider
          orientation="center"
          style="font-size: large;font-style: italic;color: #66aeed;"
        > 归属信息
        > 调拨信息
        </a-divider>
        <a-row :gutter="24">
          <a-col :span="12">
@@ -123,26 +123,26 @@
            </a-form-model-item>
          </a-col>
        </a-row>
        <div v-if="approvalDisable">
        <div v-if="useApprovalDisable">
          <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"
                prop="useLeaderApprovalDealType"
                label="审批类型"
              >
                <j-dict-select-tag
                  type="radio"
                  v-model="model.approvalDealType"
                  v-model="model.useLeaderApprovalDealType"
                  dictCode="approved_rejected"
                  placeholder="请选择处理类型"
                  :disabled="disableSubmit || initialAcceptanceDisable"
                  :disabled="disableSubmit || leanOutApprovalDisable"
                />
              </a-form-model-item>
            </a-col>
@@ -150,13 +150,116 @@
              <a-form-model-item
                :labelCol="labelCol"
                :wrapperCol="wrapperCol"
                prop="approvalComment"
                prop="useLeaderApprovalComment"
                label="审批意见"
              >
                <a-textarea
                  placeholder="请输入意见"
                  v-model="model.approvalComment"
                  :disabled="disableSubmit || returnDisable"
                  v-model="model.useLeaderApprovalComment"
                  :disabled="disableSubmit || leanOutApprovalDisable"
                />
              </a-form-model-item>
            </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"
                prop="transferLeaderApprovalDealType"
                label="审批类型"
              >
                <j-dict-select-tag
                  type="radio"
                  v-model="model.transferLeaderApprovalDealType"
                  dictCode="approved_rejected"
                  placeholder="请选择处理类型"
                  :disabled="disableSubmit || externalConfirmDisable"
                />
              </a-form-model-item>
            </a-col>
            <a-col :span="12">
              <a-form-model-item
                :labelCol="labelCol"
                :wrapperCol="wrapperCol"
                prop="transferLeaderApprovalComment"
                label="审批意见"
              >
                <a-textarea
                  placeholder="请输入意见"
                  v-model="model.transferLeaderApprovalComment"
                  :disabled="disableSubmit || externalConfirmDisable"
                />
              </a-form-model-item>
            </a-col>
          </a-row>
        </div>
        <div v-if="externalConfirmDisable">
          <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="companyLeaderCheck"
                label="是否需要公司领导审批"
              >
                <j-dict-select-tag
                  type="radio"
                  v-model="model.companyLeaderCheck"
                  dictCode="yn"
                  placeholder="请选择是否"
                  :disabled="disableSubmit || companyApprovalDisable"
                />
              </a-form-model-item>
            </a-col>
          </a-row>
        </div>
        <div v-if="companyApprovalDisable">
          <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="companyLeaderApprovalDealType"
                label="审批类型"
              >
                <j-dict-select-tag
                  type="radio"
                  v-model="model.companyLeaderApprovalDealType"
                  dictCode="approved_rejected"
                  placeholder="请选择处理类型"
                  :disabled="disableSubmit"
                />
              </a-form-model-item>
            </a-col>
            <a-col :span="12">
              <a-form-model-item
                :labelCol="labelCol"
                :wrapperCol="wrapperCol"
                prop="companyLeaderApprovalComment"
                label="审批意见"
              >
                <a-textarea
                  placeholder="请输入意见"
                  v-model="model.companyLeaderApprovalComment"
                  :disabled="disableSubmit"
                />
              </a-form-model-item>
            </a-col>
@@ -208,23 +311,26 @@
      spinning: false,
      imageSrc: null,
      validatorRules: {
        approvalDealType: [
        useLeaderApprovalDealType: [
          { required: true, message: '请选择通过或驳回!' }
        ],
        unsealApprovalDealType: [
        transferLeaderApprovalDealType: [
          { required: true, message: '请选择通过或驳回!' }
        ],
        approvalComment: [
        companyLeaderCheck: [
          { required: true, message: '请选择是或否!' }
        ],
        companyLeaderApprovalDealType: [
          { required: true, message: '请选择通过或驳回!' }
        ],
        useLeaderApprovalComment: [
          { required: true, message: '请输入审批意见!' }
        ],
        unsealApprovalComment: [
        transferLeaderApprovalComment: [
          { required: true, message: '请输入审批意见!' }
        ],
        returnComment: [
          { required: true, message: '请输入归还备注!' }
        ],
        confirmComment: [
          { required: true, message: '请输入确认意见!' }
        companyLeaderApprovalComment: [
          { required: true, message: '请输入审批意见!' }
        ]
      },
      url: {
@@ -239,8 +345,21 @@
    this.loadAllProductionTree()
  },
  computed: {
    approvalDisable: function () {
      return ['WAIT_SUBMIT', 'WAIT_APPROVAL', 'WAIT_RETURN', 'WAIT_CONFIRM', 'COMPLETE',].includes(this.model.transferStatus)
    //使用单位领导审批
    useApprovalDisable: function () {
      return ['WAIT_SUBMIT', 'WAIT_USE_LEADER_CHECK', 'WAIT_TRANSFER_LEADER_CHECK', 'WAIT_EXTERNAL_CONFIRM', 'WAIT_COMPANY_LEADER_CHECK', 'REJECT', 'COMPLETE'].includes(this.model.transferStatus)
    },
    //调入单位领导审批WAIT_USE_LEADER_CHECK
    leanOutApprovalDisable: function () {
      return ['WAIT_TRANSFER_LEADER_CHECK', 'WAIT_EXTERNAL_CONFIRM', 'WAIT_COMPANY_LEADER_CHECK', 'REJECT', 'COMPLETE'].includes(this.model.transferStatus)
    },
    //机动办确认
    externalConfirmDisable: function () {
      return ['WAIT_EXTERNAL_CONFIRM', 'WAIT_COMPANY_LEADER_CHECK', 'REJECT', 'COMPLETE'].includes(this.model.transferStatus)
    },
    // 公司领导审批
    companyApprovalDisable: function () {
      return ['WAIT_COMPANY_LEADER_CHECK', 'REJECT', 'COMPLETE'].includes(this.model.transferStatus)
    },
  },
  methods: {