Merge remote-tracking branch 'origin/mdc-test' into mdc-test

Lius

2023-11-13 3a8223b71d18205d40b894fd0b4c0fa1ca773e86

 src/views/eam/modules/faultType/FaultTypeModel.vue

@@ -14,7 +14,7 @@
    <a-spin :spinning="confirmLoading">
      <a-form :form="form">

        <a-row :gutter="24">
<!--        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item
              label="上级故障类型编号："
@@ -43,7 +43,7 @@
              />
            </a-form-item>
          </a-col>
        </a-row>
        </a-row>-->

        <a-row :gutter="24">
          <a-col :span="12">
@@ -54,8 +54,8 @@
            >
              <a-input
                allow-clear
                :disabled="codeDisable"
                :placeholder="disableSubmit?'':'请输入故障类型编号'"
                :disabled="true"
                :placeholder="disableSubmit?'':'将由系统自动生成'"
                v-decorator="['num', validatorRules.num ]"
              />
            </a-form-item>
@@ -103,13 +103,13 @@
      >
        关闭
      </a-button>
      <a-button
<!--      <a-button
        v-if="!this.model.id"
        :disabled="disableSubmit || confirmLoading"
        :loading="confirmLoading"
        @click="handleOk"
        type="primary"
      >保存并继续新增</a-button>
      >保存并继续新增</a-button>-->
      <a-button
        :disabled="disableSubmit || confirmLoading"
        :loading="confirmLoading"
@@ -124,7 +124,7 @@

<script>
import pick from 'lodash.pick'
import { postAction, requestPut } from '@/api/manage'
import { getAction,postAction, requestPut } from '@/api/manage'
import { duplicateCheck } from '@/api/api'

export default {
@@ -170,7 +170,8 @@
      },
      url: {
        add: "/eam/faultType/add",
        edit: "/eam/faultType/edit"
        edit: "/eam/faultType/edit",
        getNum: '/eam/sysIdentity/getNumNew',
      },
      //新增、编辑、删除、批量删除操作改变数据后刷新关联的组件的监听属性
      alterFlag: ""
@@ -196,6 +197,13 @@
        this.codeDisable = true;
      } else {
        this.codeDisable = false;
        this.$nextTick(() => {
          getAction(this.url.getNum, { type: 'FaultType', length: '4' }).then((res) => {
            if (res.success) {
              this.form.setFieldsValue({ num: res.message });
            }
          })
        });
      }
    },