Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z

src/views/collect/PanelOrderDeal.vue

@@ -209,10 +209,10 @@
     </el-card>
     <el-tabs type="border-card" style="margin: 15px">
       <el-tab-pane label="扫码详情">
-        <prescribeOriginPanel
+        <PannelOrderDetail
           v-if="panelALive"
           :prescribeData="curRow"
-        ></prescribeOriginPanel>
+        ></PannelOrderDetail>
       </el-tab-pane>
 <!--      <el-tab-pane label="扫码明细">-->
       <!--        <PanelOrderManuTagCode-->
@@ -252,6 +252,7 @@ import errOrder from "@/views/inout/IoCreateErrorOrder";
 import {executeFuc, getHead} from "@/utils/customConfig";
 import {convertDate} from "@/utils/date";
 import prescribeOriginPanel from "@/views/collect/PannelOrderBiz";
+import PannelOrderDetail from "./PannelOrderDetail"
 import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
 import prescribeCodePanel from "@/views/collect/PanelOrderTagCode";
 import {deleteByOrder, orderPage} from "@/api/collect/collectOrder";
@@ -328,7 +329,7 @@ export default {
   },
 
   components: {
-    addOrder, errOrder, prescribeOriginPanel, prescribeCodePanel, PanelOrderManuTagCode,PanelOrderAllDetail
+    addOrder, errOrder, prescribeOriginPanel, prescribeCodePanel, PanelOrderManuTagCode,PanelOrderAllDetail,PannelOrderDetail
   },
   methods: {
     changePlace(_this,query) {