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

qushaowei

3 天以前 0af7ddaab76e430d586eed37897df96be09ba220

 src/views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue

@@ -9,58 +9,127 @@
    centered
    switchFullscreen
    @cancel='handleCancel'
    @ok='handleOk'>
    @ok='handleOk'
  >

    <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' label='单据号' prop='code'>
              <a-input v-model='model.code' disabled />
            <a-form-model-item
              :labelCol='labelCol'
              :wrapperCol='wrapperCol'
              label='单据号'
              prop='code'
            >
              <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' label='设备编码' prop='equipmentId'>
              <lx-search-equipment-select v-model='model.equipmentId'
                                          disabled placeholder='请输入设备编号或名称搜索'></lx-search-equipment-select>
            <a-form-model-item
              :labelCol='labelCol'
              :wrapperCol='wrapperCol'
              label='设备编码'
              prop='equipmentId'
            >
              <lx-search-equipment-select
                v-model='model.equipmentId'
                disabled
                placeholder='请输入设备编号或名称搜索'
              ></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' label='申请人' prop='reportUser_dictText'>
              <a-input v-model='model.reportUser_dictText' disabled />
            <a-form-model-item
              :labelCol='labelCol'
              :wrapperCol='wrapperCol'
              label='申请人'
              prop='reportUser_dictText'
            >
              <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' label='处置原因' prop='scrapReason'>
              <a-input v-model='model.scrapReason' disabled />
            <a-form-model-item
              :labelCol='labelCol'
              :wrapperCol='wrapperCol'
              label='处置原因'
              prop='scrapReason'
            >
              <a-input
                v-model='model.scrapReason'
                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' label='备注' prop='remark'>
              <a-textarea v-model='model.remark' disabled />
            <a-form-model-item
              :labelCol='labelCol'
              :wrapperCol='wrapperCol'
              label='备注'
              prop='remark'
            >
              <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' label='审批类型' prop='approvalDealType'>
                <j-dict-select-tag v-model='model.approvalDealType' :disabled='disableSubmit || initialAcceptanceDisable' dictCode='approved_rejected'
                                   placeholder='请选择处理类型' type='radio' />
              <a-form-model-item
                :labelCol='labelCol'
                :wrapperCol='wrapperCol'
                label='审批类型'
                prop='approvalDealType'
              >
                <j-dict-select-tag
                  v-model='model.approvalDealType'
                  :disabled='disableSubmit || initialAcceptanceDisable'
                  dictCode='approved_rejected'
                  placeholder='请选择处理类型'
                  type='radio'
                />
              </a-form-model-item>
            </a-col>
            <a-col :span='12'>
              <a-form-model-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='审批意见' prop='approvalComment'>
                <a-textarea v-model='model.approvalComment' :disabled='disableSubmit || returnDisable'
                            placeholder='请输入意见' />
              <a-form-model-item
                :labelCol='labelCol'
                :wrapperCol='wrapperCol'
                label='审批意见'
                prop='approvalComment'
              >
                <a-textarea
                  v-model='model.approvalComment'
                  :disabled='disableSubmit || returnDisable'
                  placeholder='请输入意见'
                />
              </a-form-model-item>
            </a-col>
          </a-row>
@@ -142,8 +211,8 @@
    this.loadAllProductionTree()
  },
  computed: {
    approvalDisable: function() {
      return ['WAIT_CHECK'].includes(this.model.scrapStatus)
    approvalDisable: function () {
      return ['WAIT_SUBMIT', 'WAIT_CHECK', 'COMPLETE'].includes(this.model.scrapStatus)
    }
  },
  methods: {
@@ -219,5 +288,4 @@
</script>

<style lang='less' scoped>

</style>