From d10c7c728234b5a9098b7bd5bb7a914a14e33c20 Mon Sep 17 00:00:00 2001
From: su1124 <1583764726@qq.com>
Date: 星期五, 29 十二月 2023 18:37:28 +0800
Subject: [PATCH] su
---
src/views/doctor/check/index.vue | 14 +
src/views/hosp/history/index.vue | 112 +++----------
src/views/system/tijian/index.vue | 2
vue.config.js | 2
src/components/jianqianwenzhen/index.vue | 286 +++++++++++++++++++++++++++++++----
src/views/system/tijianall/index.vue | 3
src/api/hosp/history.js | 9 +
7 files changed, 306 insertions(+), 122 deletions(-)
diff --git a/src/api/hosp/history.js b/src/api/hosp/history.js
index 41013dd..57ae71b 100644
--- a/src/api/hosp/history.js
+++ b/src/api/hosp/history.js
@@ -50,3 +50,12 @@
method: 'get',
})
}
+
+// 鑾峰彇鐥囩姸鎺ュ彛闆�
+export function getZhengZhuang() {
+ return request({
+ url: '/hosp/history/getZhengZhuang',
+ method: 'get',
+ })
+}
+
diff --git a/src/components/jianqianwenzhen/index.vue b/src/components/jianqianwenzhen/index.vue
index a669b7f..380f83e 100644
--- a/src/components/jianqianwenzhen/index.vue
+++ b/src/components/jianqianwenzhen/index.vue
@@ -72,14 +72,31 @@
style="width: 700px"
/>
</el-form-item>
- <el-form-item label="鏃㈠線鐥呭彶" prop="medicalHistory">
+ <el-form-item label="鍏朵粬" prop="medicalHistory">
<el-input
type="textarea"
rows="4"
v-model="form.medicalHistory"
- placeholder="璇疯緭鍏ユ棦寰�鐥呭彶"
+ placeholder="璇疯緭鍏�"
style="width: 700px"
/>
+ </el-form-item>
+ <el-form-item label="鐥囩姸" prop="zzsjj">
+ <el-select
+ multiple
+ filterable
+ v-model="form.zzsjj"
+ placeholder="璇烽�夋嫨鐥囩姸"
+ clearable
+ style="width: 700px"
+ >
+ <el-option
+ v-for="dict in zhenghuzangList"
+ :key="dict.id"
+ :label="dict.proName"
+ :value="dict.proName"
+ />
+ </el-select>
</el-form-item>
</div>
</el-collapse-item>
@@ -96,6 +113,22 @@
</el-form-item>
<el-form-item label="鏈鏈堢粡" prop="mociage">
<el-input v-model="form.mociage" style="width: 100px" />
+ </el-form-item>
+ <el-form-item label="鏄惁寮傚父" prop="yjsfyc">
+ <el-select
+ filterable
+ v-model="form.yjsfyc"
+ placeholder="璇烽�夋嫨鏄惁寮傚父"
+ clearable
+ style="width: 150px"
+ >
+ <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>
</div>
</el-collapse-item>
@@ -180,7 +213,7 @@
</el-form-item>
</div>
</el-collapse-item>
- <el-collapse-item title="鏃㈠線鐥呭彶" name="5">
+ <el-collapse-item title="鑱屼笟鐥�" name="5">
<div style="width: 900px">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@@ -216,6 +249,30 @@
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
+ filterable
+ placeholder="璇烽�夋嫨鐤剧梾绫诲瀷"
+ clearable
+ @change="jibing"
+ >
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </template>
+ </el-table-column>
<el-table-column label="鐤剧梾鍚嶇О" prop="diseaseName">
<template slot-scope="scope">
<!-- <el-input
@@ -230,6 +287,7 @@
filterable
placeholder="璇烽�夋嫨鐥呯鍚�"
clearable
+ @change="jibing"
>
<el-option
v-for="dict in rulesList"
@@ -300,7 +358,7 @@
</div>
</el-collapse-item>
- <el-collapse-item title="鑱屼笟鍙�" name="7">
+ <el-collapse-item title="鑱屼笟鍙�" name="7" v-show="zhiye">
<div style="width: 900px">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@@ -344,7 +402,6 @@
type="date"
placeholder="閫夋嫨鏃ユ湡"
:picker-options="pickerOptions"
- style="width: 130px"
value-format="yyyy-MM-dd"
>
</el-date-picker>
@@ -359,7 +416,6 @@
type="date"
placeholder="閫夋嫨鏃ユ湡"
:picker-options="pickerOptions"
- style="width: 130px"
value-format="yyyy-MM-dd"
>
</el-date-picker>
@@ -439,21 +495,24 @@
</template>
<script>
+import { updateHistory, getInfoById, getZhengZhuang } from "@/api/hosp/history";
import { listRules } from "@/api/hosp/rules";
import { listIcd } from "@/api/system/icd";
-import { updateHistory } from "@/api/hosp/history";
export default {
dicts: ["tj_smoking_pinlv", "sys_yes_no", "tj_work_status", "tj_work"],
name: "jianqianwenzhen",
props: {
jianqianwenzhendata: {
type: Array, //鏁扮粍绫诲瀷
- default: () => [],
+ default: null,
+ },
+ jianqianwenzhendatas: {
+ type: Array, //瀛楃涓茬被鍨�
+ default: null,
},
},
data() {
let checkPhoneNum = (rule, value, callback) => {
- console.log(value);
let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
if (value == "" && value == undefined && !value) {
return callback("");
@@ -464,6 +523,19 @@
}
};
return {
+ zhenghuzangList: [],
+ options: [
+ {
+ value: "鏃㈠線鐥�",
+ label: "鏃㈠線鐥�",
+ },
+ {
+ value: "鑱屼笟鐥�",
+ label: "鑱屼笟鐥�",
+ },
+ ],
+ icd: "",
+ zhiye: true,
queryParams: {
pageNum: 1,
pageSize: 10,
@@ -531,28 +603,95 @@
watch: {
jianqianwenzhendata(val, newVla) {
if (val) {
- console.log(val);
+ val.forEach((item) => {
+ let tjNumber = item;
+ getInfoById(tjNumber).then((response) => {
+ this.form = response.data;
+ if (this.form.cusSex === "1") {
+ this.sex = true;
+ } else {
+ this.sex = false;
+ }
+ if (this.form.tjLx === "02") {
+ this.zhiye = true;
+ } else {
+ this.zhiye = false;
+ }
+ if (this.form.xiyan == null) {
+ this.form.xiyan = "1";
+ }
+ if (this.form.yjsfyc == null) {
+ this.form.yjsfyc = "N";
+ }
+ if (this.form.xiyanpinlv == null) {
+ this.form.xiyanpinlv = "0";
+ }
+ if (this.form.xiyanyear == null) {
+ this.form.xiyanyear = "0";
+ }
+ if (this.form.yinjiu == null) {
+ this.form.yinjiu = "1";
+ }
+ if (this.form.yinjiupinlv == null) {
+ this.form.yinjiupinlv = "0";
+ }
+ if (this.form.yinjiuyear == null) {
+ this.form.yinjiuyear = "0";
+ }
+ this.form.tjAskHistorysList = response.data.tjAskHistorysList;
+ // this.isdisabled= true
+ });
+ });
this.loading = false;
- this.form = val;
- if (this.form.xiyan == null) {
- this.form.xiyan = "1";
- }
- if (this.form.xiyanpinlv == null) {
- this.form.xiyanpinlv = "0";
- }
- if (this.form.xiyanyear == null) {
- this.form.xiyanyear = "0";
- }
- if (this.form.yinjiu == null) {
- this.form.yinjiu = "1";
- }
- if (this.form.yinjiupinlv == null) {
- this.form.yinjiupinlv = "0";
- }
- if (this.form.yinjiuyear == null) {
- this.form.yinjiuyear = "0";
- }
- this.form.tjAskHistorysList = val.tjAskHistorysList;
+ }
+
+ // if (this.fList) {
+ // this.getList()
+ // }
+ },
+ jianqianwenzhendatas(valse, newVla) {
+ console.log(valse);
+ if (valse) {
+ console.log(valse);
+ let tjNumber = valse.tjNum;
+ console.log(tjNumber,111);
+ getInfoById(tjNumber).then((response) => {
+ this.form = response.data;
+ if (this.form.cusSex === "1") {
+ this.sex = true;
+ } else {
+ this.sex = false;
+ }
+ if (this.form.tjLx === "02") {
+ this.zhiye = true;
+ } else {
+ this.zhiye = false;
+ }
+ if (this.form.xiyan == null) {
+ this.form.xiyan = "1";
+ }
+ if (this.form.yjsfyc == null) {
+ this.form.yjsfyc = "N";
+ }
+ if (this.form.xiyanpinlv == null) {
+ this.form.xiyanpinlv = "0";
+ }
+ if (this.form.xiyanyear == null) {
+ this.form.xiyanyear = "0";
+ }
+ if (this.form.yinjiu == null) {
+ this.form.yinjiu = "1";
+ }
+ if (this.form.yinjiupinlv == null) {
+ this.form.yinjiupinlv = "0";
+ }
+ if (this.form.yinjiuyear == null) {
+ this.form.yinjiuyear = "0";
+ }
+ this.form.tjAskHistorysList = response.data.tjAskHistorysList;
+ // this.isdisabled= true
+ });
+ this.loading = false;
}
// if (this.fList) {
@@ -562,12 +701,29 @@
},
created() {
this.getList();
+ this.getzhenzhuangList();
},
methods: {
/** 鏌ヨ鐤剧梾瀛楀吀鍒楄〃 */
getList() {
- listRules(this.queryParams).then((response) => {
+ listRules(this.queryParams).then((response) => {
this.rulesList = response.rows;
+ });
+ },
+
+ getzhenzhuangList() {
+ getZhengZhuang().then((response) => {
+ this.zhenghuzangList = response.data;
+ });
+ },
+
+ jibing(sel) {
+ console.log(sel);
+ this.rulesList.forEach((item) => {
+ console.log(item);
+ if (sel == item.bingzhong) {
+ this.icd = item.aid;
+ }
});
},
// 鎼滅储
@@ -594,6 +750,8 @@
diseaseCompany: "",
isOk: "",
remark: "",
+ icdId: "",
+ type: "",
Selection,
});
} else {
@@ -604,6 +762,8 @@
diseaseCompany: "",
isOk: "",
remark: "",
+ icdId: "",
+ type: "",
Selection,
});
}
@@ -611,6 +771,67 @@
Message.warning("璇峰厛濉啓瀹㈡埛鍚�");
}
this.$forceUpdate();
+ },
+ addmemberss() {
+ if (this.form.cusName) {
+ if (!this.form.workLogs) {
+ this.form.workLogs = [];
+ this.form.workLogs.push({
+ // id: parseInt(length),
+ beginTime: "",
+ endTime: "",
+ workCompany: "",
+ workDept: "",
+ workType: "",
+ harmTypeLogs: "",
+ fangHu: "",
+ Selection,
+ });
+ } else {
+ this.form.workLogs.push({
+ // id: parseInt(length),
+ beginTime: "",
+ endTime: "",
+ workCompany: "",
+ workDept: "",
+ workType: "",
+ harmTypeLogs: "",
+ fangHu: "",
+ Selection,
+ });
+ }
+ } else {
+ Message.warning("璇峰厛濉啓瀹㈡埛鍚�");
+ }
+ this.$forceUpdate();
+ },
+ delememberss() {
+ let that = this;
+ if (that.form.workLogs.length == that.chageall.length) {
+ that.form.workLogs = [];
+ } else {
+ that.chageall.forEach((item1, index1) => {
+ that.form.workLogs.forEach((item, index) => {
+ if (item == item1) {
+ that.form.workLogs.splice(index, 1);
+ }
+ });
+ });
+ }
+ },
+ 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);
+ }
+ });
+ });
+ }
},
handlebingChange(selection) {
this.bingshiall = [];
@@ -622,7 +843,8 @@
},
/** 鎻愪氦鎸夐挳 */
submitForm() {
- this.form.tjNum = this.jianqianwenzhendata.tjNum;
+ // this.form.tjNum = this.jianqianwenzhendata.tjNum;
+ // this.form.tjAskHistorysList.icdId = this.icd;
updateHistory(this.form).then((response) => {
this.$modal.msgSuccess("淇敼鎴愬姛");
});
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index f1f0651..f515a51 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -757,7 +757,7 @@
:before-close="handleClose1"
>
<jianqianwenzhen
- :jianqianwenzhendata="jianqianwenzhendata"
+ :jianqianwenzhendatas="jianqianwenzhendatas"
></jianqianwenzhen>
<span slot="footer" class="dialog-footer">
<el-button @click="jianqians = false">鍙� 娑�</el-button>
@@ -795,9 +795,9 @@
components: { Public, Historicalreport,jianqianwenzhen },
data() {
return {
- lishi:true,
+ lishi:false,
rowes:{},
- jianqianwenzhendata:[],
+ jianqianwenzhendatas:[],
jianqians:false,
selected: false,
checkval: false,
@@ -1334,13 +1334,19 @@
if (res.data[0] != null) {
this.reportHistorydata = res.data;
}
+ if(this.reportHistorydata.length >= 1){
+ this.lishi = true;
+ }else{
+ this.lishi = true;
+ this.$modal.msgError("鏆傛棤鍘嗗彶鎶ュ憡");
+ }
});
},
jianqian() {
let tjNumber = this.rowes.tjNumber;
getInfoById(tjNumber).then((response) => {
- this.jianqianwenzhendata = response.data;
+ this.jianqianwenzhendatas = response.data;
if (this.form.xiyan == null) {
this.form.xiyan = "1";
}
diff --git a/src/views/hosp/history/index.vue b/src/views/hosp/history/index.vue
index b19d7ea..36b0bd2 100644
--- a/src/views/hosp/history/index.vue
+++ b/src/views/hosp/history/index.vue
@@ -156,7 +156,6 @@
<script>
import jianqianwenzhen from "@/components/jianqianwenzhen";
-import { updateHistory, getInfoById } from "@/api/hosp/history";
import { Message } from "element-ui";
import { getOrderList } from "@/api/hosp/order";
import { listHarmType } from "@/api/hosp/harmType";
@@ -401,29 +400,30 @@
}
});
let tjNumber = selection.map((item) => item.tjNumber);
- getInfoById(tjNumber).then((response) => {
- this.jianqianwenzhendata = response.data;
- if (this.form.xiyan == null) {
- this.form.xiyan = "1";
- }
- if (this.form.xiyanpinlv == null) {
- this.form.xiyanpinlv = "0";
- }
- if (this.form.xiyanyear == null) {
- this.form.xiyanyear = "0";
- }
- if (this.form.yinjiu == null) {
- this.form.yinjiu = "1";
- }
- if (this.form.yinjiupinlv == null) {
- this.form.yinjiupinlv = "0";
- }
- if (this.form.yinjiuyear == null) {
- this.form.yinjiuyear = "0";
- }
- this.form.tjAskHistorysList = response.data.tjAskHistorysList;
- // this.isdisabled= true
- });
+ this.jianqianwenzhendata = tjNumber;
+ // getInfoById(tjNumber).then((response) => {
+ // this.jianqianwenzhendata = response.data;
+ // if (this.form.xiyan == null) {
+ // this.form.xiyan = "1";
+ // }
+ // if (this.form.xiyanpinlv == null) {
+ // this.form.xiyanpinlv = "0";
+ // }
+ // if (this.form.xiyanyear == null) {
+ // this.form.xiyanyear = "0";
+ // }
+ // if (this.form.yinjiu == null) {
+ // this.form.yinjiu = "1";
+ // }
+ // if (this.form.yinjiupinlv == null) {
+ // this.form.yinjiupinlv = "0";
+ // }
+ // if (this.form.yinjiuyear == null) {
+ // this.form.yinjiuyear = "0";
+ // }
+ // this.form.tjAskHistorysList = response.data.tjAskHistorysList;
+ // // this.isdisabled= true
+ // });
},
tableRowClassName({ row, rowIndex }) {
for (let i = 0; i < this.selectList.length; i++) {
@@ -433,69 +433,11 @@
}
},
- 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);
- }
- });
- });
- }
- },
+
- addmemberss() {
- if (this.form.cusName) {
- if (!this.form.workLogs) {
- this.form.workLogs = [];
- this.form.workLogs.push({
- id: parseInt(length),
- beginTime: "",
- endTime: "",
- workCompany: "",
- workDept: "",
- workType: "",
- harmTypeLogs: "",
- fangHu: "",
- Selection,
- });
- } else {
- this.form.workLogs.push({
- id: parseInt(length),
- beginTime: "",
- endTime: "",
- workCompany: "",
- workDept: "",
- workType: "",
- harmTypeLogs: "",
- fangHu: "",
- Selection,
- });
- }
- } else {
- Message.warning("璇峰厛濉啓瀹㈡埛鍚�");
- }
- this.$forceUpdate();
- },
+
- delememberss() {
- let that = this;
- if (that.form.workLogs.length == that.chageall.length) {
- that.form.workLogs = [];
- } else {
- that.chageall.forEach((item1, index1) => {
- that.form.workLogs.forEach((item, index) => {
- if (item == item1) {
- that.form.workLogs.splice(index, 1);
- }
- });
- });
- }
- },
+
},
};
</script>
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 834923d..48b54d6 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -2122,6 +2122,7 @@
tjFlowingWater: this.tjFlowingWater,
userId,
tjType,
+ tjCategory:this.tjCategory
};
} else {
data = {
@@ -2130,6 +2131,7 @@
tjFlowingWater: this.tjFlowingWater,
userId,
tjType,
+ tjCategory:this.tjCategory
};
}
getOrder(data).then((res) => {
diff --git a/src/views/system/tijianall/index.vue b/src/views/system/tijianall/index.vue
index 970ab55..b9a0052 100644
--- a/src/views/system/tijianall/index.vue
+++ b/src/views/system/tijianall/index.vue
@@ -995,6 +995,9 @@
cusSex: [
{ required: true, validator: checkPhoneNum, trigger: "change" },
],
+ category: [
+ { required: true, validator: checkPhoneNum, trigger: "change" },
+ ],
cusBrithday: [
{ required: true, validator: checkPhoneNum, trigger: "blur" },
],
diff --git a/vue.config.js b/vue.config.js
index 50a2c36..ecc0258 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -53,7 +53,7 @@
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
//target: `https://ltpeis.xaltjdkj.cn:5501/prod-api/getInfo`,
- target: `http://192.168.0.111:5011`,
+ target: `http://192.168.0.105:5011`,
// // target: `http://192.168.0.99:8080/ltkj-admin`,
// target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin`,
// target: `http://10.168.0.9:5011`,
--
Gitblit v1.8.0