扫码明细问题

src/views/collect/DealOrder.vue

@@ -209,14 +209,14 @@
             :prescribeData="curRow"
           ></prescribeOriginPanel>
         </el-tab-pane>
-        <el-tab-pane label="扫码明细">
+<!--        <el-tab-pane label="扫码明细">-->
-          <PanelOrderManuTagCode
+<!--          <PanelOrderManuTagCode-->
-            v-if="panelALive"
+<!--            v-if="panelALive"-->
-            :fifoSplit="3"
+<!--            :fifoSplit="3"-->
-            :prescribeData="curRow"
+<!--            :prescribeData="curRow"-->
-            :refreshPanel="refreshCodesPanelP"
+<!--            :refreshPanel="refreshCodesPanelP"-->
-          ></PanelOrderManuTagCode>
+<!--          ></PanelOrderManuTagCode>-->
-        </el-tab-pane>
+<!--        </el-tab-pane>-->
         <el-tab-pane label="拆零详情">
           <prescribeCodePanel
             v-if="panelALive"

src/views/collect/PanelOrderManuTagCode.vue

@@ -126,7 +126,7 @@
 <script>
 import {convertDate} from "@/utils/date";
 import {executeFuc, getHead} from "@/utils/customConfig";
-import {autoCodeDetail, autoCodeResult, manualCodeDetail,codeRemove} from "@/api/collect/collectOrder";
+import {autoCodeDetail, autoCodeResult, manualCodeDetail, codeRemove} from "@/api/collect/collectOrder";
 
 export default {
 
@@ -139,11 +139,20 @@ export default {
       type: Function,
       required: true,
     },
+    closeScanDialog: {
+      type: Function,
+      required: true,
+    },
     prescribeData: {
       type: Object,
       default: null,
       required: true
     },
+    bizId: {
+      type: Object,
+      default: null,
+      required: true
+    },
     //上货方式：1:拆零上货；2:整取上货;3：手动扫码查询
     fifoSplit: {
       type: Object,
@@ -195,7 +204,7 @@ export default {
         _this.codeRemoveMan(row.id, 1);
       })
     },
-    codeRemoveMan(codeManId,delType){
+    codeRemoveMan(codeManId, delType) {
       let post = {
         codeManId: codeManId,
         delType: delType
@@ -203,7 +212,8 @@ export default {
       codeRemove(post).then((response) => {
         if (response.code === 20000) {
           this.$message.success("操作成功！");
-          this.refreshPanel()
+          this.refreshPanel(this)
+          this.getList()
         } else {
           this.$message.error(response.message);
         }
@@ -239,6 +249,7 @@ export default {
       if (_this.prescribeData != null) {
         _this.codeQuery.page = 1
         _this.codeQuery.orderIdFk = this.prescribeData.billNo
+        _this.codeQuery.bizIdFk = this.bizId
       }
       _this.codeLoading = true;
       if (_this.fifoSplit == 3) {
@@ -317,7 +328,7 @@ export default {
         this.getList(this);
       });
     } else {
-      this.getPrescribeDetail(this);
+      this.getList(this);
     }
 
 

src/views/collect/PannelOrderBiz.vue

@@ -120,6 +120,24 @@
       @pagination="preHandleCurrentChange"
     ></pagination>
 
+
+    <el-dialog
+      title="扫码明细"
+      :visible.sync="scanDetailVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="scanDetailVisible"
+      width="65%"
+      append-to-body
+    >
+      <PanelOrderManuTagCode
+        :fifoSplit="3"
+        :prescribeData="prescribeData"
+        :bizId="bizId"
+        :closeScanDialog="closeScanDialog"
+      ></PanelOrderManuTagCode>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -128,6 +146,7 @@ import {convertDate} from "@/utils/date";
 import {detail} from "@/api/basic/sicker/prescribeApi";
 import {executeFuc, getHead} from "@/utils/customConfig";
 import {orderDetail, codeRemove} from "@/api/collect/collectOrder";
+import PanelOrderManuTagCode from "@/views/collect/PanelOrderManuTagCode";
 
 /**
  * 原始处方明细
@@ -175,7 +194,8 @@ export default {
       },
 
       countVisible: false,
-
+      scanDetailVisible: false,
+      bizId: null,
     }
   },
   methods: {
@@ -264,6 +284,16 @@ export default {
       })
     },
 
+
+    scanDetail(_this, row) {
+      _this.bizId = row.id;
+      _this.scanDetailVisible = true;
+    },
+
+    closeScanDialog() {
+      this.getPrescribeDetail(this);
+    },
+
     rowStyle({row, rowIndex}) {
       let rowBackground = {};
       if (row.count != row.scanCount) {
@@ -275,6 +305,11 @@ export default {
     },
 
   },
+
+
+  components: {
+    PanelOrderManuTagCode
+  },
   created() {
     if (this.tableHeader1 == null || this.tableHeader1.length == 0) {
       getHead("prescribeOriginPanel", "1").then((re) => {