Merge branch 'dev' into test

src/views/warehouseManagement/stockManagement/components/selectType.vue

@@ -375,7 +375,7 @@
           size: limit,
           ...where,
           factoryId: this.factoryId,
-          searchKey: this.value,
+          searchKey: encodeURIComponent(this.value),
           categoryLevelId: this.classificationId
         };
         let res = await getList(params);

src/views/warehouseManagement/stocktaking/plan/components/assignDialog.vue

@@ -286,7 +286,10 @@
       async _getInformation() {
         getInventoryPlanDetailById(this.planId).then((data) => {
           this.formData = data;
-          this.getUserList({ groupId: data.executeGroupId });
+          if(data.executeGroupId) {
+            this.getUserList({ groupId: data.executeGroupId });
+          }
+          
           this.tableData = data.planDetailVOS;
         });
       }