qxtj

qinxianzhangyao

2024-07-15 fb66c7aafd8d7ef6f4be05a0c12cfa3c4ca84863

qxtj

 src/views/reservation/resercopy/index.vue

@@ -123,7 +123,9 @@
          align="center"
          prop="company"
          width="200"
        />
        >
       
        </el-table-column>
        <!-- <el-table-column label="工号" align="center" prop="jobNo" width="80" /> -->
        <el-table-column label="姓名" align="center" prop="name" width="75" />
        <el-table-column label="性别" align="center" prop="sex" width="75">
@@ -869,6 +871,14 @@
    handleFileSuccess(response, file, fileList) {
      this.ListObj = response.data;
      this.userList = response.data.list;
      this.userList.forEach(item => {
        this.CompanyList.forEach (item1 => {
          if(item1.drugManufacturerId ==this.objs.drugManufacturerId ){
            item.company = item1.cnName
          }
        })
        
      })
      this.upload.open = false;
      this.upload.isUploading = false;
      this.$refs.upload.clearFiles();

 src/views/reservation/reservations/index.vue

@@ -1110,7 +1110,10 @@
      }
      if (this.formIn.isExpire === 2) {
        this.drawer = true;
        this.discount = this.formIn.discount;
        if( this.formIn.discount!= null){
          this.discount = this.formIn.discount;
        }
        
        //全部套餐
        if (this.formIn.sex != null) {
          let cusSex = this.formIn.sex;
@@ -1218,7 +1221,10 @@
        this.tijiao1 = false;
      }
      this.drawer1 = true;
      this.discount = this.formIn.discount;
      if( this.formIn.discount != null){
        this.discount = this.formIn.discount;

      }
      //全部套餐
      if (this.formIn.sex != null) {
        let cusSex = this.formIn.sex;
@@ -1256,10 +1262,13 @@
          this.loading = false;
        });
      }
      let cusId = this.formIn.idCard;
      let id = this.formIn.id;
      this.list1 = true;
      (this.tableData1 = []),
        (this.newpacName = []),
        getReservation(id).then((response) => {
            if (response.data) {
              let cusId = response.data.idCard;
        getTransitionList(cusId).then((response) => {
          if (response.data) {
            this.tableData1 = response.data;
@@ -1286,6 +1295,8 @@
            this.list1 = true;
          }
        });
      }
    })

      /** 查询部门下拉树结构 */
      projectGetList().then((response) => {

 src/views/system/tijianall/index.vue

@@ -404,7 +404,7 @@
        <el-tab-pane label="组合" name="third">
          <div class="tab8">
            <el-row :gutter="20" style="width: 100%">
              <el-col :span="8">
              <el-col :span="6">
                <div
                  style="
                    text-align: center;
@@ -524,7 +524,7 @@
              </el-tree> -->
            <!-- </div> -->
            <el-row :gutter="20" style="width: 100%">
              <el-col :span="8">
              <el-col :span="6">
                <div
                  style="
                    text-align: center;