cuikaidong
2025-05-23 dc2061e5768ef3a901a855cb7643467db2316a18
封存启封功能完善
已修改3个文件
99 ■■■■■ 文件已修改
src/views/eam/dispose/EamEquipmentSealUpList.vue 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flowable/workflow/FlowTodo.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/dispose/EamEquipmentSealUpList.vue
@@ -79,7 +79,14 @@
                  <a>删除</a>
                </a-popconfirm>
           </template>
          <template v-else>
          <template v-if="record.sealStatus === 'SEALED'">
             <a-popconfirm title='确定启封吗?' @confirm='() => handleUnseal(record.id)'>
              <a>启封</a>
            </a-popconfirm>
             <a-divider type='vertical' />
              <a @click='handleDetail(record)'>详情</a>
          </template>
          <template v-if="record.sealStatus === 'COMPLETE'|| record.sealStatus === 'WAIT_UNSEALING_AUDIT' ">
              <a @click='handleDetail(record)'>详情</a>
          </template>
        </span>
@@ -188,7 +195,8 @@
        list: '/eam/eamEquipmentSealUp/list',
        delete: '/eam/eamEquipmentSealUp/delete',
        deleteBatch: '/eam/eamEquipmentSealUp/deleteBatch',
        submit: '/eam/eamEquipmentSealUp/submit'
        submit: '/eam/eamEquipmentSealUp/submit',
        unseal: '/eam/eamEquipmentSealUp/unseal'
      }
    }
  },
@@ -222,6 +230,31 @@
          })
        }
      })
    },
    handleUnseal(id) {
      if (!this.url.unseal) {
        this.$message.error('请设置url.submit属性!')
        return
      }
      let that = this
      getAction(that.url.unseal, { id: id }).then((res) => {
        if (res.success) {
          //重新计算分页问题
          that.reCalculatePage(1)
          // that.$message.success(res.message);
          that.$notification.success({
            message: '消息',
            description: res.message
          })
          that.loadData()
        } else {
          // that.$message.warning(res.message);
          that.$notification.warning({
            message: '消息',
            description: res.message
          })
        }
      })
    }
  }
}
src/views/flowable/workflow/FlowTodo.vue
@@ -337,6 +337,9 @@
          case 'equipment_seal_up':
            this.handleEquipmentSealUp(item)
            break
          case 'equipment_unseal':
            this.handleEquipmentSealUp(item)
            break
          default:
            alert('没找到该流程')
        }
src/views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue
@@ -28,32 +28,27 @@
            </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 />
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sealUpReason" label="封存原因">
              <a-textarea v-model="model.sealUpReason" disabled />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanPerson_dictText" label="借用人">
              <a-input v-model="model.leanPerson_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-row>
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanReason" label="借用原因">
              <a-textarea v-model="model.leanReason" disabled />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark" label="备注">
          <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>
          </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">
@@ -70,27 +65,19 @@
            </a-col>
          </a-row>
        </div>
        <div v-if="returnDisable">
          <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 归还信息
        <div v-if="confirmDisable">
          <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="returnComment"
                                 label="归还备注">
                <a-textarea placeholder="请输入归还备注" v-model="model.returnComment"
                            :disabled="disableSubmit || confirmDisable" />
            <a-col :span="12">
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unsealApprovalDealType" label="审批类型">
                <j-dict-select-tag type="radio" v-model="model.unsealApprovalDealType" dictCode="approved_rejected"
                                   placeholder="请选择处理类型" :disabled="disableSubmit || initialAcceptanceDisable" />
              </a-form-model-item>
            </a-col>
          </a-row>
        </div>
        <div v-if="confirmDisable">
          <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"
                                 label="确认意见">
                <a-textarea placeholder="请输入意见" v-model="model.confirmComment"
            <a-col :span="12">
              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unsealApprovalComment" label="审批意见">
                <a-textarea placeholder="请输入意见" v-model="model.unsealApprovalComment"
                            :disabled="disableSubmit || completionDisable" />
              </a-form-model-item>
            </a-col>
@@ -145,7 +132,13 @@
        approvalDealType: [
          { required: true, message: '请选择通过或驳回!' }
        ],
        unsealApprovalDealType: [
          { required: true, message: '请选择通过或驳回!' }
        ],
        approvalComment: [
          { required: true, message: '请输入审批意见!' }
        ],
        unsealApprovalComment: [
          { required: true, message: '请输入审批意见!' }
        ],
        returnComment: [
@@ -168,13 +161,13 @@
  },
  computed: {
    approvalDisable: function() {
      return ['WAIT_APPROVAL', 'WAIT_RETURN', 'WAIT_CONFIRM', 'COMPLETE'].includes(this.model.leanStatus)
      return ['SEALED', 'WAIT_UNSEALING_AUDIT', 'COMPLETE'].includes(this.model.sealStatus)
    },
    returnDisable: function() {
      return ['WAIT_RETURN', 'WAIT_CONFIRM', 'COMPLETE'].includes(this.model.leanStatus)
      return ['SEALED', 'WAIT_UNSEALING_AUDIT', 'COMPLETE'].includes(this.model.sealStatus)
    },
    confirmDisable: function() {
      return ['WAIT_CONFIRM', 'COMPLETE'].includes(this.model.leanStatus)
      return ['WAIT_UNSEALING_AUDIT', 'COMPLETE'].includes(this.model.sealStatus)
    },
    completionDisable: function() {
      return ['COMPLETE'].includes(this.model.leanStatus)