qx
6 天以前 e2f7148c8d5103e1b76e8b31d65f1c3de72c3afc
Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region
2个文件已修改
26 ■■■■■ 已修改文件
src/views/reservation/resercopy/index.vue 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/tijian/index.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/reservation/resercopy/index.vue
@@ -840,7 +840,11 @@
    /** 确认按钮 */
    submitForm() {
      // if (this.objs.reservationTime && this.data.dwDeptId) {
      // 防止重复点击
      if (this.loading) {
        return;
      }
      if (this.objs.reservationTime) {
        let data = {
          copeWith: this.ListObj.hjMoney,
@@ -850,10 +854,27 @@
          yxts: this.objs.yxts,
          dwId: this.data.dwId,
        };
        // 开启全屏loading
        const loading = this.$loading({
          lock: true,
          text: '正在提交数据,请稍候...',
          spinner: 'el-icon-loading',
          background: 'rgba(0, 0, 0, 0.7)'
        });
        this.loading = true;
        newConfirm(data).then((res) => {
          this.loading = false;
          loading.close(); // 关闭全屏loading
          this.$modal.msgSuccess("提交成功");
          this.confirm = true;
          this.userList = [];
        }).catch((error) => {
          this.loading = false;
          loading.close(); // 关闭全屏loading
          console.error("提交失败:", error);
          this.$modal.msgError("提交失败,请重试");
        });
      } else {
        this.$modal.msgError("请填写带星号内容");
src/views/system/tijian/index.vue
@@ -1374,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)) {
@@ -1817,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 {