Merge remote-tracking branch 'origin/master'

吴羡

昨天 53bc8cc8fd330d5e2a4a3698967548a0b74a395a

 src/views/standard/model/index.vue

@@ -41,6 +41,9 @@
        <el-form-item label="备注" prop="remark">
          <el-input v-model="copyForm.remark" clearable size="small"></el-input>
        </el-form-item>
        <el-form-item label="标准要求值" prop="standardRequirement">
          <el-input v-model="copyForm.standardRequirement" clearable size="small"></el-input>
        </el-form-item>
        <el-form-item label="价格(元)" prop="price">
          <el-input v-model="copyForm.price" clearable size="small"></el-input>
        </el-form-item>
@@ -88,6 +91,7 @@
        number: "",
        name: "",
        remark: "",
        standardRequirement: "",
        price: "",
        id: "",
      },
@@ -103,6 +107,7 @@
        { label: "检验依据", prop: "number" },
        { label: "检验项目", prop: "name" },
        { label: "备注", prop: "remark" },
        { label: "标准要求值", prop: "standardRequirement" },
        { label: "价格(元)", prop: "price" },
        { label: "创建用户", prop: "createUserName" },
        { label: "创建时间", prop: "createTime", width: "160" },
@@ -216,7 +221,7 @@
    copyTemplate(row) {
      this.title = "复制模版";
      this.isShowCopyTem = true;
      this.copyForm.id = row.id;
      this.copyForm = this.HaveJson(row);
    },
    // 新增/编辑/复制模板
    submitCopyInfo() {
@@ -228,6 +233,7 @@
            name: this.copyForm.name,
            number: this.copyForm.number,
            remark: this.copyForm.remark,
            standardRequirement: this.copyForm.standardRequirement,
            price: this.copyForm.price === "" || this.copyForm.price == null ? null : this.copyForm.price,
          };
          switch (this.title) {