1

wwl

2025-03-04 68786262c3b3a3af9bf4da5f40749a7885da94dc

1

 src/api/doctor/examination.js

@@ -27,15 +27,21 @@
    })
}


// 点击体检人员同步
export function dataSynchronization(tjNumber) {
    return request({
        url: '/check/dataSynchronization',
        url: '/check/newdataSynchronization',
        method: 'get',
        params: {tjNumber:tjNumber}
    })
}
// 点击体检人员同步
// export function dataSynchronization(tjNumber) {
//     return request({
//         url: '/check/dataSynchronization',
//         method: 'get',
//         params: {tjNumber:tjNumber}
//     })
// }

// 点击弃检
export function qijian(tjNUm,proId) {

 src/views/doctor/examination/index.vue

@@ -181,11 +181,11 @@
                size="mini"
                type="text"
                @click="tongbu(scope.row)"
                disabled
                
                >同步</el-button
              >
              <!-- :disabled="dis" -->
              <el-button
              <!-- <el-button
                disabled
                size="mini"
                type="text"
@@ -199,7 +199,7 @@
                disabled
                @click="bohui(scope.row)"
                >驳回</el-button
              >
              > -->
            </template>
            <!--    v-show="
                  (xianshi == 'Y' || xianshi == 'y') &&
@@ -874,14 +874,12 @@
      }, 300000);
    },
    tongbu(row) {
      // this.$refs.tb.toggleRowSelection(row);
      this.$modal.loading("正在同步，请稍候...");
      this.setTime();
      let tjNumber = row.tjNumber;
      dataSynchronization(tjNumber)
        .then((res, error) => {
          if (res.code == 200) {
            // this.$forceUpdate();
            this.handleCurrentChange(row);
            clearInterval(this.clearTimeSet);
            this.clearTimeSet = null;

 src/views/hosp/order/index.vue

@@ -1238,114 +1238,50 @@
      </div> -->
    </el-dialog>

    <!-- 添加或修改体检记录对话框 -->
    <el-dialog
      :title="title"
      :visible.sync="open"
      width="950px"
      append-to-body
      :close-on-click-modal="false"
    >
      <el-tabs v-model="activeName1" type="card">
        <!-- <el-tab-pane label="订单流水" name="first">
          <el-table :data="numberList" style="width: 100%">
            <el-table-column prop="proName" label="项目/耗材" width="300">
            </el-table-column>
            <el-table-column prop="price" label="单价" width="300">
            </el-table-column>
            <el-table-column prop="count" label="数量" width="300">
            </el-table-column>
          </el-table>
          <el-table :data="bill" style="width: 100%">
            <el-table-column prop="copeWith" label="应付" width="180">
            </el-table-column>
            <el-table-column prop="discount" label="折扣" width="180">
            </el-table-column>
            <el-table-column prop="paidIn" label="实付" width="180">
            </el-table-column>
            <el-table-column prop="payType" label="付款方式" width="180">
              <template slot-scope="scope">
                <span v-if="scope.row.payType == '0'">现金支付</span>
                <span v-if="scope.row.payType == '1'">刷卡支付</span>
                <span v-if="scope.row.payType == '2'">支付宝支付</span>
                <span v-if="scope.row.payType == '3'">微信支付</span>
                <span v-if="scope.row.payType == '4'">云闪付支付</span>
              </template>
            </el-table-column>
            <el-table-column prop="payStasus" label="付款状态" width="180">
              <template slot-scope="scope">
                <span v-if="scope.row.payStasus == '0'">未付款</span>
                <span v-if="scope.row.payStasus == '1'">已付款</span>
                <span v-if="scope.row.payStasus == '2'">退费</span>
                <span v-if="scope.row.payStasus == '3'">预付款</span>
              </template>
            </el-table-column>
          </el-table>
        </el-tab-pane> -->
        <el-tab-pane label="项目汇总" name="second" style="height: 400px">
          <el-table :data="huizongList" style="width: 100%" max-height="200">
            <el-table-column
              align="center"
              type="index"
              label="序号"
              width="50"
            >
            </el-table-column>
            <el-table-column align="center" prop="parent_pro_name" label="项目">
            </el-table-column>
            <el-table-column align="center" prop="ks" label="科室">
            </el-table-column>
            <el-table-column align="center" prop="price" label="费用合计">
            </el-table-column>
          </el-table>
          <h3>付款详情</h3>
          <el-table :data="bill" style="width: 100%; margin-top: 10px">
            <el-table-column align="center" prop="copeWith" label="应付">
            </el-table-column>
            <el-table-column align="center" prop="discount" label="折扣">
            </el-table-column>
            <el-table-column align="center" prop="paidIn" label="实付">
            </el-table-column>
          </el-table>
        </el-tab-pane>
        <el-tab-pane label="明细项目" name="third" style="height: 350px">
          <el-table
            :data="infoList"
            style="width: 100%"
            max-height="330"
            :span-method="objectSpanMethod1"
          >
            <el-table-column
              align="center"
              type="index"
              label="序号"
              width="50"
            >
            </el-table-column>
            <el-table-column align="center" prop="parent_pro_name" label="父项">
            </el-table-column>
            <el-table-column align="center" prop="pro_name" label="子项">
            </el-table-column>
            <el-table-column align="center" prop="danjia" label="单价">
            </el-table-column>
            <el-table-column align="center" prop="num" label="数量">
            </el-table-column>
            <el-table-column align="center" prop="zongjia" label="总价">
            </el-table-column>
            <el-table-column
              align="center"
              prop="time"
              label="开单时间"
              width="180"
            >
            </el-table-column>
          </el-table>
        </el-tab-pane>
      </el-tabs>
      <div slot="footer" class="dialog-footer">
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>
  :title="title"
  :visible.sync="open"
  width="1400px"
  append-to-body
  :close-on-click-modal="false"
  class="custom-dialog"
>
  <el-tabs v-model="activeName1" type="card">
    <el-tab-pane label="项目汇总" name="second" style="height: 400px">
      <el-table :data="huizongList" style="width: 100%" max-height="350">
        <el-table-column align="center" type="index" label="序号" width="50"></el-table-column>
        <el-table-column align="center" prop="parent_pro_name" label="项目"></el-table-column>
        <el-table-column align="center" prop="ks" label="科室"></el-table-column>
        <el-table-column align="center" prop="price" label="费用合计"></el-table-column>
      </el-table>
      <h3>付款详情</h3>
      <el-table :data="bill" style="width: 100%; margin-top: 10px;">
        <el-table-column align="center" prop="copeWith" label="应付"></el-table-column>
        <el-table-column align="center" prop="discount" label="折扣"></el-table-column>
        <el-table-column align="center" prop="paidIn" label="实付"></el-table-column>
      </el-table>
    </el-tab-pane>
    <el-tab-pane label="明细项目" name="third" style="height: 450px;"> <!-- 移除 overflow-y: auto -->
  <el-table 
    :data="infoList" 
    style="width: 100;" 
    max-height="500"
    :span-method="objectSpanMethod1"
  >
    <el-table-column align="center" type="index" label="序号" width="50"></el-table-column>
    <el-table-column align="center" prop="parent_pro_name" label="父项"></el-table-column>
    <el-table-column align="center" prop="pro_name" label="子项"></el-table-column>
    <el-table-column align="center" prop="danjia" label="单价"></el-table-column>
    <el-table-column align="center" prop="num" label="数量"></el-table-column>
    <el-table-column align="center" prop="zongjia" label="总价"></el-table-column>
    <el-table-column align="center" prop="time" label="开单时间" width="180"></el-table-column>
  </el-table>
</el-tab-pane>
  </el-tabs>
  <div slot="footer" class="dialog-footer">
    <el-button @click="cancel">取 消</el-button>
  </div>
</el-dialog>

    <el-dialog
      :title="title1"
@@ -3121,6 +3057,26 @@
};
</script>
<style lang="scss" scoped>
.custom-dialog {
  /* 自定义弹出框的最小高度 */
  min-height: 600px; /* 从默认高度增加到 600px，可以根据需要调整 */
}

/* 调整 el-tabs 的内容区域高度 */
::v-deep .el-tabs__content {
  min-height: 500px; /* 确保选项卡内容区域有足够高度 */
}

/* 调整对话框的主体部分 */
::v-deep .el-dialog__body {
  padding: 20px;
}

/* 可选：调整 footer 的样式 */
.dialog-footer {
  padding: 10px 20px;
  text-align: right;
}
.pag {
  width: 100%;
  display: flex;