fix(#591): 请修复 Bug #591：【住院医生站-临床医嘱】长期医嘱点击停嘱未弹出时间录入弹窗
根因： - Bug #请修复 Bug #591 存在的问题 修复： - ### 变更摘要 - 全链路数据流分析**：录取（弹窗输入）→ 保存（API传入）→ 查询（Mapper返回）→ 修改（Service记录）→ 删除/停止（状态变更）→ 关联（列表展示） - ### 后端变更（4个文件） - 1. `AdviceBatchOpParam.java`** — 停嘱参数添加 `stopTime` 字段 - 新增 `@JsonFormat Date stopTime`，支持前端传入停嘱时间 - 2. `RequestBaseDto.java`** — 查询DTO添加 `stopUserName`、`stopTime` 字段 - 新增 `String stopUserName`（停嘱医生姓名） - 新增 `Date stopTime`（停嘱时间） - 3. `AdviceManageAppServiceImpl.java`** — 停嘱Service增强 - 优先使用前端传入的 `stopTime`，兜底用当前时间 - 通过 `SecurityUtils.getNickName()` 获取当前操作用户昵称，记录到 `updateBy` - 药品和诊疗两个更新入口均已同步修改 - 4. `AdviceManageAppMapper.xml`** — 三个UNION ALL子查询添加字段 - 药品子查询：`T1.effective_dose_end AS stop_time` + `T1.update_by AS stop_user_name` - 耗材子查询：`NULL AS stop_time` + `'' AS stop_user_name` - 诊疗子查询：`T1.occurrence_end_time AS stop_time` + `T1.update_by AS stop_user_name` - ### 前端变更（1个文件） - `order/index.vue`**： - 1. **停嘱时间弹窗** — 点击「停嘱」后弹出 `el-dialog`，内含 `el-date-picker`（datetime类型，默认当前时间），确定后才调用API - 2. **表格列** — 在「皮试」列后面、「诊断」列前面新增两列： - 「停嘱医生」`prop="stopUserName"`，宽度120px - 「停嘱时间」`prop="stopTime"`，宽度170px - 3. **`handleStopAdvice`** — 保留原有校验（未保存/未签发/已停止检查），校验通过后弹出时间选择弹窗而非直接调API - 4. **`confirmStopAdvice`** — 新增确认函数，将 `stopTime` 拼入请求参数后调用 `stopAdvice` API - ### 验证结果 - ✅ 前端 Lint 检查通过（仅1个预存的 `vue/no-dupe-keys` 警告） - ✅ 后端 Maven 编译通过（BUILD SUCCESS）
This commit is contained in:
@@ -1,18 +1,73 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-table ref="medicineRef" height="400" :data="medicineList" @cell-click="clickRow">
|
||||
<el-table-column label="项目编码" align="center" prop="busNo" width="150" />
|
||||
<el-table-column label="项目名称" align="center" prop="name" width="180" />
|
||||
<el-table-column label="进货价" align="center" prop="price" />
|
||||
<el-table-column label="零售价" align="center" prop="retailPrice" />
|
||||
<el-table-column label="包装单位" align="center" prop="unitCode_dictText" />
|
||||
<el-table-column label="最小单位" align="center" prop="minUnitCode_dictText" />
|
||||
<el-table-column label="规格" align="center" prop="totalVolume" />
|
||||
<el-table-column label="规格库存" align="center" prop="specificationInventory" />
|
||||
<el-table-column label="批次库存" align="center" prop="batchInventory" />
|
||||
<el-table-column label="供应商" align="center" prop="supplierId_dictText" />
|
||||
<el-table-column label="生产厂家" align="center" prop="manufacturerText" />
|
||||
<el-table-column label="批准文号" align="center" prop="approvalNumber" />
|
||||
<el-table
|
||||
ref="medicineRef"
|
||||
height="400"
|
||||
:data="medicineList"
|
||||
@cell-click="clickRow"
|
||||
>
|
||||
<el-table-column
|
||||
label="项目编码"
|
||||
align="center"
|
||||
prop="busNo"
|
||||
width="150"
|
||||
/>
|
||||
<el-table-column
|
||||
label="项目名称"
|
||||
align="center"
|
||||
prop="name"
|
||||
width="180"
|
||||
/>
|
||||
<el-table-column
|
||||
label="进货价"
|
||||
align="center"
|
||||
prop="price"
|
||||
/>
|
||||
<el-table-column
|
||||
label="零售价"
|
||||
align="center"
|
||||
prop="retailPrice"
|
||||
/>
|
||||
<el-table-column
|
||||
label="包装单位"
|
||||
align="center"
|
||||
prop="unitCode_dictText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="最小单位"
|
||||
align="center"
|
||||
prop="minUnitCode_dictText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="规格"
|
||||
align="center"
|
||||
prop="totalVolume"
|
||||
/>
|
||||
<el-table-column
|
||||
label="规格库存"
|
||||
align="center"
|
||||
prop="specificationInventory"
|
||||
/>
|
||||
<el-table-column
|
||||
label="批次库存"
|
||||
align="center"
|
||||
prop="batchInventory"
|
||||
/>
|
||||
<el-table-column
|
||||
label="供应商"
|
||||
align="center"
|
||||
prop="supplierId_dictText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="生产厂家"
|
||||
align="center"
|
||||
prop="manufacturerText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="批准文号"
|
||||
align="center"
|
||||
prop="approvalNumber"
|
||||
/>
|
||||
</el-table>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-dialog
|
||||
title="订单列表"
|
||||
v-model="localDialogVisible"
|
||||
title="订单列表"
|
||||
width="960px"
|
||||
append-to-body
|
||||
@close="resetAllData"
|
||||
>
|
||||
<el-table
|
||||
:data="orderList"
|
||||
ref="tableRef"
|
||||
:data="orderList"
|
||||
width="100%"
|
||||
highlight-current-row
|
||||
height="470px"
|
||||
@@ -21,26 +21,63 @@
|
||||
prop="supplyBusNo"
|
||||
width="200"
|
||||
align="center"
|
||||
></el-table-column>
|
||||
<el-table-column label="采购员" prop="applicantId_dictText" width="100" align="center" />
|
||||
<el-table-column label="供应商" prop="supplierId_dictText" width="220" align="center" />
|
||||
<el-table-column label="审核状态" prop="statusEnum_enumText" width="100" align="center">
|
||||
/>
|
||||
<el-table-column
|
||||
label="采购员"
|
||||
prop="applicantId_dictText"
|
||||
width="100"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
label="供应商"
|
||||
prop="supplierId_dictText"
|
||||
width="220"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
label="审核状态"
|
||||
prop="statusEnum_enumText"
|
||||
width="100"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-tag v-if="scope.row.statusEnum_enumText === '同意'" type="success">
|
||||
<el-tag
|
||||
v-if="scope.row.statusEnum_enumText === '同意'"
|
||||
type="success"
|
||||
>
|
||||
{{ scope.row.statusEnum_enumText }}
|
||||
</el-tag>
|
||||
<el-tag
|
||||
v-else
|
||||
type="danger"
|
||||
>
|
||||
{{ scope.row.statusEnum_enumText }}
|
||||
</el-tag>
|
||||
<el-tag v-else type="danger">{{ scope.row.statusEnum_enumText }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="单据类型" prop="typeEnum_enumText" width="100" align="center" />
|
||||
<el-table-column label="单据日期" prop="applyTime" width="200" align="center">
|
||||
<el-table-column
|
||||
label="单据类型"
|
||||
prop="typeEnum_enumText"
|
||||
width="100"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
label="单据日期"
|
||||
prop="applyTime"
|
||||
width="200"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ parseTime(scope.row.applyTime, '{yy}-{mm}-{dd} {hh}:{ii}:{ss}') }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-row justify="end" style="margin-top: 10px">
|
||||
<el-row
|
||||
justify="end"
|
||||
style="margin-top: 10px"
|
||||
>
|
||||
<el-pagination
|
||||
v-show="localTableDataTotal > 0"
|
||||
:current-page="queryParams.pageNo"
|
||||
:page-size="queryParams.pageSize"
|
||||
:page-sizes="[10, 50, 100, 200]"
|
||||
@@ -48,13 +85,19 @@
|
||||
:total="localTableDataTotal"
|
||||
@current-change="handleCurrentChange"
|
||||
@size-change="handleSizeChange"
|
||||
v-show="localTableDataTotal > 0"
|
||||
/>
|
||||
</el-row>
|
||||
<template #footer>
|
||||
<div class="dialog-footer">
|
||||
<el-button @click="handleCancel">取消</el-button>
|
||||
<el-button type="primary" @click="handleSubmit"> 确认 </el-button>
|
||||
<el-button @click="handleCancel">
|
||||
取消
|
||||
</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
@click="handleSubmit"
|
||||
>
|
||||
确认
|
||||
</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
@@ -331,7 +374,7 @@ const handleCancel = () => {
|
||||
});
|
||||
};
|
||||
defineOptions({
|
||||
name: 'orderDialog',
|
||||
name: 'OrderDialog',
|
||||
});
|
||||
|
||||
defineExpose({
|
||||
|
||||
@@ -1,12 +1,29 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-row :gutter="10">
|
||||
<el-form ref="formRef" :model="localForm" label-width="140px" inline :rules="rules">
|
||||
<el-form
|
||||
ref="formRef"
|
||||
:model="localForm"
|
||||
label-width="140px"
|
||||
inline
|
||||
:rules="rules"
|
||||
>
|
||||
<el-row :gutter="10">
|
||||
<el-form-item label="单据号" prop="busNo">
|
||||
<el-input v-model="localForm.busNo" placeholder="" style="width: 220px" disabled />
|
||||
<el-form-item
|
||||
label="单据号"
|
||||
prop="busNo"
|
||||
>
|
||||
<el-input
|
||||
v-model="localForm.busNo"
|
||||
placeholder=""
|
||||
style="width: 220px"
|
||||
disabled
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="开单日期" prop="applyTime">
|
||||
<el-form-item
|
||||
label="开单日期"
|
||||
prop="applyTime"
|
||||
>
|
||||
<el-date-picker
|
||||
v-model="localForm.applyTime"
|
||||
placeholder="请选择开单日期"
|
||||
@@ -16,7 +33,10 @@
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="盘点人" prop="applicantId">
|
||||
<el-form-item
|
||||
label="盘点人"
|
||||
prop="applicantId"
|
||||
>
|
||||
<el-select
|
||||
v-model="localForm.applicantId"
|
||||
placeholder="请选择盘点人"
|
||||
@@ -32,7 +52,10 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="单据分类" prop="categoryEnum">
|
||||
<el-form-item
|
||||
label="单据分类"
|
||||
prop="categoryEnum"
|
||||
>
|
||||
<el-select
|
||||
v-model="localForm.categoryEnum"
|
||||
placeholder="请选择单据分类"
|
||||
@@ -49,10 +72,13 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="摘要(A)" prop="reason">
|
||||
<el-form-item
|
||||
label="摘要(A)"
|
||||
prop="reason"
|
||||
>
|
||||
<el-input
|
||||
type="textarea"
|
||||
v-model="localForm.reason"
|
||||
type="textarea"
|
||||
placeholder="请输入摘要"
|
||||
style="width: 300px"
|
||||
:rows="1"
|
||||
@@ -68,7 +94,10 @@
|
||||
<el-col :span="8">
|
||||
<div class="form-item">
|
||||
<label class="form-label">审核人</label>
|
||||
<el-tag type="warning" plain>
|
||||
<el-tag
|
||||
type="warning"
|
||||
plain
|
||||
>
|
||||
{{
|
||||
(props.practitionerOption || []).find(
|
||||
(item) => item.value === localAuditForm.approverId
|
||||
@@ -80,7 +109,10 @@
|
||||
<el-col :span="8">
|
||||
<div class="form-item">
|
||||
<label class="form-label">审核日期</label>
|
||||
<el-tag type="primary" plain>
|
||||
<el-tag
|
||||
type="primary"
|
||||
plain
|
||||
>
|
||||
{{ parseTime(localAuditForm.approvalTime, '{y}-{m}-{d} {h}:{i}:{s}') || '暂无' }}
|
||||
</el-tag>
|
||||
</div>
|
||||
@@ -97,36 +129,39 @@
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-row
|
||||
:gutter="10"
|
||||
class="mb8"
|
||||
>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
v-if="buttonShow.isAddShow"
|
||||
type="primary"
|
||||
plain
|
||||
icon="Plus"
|
||||
@click="handleAddRow"
|
||||
v-if="buttonShow.isAddShow"
|
||||
>
|
||||
添加行
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
v-if="buttonShow.isDeleteShow"
|
||||
type="danger"
|
||||
plain
|
||||
icon="Delete"
|
||||
@click="handleDeleteRow"
|
||||
v-if="buttonShow.isDeleteShow"
|
||||
>
|
||||
删除行
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
v-if="buttonShow.isSaveShow"
|
||||
type="warning"
|
||||
plain
|
||||
icon="Check"
|
||||
@click="handleSave"
|
||||
v-if="buttonShow.isSaveShow"
|
||||
>
|
||||
保存
|
||||
</el-button>
|
||||
@@ -134,20 +169,34 @@
|
||||
</el-row>
|
||||
|
||||
<el-row :gutter="10">
|
||||
<el-form ref="tableFormRef" :model="{ localTableData }" :rules="rules" style="width: 100%">
|
||||
<el-form
|
||||
ref="tableFormRef"
|
||||
:model="{ localTableData }"
|
||||
:rules="rules"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-table
|
||||
:data="localTableData"
|
||||
ref="tableRef"
|
||||
:data="localTableData"
|
||||
class="table-container"
|
||||
max-height="calc(100vh - 400px)"
|
||||
min-height="100px"
|
||||
border
|
||||
@selection-change="handleSelectionChange"
|
||||
@row-click="handleRowClick"
|
||||
border
|
||||
|
||||
>
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column prop="itemBusNo" label="编号" fixed width="180" align="center">
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="itemBusNo"
|
||||
label="编号"
|
||||
fixed
|
||||
width="180"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-form-item
|
||||
:prop="`localTableData.${scope.$index}.itemBusNo`"
|
||||
@@ -159,7 +208,12 @@
|
||||
</el-form-item>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="itemName" label="品名" width="180" align="center">
|
||||
<el-table-column
|
||||
prop="itemName"
|
||||
label="品名"
|
||||
width="180"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-form-item
|
||||
:prop="`localTableData.${scope.$index}.itemName`"
|
||||
@@ -167,16 +221,16 @@
|
||||
>
|
||||
<PopoverList
|
||||
v-if="localTableData[scope.$index].isEditing"
|
||||
@search="handleSearch"
|
||||
:width="1300"
|
||||
:modelValue="localTableData[scope.$index].itemName"
|
||||
:model-value="localTableData[scope.$index].itemName"
|
||||
@search="handleSearch"
|
||||
>
|
||||
<template #popover-content="{}">
|
||||
<medicineList
|
||||
ref="medicineListRef"
|
||||
@selectRow="(row) => selectRow(row, scope.$index)"
|
||||
:searchKey="medicineSearchKey"
|
||||
:locationId="localForm.locationId"
|
||||
:search-key="medicineSearchKey"
|
||||
:location-id="localForm.locationId"
|
||||
@select-row="(row) => selectRow(row, scope.$index)"
|
||||
/>
|
||||
</template>
|
||||
</PopoverList>
|
||||
@@ -186,7 +240,12 @@
|
||||
</el-form-item>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="totalVolume" label="规格" width="180" align="center">
|
||||
<el-table-column
|
||||
prop="totalVolume"
|
||||
label="规格"
|
||||
width="180"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-form-item
|
||||
:prop="`localTableData.${scope.$index}.totalVolume`"
|
||||
@@ -199,7 +258,12 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- 产品批号 -->
|
||||
<el-table-column prop="lotNumber" label="产品批号" width="180" align="center">
|
||||
<el-table-column
|
||||
prop="lotNumber"
|
||||
label="产品批号"
|
||||
width="180"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-form-item
|
||||
:prop="`localTableData.${scope.$index}.lotNumber`"
|
||||
@@ -218,7 +282,12 @@
|
||||
</el-form-item>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="unitCode" label="单位" width="100" align="center">
|
||||
<el-table-column
|
||||
prop="unitCode"
|
||||
label="单位"
|
||||
width="100"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-form-item
|
||||
:prop="`localTableData.${scope.$index}.unitCode`"
|
||||
@@ -257,11 +326,11 @@
|
||||
:rules="rules.totalQuantity"
|
||||
>
|
||||
<el-input-number
|
||||
:min="0"
|
||||
v-if="localTableData[scope.$index].isEditing"
|
||||
v-model="localTableData[scope.$index].totalQuantity"
|
||||
@change="handleItemTotalQuantityChange(localTableData[scope.$index])"
|
||||
:min="0"
|
||||
controls-position="right"
|
||||
@change="handleItemTotalQuantityChange(localTableData[scope.$index])"
|
||||
/>
|
||||
<span v-else-if="localTableData[scope.$index].isViewing">
|
||||
{{ localTableData[scope.$index].totalQuantity || '' }}
|
||||
@@ -271,15 +340,20 @@
|
||||
</el-table-column>
|
||||
|
||||
<!-- 批次库存 -->
|
||||
<el-table-column prop="batchInventory" label="账面数量" width="100" align="center">
|
||||
<el-table-column
|
||||
prop="batchInventory"
|
||||
label="账面数量"
|
||||
width="100"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-form-item :prop="`localTableData.${scope.$index}.batchInventory`">
|
||||
<span
|
||||
v-if="
|
||||
getInventoryDisplay(scope.$index, 'batchMax') ||
|
||||
getInventoryDisplay(scope.$index, 'batchMaxUnit') ||
|
||||
getInventoryDisplay(scope.$index, 'batchMin') ||
|
||||
getInventoryDisplay(scope.$index, 'batchMinUnit')
|
||||
getInventoryDisplay(scope.$index, 'batchMaxUnit') ||
|
||||
getInventoryDisplay(scope.$index, 'batchMin') ||
|
||||
getInventoryDisplay(scope.$index, 'batchMinUnit')
|
||||
"
|
||||
>
|
||||
<span>
|
||||
@@ -299,7 +373,11 @@
|
||||
</el-form-item>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="实盘进价金额" width="140" align="center">
|
||||
<el-table-column
|
||||
label="实盘进价金额"
|
||||
width="140"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-form-item>
|
||||
<span>
|
||||
@@ -308,21 +386,36 @@
|
||||
</el-form-item>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="batchInventory" label="账面进价金额" width="140" align="center">
|
||||
<el-table-column
|
||||
prop="batchInventory"
|
||||
label="账面进价金额"
|
||||
width="140"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-form-item>
|
||||
<span> {{ localTableData[scope.$index].accountInPrice || '' }} </span>
|
||||
</el-form-item>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="batchInventory" label="实盘零价金额" width="140" align="center">
|
||||
<el-table-column
|
||||
prop="batchInventory"
|
||||
label="实盘零价金额"
|
||||
width="140"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-form-item>
|
||||
<span> {{ localTableData[scope.$index].totalQuantityRetailPrice || '' }} </span>
|
||||
</el-form-item>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="batchInventory" label="账面零价金额" width="140" align="center">
|
||||
<el-table-column
|
||||
prop="batchInventory"
|
||||
label="账面零价金额"
|
||||
width="140"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-form-item>
|
||||
<span> {{ localTableData[scope.$index].accountRetailPrice || '' }} </span>
|
||||
@@ -349,7 +442,12 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column prop="totalPrice" label="盈亏进价金额" width="120" align="center">
|
||||
<el-table-column
|
||||
prop="totalPrice"
|
||||
label="盈亏进价金额"
|
||||
width="120"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-form-item :prop="`localTableData.${scope.$index}.totalPrice`">
|
||||
<span>
|
||||
@@ -377,7 +475,12 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column prop="reasonCode" label="盈亏类型" width="140" align="center">
|
||||
<el-table-column
|
||||
prop="reasonCode"
|
||||
label="盈亏类型"
|
||||
width="140"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-form-item
|
||||
:prop="`localTableData.${scope.$index}.reasonCode`"
|
||||
@@ -402,7 +505,12 @@
|
||||
</el-form-item>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="price" label="进货价" width="120" align="center">
|
||||
<el-table-column
|
||||
prop="price"
|
||||
label="进货价"
|
||||
width="120"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-form-item :prop="`localTableData.${scope.$index}.price`">
|
||||
<span>
|
||||
@@ -412,7 +520,12 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- 药品追溯码 -->
|
||||
<el-table-column prop="retailPrice" label="当前销售价" width="120" align="center">
|
||||
<el-table-column
|
||||
prop="retailPrice"
|
||||
label="当前销售价"
|
||||
width="120"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-form-item
|
||||
:prop="`localTableData.${scope.$index}.retailPrice`"
|
||||
@@ -425,9 +538,17 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column prop="traceNo" label="药品追溯码" width="180" align="center">
|
||||
<el-table-column
|
||||
prop="traceNo"
|
||||
label="药品追溯码"
|
||||
width="180"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-form-item :prop="`localTableData.${scope.$index}.traceNo`" :rules="rules.traceNo">
|
||||
<el-form-item
|
||||
:prop="`localTableData.${scope.$index}.traceNo`"
|
||||
:rules="rules.traceNo"
|
||||
>
|
||||
<el-input
|
||||
v-if="localTableData[scope.$index].isEditing"
|
||||
v-model="localTableData[scope.$index].traceNo"
|
||||
@@ -442,7 +563,12 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- 药品追溯码单位 -->
|
||||
<el-table-column prop="traceNoUnitCode" label="药品追溯码单位" width="180" align="center">
|
||||
<el-table-column
|
||||
prop="traceNoUnitCode"
|
||||
label="药品追溯码单位"
|
||||
width="180"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-form-item
|
||||
:prop="`localTableData.${scope.$index}.traceNoUnitCode`"
|
||||
@@ -467,7 +593,12 @@
|
||||
</el-form-item>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="supplierId_dictText" label="供应商" width="220" align="center">
|
||||
<el-table-column
|
||||
prop="supplierId_dictText"
|
||||
label="供应商"
|
||||
width="220"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-form-item
|
||||
:prop="`localTableData.${scope.$index}.supplierId_dictText`"
|
||||
@@ -479,7 +610,12 @@
|
||||
</el-form-item>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="manufacturerText" label="厂家/产地" width="220" align="center">
|
||||
<el-table-column
|
||||
prop="manufacturerText"
|
||||
label="厂家/产地"
|
||||
width="220"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-form-item
|
||||
:prop="`localTableData.${scope.$index}.manufacturerText`"
|
||||
@@ -492,7 +628,12 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- 备注 -->
|
||||
<el-table-column prop="remake" label="备注" width="180" align="center">
|
||||
<el-table-column
|
||||
prop="remake"
|
||||
label="备注"
|
||||
width="180"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-form-item :prop="`localTableData.${scope.$index}.remake`">
|
||||
<el-input
|
||||
@@ -506,13 +647,17 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- 操作 -->
|
||||
<el-table-column label="操作" width="100" fixed="right">
|
||||
<el-table-column
|
||||
label="操作"
|
||||
width="100"
|
||||
fixed="right"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
type="primary"
|
||||
@click="handleScan(scope.row, scope.$index)"
|
||||
link
|
||||
icon="Edit"
|
||||
@click="handleScan(scope.row, scope.$index)"
|
||||
>
|
||||
扫码
|
||||
</el-button>
|
||||
@@ -523,6 +668,7 @@
|
||||
</el-row>
|
||||
<el-row justify="end">
|
||||
<el-pagination
|
||||
v-show="localTableDataTotal > 0"
|
||||
:current-page="localForm.pageNo"
|
||||
:page-size="localForm.pageSize"
|
||||
:page-sizes="[10, 50, 100, 200]"
|
||||
@@ -531,25 +677,24 @@
|
||||
:total="localTableDataTotal"
|
||||
@current-change="handleCurrentChange"
|
||||
@size-change="handleSizeChange"
|
||||
v-show="localTableDataTotal > 0"
|
||||
/>
|
||||
</el-row>
|
||||
<!-- 扫码追溯码弹窗 -->
|
||||
<TraceNoDialog
|
||||
:ypName="ypName"
|
||||
:rowData="rowData"
|
||||
:openDialog="openTraceNoDialog"
|
||||
:yp-name="ypName"
|
||||
:row-data="rowData"
|
||||
:open-dialog="openTraceNoDialog"
|
||||
@submit="submit"
|
||||
@cancel="openTraceNoDialog = false"
|
||||
/>
|
||||
<!-- 订单对话框 -->
|
||||
<orderDialog
|
||||
ref="orderDialogRef"
|
||||
:dialogVisible="dialogVisible"
|
||||
@dialogSubmit="dialogSubmit"
|
||||
@dialogCancel="dialogCancel"
|
||||
@updateTableData="updateTableData"
|
||||
></orderDialog>
|
||||
:dialog-visible="dialogVisible"
|
||||
@dialog-submit="dialogSubmit"
|
||||
@dialog-cancel="dialogCancel"
|
||||
@update-table-data="updateTableData"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -888,7 +1033,7 @@ const handleScan = (row, index) => {
|
||||
// 设置药品名称
|
||||
ypName.value = row.name;
|
||||
// 设置仓库
|
||||
rowData.value.locationId = localForm.purposeLocationId;
|
||||
rowData.value.locationId = localForm.value.purposeLocationId;
|
||||
// 设置药品类型
|
||||
rowData.value.itemType = 1;
|
||||
// 设置药品追溯码弹窗
|
||||
@@ -1607,7 +1752,7 @@ const handleOrderImport = async () => {
|
||||
};
|
||||
|
||||
// 组件名称
|
||||
defineOptions({ name: 'orderTable' });
|
||||
defineOptions({ name: 'OrderTable' });
|
||||
// 暴露方法给父组件
|
||||
defineExpose({
|
||||
resetAllData,
|
||||
|
||||
Reference in New Issue
Block a user