From e5af0daca71f21317b061f174869e6ded2829071 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期三, 13 五月 2026 09:46:03 +0800
Subject: [PATCH] Merge branch 'QD-opo' of http://116.62.18.175:6699/r/~yxh/opo-web into QD-opo
---
src/views/business/transfer/index.vue | 93 +++++++++++++++++++++++++---------------------
1 files changed, 50 insertions(+), 43 deletions(-)
diff --git a/src/views/business/transfer/index.vue b/src/views/business/transfer/index.vue
index 2a3dffe..fa88fe4 100644
--- a/src/views/business/transfer/index.vue
+++ b/src/views/business/transfer/index.vue
@@ -8,7 +8,7 @@
:inline="true"
label-width="80px"
>
- <el-form-item label="妗堜緥缂栧彿" prop="caseNo">
+ <el-form-item label="涓婃姤鍖婚櫌" prop="caseNo">
<el-input
v-model="queryParams.caseNo"
placeholder="璇疯緭鍏ユ渚嬬紪鍙�"
@@ -17,7 +17,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鎮ｈ�呭鍚�" prop="patName">
+ <el-form-item label="濮撳悕" prop="patName">
<el-input
v-model="queryParams.patName"
placeholder="璇疯緭鍏ユ偅鑰呭鍚�"
@@ -41,7 +41,7 @@
<el-option label="鏆傚瓨" :value="5" />
</el-select>
</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿">
+ <el-form-item label="杞繍鏃堕棿">
<el-date-picker
v-model="dateRange"
style="width: 240px"
@@ -150,7 +150,7 @@
<el-table-column label="搴忓彿" type="index" width="60" align="center" />
<el-table-column
- label="妗堜緥缂栧彿"
+ label="缂栧彿"
align="center"
prop="caseNo"
width="140"
@@ -177,24 +177,6 @@
show-overflow-tooltip
/>
<el-table-column
- label="娌荤枟鍖婚櫌"
- align="center"
- prop="treatmentHospitalName"
- width="150"
- />
- <el-table-column
- label="璁″垝杞繍鏃堕棿"
- align="center"
- prop="transportStartTime"
- width="160"
- />
- <el-table-column
- label="璐熻矗鍗忚皟鍛�"
- align="center"
- prop="contactPerson"
- width="100"
- />
- <el-table-column
label="杞繍鐘舵��"
align="center"
prop="transitStatus"
@@ -206,6 +188,25 @@
</el-tag>
</template>
</el-table-column>
+ <el-table-column
+ label="璁″垝杞繍鏃堕棿"
+ align="center"
+ prop="transportStartTime"
+ width="160"
+ />
+ <el-table-column
+ label="鍗忚皟鍛�"
+ align="center"
+ prop="contactPerson"
+ width="100"
+ />
+
+ <el-table-column
+ label="涓婃姤鍖婚櫌"
+ align="center"
+ prop="treatmentHospitalName"
+ width="150"
+ />
<el-table-column
label="鍒涘缓鏃堕棿"
align="center"
@@ -429,11 +430,7 @@
append-to-body
>
<div class="action-confirm">
- <p>
- 纭畾瑕亄{ actionText }}杞繍鍗� "{{
- currentTransport.id
- }}" 鍚楋紵
- </p>
+ <p>纭畾瑕亄{ actionText }}杞繍鍗� "{{ currentTransport.patName }}" 鍚楋紵</p>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="actionOpen = false">鍙� 娑�</el-button>
@@ -519,15 +516,15 @@
pageNum: 1,
pageSize: 10,
caseNo: undefined,
- patName: undefined,
+ patName: undefined
// 鍙煡璇㈠凡鍚屾剰涓旈渶瑕佽浆杩愮殑妗堜緥
// reportStatus: "3", // 宸插悓鎰�
- isTransport: "2" // 闇�瑕佽浆杩�
+ // isTransport: "2" // 闇�瑕佽浆杩�
}
};
},
created() {
- this.getList();
+ // this.getList();
this.checkAutoCreate();
},
methods: {
@@ -567,26 +564,31 @@
},
checkAutoCreate() {
const query = this.$route.query;
+ // 涓婃姤璺宠浆杩囨潵杩涜澶勭悊
if (query.autoCreate === "true") {
- // 鑷姩鎵撳紑妗堜緥閫夋嫨寮规
- this.selectCaseOpen = true;
- this.resetCaseSearch();
-
// 濡傛灉鏈夌壒瀹氱殑妗堜緥缂栧彿锛屽彲浠ラ鍏堟悳绱�
if (query.caseNo) {
+ // this.selectCaseOpen = true;
+ this.resetCaseSearch(1);
this.caseQueryParams.caseNo = query.caseNo;
- this.searchCaseList();
+ this.searchCaseList(1);
+ } else {
+ this.queryParams.patName = query.patName;
}
}
+ this.getList();
},
/** 鎼滅储鍙敤妗堜緥 */
- async searchCaseList() {
+ async searchCaseList(type) {
this.caseLoading = true;
try {
const response = await donateList(this.caseQueryParams);
if (response.code === 200) {
this.availableCaseList = response.rows || response.data || [];
this.caseTotal = response.total || 0;
+ if (type == 1 && response.data[0]) {
+ this.selectCase(response.data[0]);
+ }
} else {
this.$modal.msgError(response.msg || "鑾峰彇妗堜緥鍒楄〃澶辫触");
}
@@ -599,7 +601,7 @@
},
/** 閲嶇疆妗堜緥鎼滅储 */
- resetCaseSearch() {
+ resetCaseSearch(type) {
this.caseQueryParams = {
pageNum: 1,
pageSize: 10,
@@ -608,7 +610,12 @@
// reportStatus: "3",
isTransport: "2"
};
- this.searchCaseList();
+ if (!type) {
+ this.searchCaseList();
+ } else {
+ // 璺ㄩ〉闈㈡柊澧炲彇娑堥檺鍒�
+ this.caseQueryParams.isTransport = null;
+ }
},
/** 鍒ゆ柇妗堜緥鏄惁宸叉湁杞繍鍗� */
@@ -636,7 +643,7 @@
// 鎵撳紑杞繍鍗曠紪杈戦〉闈紝骞朵紶鍏ラ�変腑鐨勬渚�
this.currentTransport = this.convertCaseToTransport(caseData);
- console.log(this.currentTransport,'currentTransport');
+ console.log(this.currentTransport, "currentTransport");
this.isEditing = false;
this.editOpen = true;
@@ -644,7 +651,7 @@
/** 灏嗘渚嬩俊鎭浆鎹负杞繍鍗曟牸寮� */
convertCaseToTransport(caseData) {
- console.log(caseData,'2');
+ console.log(caseData, "2");
return {
caseNo: caseData.caseNo,
@@ -712,7 +719,7 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
- this.ids = selection.map(item => item.id);
+ this.ids = selection.map(item => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
@@ -740,7 +747,7 @@
/** 璇︽儏鎸夐挳鎿嶄綔 */
handleDetail(row) {
this.currentTransport = row;
- this.detailTitle = `杞繍鍗曡鎯� - ${ row.id}`;
+ this.detailTitle = `杞繍鍗曡鎯� - ${row.id}`;
this.detailOpen = true;
},
@@ -793,7 +800,7 @@
async confirmAction() {
try {
let requestData = {
- id: this.currentTransport.id
+ ...this.currentTransport
};
if (this.actionText === "寮�濮�") {
--
Gitblit v1.9.3