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

qx

昨天 a2dabfa065257464961046598061d61f274b640b

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

 src/api/doctor/checkAll.js

@@ -194,3 +194,12 @@
    params: data
  })
}

// 撤销按钮
export function chexiao(tjNUm,proId) {
  return request({
    url: '/hosp/order/chushenyemianchexiaojiekou',
    method: 'get',
    params: { tjNUm: tjNUm, proId: proId }
  })
}

 src/views/doctor/checkAll/index.vue

@@ -360,8 +360,9 @@
                  </div>
                  <template v-if="item.jyjc == '0'">
                    <el-table :stripe="true" :row-style="red" :data="item.sone" border style="width: 100%"
                      :header-cell-style="{ background: '#67C23A' }" :expand-row-keys="expends" :row-key="getRowKeys"
                      :header-cell-style="{ background: '#67C23A' }"  :row-key="getRowKeys"
                      v-loading="loading">
                      <!-- :expand-row-keys="expends" -->
                      <el-table-column type="expand">
                        <template slot-scope="props">
                          <div style="padding: 10px;">
@@ -408,11 +409,29 @@
                      <el-table-column align="center" prop="proResult" label="检测结果" width="85"></el-table-column>
                      <el-table-column align="center" prop="stanId" label=" 参考范围" width="117"></el-table-column>
                      <el-table-column align="center" prop="proAdvice" label="单位" width="78"></el-table-column>
                      <el-table-column
                        label="操作"
                        align="center"
                        class-name="small-padding fixed-width"
                        width="60"
                        fixed="right"
                      >
                        <template slot-scope="props">
                          <el-button
                            size="mini"
                            type="text"
                            icon="el-icon-delete"
                            @click="shanchu(props.row)"
                          >
                          </el-button>
                        </template>
                      </el-table-column>
                    </el-table>
                  </template>
                  <template v-if="item.jyjc == '1'">
                    <el-table :stripe="true" :row-style="red" :data="item.sone" border style="width: 100%"
                      :header-cell-style="{ background: '#67C23A' }" :expand-row-keys="expends" :row-key="getRowKeys">
                      :header-cell-style="{ background: '#67C23A' }" :row-key="getRowKeys">
                      <!-- :expand-row-keys="expends"  -->
                      <el-table-column type="expand">
                        <template slot-scope="props">
                          <div style="padding: 10px;">
@@ -457,6 +476,23 @@
                        </template>
                      </el-table-column>
                      <el-table-column align="center" prop="proResult" label="检测结果" width="403"></el-table-column>
                      <el-table-column
                        label="操作"
                        align="center"
                        class-name="small-padding fixed-width"
                        width="60"
                        fixed="right"
                      >
                        <template slot-scope="props">
                          <el-button
                            size="mini"
                            type="text"
                            icon="el-icon-delete"
                            @click="shanchu(props.row)"
                          >
                          </el-button>
                        </template>
                      </el-table-column>
                    </el-table>
                  </template>
                </div>
@@ -472,16 +508,17 @@
                    <el-table-column align="center" prop="proName" label="项目" width="260"></el-table-column>
                    <el-table-column label="状态" align="center" prop="type" :show-overflow-tooltip="true" width="120">
                      <template slot-scope="scope">
                        <span v-if="scope.row.type == '0'">未审核</span>
                        <span v-if="scope.row.type == '1'">已审核</span>
                        <span v-if="scope.row.type == '0'">未检</span>
                        <span v-if="scope.row.type == '1'">已检</span>
                        <span v-if="scope.row.type == '2'">弃检</span>
                        <span v-if="scope.row.type == '3'">延期</span>
                      </template>
                    </el-table-column>
                    <el-table-column label="检查时间" align="center" prop="bcupdateTime" width="160" />
                    <el-table-column label="操作" align="center" width="130px">
                    <el-table-column label="检查时间" align="center" prop="bcupdateTime" :formatter="formatDate" width="160" />
                    <el-table-column label="操作" align="center" width="80px">
                      <template slot-scope="scope">
                        <el-button type="primary" size="mini" @click="huifu" v-if="scope.row.type == '2'">恢复</el-button>
                        <el-button type="primary" size="mini" @click="huifu(scope.row)" v-if="scope.row.type == '2'">恢复</el-button>
                         <el-button type="primary" size="mini" @click="chexiao(scope.row)" v-if="scope.row.type == '1'">撤销</el-button>
                      </template>
                    </el-table-column>
                  </el-table>
@@ -899,6 +936,7 @@
  UpdFcPro,
  huiFuyichangxiangmu,
  hfbt,
  chexiao
} from "@/api/doctor/checkAll";
import { getInfoById } from "@/api/hosp/history";
import { getInfo } from "@/api/login";
@@ -1181,6 +1219,12 @@

    handleCurrentChangeAdvice(currentRow) {
      this.selectedAdvice = currentRow;
    },

    formatDate(row) {
      if (!row.qdcreateTime) return "";
      const date = moment(row.qdcreateTime, "YYYY-MM-DD");
      return date.isValid() ? date.format("YYYY-MM-DD") : "无效日期";
    },


@@ -1951,6 +1995,18 @@
        });
    },

     chexiao(row) {
      const tjNUm = this.tjNumber;
      const proId = row.proId;
      chexiao(tjNUm, proId).then((res) => {
        if (res.code == 200) {
          this.$message.success("撤销成功");
          this.xiangmuqingkuang();
        }
      });
    },


    yichanghuifu() {
      this.loading = true;
      let tjNum = this.tjNumber;

 src/views/reservation/reservations/index.vue

@@ -141,7 +141,7 @@
            <i class="el-icon-circle-plus-outline" @click="handleAdd1"></i>
          </el-form-item>

           <el-form-item label="套餐名称" prop="dwDeptName">
          <!--  <el-form-item label="套餐名称" prop="dwDeptName">
            <el-select v-model="queryParams.dwDeptName" placeholder="请选择套餐名称" clearable style="width: 100%"
              @change="idFn2">
              <el-option v-for="dict in deptList" :key="dict.id" :label="dict.dwDeptName" :value="dict.id" />
@@ -152,7 +152,7 @@
            <el-select v-model="queryParams.groupingName" placeholder="请选择分组名称" clearable style="width: 100%">
              <el-option v-for="dict in groupingList" :key="dict.id" :label="dict.pacName" :value="dict.id" />
            </el-select>
          </el-form-item>
          </el-form-item> -->
          <el-form-item label="预约时间">
            <el-date-picker
              clearable
@@ -409,14 +409,21 @@
      <el-table-column
        label="套餐名称"
        align="center"
        prop="tcmc"
        prop="dwDeptName"
        :show-overflow-tooltip="true"
        width="160px"
      />
      <el-table-column
        label="分组名称"
        align="center"
        prop="fzmc"
        prop="groupingName"
        :show-overflow-tooltip="true"
        width="160px"
      />
      <el-table-column
        label="分组名称"
        align="center"
        prop="department"
        :show-overflow-tooltip="true"
        width="160px"
      />