.

lkk

2 天以前 eeac81ae464d3b905da959790b5baa531ee766f5

.

 src/views/reservation/reservations/index.vue

@@ -605,10 +605,10 @@
                  style="width: 160px"
                />
              </el-form-item>
              <el-form-item label="单位名称" prop="companyId">
              <el-form-item label="单位名称" prop="company">
                <el-select
                  :remote-method="getRemoteData"
                  v-model="formIn.companyId"
                  v-model="formIn.company"
                  remote
                  default-first-option
                  allow-create
@@ -915,24 +915,16 @@
                      align="center"
                    >
                    </el-table-column>
                    <el-table-column
                    <!-- <el-table-column
                      prop="proType"
                      label="性别"
                      width="50"
                      align="center"
                    >
                      <template slot-scope="scope">
                        <template v-if="isAll(scope.row.proType)">
                          全部
                        {{ scope.row.proType || '全部' }}
                        </template>
                        <template v-else>
                          <dict-tag
                            :options="dict.type.sys_user_sex"
                            :value="String(scope.row.proType || '')"
                          />
                        </template>
                      </template>
                    </el-table-column>
                    </el-table-column> -->

                    <el-table-column
                      prop="ordPrice"
@@ -941,10 +933,11 @@
                    >
                    </el-table-column>
                    <el-table-column label="折扣" width="160px" align="center">
                      <!-- @input="validateDiscount(scope.row)" -->

                      <template slot-scope="scope">
                        <el-input-number
                          v-model.number="scope.row.discount"
                          @input="validateDiscount(scope.row)"
                          placeholder="输入折扣"
                          size="small"
                          type="number"
@@ -1716,10 +1709,10 @@
                    >
                    </el-table-column>
                    <el-table-column label="折扣" width="160px" align="center">
                      <!--  @input="validateDiscount(scope.row)" -->
                      <template slot-scope="scope">
                        <el-input-number
                          v-model.number="scope.row.discount"
                          @input="validateDiscount(scope.row)"
                          placeholder="输入折扣"
                          size="small"
                          type="number"
@@ -2205,7 +2198,8 @@
        address: "",
        tjCategory: "",
        department: "",
        company: "", // 不要设为对象
        companyId: "",
        company: "",
        career: "",
        reservationTime: "",
        timeRegion: "",
@@ -2462,7 +2456,6 @@
      this.title = "添加体检单位信息维护";
    },
    idFn1(value) {
      console.log(value, 888888);
      if (value) {
        this.form.dictCompId = value;
        // this.CompanyList.forEach((item) => {
@@ -2775,25 +2768,10 @@
      }
      let id = row.id;
      this.list1 = true;
      (this.tableData1 = []),
        (this.newpacName = []),
        this.drawer1 = true;
      (this.tableData1 = []), (this.newpacName = []), (this.drawer1 = true);
        getReservation(id).then((response) => {

          if (response.data) {
            // console.log("formIn data:", this.formIn);
            this.formIn = response.data;
            /* for (const key in this.formIn) {
              if (
                typeof this.formIn[key] === "object" &&
                this.formIn[key] !== null
              ) {
                console.warn(
                  `formIn.${key} 是对象，可能导致绑定错误`,
                  this.formIn[key]
                );
              }
            } */

            if (this.formIn.timeRegion === 0) {
              this.formIn.timeRegion = "8:00-9:00";
@@ -2818,7 +2796,7 @@
            getTransitionList1(cusId).then((response) => {
              if (response.data) {
                this.tableData1 = response.data.list;
                console.log('tableData1', this.tableData1);
              console.log("tableData1", this.tableData1);

                if (this.tableData1.length != 0) {
                  this.TotalPrice1 = 0;
@@ -3172,13 +3150,19 @@
      if (this.formIn.timeRegion === "11:00-12:00") {
        this.formIn.timeRegion = 3;
      }
      this.CompanyList.forEach((item) => {
        if (item.drugManufacturerId === this.formIn.companyId) {
          this.formIn.company = item.cnName;
        }
      });
      let data;
      if (pacId) {
        data = {
          id: this.formIn.id,
          isExpire: this.formIn.isExpire,
          address: this.formIn.address,
          company: this.formIn.companyId,
          companyId: this.formIn.companyId,
          company: this.formIn.company,
          department: this.formIn.department,
          discount: this.discount,
          email: this.formIn.email,
@@ -3204,6 +3188,7 @@
          id: this.formIn.id,
          isExpire: this.formIn.isExpire,
          address: this.formIn.address,
          companyId: this.formIn.companyId,
          company: this.formIn.company,
          department: this.formIn.department,
          discount: this.discount,
@@ -3226,20 +3211,23 @@
          career: this.formIn.career,
        };
      }
      console.log('提交参数', data);
      tjReappoint(data).then((res) => {
        if (res.code === 200) {
          this.$modal.msgSuccess("预约成功");
        }
        _this.drawer = false;
      });
      this.getList();
      this.$tab.refreshPage();
          _this.drawer = false;
        }
      });
      // this.getList();
      // this.$tab.refreshPage();
      // } else {
      //   this.$message.warning("请选择您要体检的内容");
      // }
    },
    // 最后提交按钮
    submitPrice1() {
    /*  submitPrice1() {
      let _this = this;
      if (_this.tableData1.length > 0) {
        if (this.tableData[0]) {
@@ -3293,7 +3281,7 @@
            id: this.formIn.id,
            isExpire: this.formIn.isExpire,
            address: this.formIn.address,
            company: this.formIn.company,
            companyId: this.formIn.companyId,
            department: this.formIn.department,
            discount: this.discount,
            email: this.formIn.email,
@@ -3326,7 +3314,7 @@
      } else {
        this.$message.warning("请选择您要体检的内容");
      }
    },
    }, */

    // 撤销预约·
    handleDelete(row) {