From 68786262c3b3a3af9bf4da5f40749a7885da94dc Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期二, 04 三月 2025 15:51:44 +0800
Subject: [PATCH] 1
---
src/views/hosp/order/index.vue | 170 +++++++++++++++--------------------------
src/views/doctor/examination/index.vue | 8 -
src/api/doctor/examination.js | 12 ++
3 files changed, 75 insertions(+), 115 deletions(-)
diff --git a/src/api/doctor/examination.js b/src/api/doctor/examination.js
index 4916e5e..3c9a53a 100644
--- a/src/api/doctor/examination.js
+++ b/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) {
diff --git a/src/views/doctor/examination/index.vue b/src/views/doctor/examination/index.vue
index 45c2ee0..de7d006 100644
--- a/src/views/doctor/examination/index.vue
+++ b/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;
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 2d03b88..deb3d93 100644
--- a/src/views/hosp/order/index.vue
+++ b/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;
--
Gitblit v1.8.0