From 5bf7ab4427dd6338d8e3b6204318747437bf0275 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期二, 21 一月 2025 19:32:46 +0800
Subject: [PATCH] taocan
---
src/views/doctor/checkAll/index.vue | 157 ++++++++++++++++++++------------------
src/views/system/package/index.vue | 65 ++++++++++------
src/api/doctor/checkAll.js | 10 ++
3 files changed, 133 insertions(+), 99 deletions(-)
diff --git a/src/api/doctor/checkAll.js b/src/api/doctor/checkAll.js
index 535ff8b..b3030ed 100644
--- a/src/api/doctor/checkAll.js
+++ b/src/api/doctor/checkAll.js
@@ -130,3 +130,13 @@
})
}
+// 淇敼鏍囬鍐呭
+export function addOrder(dataList) {
+ return request({
+ url: '/check/addOrderYcXmByTjh',
+ method: 'post',
+ data: dataList
+ })
+}
+
+
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index ca22f3b..cd45cf2 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -190,7 +190,12 @@
/>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="120px" fixed="right">
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ width="120px"
+ fixed="right"
+ >
<template slot-scope="scope">
<el-button
fixed="right"
@@ -585,9 +590,8 @@
<el-button type="primary" @click="proposalChange"
>鐢熸垚寤鸿</el-button
>
-
</div>
-
+
<el-form
ref="numberValidateForm"
label-width="80px"
@@ -661,11 +665,28 @@
:key="index1"
style="padding: 0 10px; margin-bottom: 10px"
>
- <div>鏍囬锛歿{ jianyi.bt || "" }}</div>
- <div>鍐呭锛歿{ jianyi.nr || "" }}</div>
+ <div>
+ 鏍囬锛�
+ <!-- {{ jianyi.bt || "" }} -->
+ <el-input
+ v-model="jianyi.bt"
+ size="small"
+ type="textarea"
+ autosize
+ ></el-input>
+ </div>
+ <div>
+ 鍐呭锛�
+ <el-input
+ v-model="jianyi.nr"
+ size="small"
+ type="textarea"
+ autosize
+ ></el-input>
+ </div>
</div>
</div>
- <div v-else style="padding: 0 10px">鏆傛棤鍐呭</div>
+ <!-- <div v-else style="padding: 0 10px">鏆傛棤鍐呭</div> -->
</template>
</el-table-column>
@@ -726,11 +747,30 @@
:key="index1"
style="padding: 0 10px; margin-bottom: 10px"
>
- <div>鏍囬锛歿{ jianyi.bt || "" }}</div>
- <div>鍐呭锛歿{ jianyi.nr || "" }}</div>
+ <!-- <div>鏍囬锛歿{ jianyi.bt || "" }}</div>
+ <div>鍐呭锛歿{ jianyi.nr || "" }}</div> -->
+ <div>
+ 鏍囬锛�
+ <!-- {{ jianyi.bt || "" }} -->
+ <el-input
+ v-model="jianyi.bt"
+ size="small"
+ type="textarea"
+ autosize
+ ></el-input>
+ </div>
+ <div>
+ 鍐呭锛�
+ <el-input
+ v-model="jianyi.nr"
+ size="small"
+ type="textarea"
+ autosize
+ ></el-input>
+ </div>
</div>
</div>
- <div v-else style="padding: 0 10px">鏆傛棤鍐呭</div>
+ <!-- <div v-else style="padding: 0 10px">鏆傛棤鍐呭</div> -->
</template>
</el-table-column>
@@ -770,7 +810,6 @@
:data="statusList"
style="width: 100%"
:header-cell-style="{ background: '#e6a23c' }"
-
>
<el-table-column
align="center"
@@ -1288,6 +1327,7 @@
gettoPdf,
getModified,
isPdfOrJimu,
+ addOrder,
} from "@/api/doctor/checkAll";
import { getInfoById } from "@/api/hosp/history";
import { getInfo } from "@/api/login";
@@ -1807,7 +1847,7 @@
if (this.tjproject == "0") {
getupdateCheckType(this.tjNumber).then((response) => {
this.changedate = response.data;
-
+
this.changedate.forEach((item) => {
this.textarea1 = item.checkAdvice;
});
@@ -1949,7 +1989,7 @@
if (row.type != 1) {
// 鍙橀鑹茬殑鏉′欢
return {
- backgroundColor: '#AAD8DF !important', // 杩欎釜return鐨勫氨鏄牱寮� 鍙互鏄痗olor 涔熷彲浠ユ槸backgroundColor
+ backgroundColor: "#AAD8DF !important", // 杩欎釜return鐨勫氨鏄牱寮� 鍙互鏄痗olor 涔熷彲浠ユ槸backgroundColor
// color: "#AAD8DF ",
};
}
@@ -2261,63 +2301,11 @@
// }
// },
change(vale) {},
- /* determine() {
- let tjNumber = this.tableAll.tjNumber;
- let advice = this.textarea1;
- let data = {
- tjNumber,
- advice,
- checkStatus: 1,
- };
- this.loading = true;
- getTjdetailList(data).then((response) => {
- if (response.code === 200) {
- this.$modal.msgSuccess("鎻愪氦鎴愬姛");
- let tjNumber = this.tjNumber;
- let data = {
- userId: this.userId,
- tjNumber: tjNumber,
- state: 1,
- id: this.MsgId,
- };
- gettoPdf(tjNumber)
- .then((res) => {
- this.$modal.msgSuccess("宸茬敓鎴愭姤鍛婏紒璇峰墠寰�鎶ュ憡鏍告敹椤甸潰纭锛�");
- })
- .catch((error) => {
- this.$modal.msgError(
- "鎵撳嵃鎶ュ憡澶辫触锛岃鍓嶅線鎶ュ憡鎵撳嵃椤甸潰琛ユ墦鎶ュ憡锛�"
- );
- })
- getfiedState(data).then((res) => {
- this.drawer = false;
- });
- this.queryParams.page = 1;
- this.queryParams.pageSize = 10;
- this.submitForm();
- this.$forceUpdate();
- });
- for (let i = 0; i < this.changedate.length; i++) {
- this.proIds = this.changedate[i].parentId;
- let remarks = this.changedate[i].remark;
- let updateOrderRemarkVos = [
- {
- tjNumber,
- proId: this.proIds.toString(),
- remarks,
- },
- ];
- getModified(updateOrderRemarkVos).then((response) => {});
- }
-
- // this.changedate.forEach((item) => {
- // this.proIds = item.parentId;
- // // this.remark = item.remark;
- // });
- }, */
determine() {
let tjNumber = this.tableAll.tjNumber;
+ let tjh = this.tableAll.tjNumber;
+ // let jyjc = this.yichangList.map(item => item.jyjc || null);
let advice = this.textarea1;
let data = {
tjNumber,
@@ -2325,10 +2313,27 @@
checkStatus: 1,
};
- // 寮�濮嬪姞杞�
- this.loading = true;
+ console.log(this.yichangList, 66);
- // 鎻愪氦鏁版嵁
+ let dataList = this.yichangList
+ .map((item) => {
+ return item.sone.map((soneItem) => ({
+ tjh,
+ parentName: item.proName,
+ jcxm: soneItem.proName,
+ map: soneItem.advices,
+ jyjc: item.jyjc, // assuming jyjc belongs to the outer item, not soneItem
+ jcjg: soneItem.proResult,
+ ckfw: soneItem.stanId,
+ dw: soneItem.proAdvice,
+ }));
+ })
+ .flat(); // 浣跨敤 flat() 鏂规硶灏嗗祵濂楁暟缁勫睍骞�
+ console.log(dataList, 777);
+
+ /* addOrder(dataList).then((res) => {
+ console.log(res, 999);
+ }); */
getTjdetailList(data)
.then((response) => {
if (response.code === 200) {
@@ -2358,6 +2363,10 @@
this.drawer = false;
});
+ const addOrderPromise = addOrder(dataList).then((res) => {
+ console.log(res, 999);
+ });
+
// 澶勭悊鍏朵粬淇敼鎿嶄綔
const updatePromises = this.changedate.map((item) => {
this.proIds = item.parentId;
@@ -2373,7 +2382,7 @@
});
// 绛夊緟鎵�鏈夎姹傚畬鎴�
- Promise.all([reportPromise, statePromise, ...updatePromises])
+ Promise.all([reportPromise, statePromise,addOrderPromise, ...updatePromises])
.then(() => {
// 鎵�鏈夎姹傚畬鎴愶紝鍏抽棴 loading
this.loading = false;
@@ -2501,16 +2510,16 @@
width: 1700px;
height: 900px;
}
-::v-deep .el-dialog__header{
+::v-deep .el-dialog__header {
padding: 8px;
}
-::v-deep .el-dialog__body{
-padding: 0;
+::v-deep .el-dialog__body {
+ padding: 0;
}
::v-deep .el-button--medium {
padding: 10px;
}
-::v-deep .el-dialog__headerbtn{
+::v-deep .el-dialog__headerbtn {
// position: relative;
top: 13px;
}
diff --git a/src/views/system/package/index.vue b/src/views/system/package/index.vue
index e8b6b9e..83d3587 100644
--- a/src/views/system/package/index.vue
+++ b/src/views/system/package/index.vue
@@ -24,19 +24,19 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="濂楅鍒嗙被" prop="categoryId">
+ <el-form-item label="浣撴绫诲埆" prop="tjCategory">
<el-select
- v-model="queryParams.categoryId"
+ v-model="queryParams.tjCategory"
placeholder="璇烽�夋嫨鐘舵��"
style="width: 200px"
filterable
clearable
>
<el-option
- v-for="dict in categoryList"
+ v-for="dict in dict.type.dict_tjtype"
:key="dict.id"
- :label="dict.name"
- :value="dict.id"
+ :label="dict.label"
+ :value="dict.value"
></el-option>
</el-select>
</el-form-item>
@@ -131,12 +131,19 @@
/>
<!-- <el-table-column label="缂栧彿" align="center" prop="pacId" /> -->
<el-table-column
- label="濂楅鍒嗙被"
+ label="浣撴绫诲埆"
width="100px"
align="center"
prop="categoryNames"
fixed
- ></el-table-column>
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.dict_tjtype"
+ :value="scope.row.tjCategory"
+ />
+ </template>
+ </el-table-column>
<el-table-column
label="濂楅鍚嶇О"
align="center"
@@ -240,12 +247,12 @@
align="center"
prop="retailPrice"
></el-table-column>
- <el-table-column
+ <!-- <el-table-column
label="鍘熶环"
width="90px"
align="center"
prop="counterPrice"
- ></el-table-column>
+ ></el-table-column> -->
<el-table-column
label="宸插敭鏁伴噺"
width="90px"
@@ -363,12 +370,7 @@
</el-select>
</el-form-item>
- <el-form-item label="濂楅绫荤洰" prop="categoryId">
- <!-- <el-input
- v-model="form.createId"
- placeholder="璇疯緭鍏ュ晢鍝佺被鐩�"
- style="width: 200px"
- /> -->
+ <!-- <el-form-item label="濂楅绫荤洰" prop="categoryId">
<el-select
v-model="form.categoryId"
placeholder="璇烽�夋嫨濂楅绫荤洰"
@@ -384,7 +386,7 @@
:value="item.id"
></el-option>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="鍏抽敭瀛�" prop="keywords">
<el-select
@@ -946,6 +948,7 @@
this.loading = true;
listCategory(this.queryParams).then((response) => {
this.categoryList = response.rows;
+ console.log(this.categoryList, 9988);
});
},
shangpin(vals) {},
@@ -1068,6 +1071,8 @@
// });
getPacInFo(this.forms.pacId).then((response) => {
this.form = response.data;
+ console.log(this.form, 2233);
+
this.form.keywords = this.form.keywords.slice(0, -1);
this.form.keywords = this.form.keywords.split(",");
// this.DataList = [];
@@ -1093,6 +1098,8 @@
this.open = true;
getPacInFo(row.pacId).then((response) => {
this.form = response.data;
+ console.log(this.form, 445);
+
this.form.keywords = this.form.keywords.slice(0, -1);
this.form.keywords = this.form.keywords.split(",");
this.DataList = [];
@@ -1153,16 +1160,16 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete1(row) {
- this.DataList = this.DataList.filter(item => item.proId !== row.proId);
+ this.DataList = this.DataList.filter((item) => item.proId !== row.proId);
// 浠� checkedNodes 涓Щ闄�
const index = this.checkedNodes.indexOf(row.proId);
if (index > -1) {
this.checkedNodes.splice(index, 1);
}
const tree = this.$refs.tree;
- const node = tree.getNode(row.proId);
+ const node = tree.getNode(row.proId);
if (node) {
- node.setChecked(false);
+ node.setChecked(false);
}
this.updateTotalPrice();
},
@@ -1280,7 +1287,10 @@
search(this.queryParams1).then((response) => {
this.Treedata = response.data.list; // 鏇存柊鏍戝舰鏁版嵁
this.total1 = response.data.total; // 鏇存柊鎬绘潯鏁�
- this.pics = this.DataList.reduce((total, item) => total + item.priceOrd, 0);
+ this.pics = this.DataList.reduce(
+ (total, item) => total + item.priceOrd,
+ 0
+ );
// 纭繚鍦ㄦ暟鎹姞杞藉悗淇濇寔閫変腑鐘舵��
this.$nextTick(() => {
@@ -1370,13 +1380,13 @@
handleCurrentChecked(data, checked, indeterminate) {
if (checked) {
// 濡傛灉宸查�夊垪琛ㄤ腑涓嶅瓨鍦ㄦ椤圭洰锛屽垯娣诲姞
- if (!this.DataList.some(item => item.proId === data.proId)) {
+ if (!this.DataList.some((item) => item.proId === data.proId)) {
this.DataList.push({
proId: data.proId,
proName: data.proName,
priceOrd: data.proPrice,
limits: 10,
- priceNow: data.proPrice
+ priceNow: data.proPrice,
});
}
// 娣诲姞鍒� checkedNodes 鏁扮粍
@@ -1385,7 +1395,9 @@
}
} else {
// 鍙栨秷閫変腑鏃讹紝浠嶥ataList涓Щ闄�
- this.DataList = this.DataList.filter(item => item.proId !== data.proId);
+ this.DataList = this.DataList.filter(
+ (item) => item.proId !== data.proId
+ );
// 浠� checkedNodes 涓Щ闄�
const index = this.checkedNodes.indexOf(data.proId);
if (index > -1) {
@@ -1395,7 +1407,7 @@
// 鏇存柊浼樻儬浠峰拰鎬讳环
this.updateTotalPrice();
- },
+ },
updateTotalPrice() {
// 璁＄畻鎵�鏈夐」鐩殑鎬讳紭鎯犱环
this.form.xianprice = this.DataList.reduce((sum, item) => {
@@ -1403,7 +1415,10 @@
}, new Big(0)).toNumber();
// 璁＄畻鍘熶环鎬诲拰
- this.pics = this.DataList.reduce((total, item) => total + item.priceOrd, 0);
+ this.pics = this.DataList.reduce(
+ (total, item) => total + item.priceOrd,
+ 0
+ );
},
spliceData() {
for (var i = 0; i < this.DataList.length; i++) {
--
Gitblit v1.8.0