Merge branch 'msb_prod' into msb_test

src/views/sales/order/index.vue

@@ -91,7 +91,7 @@
         },
     });
     watch(
-        () => route.params.id,
+        () => route.query.id,
         (value) => {
             state.condition.userId = value;
         },
@@ -99,11 +99,8 @@
     );
     watch(
         () => state.condition,
-        (value, old) => {
+        (value) => {
             store.commit('order/setCondition', _.cloneDeep(value));
-            if (value.userId !== old?.userId) {
-                handleSearch();
-            }
         },
         { immediate: true, deep: true }
     );
@@ -114,6 +111,12 @@
         },
         { deep: true }
     );
+    watch(
+        () => state.condition.userId,
+        () => {
+            handleSearch();
+        }
+    );
     const handleReset = () => {
         state.condition = {
             userId: null,