Compare commits
11 Commits
bugfix/518
...
781582c9d3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
781582c9d3 | ||
|
|
85d2b9990b | ||
|
|
c2941f5948 | ||
|
|
3dfb2b8d76 | ||
|
|
4b9553323e | ||
|
|
c9a158ddee | ||
|
|
a2095775bd | ||
|
|
c6f58596c0 | ||
|
|
4492666008 | ||
|
|
884fe09706 | ||
|
|
94040e68fb |
@@ -1034,17 +1034,6 @@ function normalizeSex(value) {
|
|||||||
return '未知';
|
return '未知';
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizeSexFromPatientInfo(patientInfo) {
|
|
||||||
// 优先使用文本字段
|
|
||||||
if (patientInfo.genderEnum_enumText) return patientInfo.genderEnum_enumText;
|
|
||||||
if (patientInfo.genderName) return patientInfo.genderName;
|
|
||||||
if (patientInfo.sex) return normalizeSex(patientInfo.sex);
|
|
||||||
// 使用数字枚举字段
|
|
||||||
if (patientInfo.genderEnum === 1) return '男';
|
|
||||||
if (patientInfo.genderEnum === 2) return '女';
|
|
||||||
return '未知';
|
|
||||||
}
|
|
||||||
|
|
||||||
function normalizeAgeUnit(value) {
|
function normalizeAgeUnit(value) {
|
||||||
const ageUnitMap = {
|
const ageUnitMap = {
|
||||||
1: '岁',
|
1: '岁',
|
||||||
@@ -1306,7 +1295,7 @@ async function show(diagnosisData) {
|
|||||||
patName: patientInfo.patientName || patientInfo.name || '', // 患者姓名
|
patName: patientInfo.patientName || patientInfo.name || '', // 患者姓名
|
||||||
parentName: '', // 家长姓名(14岁以下患者必填)
|
parentName: '', // 家长姓名(14岁以下患者必填)
|
||||||
idNo: patientInfo.idCard, // 身份证号
|
idNo: patientInfo.idCard, // 身份证号
|
||||||
sex: normalizeSexFromPatientInfo(patientInfo), // 性别
|
sex: patientInfo.sex || patientInfo.genderName || '男', // 性别
|
||||||
|
|
||||||
// 出生日期信息
|
// 出生日期信息
|
||||||
birthYear: birthInfo.year, // 出生年份
|
birthYear: birthInfo.year, // 出生年份
|
||||||
|
|||||||
@@ -251,7 +251,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<!-- 划价组套选择对话框 -->
|
<!-- 划价组套选择对话框 -->
|
||||||
<el-dialog v-model="groupSetDialogVisible" title="划价组套选择" width="600px" :close-on-click-modal="false" append-to-body :z-index="3000">
|
<el-dialog v-model="groupSetDialogVisible" title="划价组套选择" width="600px" :close-on-click-modal="false" append-to-body>
|
||||||
<div style="margin-bottom: 15px; display: flex; align-items: center; gap: 10px">
|
<div style="margin-bottom: 15px; display: flex; align-items: center; gap: 10px">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="groupSetSearchText"
|
v-model="groupSetSearchText"
|
||||||
|
|||||||
@@ -534,7 +534,6 @@ const userStore = useUserStore();
|
|||||||
const openTraceNoDialog = ref(false)
|
const openTraceNoDialog = ref(false)
|
||||||
const rowData = ref({})
|
const rowData = ref({})
|
||||||
const ypName = ref('')
|
const ypName = ref('')
|
||||||
const currentIndex = ref(-1)
|
|
||||||
|
|
||||||
const { proxy } = getCurrentInstance();
|
const { proxy } = getCurrentInstance();
|
||||||
const { warehous_type, category_code, service_type_code, specialty_code, purchase_type } =
|
const { warehous_type, category_code, service_type_code, specialty_code, purchase_type } =
|
||||||
@@ -1073,6 +1072,13 @@ function onHeaderWarehouseChange() {
|
|||||||
|
|
||||||
// 选择仓库 / 选药品后拉取该仓库存
|
// 选择仓库 / 选药品后拉取该仓库存
|
||||||
function handleLocationClick(item, row, index) {
|
function handleLocationClick(item, row, index) {
|
||||||
|
getCount({
|
||||||
|
itemId: form.purchaseinventoryList[index].itemId,
|
||||||
|
orgLocationId: form.purchaseinventoryList[index].sourceLocationId,
|
||||||
|
}).then((res) => {
|
||||||
|
if (res.data && res.data.length > 0) {
|
||||||
|
form.purchaseinventoryList[index].itemTable = res.data[0].itemTable || '';
|
||||||
|
form.purchaseinventoryList[index].totalQuantity = res.data[0].orgQuantity || 0;
|
||||||
const r = form.purchaseinventoryList[index];
|
const r = form.purchaseinventoryList[index];
|
||||||
let orgLocationId = r.sourceLocationId || receiptHeaderForm.headerLocationId || '';
|
let orgLocationId = r.sourceLocationId || receiptHeaderForm.headerLocationId || '';
|
||||||
if (!orgLocationId) {
|
if (!orgLocationId) {
|
||||||
@@ -1475,7 +1481,7 @@ function handleScan(row,index){
|
|||||||
rowData.value = row
|
rowData.value = row
|
||||||
rowData.value.itemType = receiptHeaderForm.medicationType
|
rowData.value.itemType = receiptHeaderForm.medicationType
|
||||||
ypName.value = row.name
|
ypName.value = row.name
|
||||||
openTraceNoDialog.value = true;
|
openTraceNoDialog .value = true;
|
||||||
currentIndex.value = index
|
currentIndex.value = index
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1698,17 +1704,6 @@ const exportRequiredParams = ref({
|
|||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
busNo: route.query.supplyBusNo
|
busNo: route.query.supplyBusNo
|
||||||
});
|
});
|
||||||
|
|
||||||
// 追溯码对话框提交处理
|
|
||||||
function submit(traceNoData) {
|
|
||||||
if (currentIndex.value >= 0 && form.purchaseinventoryList[currentIndex.value]) {
|
|
||||||
form.purchaseinventoryList[currentIndex.value].traceNo = traceNoData.traceNo;
|
|
||||||
form.purchaseinventoryList[currentIndex.value].ybNo = traceNoData.ybNo;
|
|
||||||
proxy.$message.success('追溯码保存成功');
|
|
||||||
}
|
|
||||||
openTraceNoDialog.value = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleExport() {
|
function handleExport() {
|
||||||
proxy.downloadGet(
|
proxy.downloadGet(
|
||||||
'/issue-manage/requisition/excel-out',
|
'/issue-manage/requisition/excel-out',
|
||||||
|
|||||||
Reference in New Issue
Block a user