@@ -85,9 +86,20 @@
+
+
+
+
+
+ 元
+
+
+
+
+
@@ -154,6 +166,8 @@ const data = reactive({
hospitalName: [{ required: true, message: '医院名称不能为空', trigger: 'blur' }],
departments: [{ required: true, message: '科室不能为空', trigger: 'blur' }],
doctor: [{ required: true, message: '大夫不能为空', trigger: 'blur' }],
+ partner: [{ required: true, message: '陪同人不能为空', trigger: 'blur' }],
+ totalCost: [{ required: true, message: '总费用不能为空', trigger: 'blur' }],
// healthRecordId: [
// { required: true, message: '健康档案不能为空', trigger: 'blur' }
// ],
@@ -234,7 +248,10 @@ function reset() {
healthRecordId: null,
visitingTime: null,
prescribe: null,
- personId: null
+ personId: null,
+ totalCost: null,
+ partner: null,
+ costDetail: null
}
proxy.resetForm('doctorRecordRef')
}
diff --git a/src/views/health/medicineStockIn/index.vue b/src/views/health/medicineStockIn/index.vue
index 7d7fdf7..24a876f 100644
--- a/src/views/health/medicineStockIn/index.vue
+++ b/src/views/health/medicineStockIn/index.vue
@@ -35,28 +35,28 @@
-
-
-
-
+
+
+
+
-
+
-
+
{{ parseTime(scope.row.productionDate, '{y}-{m}-{d}') }}
-
+
{{ parseTime(scope.row.expiringDate, '{y}-{m}-{d}') }}
-
-
+
+
@@ -89,7 +89,6 @@
-
@@ -101,14 +100,24 @@
-
+
+
+
+
+
+
+
-
+
+ 元
+
-
+
+ 元
+
@@ -241,7 +250,9 @@ function reset() {
leftCount: null,
usedCount: null,
purchaseAddress: null,
- totalPrice: null
+ totalPrice: null,
+ usage: null,
+ ageWeight: null
}
proxy.resetForm('medicineStockInRef')
}
diff --git a/src/views/health/temperatureRecord/index.vue b/src/views/health/temperatureRecord/index.vue
index 2754ffc..d4f346d 100644
--- a/src/views/health/temperatureRecord/index.vue
+++ b/src/views/health/temperatureRecord/index.vue
@@ -119,6 +119,7 @@ const healthRecordList = ref([])
const operateList = ref([
{ id: 'view', icon: 'View', title: '查看', hasPermi: ['health:temperatureRecord:query'] },
{ id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['health:temperatureRecord:edit'] },
+ { id: 'copy', icon: 'Link', title: '复制', hasPermi: ['health:marRecord:edit'] },
{ id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['health:temperatureRecord:remove'] }
])
const data = reactive({
@@ -159,6 +160,9 @@ const handleOperate = (operate, row) => {
case 'delete':
handleDelete(row)
break
+ case 'copy':
+ handleCopy(row)
+ break
default:
break
}
@@ -180,6 +184,18 @@ function getPersonList() {
})
}
+/** 复制按钮操作 */
+function handleCopy(row) {
+ reset()
+ const _id = row.id || ids.value
+ getTemperatureRecord(_id).then((response) => {
+ form.value = response.data
+ form.value.id = null
+ open.value = true
+ title.value = '复制体温记录'
+ })
+}
+
/** 查询体温记录列表 */
function getList() {
loading.value = true