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

qx

2025-03-26 155a30a172e4cf04838dcf7c8bb73ce6b200e574

 src/views/system/tijian/index.vue

@@ -1225,11 +1225,9 @@
      this.open1 = true;
      this.title = "添加体检单位信息维护";
    },
    idFn1(value) {
      if (value) {
        // console.log(value);
    idFn1() {
      if (this.form.firmName) {
        const originalCompId = this.form.firmId;
        this.form.firmName = value;
        this.CompanyList.forEach((item) => {
          if (item.cnName == this.form.firmName) {
            this.form.firmId = item.drugManufacturerId;
@@ -1239,10 +1237,15 @@
        if (this.form.firmId === originalCompId) {
          this.form.firmId = "";
        }
        if (this.form.firmId) {
          this.form.tjType = "1";
        }
       
      }

      if (this.form.firmName) {
          this.form.tjType = this.dict.type.dict_team[1].value;
        }else{
          this.form.tjType = this.dict.type.dict_team[0].value;
        }
      
    },
    getCurrentDateTime() {
      const currentDate = new Date();
@@ -1703,6 +1706,9 @@
    /** 登记提交按钮 */
submitForm() {
  let _this = this;
  if(!this.form.cusPhone || !this.form.cusName){
        this.$message.warning("请填选必填项");
      }else{
  this.$refs["form"].validate((valid) => {
    if (valid) {
      // 创建表单数据的副本并去除空格
@@ -1727,6 +1733,7 @@

      addCustomer(formData).then((response) => {
        this.responseList = response.data;
        this.form.tjType = this.dict.type.dict_team[0].value;
        this.$modal.msgSuccess("新增成功");
        _this.tcShow = true;
        _this.isDisabled = true;
@@ -1734,6 +1741,7 @@
      });
    }
  });
}
},

    getmailType() {
@@ -1772,7 +1780,12 @@
            if (this.form.reservationId != null) {
              if (this.form.groupingId) {
                this.form.firmName = this.form.compName;
                this.form.tjType = "1";
                this.dict.type.dict_team.forEach((item)=> {
                  if(item.label == "团队"){
                    this.form.tjType = item.value;
                  }
                })
                // this.form.tjType = this.dict.type.dict_team[1].value;
                this.CompanyList.forEach((item) => {
                  if (item.cnName == this.form.firmName) {
                    this.form.firmId = item.drugManufacturerId;
@@ -2326,6 +2339,11 @@

    Package() {
      this.activeNames = "first";
      if (this.form.cusSex == "男") {
            this.form.cusSex = 0;
          } else  if (this.form.cusSex == "女"){
            _this.form.cusSex = 1;
          }
      let cusSex = this.form.cusSex;
      this.datekey = Date.now();
      //全部套餐
@@ -3261,6 +3279,7 @@
            discount: item.discount,
            parentProId: item.parentProId,
            cusIdCard: item.cusId,
            yhj: item.nowPrice
          })); // 创建新的对象，包含 discount 和 id
        gaibianzhekou(newArray).then((res) => {
          this.loadingSubmit = false;