Merge branch 'main' of http://e19510c831.iok.la/admin/zhyc-sheep-ui

src/views/biosafety/diagnosis/add.vue

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

src/views/biosafety/disinfect/index.vue

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

src/views/biosafety/treatment/index.vue

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