From 9973aff235f483285e087192b3de7951213bd4a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com>
Date: Sat, 22 Jan 2022 00:32:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9Btype?=
 =?UTF-8?q?script=E7=BC=96=E8=AF=91=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Sidebar/SidebarItem.vue     |  4 ++--
 src/layout/components/TagsView/index.vue          |  4 ++--
 src/views/oms/order/index.vue                     |  6 ++++--
 src/views/pms/category/components/Attribute.vue   |  2 +-
 src/views/pms/goods/components/GoodsAttribute.vue | 14 ++++++++------
 src/views/pms/goods/components/GoodsInfo.vue      |  2 +-
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index aa6e8a3f..d03a9301 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -40,7 +40,7 @@ import {RouteRecordRaw} from "vue-router";
 
 const props = defineProps({
   item: {
-    type: Object as PropType<RouteRecordRaw>,
+    type: Object,
     required: true
   },
   isNest: {
@@ -55,7 +55,7 @@ const props = defineProps({
 
 const onlyOneChild = ref();
 
-function hasOneShowingChild(children = [] as any, parent: RouteRecordRaw) {
+function hasOneShowingChild(children = [] as any, parent: any) {
   if (!children) {
     children = [];
   }
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 78ed559e..3dfb29aa 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -68,8 +68,8 @@ const {ctx} = getCurrentInstance() as any
 const router = useRouter()
 const route = useRoute();
 
-const visitedViews = computed(() => tagsViewStoreHook().visitedViews)
-const routes = computed(() => usePermissionStoreHook().routes)
+const visitedViews = computed<any>(() => tagsViewStoreHook().visitedViews)
+const routes = computed<any>(() => usePermissionStoreHook().routes)
 
 const affixTags = ref([]);
 const visible = ref(false);
diff --git a/src/views/oms/order/index.vue b/src/views/oms/order/index.vue
index a0ea690d..b17b21bc 100644
--- a/src/views/oms/order/index.vue
+++ b/src/views/oms/order/index.vue
@@ -172,7 +172,8 @@ const state = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    orderSn: undefined
+    orderSn: undefined,
+    status:undefined
   },
   pageList: [],
   total: 0,
@@ -223,7 +224,8 @@ function resetQuery() {
   state.queryParams = {
     pageNum: 1,
     pageSize: 10,
-    orderSn: undefined
+    orderSn: undefined,
+    status: undefined
   }
   handleQuery()
 }
diff --git a/src/views/pms/category/components/Attribute.vue b/src/views/pms/category/components/Attribute.vue
index 9862f621..f199cd2f 100644
--- a/src/views/pms/category/components/Attribute.vue
+++ b/src/views/pms/category/components/Attribute.vue
@@ -33,7 +33,7 @@
                 circle
                 plain
                 size="mini"
-                @click.prevent="handleAdd(index)"
+                @click.prevent="handleAdd()"
                 style="margin-left: 15px"
             />
 
diff --git a/src/views/pms/goods/components/GoodsAttribute.vue b/src/views/pms/goods/components/GoodsAttribute.vue
index c405d9fa..3e03bfb8 100644
--- a/src/views/pms/goods/components/GoodsAttribute.vue
+++ b/src/views/pms/goods/components/GoodsAttribute.vue
@@ -31,7 +31,7 @@
               <template #default="scope">
                 <el-form-item
                     :prop="'attrList[' + scope.$index + '].name'"
-                    :rules="rules.attribute.name"
+                    :rules="rules.name"
                 >
                   <el-input v-model="scope.row.name"/>
                 </el-form-item>
@@ -42,7 +42,7 @@
               <template #default="scope">
                 <el-form-item
                     :prop="'attrList[' + scope.$index + '].value'"
-                    :rules="rules.attribute.value"
+                    :rules="rules.value"
                 >
                   <el-input v-model="scope.row.value"/>
                 </el-form-item>
@@ -115,10 +115,12 @@ watch(categoryId, (newVal, oldVal) => {
 
 const state = reactive({
   rules: {
-    attribute: {
-      name: [{required: true, message: '请填写属性名称', trigger: 'blur'}],
-      value: [{required: true, message: '请填写属性值', trigger: 'blur'}]
-    }
+    name: [
+      {required: true, message: '请填写属性名称', trigger: 'blur'}
+    ],
+    value: [
+      {required: true, message: '请填写属性值', trigger: 'blur'}
+    ]
   }
 })
 
diff --git a/src/views/pms/goods/components/GoodsInfo.vue b/src/views/pms/goods/components/GoodsInfo.vue
index cc765328..da17bbb2 100644
--- a/src/views/pms/goods/components/GoodsInfo.vue
+++ b/src/views/pms/goods/components/GoodsInfo.vue
@@ -91,7 +91,7 @@ const props = defineProps({
 })
 
 const state = reactive({
-  brandOptions: [],
+  brandOptions: [] as Array<any>,
   // 商品图册
   pictures: [] as Array<any>,
   rules: {