From 208d124f1512f45c90ac41849bd50dffda2d4f4a Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期三, 07 五月 2025 17:29:34 +0800
Subject: [PATCH] 1
---
src/views/hosp/history/index.vue | 9 +
src/views/system/comp/index.vue | 29 +++--
src/components/jianqianwenzhen/index.vue | 219 +++++++++++++++++++++++++++++++++++++++++--
3 files changed, 229 insertions(+), 28 deletions(-)
diff --git a/src/components/jianqianwenzhen/index.vue b/src/components/jianqianwenzhen/index.vue
index acaed3a..7b19825 100644
--- a/src/components/jianqianwenzhen/index.vue
+++ b/src/components/jianqianwenzhen/index.vue
@@ -59,10 +59,17 @@
style="width: 710px"
/>
</el-form-item>
- <el-form-item label="宸ヤ綔鍗曚綅鍚嶇О" prop="gongZhong" >
+ <el-form-item label="鍗曚綅鍚嶇О" prop="dwmc">
<el-input
- v-model="form.gongZhong"
- placeholder="璇疯緭鍏ュ伐绉�"
+ v-model="form.dwmc"
+ placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"
+ style="width: 710px"
+ />
+ </el-form-item>
+ <el-form-item label="鐢ㄥ伐鍗曚綅" prop="ygdw">
+ <el-input
+ v-model="form.ygdw"
+ placeholder="璇疯緭鍏ョ敤宸ュ崟浣�"
style="width: 710px"
/>
</el-form-item>
@@ -92,7 +99,7 @@
<el-radio :label="2">鍚�</el-radio>
</el-radio-group>
</el-form-item>
- <el-form-item label="鎺ヨЕ姣掔墿" prop="contactPoison">
+ <!-- <el-form-item label="鎺ヨЕ姣掔墿" prop="contactPoison">
<el-input
type="textarea"
rows="4"
@@ -100,8 +107,44 @@
placeholder="璇疯緭鍏ユ帴瑙︽瘨鐗�"
style="width: 700px"
/>
+ </el-form-item> -->
+ <el-form-item label="浣撴鍗卞鍥犵礌" prop="tjwhyx">
+ <el-select
+ filterable
+ v-model="form.tjwhyx"
+ placeholder="璇烽�夋嫨浣撴鍗卞鍥犵礌"
+ clearable
+ style="width: 180px"
+ >
+ <el-option
+ v-for="dict in dict.type.tj_work_status"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</el-form-item>
- <el-form-item label="鏃㈠線鐥呭彶" prop="medicalHistory">
+ <el-form-item
+ label="鎺ヨЕ鍗卞鍥犵礌"
+ prop="tcwhyx"
+ style="margin-left: 30px"
+ >
+ <el-select
+ filterable
+ v-model="form.tcwhyx"
+ placeholder="璇烽�夋嫨鎺ヨЕ鍗卞鍥犵礌"
+ clearable
+ style="width: 180px"
+ >
+ <el-option
+ v-for="dict in dict.type.tj_work_status"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <!-- <el-form-item label="鏃㈠線鐥呭彶" prop="medicalHistory">
<el-input
type="textarea"
rows="4"
@@ -109,8 +152,33 @@
placeholder="璇疯緭鍏ユ棦寰�鐥呭彶"
style="width: 700px"
/>
+ </el-form-item> -->
+ <el-form-item label="鏃㈠線鐥呭彶" prop="medicalHistory">
+ <el-select
+ v-model="form.medicalHistory"
+ multiple
+ allow-create
+ filterable
+ placeholder="璇烽�夋嫨鎴栬緭鍏ユ棦寰�鐥呭彶"
+ style="width: 700px"
+ >
+ <el-option
+ v-for="item in rulesList"
+ :key="item.id"
+ :label="item.icdname"
+ :value="item.icdname"
+ />
+ </el-select>
+ <!-- <el-input
+ type="textarea"
+ rows="4"
+ v-model="form.medicalHistory"
+ placeholder="璇疯緭鍏ユ棦寰�鐥呭彶"
+ style="width: 700px"
+ /> -->
</el-form-item>
- <el-form-item label="鐥囩姸" prop="zzsjj">
+
+ <!-- <el-form-item label="鐥囩姸" prop="zzsjj">
<el-select
multiple
filterable
@@ -126,7 +194,99 @@
:value="dict.proName"
/>
</el-select>
- </el-form-item>
+ </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="2" v-show="sex">
@@ -149,7 +309,8 @@
v-model="form.yjsfyc"
placeholder="璇烽�夋嫨鏄惁寮傚父"
clearable
- style="width: 150px"
+ style="width: 70px"
+ @change="onYjsfycChange"
>
<el-option
v-for="dict in dict.type.sys_yes_no"
@@ -158,6 +319,9 @@
:value="dict.value"
/>
</el-select>
+ </el-form-item>
+ <el-form-item label="鏈堢粡寮傚父鎻忚堪" prop="ycms">
+ <el-input v-model="form.ycms" style="width: 490px" />
</el-form-item>
</div>
</el-collapse-item>
@@ -206,7 +370,7 @@
<el-input
v-model="form.xiyanyear"
style="width: 70px"
- />骞� </el-form-item
+ />鏈� </el-form-item
><br />
<el-form-item label="鏄惁楗厭" prop="yinjiu">
<!-- <el-input v-model="form.yinjiupinlv" placeholder="璇疯緭鍏ラギ閰掗鐜�" /> -->
@@ -229,7 +393,7 @@
<el-input v-model="form.yinjiupinlv" style="width: 70px" />ml/澶�
</el-form-item>
<el-form-item label="楗厭鏃堕棿" prop="yinjiuyear">
- <el-input v-model="form.yinjiuyear" style="width: 70px" />骞�
+ <el-input v-model="form.yinjiuyear" style="width: 70px" />鏈�
</el-form-item>
<el-form-item label="鍏朵粬" prop="qita">
<el-input
@@ -743,7 +907,7 @@
},
],
icdId: "",
- radio: '1',
+ radio: "1",
zhiye: true,
queryParams: {
pageNum: 1,
@@ -791,7 +955,10 @@
title: "",
harmTypeList: [],
// 琛ㄥ崟鍙傛暟
- form: {},
+ form: {
+ yjsfyc: "", // 鏄惁寮傚父
+ ycms: "", // 寮傚父鎻忚堪
+ },
chageall: [],
bingshiall: [],
// 鐤剧梾瀛楀吀琛ㄦ牸鏁版嵁
@@ -806,9 +973,22 @@
trigger: "blur",
},
],
+ ycms: [
+ {
+ validator: (rule, value, callback) => {
+ if (this.form.yjsfyc === "Y" && !value) {
+ callback(new Error("鏈堢粡寮傚父鎻忚堪涓嶈兘涓虹┖"));
+ } else {
+ callback();
+ }
+ },
+ trigger: "blur",
+ },
+ ], // 鍒濆涓嶈缃负蹇呭～
},
};
},
+
watch: {
jianqianwenzhendata(val, newVla) {
if (val) {
@@ -867,6 +1047,8 @@
this.getList();
this.getzhenzhuangList();
console.log("鎺ユ敹", this.jianqianwenzhendata);
+ // console.log(this.dict.type.sys_yes_no,666666);
+
if (this.jianqianwenzhendata.length == 1) {
this.jianqianwenzhendata.forEach((item) => {
let tjNumber = item;
@@ -995,6 +1177,19 @@
this.$forceUpdate();
},
+ indexMethod(index) {
+ return (
+ (this.queryParams.pageNum - 1) * this.queryParams.pageSize + index + 1
+ );
+ },
+
+ onYjsfycChange() {
+ // 鎵嬪姩瑙﹀彂鈥滄湀缁忓紓甯告弿杩扳�濈殑鏍￠獙
+ this.$nextTick(() => {
+ this.$refs.form.validateField('ycms');
+ });
+ },
+
jibing(sel) {
this.diseaseNames = sel;
this.rulesList.forEach((item) => {
diff --git a/src/views/hosp/history/index.vue b/src/views/hosp/history/index.vue
index 154a1d9..c6c216a 100644
--- a/src/views/hosp/history/index.vue
+++ b/src/views/hosp/history/index.vue
@@ -133,6 +133,7 @@
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
+ small
/>
</div>
</div>
@@ -451,12 +452,12 @@
</script>
<style lang="scss" scoped >
.pagi {
- margin-right: -10px;
+ margin-right: 30px;
}
-/* .pag1 {
- width: 30%;
-} */
+/* .pagi1 {
+ width: 8%;
+} */
.hist1 {
width: 1580px;
display: flex;
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index 56b7442..a2790d2 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -1236,8 +1236,8 @@
>
<el-form-item label="鍗曚綅绫诲瀷" prop="isZybUnit">
<el-radio-group v-model="form.isZybUnit">
- <el-radio :label="false">鏅�氬崟浣�</el-radio>
- <el-radio :label="true">鑱屼笟鐥呭崟浣�</el-radio>
+ <el-radio :label="0">鏅�氬崟浣�</el-radio>
+ <el-radio :label="1">鑱屼笟鐥呭崟浣�</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item
@@ -1476,7 +1476,7 @@
id: "",
// 琛ㄥ崟鍙傛暟
form: {
- isZybUnit: false,
+ isZybUnit: 0,
},
lastXianPrice: 0,
forms: {
@@ -1555,6 +1555,7 @@
return this.sfzs === "Y";
},
},
+
created() {
this.getList();
},
@@ -1718,6 +1719,7 @@
validTime: null,
wbm: null,
deleted: null,
+ isZybUnit: 0
};
this.resetForm("form");
},
@@ -1777,6 +1779,7 @@
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
this.reset();
+ this.form.isZybUnit = 0;
this.open = true;
this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
},
@@ -1785,7 +1788,10 @@
this.reset();
const drugManufacturerId = row.drugManufacturerId || this.ids;
getComp(drugManufacturerId).then((response) => {
- this.form = response.data;
+ // 涓嶈鐩存帴璧嬪�兼暣涓� response.data锛岃�屾槸閫愪釜灞炴�ц祴鍊�
+ Object.assign(this.form, response.data);
+ this.form.isZybUnit = response.data.isZybUnit === true ? 1 : 0;
+ console.log('淇敼鏃剁殑 isZybUnit 鍊�:', this.form.isZybUnit);
this.open = true;
this.title = "淇敼浣撴鍗曚綅淇℃伅缁存姢";
});
@@ -1823,7 +1829,6 @@
new Big(0)
).toNumber();
});
- // ----------------------------------------------------------
})
.catch(() => {
this.youhui = oldValue;
@@ -2423,19 +2428,19 @@
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
+ const submitData = {
+ ...this.form,
+ isZybUnit: Boolean(this.form.isZybUnit) // 杞崲涓哄竷灏斿��
+ };
if (this.form.drugManufacturerId != null) {
- updateComp(this.form).then((response) => {
+ updateComp(submitData).then((response) => {
this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
this.getList();
});
} else {
- if (
- this.form.cnName &&
- this.form.contactPerson &&
- this.form.contactPhone
- ) {
- addComp(this.form).then((response) => {
+ if (this.form.cnName && this.form.contactPerson && this.form.contactPhone) {
+ addComp(submitData).then((response) => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
--
Gitblit v1.8.0