diff --git a/src/views/health/medicineStockIn/index.vue b/src/views/health/medicineStockIn/index.vue
index 99085f9..8b47801 100644
--- a/src/views/health/medicineStockIn/index.vue
+++ b/src/views/health/medicineStockIn/index.vue
@@ -74,21 +74,31 @@
     <!-- 添加或修改药品入库清单对话框 -->
     <el-dialog :title="title" v-model="open" width="880px" append-to-body>
       <el-form ref="medicineStockInRef" :inline="true" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="药品名称" prop="medicineId">
-          <el-select v-model="form.medicineId" placeholder="请选择药品名称" clearable>
-            <el-option v-for="medicine in medicineList" :key="medicine.id" :label="medicine.name" :value="medicine.id" />
+        <el-form-item label="药品名称" style="width: 792px" prop="medicineId">
+          <el-select v-model="form.medicineId" placeholder="请选择药品名称" @change="handleMedicineChange" clearable>
+            <el-option v-for="medicine in medicineList" :key="medicine.id" :label="medicine.shortNameBrandPackaging" :value="medicine.id" />
           </el-select>
         </el-form-item>
+        <el-form-item label="入库编号" prop="code">
+          <el-input v-model="form.code" placeholder="请输入入库编号" />
+        </el-form-item>
+        <el-form-item label="入库数量" prop="quantity">
+          <el-input @change="handleQuantityChange" v-model="form.quantity" type="number" placeholder="请输入入库数量"> </el-input>
+        </el-form-item>
         <el-form-item label="购买时间" prop="purchaseDate">
           <el-date-picker clearable v-model="form.purchaseDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择购买时间">
           </el-date-picker>
         </el-form-item>
-
-        <el-form-item label="入库编号" prop="code">
-          <el-input v-model="form.code" placeholder="请输入入库编号" />
+        <el-form-item label="使用状态" prop="state">
+          <el-select v-model="form.state" placeholder="请选择使用状态">
+            <el-option v-for="dict in used_state" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="入库数量" prop="quantity">
-          <el-input v-model="form.quantity" type="number" placeholder="请输入入库数量"> </el-input>
+        <el-form-item label="生产日期" prop="productionDate">
+          <el-date-picker clearable v-model="form.productionDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择生产日期"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="过期日期" prop="expiringDate">
+          <el-date-picker clearable v-model="form.expiringDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择过期日期"> </el-date-picker>
         </el-form-item>
         <el-form-item label="包装单位" prop="packageUnit">
           <el-select v-model="form.packageUnit" placeholder="请选择包装单位">
@@ -103,17 +113,6 @@
             <el-option v-for="dict in medical_unit" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="使用状态" prop="state">
-          <el-select v-model="form.state" placeholder="请选择使用状态">
-            <el-option v-for="dict in used_state" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="生产日期" prop="productionDate">
-          <el-date-picker clearable v-model="form.productionDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择生产日期"> </el-date-picker>
-        </el-form-item>
-        <el-form-item label="过期日期" prop="expiringDate">
-          <el-date-picker clearable v-model="form.expiringDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择过期日期"> </el-date-picker>
-        </el-form-item>
         <el-form-item label="已使用数量" prop="usedCount">
           <el-input v-model="form.usedCount" type="number" placeholder="请输入已使用数量"> </el-input>
         </el-form-item>
@@ -123,12 +122,6 @@
         <el-form-item label="年龄体重" prop="ageWeight">
           <el-input v-model="form.ageWeight" placeholder="请输入年龄体重" />
         </el-form-item>
-        <el-form-item label="医嘱" style="width: 792px" prop="usage">
-          <el-input v-model="form.usage" placeholder="请输入医嘱" />
-        </el-form-item>
-        <el-form-item label="购买地址" style="width: 792px" prop="purchaseAddress">
-          <el-input v-model="form.purchaseAddress" placeholder="请输入购买地址" />
-        </el-form-item>
         <el-form-item label="药品单价" prop="purchasePrice">
           <el-input v-model="form.purchasePrice" type="number" placeholder="请输入药品单价">
             <template #suffix>元</template>
@@ -139,6 +132,12 @@
             <template #suffix>元</template>
           </el-input>
         </el-form-item>
+        <el-form-item label="医嘱" style="width: 792px" prop="usage">
+          <el-input v-model="form.usage" placeholder="请输入医嘱" />
+        </el-form-item>
+        <el-form-item label="购买地址" style="width: 792px" prop="purchaseAddress">
+          <el-input v-model="form.purchaseAddress" placeholder="请输入购买地址" />
+        </el-form-item>
         <el-form-item label="备注" style="width: 792px" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -226,6 +225,23 @@ const handleOperate = (operate, row) => {
 
 const { queryParams, form, rules, queryMedicineParams } = toRefs(data)
 
+const handleQuantityChange = (val) => {
+  getMedicineBasic(form.value.medicineId).then((response) => {
+    form.value.totalCount = response.data.specifications * val
+  })
+}
+
+const handleMedicineChange = (medicineId) => {
+  getMedicineBasic(medicineId).then((response) => {
+    form.value.packageUnit = response.data.packageUnit
+    form.value.unit = response.data.unit
+    form.value.totalCount = response.data.specifications
+    if (form.value.quantity != null) {
+      form.value.totalCount = response.data.specifications * form.value.quantity
+    }
+  })
+}
+
 /** 查询药品入库清单列表 */
 function getList() {
   loading.value = true
@@ -254,7 +270,7 @@ function reset() {
   form.value = {
     id: null,
     medicineId: null,
-    quantity: null,
+    quantity: 1,
     productionDate: null,
     expiringDate: null,
     purchaseDate: null,