src/views/spare/modules/sparePart/SparePartModel.vue
@@ -89,12 +89,12 @@
            <a-form-item
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              label="主单位"
              label="单位"
            >
              <j-dict-select-tag
                allow-clear
                :disabled="disableSubmit"
                :placeholder="disableSubmit?'':'请选择主单位'"
                :placeholder="disableSubmit?'':'请选择单位'"
                :triggerChange="true"
                dictCode="mom_base_unit,name,id,status!='0' and del_flag!='1'"
                v-decorator="['mainUnitId', validatorRules.mainUnitId]"
@@ -104,7 +104,7 @@
          </a-col>
        </a-row>
        <a-row style="width: 100%">
          <a-col :span="24 / 2">
<!--          <a-col :span="24 / 2">
            <a-form-item
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
@@ -119,7 +119,7 @@
                @change="(e)=>handle3Change(e)"
              />
            </a-form-item>
          </a-col>
          </a-col>-->
          <a-col :span="24 / 2  ">
            <a-form-item
              :labelCol="labelCol"
@@ -134,8 +134,8 @@
            </a-form-item>
          </a-col>
        </a-row>
        <a-row style="width: 100%">
          <!-- hidden -->
<!--        <a-row style="width: 100%">
          &lt;!&ndash; hidden &ndash;&gt;
          <a-col :span="24 / 2  ">
            <a-form-item
              :labelCol="labelCol"
@@ -149,7 +149,7 @@
              />
            </a-form-item>
          </a-col>
        </a-row>
        </a-row>-->
        <a-row style="width: 100%">
          <a-col :span="24 / 2">
            <a-form-item
@@ -311,7 +311,7 @@
      validatorRules: {
        num: {
          rules: [
            { required: true, message: '请输入设备分类编号!' },
            // { required: true, message: '请输入设备分类编号!' },
            { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
            // { validator: this.validateNum },
          ]
@@ -333,6 +333,7 @@
        edit: "/spare/sparePart/edit",
        getAuxiliaryUnits: "/spare/sparePart/getAuxiliaryUnits",
        getConversionRatio: "/spare/sparePart/getConversionRatio",
        getNum: '/eam/sysIdentity/getNumNew',
      },
      //新增、编辑、删除、批量删除操作改变数据后刷新关联的组件的监听属性
      alterFlag: "",
@@ -377,6 +378,13 @@
        this.codeDisable = true;
      } else {
        this.codeDisable = false;
        // this.$nextTick(() => {
        //   getAction(this.url.getNum, { type: 'SparePart', length: '4' }).then((res) => {
        //     if (res.success) {
        //       this.form.setFieldsValue({ num: res.message });
        //     }
        //   })
        // });
      }
    },
@@ -388,12 +396,19 @@
    handleOk() {
      const that = this;
      // 触发表单验证
      this.form.validateFields((err, values) => {
      this.form.validateFields(async (err, values) => {
        if (!err) {
          that.confirmLoading = true;
          let formData = Object.assign(this.model, values);
          let obj;
          if (!this.model.id) {
            if(!formData.num){
                await getAction(this.url.getNum, { type: 'SparePart', length: '4' }).then((res) => {
                if (res.success) {
                  formData.num = res.message;
                }
              });
            }
            formData.sparePartCategoryId = this.sparePartCategoryId
            obj = postAction(this.url.add, formData);
          } else {