From 00d4894e071f319e36ac8de5a8f34cbdf445bbe3 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期三, 14 五月 2025 08:56:56 +0800
Subject: [PATCH] 1
---
src/views/system/comp/index.vue | 42 +++-
src/components/jianqianwenzhen/index.vue | 489 ++++++++++++++++++++++++++++++------------------
src/api/hosp/history.js | 11 +
3 files changed, 342 insertions(+), 200 deletions(-)
diff --git a/src/api/hosp/history.js b/src/api/hosp/history.js
index 57ae71b..2cb8850 100644
--- a/src/api/hosp/history.js
+++ b/src/api/hosp/history.js
@@ -46,7 +46,7 @@
//鏍规嵁瀹㈡埛id鑾峰彇闂瘖璇︾粏淇℃伅
export function getInfoById(tjNumber) {
return request({
- url: '/hosp/history/getInfoById?tjNumber=' + tjNumber ,
+ url: '/hosp/history/getInfoById?tjNumber=' + tjNumber,
method: 'get',
})
}
@@ -59,3 +59,12 @@
})
}
+// 鍒犻櫎鑱屼笟鐥囩姸鎴栬亴涓氱梾鍙叉帴鍙�
+export function removeAskHistorys(historyId) {
+ return request({
+ url: '/hosp/history/removeAskHistorys',
+ method: 'post',
+ data: historyId
+ })
+}
+
diff --git a/src/components/jianqianwenzhen/index.vue b/src/components/jianqianwenzhen/index.vue
index 7b19825..5b95b89 100644
--- a/src/components/jianqianwenzhen/index.vue
+++ b/src/components/jianqianwenzhen/index.vue
@@ -77,18 +77,18 @@
<!-- <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ伐榫�" style="width: 150px" />骞� -->
<el-input-number
v-model="form.gongLing"
- label="璇疯緭鍏ュ伐榫�"
+ label="璇疯緭鍏ユ�诲伐榫�"
></el-input-number
>骞�
</el-form-item>
<el-form-item
label="鎺ヨЕ鏈夊鐗╁伐榫�"
- prop="gongLing"
+ prop="zgongLing"
label-width="150px"
>
<!-- <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ伐榫�" style="width: 150px" />骞� -->
<el-input-number
- v-model="form.gongLing"
+ v-model="form.zgongLing"
label="璇疯緭鍏ユ帴瑙︽湁瀹崇墿宸ラ緞"
></el-input-number
>骞�
@@ -144,38 +144,37 @@
/>
</el-select>
</el-form-item>
- <!-- <el-form-item label="鏃㈠線鐥呭彶" prop="medicalHistory">
- <el-input
- type="textarea"
- rows="4"
- v-model="form.medicalHistory"
- placeholder="璇疯緭鍏ユ棦寰�鐥呭彶"
- style="width: 700px"
- />
- </el-form-item> -->
- <el-form-item label="鏃㈠線鐥呭彶" prop="medicalHistory">
+ <el-form-item label="鏃㈠線鐥呭彶" prop="mediHistoryq">
<el-select
- v-model="form.medicalHistory"
+ v-model="form.mediHistoryq"
multiple
allow-create
filterable
placeholder="璇烽�夋嫨鎴栬緭鍏ユ棦寰�鐥呭彶"
style="width: 700px"
>
- <el-option
+ <!-- <el-option
v-for="item in rulesList"
:key="item.id"
:label="item.icdname"
:value="item.icdname"
+ /> -->
+ <el-option
+ v-for="item in rulesList"
+ :key="item.id"
+ :label="item.icdname"
+ :value="item.id"
/>
</el-select>
- <!-- <el-input
+ </el-form-item>
+ <el-form-item label="鏃㈠線鐥呭彶" prop="medicalHistoryOther">
+ <el-input
type="textarea"
rows="4"
- v-model="form.medicalHistory"
+ v-model="form.medicalHistoryOther"
placeholder="璇疯緭鍏ユ棦寰�鐥呭彶"
style="width: 700px"
- /> -->
+ />
</el-form-item>
<!-- <el-form-item label="鐥囩姸" prop="zzsjj">
@@ -195,100 +194,99 @@
/>
</el-select>
</el-form-item> -->
- <div style="width: 900px">
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-plus"
- size="mini"
- @click="addmembers()"
- >娣诲姞
- </el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- icon="el-icon-delete"
- size="mini"
- @click="delemembers()"
- >鍒犻櫎
- </el-button>
- </el-col>
- </el-row>
- <el-table
- border
- :data="form.tjAskHistorysList"
- ref="tjAskHistorys"
- style="width: 98%"
- @selection-change="handlebingChange"
- >
- <el-table-column type="selection" width="40" align="center" />
- <el-table-column
- label="搴忓彿"
- width="80"
- align="center"
- type="index"
- :index="indexMethod"
- />
- <el-table-column
- label="鐥囩姸鍚嶇О"
- prop="diseaseName"
- align="center"
- >
- <template slot-scope="scope">
- <el-select
- :remote-method="getRemoteData"
- v-model="scope.row.diseaseName"
- remote
- filterable
- placeholder="璇烽�夋嫨鐥囩姸鍚嶇О"
- clearable
- @change="jibing"
- >
- <el-option
- v-for="dict in zhenghuzangList"
- :key="dict.id"
- :label="dict.proName"
- :value="dict.proName"
- />
- </el-select>
- </template>
- </el-table-column>
- <el-table-column
- label="鐥囩姸鏃ユ湡"
- width="160"
- prop="diseaseData"
- align="center"
- >
- <template slot-scope="scope">
- <el-date-picker
- size="mini"
- v-model="scope.row.diseaseData"
- align="right"
- type="date"
- placeholder="閫夋嫨鏃ユ湡"
- :picker-options="pickerOptions"
- style="width: 130px"
- value-format="yyyy-MM-dd"
- >
- </el-date-picker>
- </template>
- </el-table-column>
-
- <el-table-column label="澶囨敞" prop="remark" align="center">
- <template slot-scope="scope">
- <el-input
- size="mini"
- v-model="scope.row.remark"
- placeholder="璇疯緭鍏ュ娉�"
- />
- </template>
- </el-table-column>
- </el-table>
- </div>
</div>
</el-collapse-item>
+ <el-collapse-item title="鑱屼笟鐥囩姸" name="6">
+ <div style="width: 900px">
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ icon="el-icon-plus"
+ size="mini"
+ @click="addzj()"
+ >娣诲姞
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="danger"
+ icon="el-icon-delete"
+ size="mini"
+ @click="delezz()"
+ >鍒犻櫎
+ </el-button>
+ </el-col>
+ </el-row>
+ <el-table
+ border
+ :data="form.zhiyezzList"
+ ref="zhiyezzList"
+ style="width: 98%"
+ @selection-change="handlezzChange"
+ >
+ <el-table-column type="selection" width="40" align="center" />
+ <el-table-column
+ label="搴忓彿"
+ width="80"
+ align="center"
+ type="index"
+ :index="indexMethod"
+ />
+ <el-table-column label="鐥囩姸鍚嶇О" prop="name" align="center">
+ <template slot-scope="scope">
+ <el-select
+ :remote-method="getZzData"
+ v-model="scope.row.diseaseName"
+ remote
+ filterable
+ placeholder="璇烽�夋嫨鐥囩姸鍚嶇О"
+ clearable
+ @change="zz"
+ >
+ <el-option
+ v-for="dict in zhenghuzangList"
+ :key="dict.id"
+ :label="dict.proName"
+ :value="dict.proName"
+ />
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鐥囩姸鏃ユ湡"
+ width="160"
+ prop="diseaseData"
+ align="center"
+ >
+ <template slot-scope="scope">
+ <el-date-picker
+ size="mini"
+ v-model="scope.row.diseaseData"
+ align="right"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ :picker-options="pickerOptions"
+ style="width: 130px"
+ value-format="yyyy-MM-dd"
+ >
+ </el-date-picker>
+ </template>
+ </el-table-column>
+
+ <el-table-column label="澶囨敞" prop="bz" align="center">
+ <template slot-scope="scope">
+ <el-input
+ size="mini"
+ v-model="scope.row.bz"
+ placeholder="璇疯緭鍏ュ娉�"
+ />
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-collapse-item>
+
<el-collapse-item title="鏈堢粡鍙�" name="2" v-show="sex">
<div style="width: 900px">
<el-form-item label="鍒濇疆(宀�)" prop="chuchao">
@@ -406,7 +404,7 @@
</el-form-item>
</div>
</el-collapse-item>
- <el-collapse-item title="鑱屼笟鐥�" name="5" v-show="zhiyebingshi">
+ <el-collapse-item title="鑱屼笟鐥呭彶" name="5" v-show="zhiyebingshi">
<div style="width: 900px">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@@ -436,19 +434,8 @@
@selection-change="handlebingChange"
>
<el-table-column type="selection" width="40" align="center" />
- <!-- <el-table-column
- label="搴忓彿"
- align="center"
- prop="index"
- width="50"
- /> -->
<el-table-column label="鐤剧梾绫诲瀷" prop="type">
<template slot-scope="scope">
- <!-- <el-input
- size="mini"
- v-model="scope.row.diseaseName"
- placeholder="璇疯緭鍏ョ柧鐥呭悕绉�"
- /> -->
<el-select
v-model="scope.row.type"
remote
@@ -466,7 +453,6 @@
</template>
</el-table-column>
<el-table-column label="鐤剧梾id" prop="icdId" v-if="false">
- <!-- <template slot-scope="scope"> -->
<el-select
:remote-method="getRemoteData"
v-model="icdId"
@@ -482,15 +468,9 @@
:value="dict.id"
/>
</el-select>
- <!-- </template> -->
</el-table-column>
<el-table-column label="鐤剧梾鍚嶇О" prop="diseaseName">
<template slot-scope="scope">
- <!-- <el-input
- size="mini"
- v-model="scope.row.diseaseName"
- placeholder="璇疯緭鍏ョ柧鐥呭悕绉�"
- /> -->
<el-select
:remote-method="getRemoteData"
v-model="scope.row.diseaseName"
@@ -511,10 +491,6 @@
</el-table-column>
<el-table-column label="璇婃柇鏃ユ湡" prop="diseaseData">
<template slot-scope="scope">
- <!-- <el-input
- v-model="scope.row.diseaseData"
- placeholder="璇疯緭鍏ヨ瘖鏂棩鏈�"
- /> -->
<el-date-picker
size="mini"
v-model="scope.row.diseaseData"
@@ -539,7 +515,6 @@
</el-table-column>
<el-table-column label="鏄惁鐥婃剤" prop="isOk">
<template slot-scope="scope">
- <!-- <el-input v-model="scope.row.isOk" placeholder="璇疯緭鍏ユ槸鍚︾棅鎰�" /> -->
<el-select
filterable
size="mini"
@@ -568,7 +543,7 @@
</el-table>
</div>
</el-collapse-item>
- <el-collapse-item title="鏃㈠線鐥呭彶" name="5" v-show="jiwangbingshi">
+ <!-- <el-collapse-item title="鏃㈠線鐥呭彶" name="5" v-show="jiwangbingshi">
<div style="width: 900px">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@@ -598,19 +573,8 @@
@selection-change="handlebingChange"
>
<el-table-column type="selection" width="40" align="center" />
- <!-- <el-table-column
- label="搴忓彿"
- align="center"
- prop="index"
- width="50"
- /> -->
<el-table-column label="鐤剧梾绫诲瀷" prop="type">
<template slot-scope="scope">
- <!-- <el-input
- size="mini"
- v-model="scope.row.diseaseName"
- placeholder="璇疯緭鍏ョ柧鐥呭悕绉�"
- /> -->
<el-select
v-model="scope.row.type"
remote
@@ -628,7 +592,6 @@
</template>
</el-table-column>
<el-table-column label="鐤剧梾id" prop="icdId" v-if="false">
- <!-- <template slot-scope="scope"> -->
<el-select
:remote-method="getRemoteData"
v-model="icdId"
@@ -644,15 +607,9 @@
:value="dict.id"
/>
</el-select>
- <!-- </template> -->
</el-table-column>
<el-table-column label="鐤剧梾鍚嶇О" prop="diseaseName">
<template slot-scope="scope">
- <!-- <el-input
- size="mini"
- v-model="scope.row.diseaseName"
- placeholder="璇疯緭鍏ョ柧鐥呭悕绉�"
- /> -->
<el-select
:remote-method="getRemoteData"
v-model="scope.row.diseaseName"
@@ -673,10 +630,6 @@
</el-table-column>
<el-table-column label="璇婃柇鏃ユ湡" prop="diseaseData">
<template slot-scope="scope">
- <!-- <el-input
- v-model="scope.row.diseaseData"
- placeholder="璇疯緭鍏ヨ瘖鏂棩鏈�"
- /> -->
<el-date-picker
size="mini"
v-model="scope.row.diseaseData"
@@ -701,7 +654,6 @@
</el-table-column>
<el-table-column label="鏄惁鐥婃剤" prop="isOk">
<template slot-scope="scope">
- <!-- <el-input v-model="scope.row.isOk" placeholder="璇疯緭鍏ユ槸鍚︾棅鎰�" /> -->
<el-select
filterable
size="mini"
@@ -729,9 +681,9 @@
</el-table-column>
</el-table>
</div>
- </el-collapse-item>
+ </el-collapse-item> -->
- <el-collapse-item title="鑱屼笟鍙�" name="7" v-show="zhiye">
+ <!-- <el-collapse-item title="鑱屼笟鍙�" name="7" v-show="zhiye">
<div style="width: 900px">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@@ -760,12 +712,6 @@
@selection-change="handlezhiyeChange"
>
<el-table-column type="selection" width="40" align="center" />
- <!-- <el-table-column
- label="搴忓彿"
- align="center"
- prop="index"
- width="50"
- /> -->
<el-table-column label="寮�濮嬫椂闂�" prop="beginTime">
<template slot-scope="scope">
<el-date-picker
@@ -823,7 +769,6 @@
</el-table-column>
<el-table-column label="鏈夊鍥犵礌" prop="harmTypeLogs">
<template slot-scope="scope">
- <!-- <el-input v-model="scope.row.isOk" placeholder="璇疯緭鍏ユ槸鍚︾棅鎰�" /> -->
<el-select
filterable
size="mini"
@@ -852,7 +797,7 @@
</el-table-column>
</el-table>
</div>
- </el-collapse-item>
+ </el-collapse-item> -->
</el-collapse>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -868,9 +813,13 @@
</template>
<script>
-import { updateHistory, getInfoById, getZhengZhuang } from "@/api/hosp/history";
+import {
+ updateHistory,
+ getInfoById,
+ getZhengZhuang,
+ removeAskHistorys,
+} from "@/api/hosp/history";
import { list } from "@/api/hosp/rules";
-import { listIcd } from "@/api/system/icd";
export default {
dicts: ["tj_smoking_pinlv", "sys_yes_no", "tj_work_status", "tj_work"],
name: "jianqianwenzhen",
@@ -907,7 +856,7 @@
},
],
icdId: "",
- radio: "1",
+ radio: 1,
zhiye: true,
queryParams: {
pageNum: 1,
@@ -951,16 +900,35 @@
multiple: true,
// ${subTable.functionName}琛ㄦ牸鏁版嵁
tjAskHistorysList: [],
+ zhiyezzList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
harmTypeList: [],
// 琛ㄥ崟鍙傛暟
form: {
+ cusName: "",
+ work: "",
+ workStatus: "",
+ gongZhong: "",
+ dwmc: "",
+ ygdw: "",
+ gongLing: "",
+ zgongLing: "",
yjsfyc: "", // 鏄惁寮傚父
ycms: "", // 寮傚父鎻忚堪
+ xiyan: "",
+ xiyanpinlv: "",
+ xiyanyear: "",
+ yinjiu: "",
+ yinjiupinlv: "",
+ yinjiuyear: "",
+ qita: "",
+ medicalHistoryOther: "",
+ mediHistoryq: [],
},
chageall: [],
bingshiall: [],
+ selectedZhiyezz: [],
// 鐤剧梾瀛楀吀琛ㄦ牸鏁版嵁
icdList: [],
rulesList: [],
@@ -991,17 +959,29 @@
watch: {
jianqianwenzhendata(val, newVla) {
+ console.log(val, 555);
if (val) {
val.forEach((item) => {
let tjNumber = item;
getInfoById(tjNumber).then((response) => {
- this.form = response.data;
+ // this.form = response.data;
+
+ Object.assign(this.form, response.data);
+ console.log(response.data.medicalHistoryIds, 8888);
+
+ const medicalHistoryIds = response.data.medicalHistoryIds;
+ const splitIds = medicalHistoryIds
+ ? medicalHistoryIds.split(",")
+ : [];
+ this.form.mediHistoryq = splitIds;
+ // this.form.medicalHistoryOther = response.data.medicalHistoryOther;
+
if (this.form.cusSex === "1") {
this.sex = true;
} else {
this.sex = false;
}
- if (this.form.tjLx === "02") {
+ /* if (this.form.tjLx === "02") {
this.zhiye = true;
this.zhiyebingshi = true;
this.jiwangbingshi = false;
@@ -1009,7 +989,7 @@
this.zhiye = false;
this.zhiyebingshi = false;
this.jiwangbingshi = true;
- }
+ } */
if (this.form.xiyan == null) {
this.form.xiyan = "1";
}
@@ -1036,6 +1016,9 @@
this.form.gongLing = 1; // 宸ラ緞榛樿鍊�
}
this.form.tjAskHistorysList = response.data.tjAskHistorysList;
+ this.form.zhiyezzList = response.data.zhiyezzList;
+ console.log(response.data.tjAskHistorysList, 123456);
+
// this.isdisabled= true
});
});
@@ -1046,6 +1029,7 @@
created() {
this.getList();
this.getzhenzhuangList();
+ console.log(this.form.cusSex, 15555);
console.log("鎺ユ敹", this.jianqianwenzhendata);
// console.log(this.dict.type.sys_yes_no,666666);
@@ -1053,7 +1037,13 @@
this.jianqianwenzhendata.forEach((item) => {
let tjNumber = item;
getInfoById(tjNumber).then((response) => {
- this.form = response.data;
+ // this.form = response.data;
+ Object.assign(this.form, response.data);
+
+ const splitIds = response.data.medicalHistoryIds.split(",");
+ this.form.mediHistoryq = splitIds;
+ this.form.medicalHistoryOther = response.data.medicalHistoryOther;
+
if (this.form.cusSex === "1") {
this.sex = true;
} else {
@@ -1090,6 +1080,7 @@
this.form.yinjiuyear = "0";
}
this.form.tjAskHistorysList = response.data.tjAskHistorysList;
+ this.form.zhiyezzList = response.data.zhiyezzList;
// this.isdisabled= true
});
});
@@ -1109,6 +1100,66 @@
this.zhenghuzangList = response.data;
});
},
+
+ addzj() {
+ if (this.form.cusName) {
+ if (!this.form.zhiyezzList) {
+ this.form.zhiyezzList = [];
+ this.form.zhiyezzList.push({
+ id: parseInt(length),
+ diseaseName: "",
+ diseaseData: "",
+ diseaseCompany: "",
+ isOk: "",
+ remark: "",
+ icdId: "",
+ type: "",
+ });
+ } else {
+ this.form.zhiyezzList.push({
+ id: parseInt(length),
+ diseaseName: "",
+ diseaseData: "",
+ diseaseCompany: "",
+ isOk: "",
+ remark: "",
+ icdId: "",
+ type: "",
+ });
+ }
+ } else {
+ Message.warning("璇峰厛濉啓瀹㈡埛鍚�");
+ }
+ this.$forceUpdate();
+ },
+
+ delezz() {
+ if (this.selectedZhiyezz && this.selectedZhiyezz.length > 0) {
+ const historyId = this.selectedZhiyezz.map((item) => item.diseaseId);
+ console.log(historyId, "鍑嗗鍒犻櫎鐨� diseaseId");
+
+ // 鍙戣姹�
+ removeAskHistorys(historyId).then((res) => {
+ console.log(res, "鍒犻櫎鎺ュ彛鍝嶅簲");
+
+ this.$message.success("鍒犻櫎鎴愬姛");
+
+ // 鎺ュ彛鎴愬姛鍚庡啀鏈湴鍒犻櫎
+ this.form.zhiyezzList = this.form.zhiyezzList.filter(
+ (item) =>
+ !this.selectedZhiyezz.some(
+ (selected) => selected.diseaseId === item.diseaseId
+ )
+ );
+
+ this.selectedZhiyezz = [];
+ this.$forceUpdate();
+ });
+ } else {
+ this.$message.warning("璇峰厛閫夋嫨瑕佸垹闄ょ殑椤�");
+ }
+ },
+
// 鏂板琛�
addmembers() {
if (this.form.cusName) {
@@ -1186,7 +1237,7 @@
onYjsfycChange() {
// 鎵嬪姩瑙﹀彂鈥滄湀缁忓紓甯告弿杩扳�濈殑鏍￠獙
this.$nextTick(() => {
- this.$refs.form.validateField('ycms');
+ this.$refs.form.validateField("ycms");
});
},
@@ -1199,6 +1250,19 @@
});
this.form.tjAskHistorysList.forEach((item) => {
if (item.diseaseName == sel) {
+ item.icdId = this.icdId;
+ }
+ });
+ },
+ zz(sel) {
+ this.name = sel;
+ this.zhenghuzangList.forEach((item) => {
+ if (sel == item.icdname) {
+ this.icdId = item.id;
+ }
+ });
+ this.form.zhiyezzList.forEach((item) => {
+ if (item.name == sel) {
item.icdId = this.icdId;
}
});
@@ -1217,6 +1281,19 @@
}
},
+ getZzData(query) {
+ if (query) {
+ let data = {
+ icdname: query,
+ pageNum: 1,
+ pageSize: 200,
+ };
+ getZhengZhuang(data).then((response) => {
+ this.zhenghuzangList = response.data;
+ });
+ }
+ },
+
delememberss() {
let that = this;
if (that.form.workLogs.length == that.chageall.length) {
@@ -1231,23 +1308,41 @@
});
}
},
+
+
delemembers() {
- let that = this;
- if (that.form.tjAskHistorysList.length == that.bingshiall.length) {
- that.form.tjAskHistorysList = [];
- } else {
- that.bingshiall.forEach((item1, index1) => {
- that.form.tjAskHistorysList.forEach((item, index) => {
- if (item == item1) {
- that.form.tjAskHistorysList.splice(index, 1);
- }
- });
+ if (this.bingshiall && this.bingshiall.length > 0) {
+ const historyId = this.bingshiall.map((item) => item.diseaseId);
+
+ // 鍙戣姹�
+ removeAskHistorys(historyId).then((res) => {
+ console.log(res, "鍒犻櫎鎺ュ彛鍝嶅簲");
+
+ this.$message.success("鍒犻櫎鎴愬姛");
+
+ // 鎺ュ彛鎴愬姛鍚庡啀鏈湴鍒犻櫎
+ this.form.tjAskHistorysList = this.form.tjAskHistorysList.filter(
+ (item) =>
+ !this.bingshiall.some(
+ (selected) => selected.diseaseId === item.diseaseId
+ )
+ );
+
+ this.bingshiall = [];
+ this.$forceUpdate();
});
+ } else {
+ this.$message.warning("璇峰厛閫夋嫨瑕佸垹闄ょ殑椤�");
}
},
+
handlebingChange(selection) {
this.bingshiall = [];
this.bingshiall = selection;
+ },
+ handlezzChange(val) {
+ // 鏇存柊閫変腑鐨勯」
+ this.selectedZhiyezz = val;
},
handlezhiyeChange(selection) {
this.chageall = [];
@@ -1267,10 +1362,30 @@
this.$refs.form.validate((valid) => {
if (valid) {
this.$emit("submitLoading", true);
+ // this.form.medicalHistory =this.form.mediHistory
+ const selected = this.form.mediHistoryq || [];
+
+ this.form.medicalHistory = selected.map((name) => {
+ const match = this.rulesList.find((item) => item.id === name);
+ // console.log(match);
+
+ return {
+ icdname: match.icdname,
+ id: match ? match.id : "",
+ };
+ });
+ console.log(this.form.medicalHistory, 1236);
+
updateHistory(this.form)
.then((response) => {
this.$message.success("淇敼鎴愬姛");
- this.form = response.data; // 鏇存柊琛ㄥ崟鏁版嵁
+ // this.form = response.data; // 鏇存柊琛ㄥ崟鏁版嵁
+
+ Object.assign(this.form, response.data);
+
+ const splitIds = response.data.medicalHistoryIds.split(",");
+ this.form.medicalHistoryOther = response.data.medicalHistoryOther;
+ this.form.mediHistoryq = splitIds;
})
.catch((error) => {
this.$message.error("淇敼澶辫触");
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index a2790d2..f4ddb0f 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -945,7 +945,6 @@
</el-table>
</el-col>
</el-row>
- <!-- -=----------------------------------------------------- -->
<el-row :gutter="24" v-else>
<el-col :span="6" :xs="24">
<el-form
@@ -1296,14 +1295,28 @@
<el-input v-model="form.zybCode" placeholder="璇疯緭鍏ユ墍灞炲湴鍖�" />
</el-form-item>
<el-form-item
- label="浜插睘鍏崇郴"
+ label="闅跺睘鍏崇郴"
prop="industryType"
v-if="form.isZybUnit"
>
- <el-input
+ <!-- <el-input
v-model="form.industryType"
- placeholder="璇疯緭鍏ヤ翰灞炲叧绯�"
- />
+ placeholder="璇疯緭鍏ラ毝灞炲叧绯�"
+ /> -->
+ <el-select
+ filterable
+ v-model="form.industryType"
+ placeholder="璇烽�夋嫨闅跺睘鍏崇郴"
+ clearable
+ style="width: 70px"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_yes_no"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="缁忔祹绫诲瀷" prop="jjType" v-if="form.isZybUnit">
<el-input v-model="form.jjType" placeholder="璇疯緭鍏ョ粡娴庣被鍨�" />
@@ -1403,6 +1416,7 @@
"dict_data_status",
"sys_user_sex",
"reservation_pay_type",
+ "sys_yes_no"
],
data() {
let checkPhoneNum = (rule, value, callback) => {
@@ -1476,7 +1490,7 @@
id: "",
// 琛ㄥ崟鍙傛暟
form: {
- isZybUnit: 0,
+ isZybUnit: 0,
},
lastXianPrice: 0,
forms: {
@@ -1555,7 +1569,7 @@
return this.sfzs === "Y";
},
},
-
+
created() {
this.getList();
},
@@ -1719,7 +1733,7 @@
validTime: null,
wbm: null,
deleted: null,
- isZybUnit: 0
+ isZybUnit: 0,
};
this.resetForm("form");
},
@@ -1779,7 +1793,7 @@
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
this.reset();
- this.form.isZybUnit = 0;
+ this.form.isZybUnit = 0;
this.open = true;
this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
},
@@ -1791,7 +1805,7 @@
// 涓嶈鐩存帴璧嬪�兼暣涓� response.data锛岃�屾槸閫愪釜灞炴�ц祴鍊�
Object.assign(this.form, response.data);
this.form.isZybUnit = response.data.isZybUnit === true ? 1 : 0;
- console.log('淇敼鏃剁殑 isZybUnit 鍊�:', this.form.isZybUnit);
+ console.log("淇敼鏃剁殑 isZybUnit 鍊�:", this.form.isZybUnit);
this.open = true;
this.title = "淇敼浣撴鍗曚綅淇℃伅缁存姢";
});
@@ -2430,7 +2444,7 @@
if (valid) {
const submitData = {
...this.form,
- isZybUnit: Boolean(this.form.isZybUnit) // 杞崲涓哄竷灏斿��
+ isZybUnit: Boolean(this.form.isZybUnit), // 杞崲涓哄竷灏斿��
};
if (this.form.drugManufacturerId != null) {
updateComp(submitData).then((response) => {
@@ -2439,7 +2453,11 @@
this.getList();
});
} else {
- if (this.form.cnName && this.form.contactPerson && this.form.contactPhone) {
+ if (
+ this.form.cnName &&
+ this.form.contactPerson &&
+ this.form.contactPhone
+ ) {
addComp(submitData).then((response) => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
--
Gitblit v1.8.0