Merge branch 'dev'

src/views/medince/sys-medince/index.vue

@@ -34,7 +34,7 @@
       " placeholder="请输入药品备注" @press-enter="handleQuery" />
       </a-form-item>
       <a-form-item field="order.stock" label="库存排序">
-        <a-select  v-model="queryForm.order.stock" placeholder="库存排序" :style="{ width: '182px' }">
+        <a-select  v-model="queryForm.order.stock" placeholder="请选择库存排序" :style="{ width: '182px' }">
           <a-option value="asc">正序</a-option>
           <a-option value="desc">倒序</a-option>
         </a-select>
@@ -142,7 +142,9 @@
   };
   // form
   const queryForm = reactive({
-    order:{}
+    order:{
+      stock:''
+    }
   });
   const modalForm = reactive({
     user:{},
@@ -294,6 +296,7 @@
   // 重置搜索
   const handleResetQuery = () => {
     proxy.$refs.queryFormRef.resetFields();
+    queryForm.order.stock='';
     getMedinceInfo(queryForm);
   }
   const familyVisibleChange=(data)=>{