Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region

qx

6 天以前 e2f7148c8d5103e1b76e8b31d65f1c3de72c3afc

 src/views/system/tijian/index.vue

@@ -248,7 +248,7 @@
                <el-button v-show="lishi" type="primary" @click="cope" size="mini">一键复制</el-button>
                <el-button type="primary" @click="inputChanges" v-show="lishi" size="mini"
                  :disabled="confirm">历史体检记录</el-button>
                <el-button :disabled="isDisabled" type="primary" size="mini" @click="submitForm">登记</el-button>
                <el-button :disabled="butopen" type="primary" size="mini" @click="submitForm">登记</el-button>
                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" @queryTable="getList">重置</el-button>
              </div>
            </el-col>
@@ -943,6 +943,7 @@
      // 非单个禁用
      single: true,
      cardreader: false,
      butopen:false,
      // 非多个禁用
      multiple: true,
      nodeobj: {},
@@ -1373,6 +1374,8 @@
      });
    },
    inputChange() {
      
      
      const reg =
        /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
      if (reg.test(this.form.cusIdcard)) {
@@ -1745,6 +1748,7 @@
    /** 登记提交按钮 */
    submitForm() {
      let _this = this;
      _this.butopen = true;
      if (!this.form.cusPhone || !this.form.cusName) {
        this.$message.warning("请填选必填项");
        return;
@@ -1781,6 +1785,7 @@
          // }

          addCustomer(formData).then((response) => {
             _this.butopen = false;
            this.responseList = response.data;
            this.form.tjType = this.dict.type.dict_team[0].value;
            this.$modal.msgSuccess("新增成功");
@@ -1788,8 +1793,8 @@
            _this.isDisabled = true;
            _this.top = false;
          }).catch((error) => {
             _this.butopen = false;
            this.$modal.msgError("登记失败，请检查数据");
            console.error("Error in addCustomer:", error);
          });
        }
      });
@@ -1814,6 +1819,7 @@
          _this.top = false;
          if (response.data) {
            this.form = response.data;
            this.form.firmDeptName = response.data.department;
            if (this.form.discount === null) {
              this.discount = 10;
            } else {