From bbbc81e677639ccc30944eb84de36c3bb5867256 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期四, 05 六月 2025 16:26:42 +0800
Subject: [PATCH] 1
---
src/views/doctor/checkAll/index.vue | 189 +++++++++++++++++++++++++----------------------
1 files changed, 101 insertions(+), 88 deletions(-)
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index e907229..1dcb6d9 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -1,6 +1,7 @@
<template>
<div class="mainbox">
- <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin-top: 10px" v-if="tjStatus == 0">
+ <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin-top: 10px"
+ v-if="tjStatus == 0">
<el-form-item label="濮撳悕" prop="name">
<el-input v-model="queryParams.name" style="width: 120px" placeholder="璇疯緭鍏ュ鍚�" clearable
@keyup.enter.native="submitForm"></el-input>
@@ -21,6 +22,13 @@
<el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName" :value="dict" />
</el-select>
</el-form-item>
+ <el-form-item label="浣撴绫诲埆">
+ <el-select style="width: 200px" v-model="queryParams.tjCategory" placeholder="璇烽�夋嫨浣撴绫诲埆">
+ <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
+ </el-select>
+ <!-- <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> -->
+ </el-form-item>
<el-form-item>
<el-button type="primary" size="mini" @click="submitForm" style="margin-right: 15px">鎼滅储</el-button>
<el-button size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -28,7 +36,8 @@
</el-form>
- <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin-top: 10px" v-if="tjStatus == 1">
+ <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin-top: 10px"
+ v-if="tjStatus == 1">
<el-form-item label="濮撳悕" prop="name">
<el-input v-model="queryParams.name" style="width: 120px" placeholder="璇疯緭鍏ュ鍚�" clearable
@keyup.enter.native="submitForm"></el-input>
@@ -44,9 +53,16 @@
<el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName" :value="dict" />
</el-select>
</el-form-item>
- <el-form-item label="瀹℃牳鍖诲笀" prop="shys">
+ <el-form-item label="瀹℃牳鍖诲笀" prop="shys">
<el-input ref="inputName" v-model="queryParams.shys" style="width: 180px" placeholder="璇疯緭鍏ュ鏍稿尰甯�" clearable
@keyup.enter.native="submitForm"></el-input>
+ </el-form-item>
+ <el-form-item label="浣撴绫诲埆">
+ <el-select style="width: 200px" v-model="queryParams.tjCategory" placeholder="璇烽�夋嫨浣撴绫诲埆">
+ <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
+ </el-select>
+ <!-- <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> -->
</el-form-item>
<el-form-item>
<el-button type="primary" size="mini" @click="submitForm" style="margin-right: 15px">鎼滅储</el-button>
@@ -94,12 +110,13 @@
<el-table-column label="鐢佃瘽" align="center" prop="cusPhone" :show-overflow-tooltip="true" width="130px" />
<el-table-column label="瀹℃牳鏃堕棿" align="center" prop="shsj" :show-overflow-tooltip="true" width="180px" />
<el-table-column label="瀹屾垚鏃堕棿" align="center" prop="finishTime" :show-overflow-tooltip="true" width="160px" />
- <el-table-column label="鐘舵��" align="center" prop="tjStatus" :show-overflow-tooltip="true" width="120px" v-if="tjStatus == 0">
+ <el-table-column label="鐘舵��" align="center" prop="tjStatus" :show-overflow-tooltip="true" width="120px"
+ v-if="tjStatus == 0">
<template slot-scope="scope" v-if="tjStatus == 0">
<span>{{ scope.row.tjStatus == "1" ? "宸插鏍�" : "鏈鏍�" }}</span>
</template>
</el-table-column>
- <el-table-column label="瀹℃牳鍖诲笀" align="center" prop="shys" width="120px" v-if="tjStatus == 1"/>
+ <el-table-column label="瀹℃牳鍖诲笀" align="center" prop="shys" width="120px" v-if="tjStatus == 1" />
<el-table-column label="鍗曚綅鍚嶇О" align="center" prop="tjCompName" :show-overflow-tooltip="true" />
<el-table-column label="浣撴绫诲埆" align="center" prop="tjCategory">
<template slot-scope="scope">
@@ -140,10 +157,8 @@
<tr style="border: 1px solid #dfe6ec; border-collapse: collapse; height: 36px;">
<td style="border: 1px solid #dfe6ec; border-collapse: collapse">濮撳悕锛�</td>
<td style="border: 1px solid #dfe6ec; border-collapse: collapse">{{ tableAll.cusName }}</td>
- <td style="border: 1px solid #dfe6ec; border-collapse: collapse">鎬у埆锛�</td>
- <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
- {{ tableAll.cusSex == 0 ? "鐢�" : tableAll.cusSex == 1 ? "濂�" : "鏈煡" }}
- </td>
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse">鎬у埆锛歿{ tableAll.cusSex == 0 ? "鐢�" : tableAll.cusSex == 1 ? "濂�" : "鏈煡" }}</td>
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse">骞撮緞锛歿{ tableAll.age }}</td>
</tr>
<tr style="border: 1px solid #dfe6ec; border-collapse: collapse; height: 36px;">
<td style="border: 1px solid #dfe6ec; border-collapse: collapse">浣撴鍗曞彿锛�</td>
@@ -274,11 +289,10 @@
<el-form v-if="tableAll && tableAll.tjCategory === '02'" ref="numberValidateForm" label-width="80px"
class="demo-ruleForm">
<el-form-item label="妫�鏌ョ粨璁�">
- <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="textarea1" :rows="3"
- style="width: 96%"></el-input>
+ <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="zhiyeJl" :rows="3" style="width: 96%"></el-input>
</el-form-item>
<el-form-item label="浣撴缁撴灉">
- <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="res" :rows="3" style="width: 96%"></el-input>
+ <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="zhiyeJg" :rows="3" style="width: 96%"></el-input>
</el-form-item>
</el-form>
<div style="margin: 0 0px 10px 15px" v-if="tjproject != '1'">
@@ -445,16 +459,16 @@
</span>
<div v-if="xmChange.length > 0" style="display: flex;">
<div style="margin:0 40px;font-size: 0.8vw;">椤圭洰鍚嶇О锛歿{ xmChange[0].proName || "" }}</div>
- <div style="margin:0 40px ;font-size: 0.8vw;">浠锋牸锛歿{ xmChange[0].price || "" }}</div>
+ <div style="margin:0 80px ;font-size: 0.8vw;">浠锋牸锛歿{ xmChange[0].price || "" }}</div>
</div>
<div v-else style="display: flex;">
<div style="margin:0 40px;font-size: 0.8vw;">椤圭洰鍚嶇О锛歿{ }}</div>
- <div style="margin:0 40px ;font-size: 0.8vw;">浠锋牸锛歿{ }}</div>
+ <div style="margin:0 80px ;font-size: 0.8vw;">浠锋牸锛歿{ }}</div>
</div>
<el-button type="primary" size="mini" @click="handleaddClick()">娣诲姞</el-button>
</div>
- <el-table :row-style="redxiangmu" :data="fcList" style="width: 100%">
+ <el-table :row-style="redxiangmu" :data="fcList" style="width: 100%" border>
<el-table-column type="selection" width="40" align="center" />
<el-table-column label="搴忓彿" align="center" prop="newID" />
<el-table-column label="鍚嶇О" align="center" prop="proName" width="100px" />
@@ -807,7 +821,8 @@
isPdfOrJimu,
addOrder,
addOrder1,
- getFcList, UpdFcPro
+ getFcList,
+ UpdFcPro
} from "@/api/doctor/checkAll";
import { getInfoById } from "@/api/hosp/history";
import { getInfo } from "@/api/login";
@@ -835,6 +850,7 @@
Prescription,
},
dicts: [
+ "dict_team",
"dict_tjtype",
"sys_user_sex",
"sys_yes_no",
@@ -848,14 +864,15 @@
name: "checkAll",
data() {
return {
- res: '鏈彂鐜扮洰鏍囨�х柧鐥�',
+ zhiyeJl: '', // 鍒濆鍖栨鏌ョ粨璁轰负绌�
+ zhiyeJg: '', // 鍒濆鍖栦綋妫�缁撴灉涓洪粯璁ゅ��
selectedAdvice: null,
activeAdviceIndex: 0,
advicerulesList: [],
xmChange: [],
showjianyi: false,
- adviceLoading: false, // 鎺у埗琛ㄦ牸鍔犺浇鐘舵��
- adviceEmptyText: '鏆傛棤鏁版嵁', // 鑷畾涔夌┖鏁版嵁鎻愮ず
+ adviceLoading: false,
+ adviceEmptyText: '鏆傛棤鏁版嵁',
total1: 0,
forms: {
pacName: ""
@@ -865,9 +882,9 @@
queryParams1: {
pageNum: 1,
pageSize: 10,
- zyzd: '', // 寤鸿鍚嶇О
+ zyzd: '',
},
- adviceCache: new Map(), // 缂撳瓨寤鸿鏁版嵁
+ adviceCache: new Map(),
addNewDialogVisible: false,
newItem: {
parentName: '',
@@ -950,7 +967,7 @@
Testitems: [],
CheckBox: {},
startTime: [],
- isCollapsed: 0,
+ isCollapsed: 0,
textarea1: "",
loading: true,
selectLettercurrent: " ",
@@ -973,6 +990,7 @@
name: null,
checkStatus: null,
shys: null,
+ tjCategory: null
},
formobj: {},
yichangList: [],
@@ -1009,11 +1027,10 @@
},
created() {
- console.log(this.dict.type.dict_tjtype, "鑱屼笟浣撴"); // 鎵撳嵃瀛楀吀鏁版嵁
+ console.log(this.dict.type.dict_tjtype, "鑱屼笟浣撴");
this.getConfigKey();
this.getdate();
},
-
mounted() {
this.$nextTick(() => {
this.$refs.inputName.focus();
@@ -1031,10 +1048,10 @@
this.queryParams1.pageNum = 1;
this.queryParams1.pageSize = 10;
this.queryParams1.zyzd = '';
- this.selectedAdvice = null; // 閲嶇疆閫変腑寤鸿
- this.advicerulesList = []; // 娓呯┖寤鸿鍒楄〃
+ this.selectedAdvice = null;
+ this.advicerulesList = [];
this.total1 = 0;
- this.adviceCache.clear(); // 娓呯┖缂撳瓨
+ this.adviceCache.clear();
this.filterAdvices();
this.showjianyi = true;
},
@@ -1045,10 +1062,8 @@
this.queryParams1.pageNum = 1;
}
- // 鐢熸垚缂撳瓨 key锛屼粎浣跨敤 zyzd 鍜屽垎椤靛弬鏁�
const cacheKey = `${this.queryParams1.zyzd || ''}_${this.queryParams1.pageNum}_${this.queryParams1.pageSize}`;
- // 妫�鏌ョ紦瀛�
if (this.adviceCache.has(cacheKey)) {
const cachedData = this.adviceCache.get(cacheKey);
this.advicerulesList = cachedData.rows;
@@ -1057,7 +1072,6 @@
return;
}
- // 鏄剧ず鍔犺浇鐘舵��
this.adviceLoading = true;
this.adviceEmptyText = '鍔犺浇涓�...';
@@ -1066,13 +1080,11 @@
this.advicerulesList = response.rows || [];
this.total1 = response.total || 0;
- // 瀛樺叆缂撳瓨
this.adviceCache.set(cacheKey, {
rows: this.advicerulesList,
total: this.total1,
});
- // 鏇存柊绌烘暟鎹彁绀�
this.adviceEmptyText = this.advicerulesList.length === 0 ? '鏆傛棤鍖归厤鐨勫缓璁�' : '鏆傛棤鏁版嵁';
})
.catch((error) => {
@@ -1085,14 +1097,14 @@
.finally(() => {
this.adviceLoading = false;
});
- }, 800), // 闃叉姈鏃堕棿涓� 800ms
+ }, 800),
handleCurrentChangeAdvice(currentRow) {
this.selectedAdvice = currentRow;
},
- toggleCollapse3() {
+ toggleCollapse3() {
this.isCollapsed = 0;
},
toggleCollapse() {
@@ -1112,7 +1124,6 @@
}
},
- // 鍙栨秷閫夋嫨骞跺叧闂璇濇
cancelAdviceDialog() {
this.showjianyi = false;
this.selectedAdvice = null;
@@ -1123,7 +1134,6 @@
this.adviceCache.clear();
},
- // 鍏抽棴瀵硅瘽妗嗗墠鐨勭‘璁�
handleCloseAdviceDialog(done) {
if (this.selectedAdvice) {
this.$confirm('鎮ㄥ凡閫夋嫨涓�鏉″缓璁紝纭畾瑕佸叧闂悧锛�', '鎻愮ず', {
@@ -1251,6 +1261,7 @@
this.newItem.jcxm = value;
}
},
+
change(val) {
console.log('閫変腑鐨勫�兼槸锛�', val);
},
@@ -1313,63 +1324,50 @@
},
handleQuery() {
- this.xmopen = true
+ this.xmopen = true;
let data = {
tjNum: this.tjNumber,
type: 0
- }
+ };
getFcList(data).then(res => {
- this.datasList = res.data
- })
+ this.datasList = res.data;
+ });
},
handleaddClick() {
- console.log(this.xmChange)
+ console.log(this.xmChange);
let data = {
orderId: this.xmChange[0].orderId,
data: [{
proId: this.xmChange[0].proId,
type: 1
}]
- }
- UpdFcPro(data).then(res => {
- if (res.code == 200) {
- this.xmChange = []
- this.fuchaxiangmu()
- }
- })
+ };
+ UpdFcPro(data).then(res => { });
},
- handledeleteClick(row) {
- let data = {
- orderId: row.orderId,
- data: [{
- proId: row.proId,
- type: 0
- }]
- }
- UpdFcPro(data).then(res => {
- if (res.code == 200) {
- this.fuchaxiangmu()
- }
- })
+ handledeleteClick() {
+ UpdFcPro(data).then(res => { });
},
handlexmChange(selection) {
- this.xmChange = []
- this.xmChange = selection
+ this.xmChange = [];
+ this.xmChange = selection;
if (selection.length > 1) {
let del_row = selection.shift();
- this.$refs.elTable.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ this.$refs.elTable.toggleRowSelection(del_row, false);
}
},
+
submitFormxm() {
- this.xmopen = false
+ this.xmopen = false;
},
+
cancels() {
- this.xmopen = false
- this.xmChange = []
+ this.xmopen = false;
+ this.xmChange = [];
},
+
getExpends() {
this.expends = this.yichangList.flatMap(item =>
item.sone.map(soneItem => soneItem.orderDetailId)
@@ -1391,6 +1389,7 @@
getRowKeys(row) {
return row.orderDetailId;
},
+
xiangmuqingkuang() {
this.loading = true;
cSWebGetPro(this.tjNumber)
@@ -1452,9 +1451,6 @@
getFcList(data)
.then((res) => {
this.fcList = res.data;
- this.fcList.forEach((item, index) => {
- item.newID = index + 1;
- })
})
.catch((error) => {
console.error('鑾峰彇澶嶆煡椤圭洰澶辫触:', error);
@@ -1845,7 +1841,19 @@
resetQuery() {
this.startTime = [];
- this.resetForm("tableList");
+ this.queryParams = {
+ page: 1,
+ pageSize: 10,
+ tjNumber: "",
+ beginTime: null,
+ endTime: null,
+ compId: null,
+ name: null,
+ checkStatus: null,
+ shys: null,
+ tjCategory: null
+ },
+ this.resetForm("tableList");
this.submitForm();
},
@@ -1910,11 +1918,17 @@
for (let i = 0; i < this.changedate.length; i++) {
this.remark = this.changedate[i].remark;
}
+ // 鍥炴樉 zhiyeJl 鍜� zhiyeJg
+ this.zhiyeJl = this.changedate[0].zhiyejl || '';
+ this.zhiyeJg = this.changedate[0].zhiyejg || '鏈彂鐜扮洰鏍囨�х柧鐥�';
} else {
this.$message({
type: "warning",
message: "璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁",
});
+ // 濡傛灉娌℃湁鏁版嵁锛屾竻绌哄瓧娈�
+ this.zhiyeJl = '';
+ this.zhiyeJg = '鏈彂鐜扮洰鏍囨�х柧鐥�';
}
});
});
@@ -1949,11 +1963,17 @@
this.changedate.forEach((item) => {
this.textarea1 = item.checkAdvice || "";
});
+ // 鍥炴樉 zhiyeJl 鍜� zhiyeJg
+ this.zhiyeJl = this.changedate[0].zhiyejl || '';
+ this.zhiyeJg = this.changedate[0].zhiyejg || '鏈彂鐜扮洰鏍囨�х柧鐥�';
} else {
this.$message({
type: "warning",
message: "璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁",
});
+ // 濡傛灉娌℃湁鏁版嵁锛屾竻绌哄瓧娈�
+ this.zhiyeJl = '';
+ this.zhiyeJg = '鏈彂鐜扮洰鏍囨�х柧鐥�';
}
});
});
@@ -2017,10 +2037,9 @@
tjNumber,
advice,
checkStatus: 1,
+ zhiyeJl: this.zhiyeJl, // 娣诲姞妫�鏌ョ粨璁�
+ zhiyeJg: this.zhiyeJg // 娣诲姞浣撴缁撴灉
};
-
- console.log(this.yichangList, 6644);
-
let dataList = this.yichangList
.map((item) => {
return item.sone.map((soneItem) => ({
@@ -2034,14 +2053,17 @@
dw: soneItem.proAdvice,
}));
})
- .flat(); // 浣跨敤 flat() 鏂规硶灏嗗祵濂楁暟缁勫睍骞�
+ .flat();
+ this.loading = true;
getTjdetailList(data)
.then((response) => {
if (response.code === 200) {
this.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ // 娓呯┖瀛楁
+ this.zhiyeJl = '';
+ this.zhiyeJg = '';
- // 鍑嗗鐢熸垚鎶ュ憡鐨勮姹傛暟鎹�
let reportData = {
userId: this.userId,
tjNumber: tjNumber,
@@ -2049,12 +2071,8 @@
id: this.MsgId,
};
- // 璋冪敤 addOrderPromise
- console.log(dataList, 5555);
-
addOrder(dataList)
.then((res) => {
- console.log(res, 999);
if (res.code == 200) {
gettoPdf(tjNumber)
.then((res) => {
@@ -2080,41 +2098,36 @@
remarks,
},
];
- return getModified(updateOrderRemarkVos); // 杩斿洖 Promise
+ return getModified(updateOrderRemarkVos);
});
- // 绛夊緟鎵�鏈夎姹傚畬鎴�
Promise.all([statePromise, ...updatePromises])
.then(() => {
- // 鎵�鏈夎姹傚畬鎴愶紝鍏抽棴 loading
this.loading = false;
- // 鏇存柊鍒嗛〉淇℃伅
this.queryParams.page = 1;
this.queryParams.pageSize = 10;
this.submitForm();
this.$forceUpdate();
})
.catch((error) => {
- // 澶勭悊閿欒鎯呭喌
this.loading = false;
console.error("鍙戠敓閿欒:", error);
});
}
})
.catch((error) => {
- // 濡傛灉 addOrderPromise 澶辫触锛屽鐞嗛敊璇�
this.loading = false;
console.error("addOrderPromise 澶辫触:", error);
});
} else {
- // 鎻愪氦澶辫触锛屽叧闂� loading
this.loading = false;
+ this.$modal.msgError("鎻愪氦澶辫触");
}
})
.catch((error) => {
- // 鎻愪氦璇锋眰澶辫触锛屽叧闂� loading
this.loading = false;
console.error("鎻愪氦璇锋眰澶辫触:", error);
+ this.$modal.msgError("鎻愪氦璇锋眰澶辫触");
});
},
--
Gitblit v1.8.0