From a16362af4b837fe2ede10aa9cd394099e5b6e560 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Fri, 14 Feb 2025 14:02:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E9=80=89=E6=8B=A9=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IocCollectOrderCheckCode.vue      | 64 ++++++++++---------
 .../collect/selectCollectOrderDialog.vue      | 14 +++-
 2 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/src/views/collect/IocCollectOrderCheckCode.vue b/src/views/collect/IocCollectOrderCheckCode.vue
index f85340d2..fa27c20e 100644
--- a/src/views/collect/IocCollectOrderCheckCode.vue
+++ b/src/views/collect/IocCollectOrderCheckCode.vue
@@ -51,7 +51,8 @@
         </el-row>
 
 
-        <div style="border: 1px solid #ebeef5;border-radius: 2px;margin-top: 15px;padding: 15px"  v-loading="this.loading">
+        <div style="border: 1px solid #ebeef5;border-radius: 2px;margin-top: 15px;padding: 15px"
+             v-loading="this.loading">
           <el-row :gutter="0" style="margin-top: 5px">
             <el-col :span="20">
               <el-form-item prop="code" :label="scanTip" label-width="80px">
@@ -208,15 +209,16 @@
         :confirmSelect="this.confirmSelect"
         :closeDialog="this.closeDialog"
         :viewType="viewType"
+        :isAudit="true"
       ></selectPrescribeDialog>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { isBlank } from '@/utils/strUtil'
-import { getCodeEndList } from '@/api/collect/IoCollectCodeSelect'
-import { enterCodeBillNo, enterCodeWeb } from '@/api/inout/order'
+import {isBlank} from '@/utils/strUtil'
+import {getCodeEndList} from '@/api/collect/IoCollectCodeSelect'
+import {enterCodeBillNo, enterCodeWeb} from '@/api/inout/order'
 import {
   autoCodeResult,
   findByBill,
@@ -225,7 +227,7 @@ import {
   abandonOrder,
   getCurOrder
 } from '@/api/collect/collectOrder'
-import { checkCollectOrderManCode, draftOrder, finishCheckOrder, updateOrder } from '@/api/collect/splitCreateOrder'
+import {checkCollectOrderManCode, draftOrder, finishCheckOrder, updateOrder} from '@/api/collect/splitCreateOrder'
 import selectPrescribeDialog from "@/views/collect/selectCollectOrderDialog";
 import { getSet } from '@/api/collect/collectSet'
 
@@ -286,8 +288,8 @@ export default {
       codeList: [],
 
       checkCodeList: [],
-      busDataList:[],
-      busDataTotal:0,
+      busDataList: [],
+      busDataTotal: 0,
       //用于校验扫码数量
       codeCount: 0,
       selectPrescriptionVisible: false,
@@ -305,20 +307,20 @@ export default {
       if (this.scanCode.includes("DMOENTER")) {
         if (this.orderData.billNo == null) {
           this.$message.error('请先选择单据')
-        }else {
+        } else {
           this.confirmCheckOrder()
         }
         this.scanCode = ''
         return
-      }else if (this.scanCode.includes("DMOCANCEL")) {
+      } else if (this.scanCode.includes("DMOCANCEL")) {
         if (this.orderData.billNo == null) {
           this.$message.error('请先选择单据')
-        }else {
+        } else {
           this.cancelOrder()
         }
         this.scanCode = ''
         return
-      }else if (this.scanCode.includes("DMODEL")) {
+      } else if (this.scanCode.includes("DMODEL")) {
         // this.deleteCode()
         this.scanCode = ''
         return
@@ -392,7 +394,7 @@ export default {
               .catch(() => {
                 this.filterQuery.udiCode = response.data.code;
               });
-          }  else {
+          } else {
             this.scanCode = ""
             this.$alert(response.message, "提示", {
               confirmButtonText: "确定",
@@ -410,19 +412,19 @@ export default {
       // this.getInputFocus()
     },
 
-    addCode(){
+    addCode() {
       //前端单码校验是否已经校验该码
       let isIncludes = this.checkCode(this.filterQuery.udiCode)
-      if (!isIncludes){
+      if (!isIncludes) {
         this.filterQuery.orderIdFk = this.orderData.billNo
         this.verifyCode(this.filterQuery)
-      }else {
+      } else {
         this.scanCode = ""
         this.getInputFocus()
         this.$message.error("该追溯码已审核")
       }
     },
-    checkCode(code){
+    checkCode(code) {
       return this.checkCodeList.includes(code)
     },
 
@@ -449,7 +451,7 @@ export default {
           this.getCodeList()
           this.getBizDetailList()
           this.updateOrder()
-        }else {
+        } else {
           this.$refs.inputRef.focus()
           this.$refs.inputRef.select()
           this.scanCode = ''
@@ -526,8 +528,8 @@ export default {
         }
       })
     },
-    checkCodeEnd(){
-      if (this.codeCount == this.detailList.length){
+    checkCodeEnd() {
+      if (this.codeCount == this.detailList.length) {
         this.$confirm("单据追溯码已经全部审核完毕，是否立即完成单据审核？", '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -687,21 +689,21 @@ export default {
       const vailCodeResultResponse = {}
       const codeList = []
       params.udiCodeList.forEach(code => {
-        let isIncludes =  this.checkCode(code)
-        if (isIncludes){
+        let isIncludes = this.checkCode(code)
+        if (isIncludes) {
           vailCodeResultResponse.status = 2;
           vailCodeResultResponse.code = code;
           vailCodeResultResponse.errMsg = "追溯码已被校验";
           vailCodeResultResponseList.push(vailCodeResultResponse);
-        }else {
+        } else {
           codeList.push(code)
         }
       });
-      if (vailCodeResultResponseList.length > 0){
+      if (vailCodeResultResponseList.length > 0) {
         this.printCodeResultList(vailCodeResultResponseList)
       }
 
-      if (codeList.length > 0){
+      if (codeList.length > 0) {
         params.udiCodeList = codeList
         this.verifyCode(params)
       }
@@ -716,7 +718,7 @@ export default {
     },
     confirmCheckOrder() {
       //完成校验
-      if (this.codeCount != this.detailList.length){
+      if (this.codeCount != this.detailList.length) {
         this.$confirm('当前单据追溯码未全部审核是否完成此单据?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -725,7 +727,7 @@ export default {
           this.commitCheckOrder()
         }).catch(() => {
         })
-      }else {
+      } else {
         this.$confirm('是否确定完成此单据审核?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -745,7 +747,7 @@ export default {
     finishOrder() {
       finishCheckOrder(this.orderData).then(res => {
         if (res.code == 20000) {
-        }else {
+        } else {
           this.$message.error(res.message)
         }
       }).catch(() => {
@@ -759,10 +761,10 @@ export default {
         type: 'warning'
       }).then(() => {
         abandonOrder(this.orderData).then(res => {
-          if (res.code == 20000){
+          if (res.code == 20000) {
             this.init()
             this.$message.success("放弃成功")
-          }else {
+          } else {
             this.$message.error(res.message)
           }
         })
@@ -785,7 +787,7 @@ export default {
       this.selectSysParam()
       // this.startDeal();
     },
-    selectAllData(){
+    selectAllData() {
       this.placeholder = '已选入单据，请扫描追溯码进行审核'
       this.scanCode = ''
       this.orderData.workPlaceCode = this.workplaceId;
@@ -909,7 +911,7 @@ export default {
         }
       })
     },
-    rowStyle({ row, rowIndex }) {
+    rowStyle({row, rowIndex}) {
       let rowBackground = {}
       if (this.checkCodeList.length == 0) {
         rowBackground.color = '#F56C6C'
diff --git a/src/views/collect/selectCollectOrderDialog.vue b/src/views/collect/selectCollectOrderDialog.vue
index 4f6d0de3..473e29b2 100644
--- a/src/views/collect/selectCollectOrderDialog.vue
+++ b/src/views/collect/selectCollectOrderDialog.vue
@@ -516,6 +516,11 @@ export default {
       type: Object,
       required: false,
     },
+    isAudit: {
+      type: Boolean,
+      required: false,
+    },
+
   },
   data() {
     return {
@@ -642,8 +647,13 @@ export default {
         this.filterQuery.startTime = null;
         this.filterQuery.endTime = null;
       }
+      if (this.isAudit != null) {
+        this.filterQuery.workPlaceCode = null
+      } else {
+        this.filterQuery.workPlaceCode = this.$route.query.workplaceId
+      }
       // this.filterQuery.workPlaceCode = null
-      this.filterQuery.workPlaceCode = this.$route.query.workplaceId
+
       // workPlaceCode: this.workplaceId,
       this.filterQuery.busType = this.busType
       // this.filterQuery.fromCorp = this.fromCorp
@@ -781,7 +791,7 @@ export default {
         return
       })
     },
-    handleTabClick(tab){
+    handleTabClick(tab) {
       this.panelALive = false
     }
   },