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

解决合并冲突

Browse Source
This commit is contained in:
chenqi
2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

192
openhis-ui-vue3/src/views/basicmanage/supplier/index.vue
View File

@@ -35,59 +35,27 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Plus"
@click="handleAdd"
>添加</el-button
>
<el-button type="primary" plain icon="Plus" @click="handleAdd">添加</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Remove"
:disabled="multiple"
@click="handleClose"
<el-button type="danger" plain icon="Remove" :disabled="multiple" @click="handleClose"
>停用</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="CirclePlus"
:disabled="multiple"
@click="handleStart"
<el-button type="success" plain icon="CirclePlus" :disabled="multiple" @click="handleStart"
>启用</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Search"
@click="getList"
>查询</el-button
>
<el-button type="primary" plain icon="Search" @click="getList">查询</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="CircleClose"
@click="handleClear"
>清空条件</el-button
>
<el-button type="warning" plain icon="CircleClose" @click="handleClear">清空条件</el-button>
</el-col>
</el-row>
<el-table
v-loading="loading"
:data="supplierList"
@selection-change="handleSelectionChange"
>
<el-table v-loading="loading" :data="supplierList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="编号" align="center" key="busNo" prop="busNo" />
<el-table-column
@@ -111,26 +79,9 @@
prop="typeEnum_enumText"
:show-overflow-tooltip="true"
/>
<el-table-column
label="地址"
align="center"
key="address"
prop="address"
width="120"
/>
<el-table-column
label="联系人电话"
align="center"
key="phone"
prop="phone"
/>
<el-table-column
label="联系人邮箱"
align="center"
key="email"
prop="email"
width="160"
/>
<el-table-column label="地址" align="center" key="address" prop="address" width="120" />
<el-table-column label="联系人电话" align="center" key="phone" prop="phone" />
<el-table-column label="联系人邮箱" align="center" key="email" prop="email" width="160" />
<el-table-column
label="活动标识"
align="center"
@@ -152,20 +103,10 @@
class-name="small-padding fixed-width"
>
<template #default="scope">
<el-button
link
type="primary"
icon="Edit"
@click="handleUpdate(scope.row)"
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
>编辑</el-button
>
<el-button
link
type="primary"
icon="View"
@click="handleView(scope.row)"
>查看</el-button
>
<el-button link type="primary" icon="View" @click="handleView(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
@@ -179,28 +120,16 @@
<!-- 添加或修改用户配置对话框 -->
<el-dialog :title="title" v-model="open" width="600px" append-to-body>
<el-form
:model="form"
:rules="rules"
ref="supplierRef"
label-width="110px"
>
<el-form :model="form" :rules="rules" ref="supplierRef" label-width="110px">
<el-row>
<el-col :span="12">
<el-form-item label="名称" prop="name">
<el-input
v-model="form.name"
placeholder="请输入名称"
/>
<el-input v-model="form.name" placeholder="请输入名称" />
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.id != undefined">
<el-form-item label="编码" prop="busNo">
<el-input
v-model="form.busNo"
placeholder="请输入编码"
disabled
/>
<el-input v-model="form.busNo" placeholder="请输入编码" disabled />
</el-form-item>
</el-col>
</el-row>
@@ -261,17 +190,17 @@
</el-col>
<el-col :span="12">
<!-- <el-form-item label="机构编号" prop="orgId"> -->
<!-- <el-input v-model="form.orgId" maxlength="11" /> -->
<el-form-item label="提供部门" prop="orgId">
<el-tree-select
v-model="form.orgId"
:data="deptOptions"
:props="{ value: 'id', label: 'name', children: 'children' }"
value-key="id"
placeholder="请选择提供部门"
check-strictly
clearable
/>
<!-- <el-input v-model="form.orgId" maxlength="11" /> -->
<el-form-item label="提供部门" prop="orgId">
<el-tree-select
v-model="form.orgId"
:data="deptOptions"
:props="{ value: 'id', label: 'name', children: 'children' }"
value-key="id"
placeholder="请选择提供部门"
check-strictly
clearable
/>
<!-- </el-form-item> -->
</el-form-item>
</el-col>
@@ -297,14 +226,11 @@ import {
startSupplier,
getSupplierInit,
deptTreeSelect,
} from "./components/supplier";
} from './components/supplier';
const router = useRouter();
const { proxy } = getCurrentInstance();
const { sys_normal_disable, sys_user_sex } = proxy.useDict(
"sys_normal_disable",
"sys_user_sex"
);
const { sys_normal_disable, sys_user_sex } = proxy.useDict('sys_normal_disable', 'sys_user_sex');
const supplierList = ref([]);
const open = ref(false);
@@ -314,7 +240,7 @@ const ids = ref([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const title = ref("");
const title = ref('');
const supplierTypeOptions = ref(undefined);
const deptOptions = ref(undefined); // 部门树选项
// 是否停用
@@ -334,8 +260,10 @@ const data = reactive({
// sourceEnum: undefined, // 来源（包括 1：厂商/产地目录分类，2：自定义）
},
rules: {
name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
typeEnum: [{ required: true, message: "类型不能为空", trigger: "blur" }],
name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
typeEnum: [{ required: true, message: '类型不能为空', trigger: 'blur' }],
orgId: [{ required: true, message: '提供部门不能为空', trigger: 'blur' }],
// address: [{ required: true, message: "地址不能为空", trigger: "blur" }],
// phone: [{ required: true, message: "联系人电话不能为空", trigger: "blur" }],
// email: [{ required: true, message: "联系人邮箱不能为空", trigger: "blur" },
@@ -347,30 +275,30 @@ const data = reactive({
const { queryParams, form, rules } = toRefs(data);
/** 验证邮箱地址是否有效*/
function validateEmail (rule, value, callback) {
function validateEmail(rule, value, callback) {
const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
if (!emailRegex.test(value)) {
callback(new Error('请输入有效的邮箱地址'));
} else {
callback();
}
};
}
/** 厂商种类查询下拉树结构 */
function getsupplierTypeList() {
getSupplierInit().then((response) => {
console.log(response, "response");
console.log(response, 'response');
supplierTypeOptions.value = response.data.supplierTypeOptions;
});
}
/** 查询部门下拉树结构 */
function getDeptTree() {
console.log("查询部门下拉树结构");
console.log('查询部门下拉树结构');
deptTreeSelect().then((response) => {
console.log(response, "response查询部门下拉树结构");
console.log(response, 'response查询部门下拉树结构');
deptOptions.value = response.data.records;
console.log(deptOptions.value, "部门下拉树结构");
console.log(deptOptions.value, '部门下拉树结构');
});
}
@@ -378,14 +306,14 @@ function getDeptTree() {
function getList() {
loading.value = true;
// queryParams.value.statusEnum = +queryParams.value.statusEnum
console.log(queryParams.value, "queryParams.value");
console.log(queryParams.value, 'queryParams.value');
getSupplierList(queryParams.value).then((res) => {
loading.value = false;
console.log(res, "res", res.data.records);
console.log(res, 'res', res.data.records);
supplierList.value = res.data.records;
console.log(supplierList.value, "supplierList.value");
console.log(supplierList.value, 'supplierList.value');
total.value = res.data.total;
console.log(total.value, "total.value");
console.log(total.value, 'total.value');
});
}
/** 节点单击事件 */
@@ -403,13 +331,13 @@ function handleQuery() {
function handleStart(row) {
const stardIds = row.id || ids.value;
proxy.$modal
.confirm("是否确定启用数据！")
.confirm('是否确定启用数据！')
.then(function () {
return startSupplier(stardIds);
})
.then(() => {
getList();
proxy.$modal.msgSuccess("启用成功");
proxy.$modal.msgSuccess('启用成功');
})
.catch(() => {});
}
@@ -417,13 +345,13 @@ function handleStart(row) {
function handleClose(row) {
const stopIds = row.id || ids.value;
proxy.$modal
.confirm("是否确认停用数据！")
.confirm('是否确认停用数据！')
.then(function () {
return stopSupplier(stopIds);
})
.then(() => {
getList();
proxy.$modal.msgSuccess("停用成功");
proxy.$modal.msgSuccess('停用成功');
})
.catch(() => {});
}
@@ -435,13 +363,13 @@ function handleClear() {
// queryParams.value.sourceEnum = undefined;
// queryParams.value.busNo = undefined;
// 清空查询条件
proxy.resetForm("queryRef");
proxy.resetForm('queryRef');
getList();
}
/** 选择条数 */
function handleSelectionChange(selection) {
console.log(selection, "selection");
console.log(selection, 'selection');
// selectedData.value = selection.map((item) => ({ ...item })); // 存储选择的行数据
ids.value = selection.map((item) => item.id);
single.value = selection.length != 1;
@@ -457,7 +385,7 @@ function reset() {
status: undefined,
statusEnum: undefined,
};
proxy.resetForm("supplierRef");
proxy.resetForm('supplierRef');
}
/** 取消按钮 */
function cancel() {
@@ -468,34 +396,34 @@ function cancel() {
function handleAdd() {
reset();
open.value = true;
title.value = "新增";
title.value = '新增';
}
/** 修改按钮操作 */
function handleUpdate(row) {
reset();
console.log(row, "row");
console.log(row, 'row');
form.value = JSON.parse(JSON.stringify(row));
form.value.activeFlag == 1 ? (form.value.activeFlag = true) : (form.value.activeFlag = false); //是否为活性
// console.log(form.value.ty, "form.value");
open.value = true;
title.value = "厂商/产地编辑";
title.value = '厂商/产地编辑';
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["supplierRef"].validate((valid) => {
proxy.$refs['supplierRef'].validate((valid) => {
if (valid) {
form.value.activeFlag == true ? (form.value.activeFlag = 1) : (form.value.activeFlag = 0); //是否为活性
console.log(form.value, "*****************");
console.log(form.value, '*****************');
if (form.value.id != undefined) {
console.log(form.value, "editSupplier");
console.log(form.value, 'editSupplier');
editSupplier(form.value).then((response) => {
proxy.$modal.msgSuccess("修改成功");
proxy.$modal.msgSuccess('修改成功');
open.value = false;
getList();
});
} else {
addSupplier(form.value).then((response) => {
proxy.$modal.msgSuccess("新增成功");
proxy.$modal.msgSuccess('新增成功');
open.value = false;
getList();
});
@@ -507,10 +435,10 @@ function submitForm() {
/** 详细按钮操作 */
function handleView(row) {
reset();
title.value = "查看";
title.value = '查看';
open.value = true;
getSupplierOne(row.id).then((response) => {
console.log(response, "responsebbbb", row.id);
console.log(response, 'responsebbbb', row.id);
form.value = response.data;
});
}
@@ -523,4 +451,4 @@ getDeptTree();
display: flex;
align-items: center;
}
</style>
</style>