wangjunping/his
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

供应商前台 其他画面bug修正 up by dh

Browse Source
This commit is contained in:
duhe
2025-02-28 17:38:55 +08:00
parent a9b01023bc
commit 824281c6af
13 changed files with 625 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
openhis-ui-vue3/src/views/catalog/device/components/device.js
View File

@@ -3,6 +3,7 @@ import { parseStrEmpty } from "@/utils/openhis";
// 查询器材目录列表
export function getDeviceList(query) {
console.log(query,'aaaaa')
return request({
url: '/datadictionary/device/information-page',
method: 'get',

14
openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
View File

@@ -265,12 +265,6 @@ const emits = defineEmits(["submit"]); // 声明自定义事件
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 50,
diseaseName: undefined, // 疾病名称
status: undefined, // 状态（包括 1：预置，2：启用，3：停用）
},
rules: {
// busNo: [{ required: true, message: "编码不能为空", trigger: "blur" }],
// name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
@@ -353,6 +347,8 @@ function submitForm() {
// : (form.value.statusEnum = "2");
// console.log(form.value, "editDevice", form.value.statusEnum);
editDevice(form.value).then((response) => {
// 触发自定义事件，并传递数据给父组件
emits("submit");
proxy.$modal.msgSuccess("修改成功");
visible.value = false;
reset(); // 重置表单数据
@@ -367,6 +363,12 @@ function submitForm() {
});
}
}
/** 取消按钮 */
function cancel() {
open.value = false;
reset();
}
defineExpose({
show,
edit,

6
openhis-ui-vue3/src/views/catalog/device/components/deviceViewDialog.vue
View File

@@ -304,12 +304,6 @@ const conditionDefinitionOptions = ref(undefined);
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 50,
diseaseName: undefined, // 疾病名称
status: undefined, // 状态（包括 1：预置，2：启用，3：停用）
},
rules: {
name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
conditionCode: [

10
openhis-ui-vue3/src/views/catalog/device/index.vue
View File

@@ -377,7 +377,7 @@
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
@@ -436,7 +436,7 @@ const viewData = ref({});
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageNo: 1,
pageSize: 50,
searchKey: undefined, // 品名/商品名/英文品名/编码/拼音
typeEnum: undefined, // 类型（包括 1：中药，2：成药）
@@ -472,6 +472,7 @@ function getDiseaseTreatmentList() {
}
/** 查询器材目录列表 */
function getList() {
console.log(getList, "getList");
loading.value = true;
getDeviceList(queryParams.value).then((res) => {
loading.value = false;
@@ -486,7 +487,7 @@ function handleNodeClick(data) {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.pageNo = 1;
getList();
}
@@ -558,7 +559,8 @@ function openAddDevice() {
}
/** 打开编辑弹窗 */
function openEditDevice(row) {
console.log("打开新增弹窗");
currentData.value = {}
console.log("打开编辑弹窗");
currentData.value = row;
console.log(currentData.value, "currentData");
title.value = "编辑";

52
openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentDialog.vue
View File

@@ -30,7 +30,11 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="拼音码(项目名称)" prop="pyStr" class="custom-label-spacing">
<el-form-item
label="拼音码(项目名称)"
prop="pyStr"
class="custom-label-spacing"
>
<el-input v-model="form.pyStr" placeholder="" maxlength="30" />
</el-form-item>
</el-col>
@@ -59,7 +63,11 @@
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="使用单位" prop="permittedUnitCode">
<el-input v-model="form.permittedUnitCode" placeholder="" maxlength="30" />
<el-input
v-model="form.permittedUnitCode"
placeholder=""
maxlength="30"
/>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -75,7 +83,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="医保对码标记" prop="ybMatchFlag">
@@ -94,14 +102,22 @@
<el-col :span="8">
<el-form-item label="身体部位" prop="bodySiteCode">
<!-- <el-input v-model="form.ybFlag" placeholder="" maxlength="30" /> -->
<el-input v-model="form.bodySiteCode" placeholder="" maxlength="30" />
<el-input
v-model="form.bodySiteCode"
placeholder=""
maxlength="30"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="所需标本" prop="specimenCode">
<el-input v-model="form.specimenCode" placeholder="" maxlength="30" />
<el-input
v-model="form.specimenCode"
placeholder=""
maxlength="30"
/>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -109,7 +125,6 @@
<el-checkbox v-model="form.ruleId"></el-checkbox>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="16">
@@ -124,7 +139,7 @@
</el-col>
</el-row>
</el-form>
<template #footer v-if="title !='查看'">
<template #footer v-if="title != '查看'">
<div class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
@@ -156,12 +171,6 @@ const emits = defineEmits(["submit"]); // 声明自定义事件
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 50,
diseaseName: undefined, // 疾病名称
status: undefined, // 状态（包括 1：预置，2：启用，3：停用）
},
rules: {
// busNo: [{ required: true, message: "编码不能为空", trigger: "blur" }],
// name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
@@ -188,17 +197,17 @@ const props = defineProps({
function show() {
// queryParams.roleId = props.roleId;
// getList();
title.value = ''
title.value = props.title
console.log(props, "22222",title.value);
title.value = "";
title.value = props.title;
console.log(props, "22222", title.value);
visible.value = true;
}
// 显示弹框
function edit() {
// queryParams.roleId = props.roleId;
// getList();
title.value = ''
title.value = props.title
title.value = "";
title.value = props.title;
form.value = props.item;
visible.value = true;
}
@@ -229,6 +238,8 @@ function reset() {
function submitForm() {
if (form.value.id != undefined) {
editDiagnosisTreatment(form.value).then((response) => {
// 触发自定义事件，并传递数据给父组件
emits("submit");
proxy.$modal.msgSuccess("修改成功");
visible.value = false;
reset(); // 重置表单数据
@@ -243,6 +254,11 @@ function submitForm() {
});
}
}
/** 取消按钮 */
function cancel() {
open.value = false;
reset();
}
defineExpose({
show,
edit,

6
openhis-ui-vue3/src/views/catalog/diagnosisTreatment/components/diagnosisTreatmentViewDialog.vue
View File

@@ -304,12 +304,6 @@ const conditionDefinitionOptions = ref(undefined);
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 50,
diseaseName: undefined, // 疾病名称
status: undefined, // 状态（包括 1：预置，2：启用，3：停用）
},
rules: {
name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
conditionCode: [

6
openhis-ui-vue3/src/views/catalog/diagnosisTreatment/index.vue
View File

@@ -309,7 +309,7 @@
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
@@ -368,7 +368,7 @@ const viewData = ref({});
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageNo: 1,
pageSize: 50,
searchKey: undefined, // 品名/商品名/英文品名/编码/拼音
typeCode: undefined, // 类型（包括 1：中药，2：成药）
@@ -419,7 +419,7 @@ function handleNodeClick(data) {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.pageNo = 1;
getList();
}

6
openhis-ui-vue3/src/views/catalog/disease/index.vue
View File

@@ -239,7 +239,7 @@
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
@@ -331,7 +331,7 @@ const statusFlagOptions = ref(undefined);
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageNo: 1,
pageSize: 50,
searchKey: undefined, // 疾病名称
statusEnum: undefined, // 状态（包括 1：预置，2：启用，3：停用）
@@ -385,7 +385,7 @@ function handleNodeClick(data) {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.pageNo = 1;
getList();
}
// /** 重置按钮操作 */

6
openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
View File

@@ -541,12 +541,6 @@ const emits = defineEmits(['submit']); // 声明自定义事件
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 50,
diseaseName: undefined, // 疾病名称
status: undefined, // 状态（包括 1：预置，2：启用，3：停用）
},
rules: {
// busNo: [{ required: true, message: "编码不能为空", trigger: "blur" }],
// name: [{ required: true, message: "名称不能为空", trigger: "blur" }],

6
openhis-ui-vue3/src/views/catalog/medicine/components/medicineViewDialog.vue
View File

@@ -304,12 +304,6 @@ const conditionDefinitionOptions = ref(undefined);
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 50,
diseaseName: undefined, // 疾病名称
status: undefined, // 状态（包括 1：预置，2：启用，3：停用）
},
rules: {
name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
conditionCode: [

6
openhis-ui-vue3/src/views/catalog/medicine/index.vue
View File

@@ -417,7 +417,7 @@
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
@@ -521,7 +521,7 @@ const viewData = ref({});
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageNo: 1,
pageSize: 50,
searchKey: undefined, // 品名/商品名/英文品名/编码/拼音
statusEnum: undefined, // 状态（包括 1：预置，2：启用，3：停用）
@@ -571,7 +571,7 @@ function handleNodeClick(data) {
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
queryParams.value.pageNo = 1;
getList();
}