Merge remote-tracking branch 'origin/master'

zhaowei

2 天以前 9be2e2f91332ed341406acf9739d8912dddbf6fe

 src/views/eam/technical/modules/EamTechnicalStatusEvaluationApplicationModal.vue

@@ -1,66 +1,30 @@
<template>
  <j-modal
    :title="title"
    :width="800"
    :visible="visible"
    :confirmLoading="confirmLoading"
    switchFullscreen
    @ok="handleOk"
    @cancel="handleCancel"
    cancelText="关闭">
    
  <j-modal :title="title" :width="800" :visible="visible" :confirmLoading="confirmLoading" switchFullscreen
           @ok="handleOk" @cancel="handleCancel" cancelText="关闭">
    <a-spin :spinning="confirmLoading">
      <a-form-model ref="form" :model="model" :rules="validatorRules">
      
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag" label="删除标记">
          <a-input-number v-model="model.delFlag"/>
      <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
        <a-form-model-item prop="factoryOrgCode" label="申请部门">
          <a-tree-select v-model="model.factoryOrgCode" style="width: 100%" :tree-data="productionTreeData"
                         :disabled="!editable"
                         show-search :replaceFields="{key:'orgCode',value:'orgCode'}"
                         @change="()=>delete model.equipmentId"
                         treeNodeFilterProp="title" searchPlaceholder="请输入关键字搜索"
                         :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择申请部门"
                         :allow-clear="false" tree-default-expand-all/>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applicationOrderNum" label="申请单号">
          <a-input placeholder="请输入申请单号" v-model="model.applicationOrderNum" />
        <a-form-model-item prop="equipmentId" label="统一编码">
          <lx-search-equipment-select :disabled="!editable||!model.factoryOrgCode"
                                      :placeholder="!model.factoryOrgCode?'请选择申请部门':'请输入统一编码或名称搜索'"
                                      v-model="model.equipmentId" :allow-clear="false"
                                      :factoryOrgCode="model.factoryOrgCode"/>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applicant" label="申请人">
          <a-input placeholder="请输入申请人" v-model="model.applicant" />
        <a-form-model-item prop="evaluationDate" label="技术状态鉴定日期">
          <a-date-picker value-format="YYYY-MM-DD" v-model="model.evaluationDate" :allow-clear="false"
                         style="width: 100%"/>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryOrgCode" label="申请部门">
          <a-input placeholder="请输入申请部门" v-model="model.factoryOrgCode" />
        <a-form-model-item label="备注">
          <a-textarea placeholder="请输入备注" v-model="model.remark"/>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applyDate" label="申请日期">
          <a-input placeholder="请输入申请日期" v-model="model.applyDate" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applicationStatus" label="申请单状态;待提交、待单位室级领导审核、生产设备管理主管审核、待保障部领导审核、已作废、已完成">
          <a-input placeholder="请输入申请单状态;待提交、待单位室级领导审核、生产设备管理主管审核、待保障部领导审核、已作废、已完成" v-model="model.applicationStatus" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departHeaderSignature" label="申请单位室级领导签字">
          <a-input placeholder="请输入申请单位室级领导签字" v-model="model.departHeaderSignature" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departHeaderSignatureTime" label="申请单位室级领导签字时间">
          <a-input placeholder="请输入申请单位室级领导签字时间" v-model="model.departHeaderSignatureTime" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departHeaderComment" label="申请单位室级领导意见">
          <a-input placeholder="请输入申请单位室级领导意见" v-model="model.departHeaderComment" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionHeaderSignature" label="生产设备管理主管签字">
          <a-input placeholder="请输入生产设备管理主管签字" v-model="model.productionHeaderSignature" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionHeaderSignatureTime" label="生产设备管理主管签字四件">
          <a-input placeholder="请输入生产设备管理主管签字四件" v-model="model.productionHeaderSignatureTime" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionHeaderComment" label="生产设备管理主管意见">
          <a-input placeholder="请输入生产设备管理主管意见" v-model="model.productionHeaderComment" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionSupportSignature" label="生产保障部领导签字">
          <a-input placeholder="请输入生产保障部领导签字" v-model="model.productionSupportSignature" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionSupportSignatureTime" label="生产保障部领导签字时间">
          <a-input placeholder="请输入生产保障部领导签字时间" v-model="model.productionSupportSignatureTime" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionSupportComment" label="生产保障部领导意见">
          <a-input placeholder="请输入生产保障部领导意见" v-model="model.productionSupportComment" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="hfCode" label="HF编码">
          <a-input placeholder="请输入HF编码" v-model="model.hfCode" />
        </a-form-model-item>
		
      </a-form-model>
    </a-spin>
  </j-modal>
@@ -68,89 +32,103 @@

<script>
  import { httpAction } from '@/api/manage'
  import moment from "moment"
  import LxSearchEquipmentSelect from '../../equipment/modules/LxSearchEquipmentSelect'

  export default {
    name: "EamTechnicalStatusEvaluationApplicationModal",
    data () {
    name: 'EamTechnicalStatusEvaluationApplicationModal',
    components: { LxSearchEquipmentSelect },
    props: {
      productionTreeData: {
        type: Array
      }
    },
    data() {
      return {
        title:"操作",
        title: '操作',
        editable: true,
        visible: false,
        model: {},
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
          sm: { span: 5 }
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 },
          sm: { span: 16 }
        },

        confirmLoading: false,
        validatorRules:{
        validatorRules: {
          factoryOrgCode: [{ required: true, message: '请选择申请部门', trigger: 'change' }],
          equipmentId: [{ required: true, message: '请输入统一编码或名称搜索', trigger: 'change' }],
          evaluationDate: [{ required: true, message: '请选择技术状态鉴定日期', trigger: 'change' }]
        },
        url: {
          add: "/eam/eamTechnicalStatusEvaluationApplication/add",
          edit: "/eam/eamTechnicalStatusEvaluationApplication/edit",
        },
          add: '/eam/eamTechnicalStatusEvaluationApplication/add',
          edit: '/eam/eamTechnicalStatusEvaluationApplication/edit'
        }
      }
    },
    created () {
    },
    methods: {
      add () {
        //初始化默认值
        this.edit({});
      add() {
        this.model = {}
        this.editable = true
        this.visible = true
      },
      edit (record) {
        this.model = Object.assign({}, record);
        this.visible = true;

      edit(record) {
        this.model = Object.assign({}, record)
        this.editable = false
        this.visible = true
      },
      close () {
        this.$emit('close');
        this.visible = false;
        this.$refs.form.clearValidate();
      },
      handleOk () {
        const that = this;

      handleOk() {
        const that = this
        // 触发表单验证
         this.$refs.form.validate(valid => {
        this.$refs.form.validate(valid => {
          if (valid) {
            that.confirmLoading = true;
            let httpurl = '';
            let method = '';
            if(!this.model.id){
              httpurl+=this.url.add;
              method = 'post';
            }else{
              httpurl+=this.url.edit;
               method = 'put';
            that.confirmLoading = true
            let httpurl = ''
            let method = ''
            if (!this.model.id) {
              httpurl += this.url.add
              method = 'post'
            } else {
              httpurl += this.url.edit
              method = 'put'
            }
            httpAction(httpurl,this.model,method).then((res)=>{
              if(res.success){
                that.$message.success(res.message);
                that.$emit('ok');
              }else{
                that.$message.warning(res.message);
            httpAction(httpurl, this.model, method).then((res) => {
              if (res.success) {
                that.$notification.success({
                  message: '消息',
                  description: res.message
                })
                that.close()
                that.$emit('ok')
              } else {
                that.$notification.warning({
                  message: '消息',
                  description: res.message
                })
              }
            }).finally(() => {
              that.confirmLoading = false;
              that.close();
              that.confirmLoading = false
            })
          }else{
             return false;
          } else {
            return false
          }
        })
      },
      handleCancel () {

      handleCancel() {
        this.close()
      },


      close() {
        this.$emit('close')
        this.visible = false
        this.$refs.form.clearValidate()
      }
    }
  }
</script>

<style lang="less" scoped>

</style>
</script>