Merge branch 'feature/pyh_销售采购管理优化' into develop

src/views/mallManagement/goods/newclassify_index/index.vue

@@ -151,12 +151,20 @@ export default {
 			disposition: {
 				btnType: 'text',
 				click: ({ row, index, column }) => {
+					// this.$router.push({
+					// 	name: "newclassify_set",
+					// 	query: {
+					// 		item: row
+					// 	},
+					// });
 					this.$router.push({
-						name: "newclassify_set",
-						query: {
-							item: row
+						name: 'newclassify_set',
+						params: {
+							pageName: row.goodsNewsCategoryId,
+							pageType: '-',
+							pageCode: JSON.stringify(row)
 						},
-					});
+					})
 				}
 			},
 			edit: {  

src/views/mallManagement/goods/newclassify_set/index.vue

@@ -212,18 +212,20 @@ export default {
       defaultProps: {
         children: 'children',
         label: 'name'
-      }
+      },
     };
   },
   computed: {
 
   },
   created() {
-    const { item } = this.$route.query;
-    this.mainForm.mainTitle = item.mainTitle;
-    this.mainForm.subtitle = item.subTitle;
-    this.mainForm.goodsType = item.type;
-    this.objectId = item.goodsNewsCategoryId
+	if(this?.$route?.params?.pageCode){
+		const item = JSON.parse(this?.$route?.params?.pageCode)
+		this.mainForm.mainTitle = item.mainTitle;
+		this.mainForm.subtitle = item.subTitle;
+		this.mainForm.goodsType = item.type;
+		this.objectId = item.goodsNewsCategoryId
+	}
 
     this.getEnterpriseTemplate()
     this.getactivityGoodsDetail()