diff --git a/src/views/sales/order/index.vue b/src/views/sales/order/index.vue
index a670215..4037dd4 100644
--- a/src/views/sales/order/index.vue
+++ b/src/views/sales/order/index.vue
@@ -99,18 +99,18 @@
     );
     watch(
         () => state.condition,
-        (value) => {
+        (value, old) => {
             store.commit('order/setCondition', _.cloneDeep(value));
-            // if (value.userId !== old.userId) {
-            // handleSearch && handleSearch();
-            // }
+            if (value.userId !== old?.userId) {
+                handleSearch();
+            }
         },
         { immediate: true, deep: true }
     );
     watch(
         () => state.condition.orderStatus,
         () => {
-            // handleSearch && handleSearch();
+            handleSearch();
         },
         { deep: true }
     );
diff --git a/src/views/sales/order/ship.vue b/src/views/sales/order/ship.vue
index 7888811..9b4744e 100644
--- a/src/views/sales/order/ship.vue
+++ b/src/views/sales/order/ship.vue
@@ -1,6 +1,13 @@
 <template>
-    <el-dialog v-model="visible" height="500px" title="批量发货" width="800px">
-        <table-list v-loading="loading" :code="code" :config="config" :data="list" :operation="[]" />
+    <el-dialog v-model="visible" title="批量发货" width="800px">
+        <table-list
+            v-loading="loading"
+            :code="code"
+            :config="config"
+            :data="list"
+            :operation="[]"
+            style="height: 500px"
+        />
         <template #footer>
             <el-button type="danger" @click="handleClose">取消</el-button>
             <el-button :loading="loading" type="primary" @click="handleSave">确定发货</el-button>