Merge branch 'sit' into dev

src/views/sellOut/returnOrder/detail.vue

@@ -40,9 +40,7 @@
               name="0"
               v-if="
                 newTime !== '' &&
-                sitem &&
-                !(sitem.order_type === '1' || sitem.order_type === '5')
-              "
+                sitem &&sitem.return_tag === '2'"
             >
               <!----047--->
               <return-record
@@ -58,8 +56,7 @@
               name="1"
               v-if="status == '2' || status == '3' || status == '4'&&
                 newTime !== '' &&
-                sitem &&
-                !(sitem.order_type === '1' || sitem.order_type === '5')"
+                sitem &&sitem.return_tag === '2'"
               
             >
               <!----042--->
@@ -75,10 +72,8 @@
               name="2"
               v-if="status == '3' || status == '4'&&
                 newTime !== '' &&
-                sitem &&
-                !(sitem.order_type === '1' || sitem.order_type === '5')"
+                sitem &&sitem.return_tag === '2'"
             >
-              <!----043--->
               <audit-form
                 v-if="newTime != ''"
                 :newTime="newTime"