田源
2023-07-14 f716ce30de91dbcbf55ce5e3c658e7a165b7ee81
Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -313,13 +313,13 @@
      if (!formValidate) return;
      let codeValidate = true;
      // 进行码值申请校验
      if (this.showCodeApply) {
        codeValidate = await this.$refs.CodeApply.validate();
        if (!codeValidate) {
          this.activeName = "codeApply";
          return false;
        }
      }
      // if (this.showCodeApply) {
      //   codeValidate = await this.$refs.CodeApply.validate();
      //   if (!codeValidate) {
      //     this.activeName = "codeApply";
      //     return false;
      //   }
      // }
      let resembleQueryList = [];
      if (this.$refs.resembleQueryRef) {
        // 进行相似项查询
@@ -332,6 +332,20 @@
        const { defaultValue, formValue } = this.getDefaultValueAndFormValues(
          this.form
        );
        const noData = [
          "jiliangdwname",
          "materialtypeText",
          "morengongysname",
          "$caigouwl",
          "$xiaoshouwl",
          "$shifoupihaoguanli",
          "lcstatus_text",
          "hesuanfenleiname",
          "$kucunwl",
        ];
        noData.forEach((item) => {
          this.$delete(formValue, item);
        });
        resForm.data = formValue;
        resForm = Object.assign({}, resForm, defaultValue);
        resForm.secDTOList = [];
@@ -373,11 +387,9 @@
            let resForm = {};
            const { defaultValue, formValue } =
              this.getDefaultValueAndFormValues(this.form);
            noData.forEach(item => {
              if (formValue[item]) {
                this.$delete(formValue, item)
              }
            })
            noData.forEach((item) => {
              this.$delete(formValue, item);
            });
            resForm.data = formValue;
            resForm = Object.assign({}, resForm, defaultValue);
            resForm.secDTOList = this.secVOList.map((item) => {
@@ -389,7 +401,6 @@
            resForm.codeClassifyOid = this.codeClassifyOid;
            resForm.codeRuleOid = this.codeRuleOid;
            resForm.templateOid = this.templateOid;
            console.log(resForm, 'ddd');
            this.$emit("submit", resForm);
          })
          .catch(() => {});