4/4 处理单据页面优化1.0

src/views/collect/DealOrder.vue

@@ -216,6 +216,7 @@
         <prescribeOriginPanel
           v-if="panelALive"
           :prescribeData="curRow"
+          :bizIds="bizIds"
         ></prescribeOriginPanel>
         <!-- 在表格下方添加说明 -->
         <!--</el-tab-pane>-->
@@ -336,7 +337,6 @@ import selectPrescribeDialog from '@/views/collect/selectCollectOrderDialog'
 import PanelOrderManuTagCode from './PanelOrderManuTagCode'
 import prescribeOriginPanel from './PannelOrderBiz'
 import prescribeCodePanel from './PanelOrderTagCode'
-import PannelOrderBiz from './PannelOrderBiz'
 import { listPage } from '@/api/basic/workPlace/sysWorkplaceManage'
 import { enterCodeWeb, batchVailCode, enterCodeBillNo, saveOrderWeb, batchUpdateCode } from '@/api/inout/order'
 import {
@@ -479,7 +479,8 @@ export default {
       },
       labelName: 1,
       scanStatus: null, // 1:扫码剔除; null 处理单据
-      collectSet: {}
+      collectSet: {},
+      bizIds: [],
     }
   },
 
@@ -489,7 +490,6 @@ export default {
     selectPrescribeDialog,
     prescribeCodePanel,
     PanelOrderManuTagCode, prescribeOriginPanel,
-    PannelOrderBiz,
     PanelOrderAllDetail
   },
   watch: {
@@ -678,7 +678,7 @@ export default {
       _this.$nextTick(() => {
         _this.panelALive = true
       })
-      _this.getBizDetailList()
+      // _this.getBizDetailList()
       _this.vailOrderFinish()
     },
     refreshCodesPanelBank(_this) {
@@ -1017,6 +1017,7 @@ export default {
           this.formData = res.data
           this.curRow = this.formData
           this.$refs.inputRef.focus()
+          this.bizIds = res.data.bizIds
           this.refreshCodesPanel(this)
         } else {
           if (res.code == 502) {
@@ -1094,13 +1095,23 @@ export default {
     },
 
     finishOrder() {
+      // 显示加载状态
+
       finishOrder(this.formData).then(res => {
+        const loading = this.$loading({
+          lock: true,
+          text: '单据完成中...',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
         this.loading = false
         if (res.code == 20000) {
           const audio = new Audio(require('@/assets/audioFiles/order.mp3'))
           audio.play()
           this.reset()
+          loading.close();
           if (this.formDataVisible.scanType != 1) {
+            loading.close();
             this.findCurOrder()
           }
         } else if (res.code == 502) {
@@ -1110,7 +1121,9 @@ export default {
             type: 'warning'
           }).then(() => {
             this.formData.confirmFinish = true
+            loading.close();
             this.finishOrder()
+            this.reset()
           }).catch(() => {
           })
         } else if (res.code == 503) {
@@ -1120,9 +1133,11 @@ export default {
             }
           })
         } else {
+          loading.close();
           this.$message.error(res.message)
         }
       }).catch(() => {
+        loading.close();
         this.loading = false
       })
     },
@@ -1217,6 +1232,7 @@ export default {
     confirmSelect(row) {
       this.formData = row
       this.formData.workPlaceCode = this.workplaceId
+      this.bizIds = []
       this.startDeal()
       // this.generateBarcode()
     },
@@ -1448,6 +1464,7 @@ export default {
       this.clearCode()
       this.$refs.inputRef.focus()
       this.$refs.inputRef.select()
+      this.bizIds = []
     },
     toggleBusType() {
       //隐藏下拉框内容
@@ -1540,6 +1557,7 @@ export default {
                   this.formData.insert = false
                   this.curRow = this.formData
                   this.$refs.inputRef.focus()
+                  this.bizIds = res.data.collectOrder.bizIdList
                   this.refreshCodesPanel(this)
                   this.printMutiCodeResult(res.data.vailCodeResultResponses)
                 } else {
@@ -1728,8 +1746,9 @@ export default {
       if (this.formData.billNo != null) {
         if (event.key === 'F9' || event.keyCode === 120) {
           event.preventDefault() // 阻止默认行为
-          this.finishOrder()
           MessageBox.close()
+          this.finishOrder()
+
 
         }
         if (event.key === 'F10' || event.keyCode === 121) {

src/views/collect/PannelOrderBiz.vue

@@ -72,15 +72,6 @@
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="preTotal>0"
-      :total="preTotal"
-      :limit.sync="preQuery.limit"
-      :page.sync="preQuery.page"
-      @pagination="preHandleCurrentChange"
-    ></pagination>
-
-
     <el-dialog
       title="扫码明细"
       :visible.sync="scanDetailVisible"
@@ -130,6 +121,11 @@ export default {
       default: 1,
       required: true
     },
+    bizIds: {
+      type: Array,
+      default: null,
+      required: true
+    },
 
 
   },
@@ -137,19 +133,17 @@ export default {
     return {
       //界面配置相关
       //原始处方明细
-      tableHeader1: [],
-      queryList1: [],
-      tableObj1: [],
-      fromList1: [],
-      convertDateFun: convertDate,
+      // convertDateFun: convertDate,
 
       preLoading: false,
       preDetailList: [],
+      bizDataList: [],
       preTotal: 0,
       preQuery: {
         orderIdFk: null,
         page: 1,
-        limit: 10
+        limit: 10,
+        bizIdList: []
       },
 
       countVisible: false,
@@ -163,25 +157,51 @@ export default {
     }
   },
   methods: {
-    async getPrescribeDetail() {
+     getPrescribeDetail() {
       if (!this.hasPrescribeData) return
-
       this.preQuery.page = 1
       this.preQuery.orderIdFk = this.prescribeData.billNo
       this.preLoading = true
+        orderDetail(this.preQuery).then(res => {
+          if (res.code !== 20000) {
+            this.$message.error(res.message)
+            return
+          }
+          this.preDetailList = res.data.list.sort((a, b) => {
+            const aMet = a.scanCount === a.shouldCount;
+            const bMet = b.scanCount === b.shouldCount;
+            // 符合条件的行排在后面
+            if (aMet && !bMet) return 1;
+            if (!aMet && bMet) return -1;
+            return 0; // 保持原有顺序
+          });
+        }).catch(() => {
+          this.$message.error('数据加载失败')
+        }).finally(() => {
+          this.preLoading = false
+        })
+    },
 
-      try {
-        const res = await orderDetail(this.preQuery)
+    getPrescribeDetailList() {
+      if (!this.hasPrescribeData) return
+      this.preQuery.page = 1
+      this.preQuery.orderIdFk = this.prescribeData.billNo
+      this.preQuery.bizIdList = this.bizIds
+      this.preLoading = true
+      orderDetail(this.preQuery).then(res => {
         if (res.code !== 20000) {
           this.$message.error(res.message)
           return
         }
-        this.preDetailList = res.data.list
-      } catch (error) {
+
+        //todo 一搜索列表就空掉
+        this.bizDataList = res.data.list
+        //根据 bizid 去换掉 当前行
+      }).catch(() => {
         this.$message.error('数据加载失败')
-      } finally {
+      }).finally(() => {
         this.preLoading = false
-      }
+      })
     },
 
     preHandleCurrentChange(val) {
@@ -204,7 +224,7 @@ export default {
       if (row.scanActCount == null) return 'danger'
       if (row.scanActCount < row.count) return 'danger'
       if (row.scanActCount >= row.count) return 'success'
-      return  "danger"
+      return  "success"
     },
     // getTagColor(row) {
     //   if (row.autoTagStatus === 2) {
@@ -232,6 +252,17 @@ export default {
       return row.scanCount < row.shouldCount ? 'error' : 'success'
     },
 
+    customSort(a, b) {
+      // 如果扫码数量和应扫码数量相等，则排在最后
+      if (a.scanCount >= a.shouldCount ) {
+        return 1; // a 排在 b 后面
+      }
+      if (a.scanCount < a.shouldCount ) {
+        return -1; // b 排在 a 后面
+      }
+      // 如果两者都满足或都不满足，则保持原顺序
+      return 0;
+    },
     async codeRemoveMan(codeManId, delType) {
       try {
         const response = await codeRemove({ codeManId, delType })
@@ -273,7 +304,12 @@ export default {
     PanelOrderManuTagCode
   },
   created() {
-    this.getPrescribeDetail()
+    // if (this.bizIds.length > 0){
+    //   this.preQuery.bizIdList = this.bizIds
+    //   this.getPrescribeDetailList()
+    // }else {
+      this.getPrescribeDetail()
+    // }
     this.countVisible = this.dealStatus !== 1
   }