Compare commits

..

No commits in common. "8be5607e82b159fa59460fbd7b99cb801380d0bb" and "393e44442a35a01519cbd8c9aa059c5a3b5ceb5c" have entirely different histories.

3 changed files with 7 additions and 38 deletions

View File

@ -102,7 +102,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="转入羊舍" prop="sheepfoldId"> <el-form-item label="转入羊舍" prop="sheepfoldId">
<el-select v-model="form.sheepfoldId" placeholder="请选择转入羊舍" filterable <el-select v-model="form.sheepfoldId" placeholder="请选择转入羊舍"
style="width: 100%;"> style="width: 100%;">
<el-option v-for="item in sheepfolds" :key="item.id" :label="item.name" <el-option v-for="item in sheepfolds" :key="item.id" :label="item.name"
:value="item.id" /> :value="item.id" />

View File

@ -528,7 +528,7 @@ onMounted(() => {
request({ url: '/sheepfold_management/sheepfold_management/list', method: 'get' }).then(res => { request({ url: '/sheepfold_management/sheepfold_management/list', method: 'get' }).then(res => {
barns.value = res.rows barns.value = res.rows
}) })
listPrescription({ status: 1, persType: 3 }).then(res => { listPrescription({ status: 1, persType: 1 }).then(res => {
presOptions.value = res.rows.map(item => ({ id: item.id, label: item.name })) presOptions.value = res.rows.map(item => ({ id: item.id, label: item.name }))
}) })
listUnit().then(res => { listUnit().then(res => {

View File

@ -163,17 +163,6 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="使用时间" >
<template #default="scope">
<el-date-picker
v-model="scope.row.usetime"
type="date"
placeholder="选择日期"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
style="width: 100%;"/>
</template>
</el-table-column>
<el-table-column label="生产厂家"> <el-table-column label="生产厂家">
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row.manufacturer" placeholder="生产厂家" /> <el-input v-model="scope.row.manufacturer" placeholder="生产厂家" />
@ -276,14 +265,14 @@
<el-date-picker v-model="editForm.datetime" type="date" style="width: 100%" /> <el-date-picker v-model="editForm.datetime" type="date" style="width: 100%" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12"> <el-col :span="12">
<el-form-item label="处方"> <el-form-item label="处方">
<el-select v-model="selectedPresId" filterable clearable placeholder="请选择处方" style="width: 100%" <el-select v-model="selectedPresId" filterable clearable placeholder="请选择处方" style="width: 100%"
@change="handleSelectPrescription"> @change="handleSelectPrescription">
<el-option v-for="item in presOptions" :key="item.id" :label="item.label" :value="item.id" /> <el-option v-for="item in presOptions" :key="item.id" :label="item.label" :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> --> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
@ -339,18 +328,6 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="使用时间" >
<template #default="scope">
<el-date-picker
v-model="scope.row.usetime"
type="date"
placeholder="选择日期"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
style="width: 100%;"
/>
</template>
</el-table-column>
<el-table-column label="生产厂家"> <el-table-column label="生产厂家">
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row.manufacturer" placeholder="生产厂家" /> <el-input v-model="scope.row.manufacturer" placeholder="生产厂家" />
@ -401,7 +378,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="转入羊舍" prop="sheepfoldId"> <el-form-item label="转入羊舍" prop="sheepfoldId">
<el-select v-model="addDia.sheepfoldId" filterable placeholder="请选择转入羊舍" <el-select v-model="addDia.sheepfoldId" placeholder="请选择转入羊舍"
style="width: 100%;"> style="width: 100%;">
<el-option v-for="item in sheepfolds" :key="item.id" :label="item.name" <el-option v-for="item in sheepfolds" :key="item.id" :label="item.name"
:value="item.id" /> :value="item.id" />
@ -507,7 +484,7 @@ const rules = {
} }
const swPresDetailList = ref([ const swPresDetailList = ref([
{ mediId: null, dosage: 0, unit: null, usageId: null, usetime: new Date().toISOString().slice(0, 10),manufacturer: '', batchNumber: '' } { mediId: null, dosage: 0, unit: null, usageId: null, manufacturer: '', batchNumber: '' }
]) ])
/* ---------- 新增诊疗 ---------- */ /* ---------- 新增诊疗 ---------- */
@ -587,15 +564,7 @@ function handleSelectPrescription(id) {
/* ---------- 药品明细 ---------- */ /* ---------- 药品明细 ---------- */
function handleAddSwPresDetail() { function handleAddSwPresDetail() {
swPresDetailList.value.push({ swPresDetailList.value.push({ mediId: null, dosage: 0, unit: null, usageId: null, manufacturer: '', batchNumber: '' })
mediId: null,
dosage: 0,
unit: null,
usageId: null,
usetime:new Date().toISOString().slice(0, 10),
manufacturer: '',
batchNumber: ''
})
} }
function deletePresDetail(row) { function deletePresDetail(row) {
swPresDetailList.value.splice(swPresDetailList.value.indexOf(row), 1) swPresDetailList.value.splice(swPresDetailList.value.indexOf(row), 1)