Merge branch 'master' of http://gitlab.pubdata.cn/liangyibo/CameraMachine

frontend/src/views/Photography/shot.vue

@@ -554,6 +554,11 @@ const reTakePicture = async (img)=>{
       runLoading.value = false;
       if(result.code === 0){
         getPhotoRecords()
+
+
+        runLoading.value = false;
+        reNosObj.value.goods_art_no = ''
+        reNosObj.value.action = ''
         setTimeout(()=>{
           showlastPhoto.value = false
         },6000)
@@ -879,6 +884,10 @@ clientStore.ipc.on(icpList.socket.message + '_run_mcu_update', (event, result) =
             },1000)
             console.log(item);
             console.log( goodsList.value);
+
+            runLoading.value = false;
+            reNosObj.value.goods_art_no = ''
+            reNosObj.value.action = ''
           }
         })
        // getPhotoRecords()