Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui

src/views/wms/countManage/count/countPlanMain/index.vue

@@ -739,7 +739,7 @@ const getAreaAllList = async () => {
     allList.value.areaAllList = res.map((element) => {
       return {
         value: element.code,
-        label: element.name
+        label: element.name + '-'+ element.code
       }
     })
   })

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@@ -508,7 +508,8 @@ const submitForm = async (formType, data) => {
       return;
     } 
           })
-  if(flag){
+  if(flag.value){
+    formRef.value.formLoading = false
     return
   }
   try {