Merge remote-tracking branch 'origin/master'

吴羡

11 小时以前 1193ed5cf72c8d1093d0c061b9eefe61a28b0cb7

 src/views/CNAS/process/method/standardMethod/index.vue

@@ -70,6 +70,12 @@
            <el-option label="是" :value="1"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="是否查新" prop="needSearchNew">
          <el-select v-model="addForm.needSearchNew" size="small" placeholder="请选择" style="width: 100%">
            <el-option label="否" :value="0"></el-option>
            <el-option label="是" :value="1"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item v-if="title === '新增'" label="附件">
          <el-upload ref="addUpload" action="#" :auto-upload="false" multiple :file-list="pendingFiles"
                     :on-change="pendingFileChange" :on-remove="pendingFileRemove" :before-upload="beforeFileUpload"
@@ -175,6 +181,14 @@
            }
          },
        },
        {
          label: "是否查新",
          prop: "needSearchNew",
          width: "90px",
          dataType: "tag",
          formatData: (value) => value == 1 ? "是" : "否",
          formatType: (value) => value == 1 ? "success" : "info",
        },
        {label: "创建人", prop: "createUserName"},
        {label: "创建时间", prop: "createTime"},
        {label: "更新人", prop: "updateUserName"},
@@ -232,6 +246,9 @@
        isUse: [
          {required: true, message: "请选择是否启用", trigger: "change"},
        ],
        needSearchNew: [
          {required: true, message: "请选择是否查新", trigger: "change"},
        ],
      },
    };
  },
@@ -275,7 +292,7 @@
    },
    openAdd() {
      this.title = "新增";
      this.addForm = {industryIds: [], isProduct: 1, isUse: 1};
      this.addForm = {industryIds: [], isProduct: 1, isUse: 1, needSearchNew: 0};
      this.pendingFiles = [];
      this.addDlog = true;
    },
@@ -284,6 +301,7 @@
      this.addDlog = true;
      this.addForm = this.HaveJson(row)
      this.addForm.industryIds = this.addForm.industryIds || [];
      if (this.addForm.needSearchNew == null) this.addForm.needSearchNew = 0;
    },
    getQualificationList() {
      this.getDicts("cnas_method_qualification").then((response) => {