From 775478c598a4b2c3c6be84fcaadf96a7cc867007 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Mon, 9 Dec 2024 16:55:05 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.env.production b/.env.production
index b36dd60c..45f7d37b 100644
--- a/.env.production
+++ b/.env.production
@@ -72,6 +72,9 @@ VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_WMS_MC/'
 # 四川平武
 # VUE_APP_BASE_API = 'http://192.168.20.3:9150/UDI_WMS_MC/'
 
+# 漳州疾控
+VUE_APP_BASE_API = 'http://116.204.116.198:9160/UDI_WMS_MC/'
+
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'
 

From 43ace68aaa8d21bb28d7edcbc76f2814a721ef9a Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 12 Dec 2024 14:16:17 +0800
Subject: [PATCH 2/5] =?UTF-8?q?12/12=20=E4=BB=A3=E7=A0=81=E5=A4=87?=
 =?UTF-8?q?=E4=BB=BD=20=E6=89=AB=E7=A0=81=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/collect/splitCreateOrder.js           |  22 ++++
 src/views/collect/DialogCheckCode.vue         | 116 ++++++++++++++++--
 .../collect/IocCollectOrderCheckCode.vue      |   4 +-
 src/views/collect/PanelOrderEndSearch.vue     |   6 +
 4 files changed, 140 insertions(+), 8 deletions(-)

diff --git a/src/api/collect/splitCreateOrder.js b/src/api/collect/splitCreateOrder.js
index 5b4175ae..f9eca242 100644
--- a/src/api/collect/splitCreateOrder.js
+++ b/src/api/collect/splitCreateOrder.js
@@ -81,4 +81,26 @@ export function checkCollectOrderManCode(query) {
   });
 }
 
+export function scanCheckCodeOrder(query) {
+  return axios({
+    url: "/udiwms/basic/collect/IoCollectCodeBackup/scanCheckCode",
+    method: "post",
+    data: query
+  });
+}
+
+export function scanCheckCodeReplace(query) {
+  return axios({
+    url: "/udiwms/basic/collect/IoCollectCodeBackup/scanCheckCodeReplace",
+    method: "post",
+    data: query
+  });
+}
 
+export function commitCheckCodeOrder(query) {
+  return axios({
+    url: "/udiwms/basic/collect/IoCollectCodeBackup/commitCheckCodeOrder",
+    method: "post",
+    data: query
+  });
+}
diff --git a/src/views/collect/DialogCheckCode.vue b/src/views/collect/DialogCheckCode.vue
index 2aaf5978..a4a22aa5 100644
--- a/src/views/collect/DialogCheckCode.vue
+++ b/src/views/collect/DialogCheckCode.vue
@@ -1,6 +1,13 @@
 <template>
   <div>
     <el-card>
+      <el-button-group  style="display: flex; justify-content: flex-end;">
+        <el-button
+          type="primary"
+          @click.native="confirmCheckOrder()"
+        >校验完成
+        </el-button>
+      </el-button-group>
       <el-form :model="orderData" class="demo-form-inline" style="margin-top: 30px" @submit.native.prevent>
 
         <!--<div style="border: 1px solid #ebeef5;border-radius: 2px;margin-top: 15px;padding: 15px">-->
@@ -76,7 +83,7 @@
       <!--单据业务详情-->
       <el-tab-pane>
         <span slot="label">单据 {{ orderData.billNo }}-追溯码详情</span>
-        <el-table :data="detailList" style="width: 100%;" highlight-current-row="true" border ref="multipleTable">
+        <el-table :data="detailList" style="width: 100%;" highlight-current-row="true" border ref="multipleTable" >
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column label="追溯码" prop="code" width="160"></el-table-column>
           <el-table-column label="药品编码" prop="nameCode"></el-table-column>
@@ -86,7 +93,7 @@
           <el-table-column label="生产日期" prop="productDate"></el-table-column>
           <el-table-column label="失效日期" prop="expireDate"></el-table-column>
           <el-table-column label="序列号" prop="serialNo"></el-table-column>
-          <el-table-column label="扫码数量" prop="scanActCount"></el-table-column>
+          <!--<el-table-column label="扫码数量" prop="scanActCount"></el-table-column>-->
           <el-table-column label="批准文号" prop="zczbhhzbapzbh"></el-table-column>
 
         </el-table>
@@ -104,7 +111,8 @@
 
 <script>
 import { isBlank } from '@/utils/strUtil'
-import { getCodeEndList,checkCode } from '@/api/collect/IoCollectCodeSelect'
+import { getCodeEndList } from '@/api/collect/IoCollectCodeSelect'
+import { commitCheckCodeOrder, scanCheckCodeOrder, scanCheckCodeReplace } from '@/api/collect/splitCreateOrder'
 
 export default {
   name: 'DialogCheckCode',
@@ -113,7 +121,11 @@ export default {
       type: Object,
       default: null,
       required: true
-    }
+    },
+    closeCodeCheckDialog: {
+      type: Function,
+      required: true
+    },
   },
   data() {
     return {
@@ -138,7 +150,9 @@ export default {
         code: '',
         billNo: null,
         codeList: [],
-      }
+      },
+      checkCodeList:[],
+      checkCodeEndList:[],
     }
   },
   methods: {
@@ -168,15 +182,39 @@ export default {
       // this.getInputFocus()
     },
     verifyCode(query) {
-      checkCode(query).then(res => {
+      scanCheckCodeOrder(query).then(res => {
         if (res.code == 20000) {
           if (Array.isArray(res.data)) {
             this.printCodeResultList(res.data)
           } else {
             this.verifyFinish(1, res.data, res.message)
+            this.checkCodeEndList.push(query.code)
+            //码不对 全部码
             this.$message.success('校验成功')
           }
-        } else {
+        }else if (res.code == 503){
+          //追溯码不存在 是否执行更换
+          this.$confirm('该追溯码不存在是否继续添加', '提示', {
+            confirmButtonText: '添加',
+            cancelButtonText: '取消',
+            type: 'warning',
+            center: true,
+            closeOnPressEscape: false,//按下 ESC 键关闭弹窗
+            closeOnClickModal: false,//点击遮罩关闭弹窗
+            distinguishCancelAndClose: true,//区分取消与关闭
+          }).then(() => {
+            scanCheckCodeReplace(query).then(res => {
+              if (res.code == 20000){
+                this.scanCode = ''
+                this.orderData.checkCodeConfirm = res.data.checkCodeConfirm
+                this.getInputFocus()
+                this.$message.success("添加成功")
+              }else {
+                this.$message.error("添加失败")
+              }
+            })
+          })
+        }else {
           if (Array.isArray(res.data)) {
 
           } else {
@@ -305,6 +343,7 @@ export default {
       getCodeEndList(this.codeQuery).then((res) => {
         if (res.code === 20000) {
           this.detailList = res.data.list || []
+          this.checkCodeList = this.detailList.map(item => item.code)
           this.resultTotal = res.data.total || 0;
         } else {
           this.$message.error(res.message)
@@ -328,6 +367,52 @@ export default {
       // }
       // })
     },
+    confirmCheckOrder(){
+      if (this.orderData.checkCodeConfirm == 1){
+        //追溯码不存在 是否执行更换
+        this.$confirm('当前单据存在可替换追溯码是否替换完成校验', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+          center: true,
+          closeOnPressEscape: false,//按下 ESC 键关闭弹窗
+          closeOnClickModal: false,//点击遮罩关闭弹窗
+          distinguishCancelAndClose: true,//区分取消与关闭
+        }).then(() => {
+          this.commit()
+        }).catch(() => {
+
+        })
+      }else {
+        this.commit()
+      }
+
+        // // 检查是否所有行都是绿色
+        // let allGreen = this.detailList.every(row => {
+        //   return this.checkCodeEndList.includes(row.code);
+        // });
+        //
+        // if (allGreen) {
+        //   // 如果所有行都是绿色，执行提交操作
+        //   // this.doSubmit();
+        //   this.$message.success('所有行都是绿色');
+        // } else {
+        //   // 如果不是所有行都是绿色，提示用户
+        //   this.$message.error('请确保所有行都是绿色后再提交');
+        // }
+    },
+    commit(){
+      commitCheckCodeOrder(this.filterQuery).then(res => {
+        if (res.code == 20000){
+          this.closeCodeCheckDialog()
+          this.$message.success("校验完成")
+        }else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+
+      })
+    },
     init() {
       this.codeQuery = {
         billNo: null,
@@ -337,9 +422,26 @@ export default {
       }
       this.errVisible = false
       this.successVisible = true
+    },
+    rowStyle({ row, rowIndex }) {
+      let rowBackground = {}
+      if (this.checkCodeEndList.length == 0) {
+        rowBackground.color = '#F56C6C'
+        rowBackground.height = '38px'
+        return rowBackground
+      }
+      if (this.checkCodeEndList.includes(row.code)) {
+        rowBackground.color = '#56a717'
+      }
+      if (!this.checkCodeEndList.includes(row.code)) {
+        rowBackground.color = '#F56C6C'
+      }
+      rowBackground.height = '38px'
+      return rowBackground
     }
   },
   created() {
+    this.filterQuery.billNo = this.orderData.billNo
     this.getResultDetailList()
     this.init()
   },
diff --git a/src/views/collect/IocCollectOrderCheckCode.vue b/src/views/collect/IocCollectOrderCheckCode.vue
index bc62cda4..25447997 100644
--- a/src/views/collect/IocCollectOrderCheckCode.vue
+++ b/src/views/collect/IocCollectOrderCheckCode.vue
@@ -130,7 +130,7 @@
       <el-tabs type="border-card" style="margin: 15px">
         <!--单据业务详情-->
         <el-tab-pane>
-          <span slot="label">单据 {{ filterQuery.billNo }}-追溯码详情</span>
+          <span slot="label">单据 {{ orderData.billNo }}-追溯码详情</span>
           <el-table :data="detailList" style="width: 100%;" highlight-current-row="true" border ref="multipleTable"
                     :row-style="rowStyle"
           >
@@ -414,6 +414,7 @@ export default {
     async printCodeResultList(vailCodeResultResponses) {
       this.errResult = ''
       this.result = ''
+      this.scanCode = ''
       this.successVisible = false
       this.errVisible = false
       this.scanTitle = '扫码结果：'
@@ -536,6 +537,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.init()
+        this.$message.success("放弃成功")
       }).catch(() => {
       });
     },
diff --git a/src/views/collect/PanelOrderEndSearch.vue b/src/views/collect/PanelOrderEndSearch.vue
index 6cab307c..e0d9e8c3 100644
--- a/src/views/collect/PanelOrderEndSearch.vue
+++ b/src/views/collect/PanelOrderEndSearch.vue
@@ -280,9 +280,11 @@
       v-if="codeCheckVisible"
       width="60%"
       append-to-body
+      @close="closeCodeCheckDialog"
     >
       <DialogCheckCode
         :orderData="curRow"
+        :closeCodeCheckDialog="closeCodeCheckDialog"
       >
 
       </DialogCheckCode>
@@ -563,6 +565,10 @@ export default {
       _this.curRow = row
       _this.codeCheckVisible = true
     },
+    closeCodeCheckDialog(){
+      this.codeCheckVisible = false
+      this.getList()
+    }
 
   },
   created() {

From 051431164b2ec301d36f185cb0e46515db8e70ce Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Thu, 12 Dec 2024 14:22:18 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8C=89=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/busType/bussinessTypeModify.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index cbb57869..143378c6 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -781,6 +781,7 @@
                 >
                   <el-option label="扫码结果提交" :value="0"></el-option>
                   <el-option label="比对结果提交" :value="1"></el-option>
+                  <el-option label="按业务单提交" :value="3"></el-option>
                 </el-select>
               </el-col>
               <el-divider direction="vertical"></el-divider>

From e8f5c0de7965859475b33328429441adaee2b6a3 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 12 Dec 2024 18:44:20 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E5=B7=A5=E4=BD=8D=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=8C=BB=E4=BF=9D=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/workplace/addBusTypeDialog.vue | 9 +++++++++
 src/views/basic/workplace/busTypeManage.vue    | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/views/basic/workplace/addBusTypeDialog.vue b/src/views/basic/workplace/addBusTypeDialog.vue
index e039b444..d0534b69 100644
--- a/src/views/basic/workplace/addBusTypeDialog.vue
+++ b/src/views/basic/workplace/addBusTypeDialog.vue
@@ -109,6 +109,14 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="12" class="el-col">
+          <el-form-item label="是否上传医保:" prop="uploadYb" class="query-form-item">
+            <el-select v-model="formData.uploadYb" style="width: 80%" placeholder="出入库方式">
+              <el-option label="是" :value="1"></el-option>
+              <el-option label="否" :value="0"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-row>
 
       <el-divider></el-divider>
@@ -347,6 +355,7 @@ export default {
         warnType: 2,
         workplaceType: 3,
         autoTag: 0,
+        uploadYb: 0,
         monopoly: 0,
         orderFinishVerify: 0,
         isPopular: 1,
diff --git a/src/views/basic/workplace/busTypeManage.vue b/src/views/basic/workplace/busTypeManage.vue
index 02242acd..042fec2f 100644
--- a/src/views/basic/workplace/busTypeManage.vue
+++ b/src/views/basic/workplace/busTypeManage.vue
@@ -95,6 +95,11 @@
             <span>{{ autoHandles[scope.row.autoHandle] }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="是否上传医保" prop="uploadYb" width="100">
+          <template slot-scope="scope">
+            <span>{{ uploadYb[scope.row.uploadYb] }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="发货方" prop="shipper" width="100">
           <template slot-scope="scope">
             <span>{{ shippers[scope.row.shipper] }}</span>
@@ -334,6 +339,10 @@ export default {
         1: '是',
         0: '否',
       },
+      uploadYb: {
+        1: '是',
+        0: '否',
+      },
       autoHandles: {
         'false': '否',
         'true' : '是',

From 72a58f387a7de98ff7dbbd539f69d73cc0daa69a Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 13 Dec 2024 18:38:21 +0800
Subject: [PATCH 5/5] =?UTF-8?q?12/13=20=E7=A0=81=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B41.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/DialogCheckCode.vue      | 154 +++++++--
 src/views/collect/DialogScanCodeDetail.vue | 356 +++++++++++----------
 2 files changed, 309 insertions(+), 201 deletions(-)

diff --git a/src/views/collect/DialogCheckCode.vue b/src/views/collect/DialogCheckCode.vue
index a4a22aa5..edf73198 100644
--- a/src/views/collect/DialogCheckCode.vue
+++ b/src/views/collect/DialogCheckCode.vue
@@ -83,7 +83,7 @@
       <!--单据业务详情-->
       <el-tab-pane>
         <span slot="label">单据 {{ orderData.billNo }}-追溯码详情</span>
-        <el-table :data="detailList" style="width: 100%;" highlight-current-row="true" border ref="multipleTable" >
+        <el-table :data="detailList" style="width: 100%;" highlight-current-row="true" border ref="multipleTable" :row-style="rowStyle">
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column label="追溯码" prop="code" width="160"></el-table-column>
           <el-table-column label="药品编码" prop="nameCode"></el-table-column>
@@ -97,6 +97,32 @@
           <el-table-column label="批准文号" prop="zczbhhzbapzbh"></el-table-column>
 
         </el-table>
+        <el-row style="text-align: right;font-size: 12px;margin-top: 10px">
+          <el-col span="24">
+            <div style="float: right">
+              <!--<td>-->
+              <!--  <div style="background-color: #F56C6C;width: 10px;height: 10px;"></div>-->
+              <!--</td>-->
+              <!--<td><span style="color: #6d6d6d;"><pre>未赋码  </pre></span></td>-->
+
+
+              <td>
+                <div style="background-color: #E6A23C;width: 10px;height: 10px;"></div>
+              </td>
+              <td>
+                <span style="color: #6d6d6d;"><pre>替换码  </pre></span>
+              </td>
+
+
+              <td>
+                <div style="background-color: #67C23A;width: 10px;height: 10px;"></div>
+              </td>
+              <td>
+                <span style="color: #6d6d6d;"><pre>已校验</pre></span>
+              </td>
+            </div>
+          </el-col>
+        </el-row>
         <pagination
           v-show="resultTotal>0"
           :total="resultTotal"
@@ -104,6 +130,8 @@
           :page.sync="codeQuery.page"
           @pagination="getResultDetailList"
         ></pagination>
+        <!-- 在表格下方添加说明 -->
+
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -143,6 +171,7 @@ export default {
       codeQuery: {
         billNo:null,
         code: null,
+        selectType:2,
         page: 1,
         limit: 10
       },
@@ -186,44 +215,95 @@ export default {
         if (res.code == 20000) {
           if (Array.isArray(res.data)) {
             this.printCodeResultList(res.data)
+            this.codeQuery.selectType = 1
+            this.getResultDetailList()
+            let codeList = res.data
+            let filterCodeList = codeList.filter(item => item.status === 5).map(item => item.code);;
+            if (filterCodeList.length > 0){
+              query.codeList = filterCodeList
+              this.replaceCode(query,1)
+            }
           } else {
             this.verifyFinish(1, res.data, res.message)
             this.checkCodeEndList.push(query.code)
+            this.codeQuery.selectType = 1
+            this.getResultDetailList()
             //码不对 全部码
             this.$message.success('校验成功')
           }
         }else if (res.code == 503){
-          //追溯码不存在 是否执行更换
-          this.$confirm('该追溯码不存在是否继续添加', '提示', {
-            confirmButtonText: '添加',
-            cancelButtonText: '取消',
-            type: 'warning',
-            center: true,
-            closeOnPressEscape: false,//按下 ESC 键关闭弹窗
-            closeOnClickModal: false,//点击遮罩关闭弹窗
-            distinguishCancelAndClose: true,//区分取消与关闭
-          }).then(() => {
-            scanCheckCodeReplace(query).then(res => {
-              if (res.code == 20000){
-                this.scanCode = ''
-                this.orderData.checkCodeConfirm = res.data.checkCodeConfirm
-                this.getInputFocus()
-                this.$message.success("添加成功")
-              }else {
-                this.$message.error("添加失败")
-              }
-            })
+          this.replaceCode(query,2)
+        } else if (res.code == 504){
+        //追溯码不存在 是否执行更换
+        this.$confirm('追溯码校验超出是否继续添加', '提示', {
+          confirmButtonText: '添加',
+          cancelButtonText: '取消',
+          type: 'warning',
+          center: true,
+          closeOnPressEscape: false,//按下 ESC 键关闭弹窗
+          closeOnClickModal: false,//点击遮罩关闭弹窗
+          distinguishCancelAndClose: true,//区分取消与关闭
+        }).then(() => {
+          scanCheckCodeReplace(query).then(res => {
+            if (res.code == 20000){
+              this.scanCode = ''
+              this.orderData.checkCodeConfirm = res.data.checkCodeConfirm
+              this.codeQuery.selectType = 1
+              this.getResultDetailList()
+              this.getInputFocus()
+              this.$message.success("添加成功")
+            }else {
+              this.$message.error("添加失败")
+            }
           })
-        }else {
+        })
+      }else {
           if (Array.isArray(res.data)) {
 
           } else {
-            this.verifyFinish(2, res.data, res.message)
+            this.scanCode = ''
+            this.getInputFocus()
+            // this.verifyFinish(2, res.data, res.message)
             this.$message.error(res.message)
           }
         }
       })
     },
+    replaceCode(query,type){
+      let title = ''
+      if (type == 1){
+        const codeStr = query.codeList.join('\n');
+         title = `${codeStr}该追溯码不存在是否继续添加`;
+      }else {
+         title = '该追溯码不存在是否继续添加'
+      }
+      //追溯码不存在 是否执行更换
+      this.$confirm(title, '提示', {
+        confirmButtonText: '添加',
+        cancelButtonText: '取消',
+        type: 'warning',
+        center: true,
+        closeOnPressEscape: false,//按下 ESC 键关闭弹窗
+        closeOnClickModal: false,//点击遮罩关闭弹窗
+        distinguishCancelAndClose: true,//区分取消与关闭
+      }).then(() => {
+        scanCheckCodeReplace(query).then(res => {
+          if (res.code == 20000){
+            this.scanCode = ''
+            this.orderData.checkCodeConfirm = res.data.checkCodeConfirm
+            this.codeQuery.selectType = 1
+            this.getResultDetailList()
+            this.getInputFocus()
+            this.$message.success("添加成功")
+          }else {
+            this.$message.error("添加失败")
+          }
+        })
+      }).catch(() => {
+        this.scanCode = ''
+        this.getInputFocus()
+      })
+    },
     verifyFinish(val, data, message) {
       if (val == 1) {
         this.errVisible = false
@@ -297,9 +377,13 @@ export default {
       for (let i = 0; i < vailCodeResultResponses.length; i++) {
         let data = vailCodeResultResponses[i]
         if (data.status == 1) {
+          this.scanResultType = "success"
           this.result = this.result + (isBlank(this.result) ? '' : ';') + vailCodeResultResponses[i].code + ':' + vailCodeResultResponses[i].sucMsg
         } else if (data.status == 2) {
           this.errResult = this.errResult + '\n' + vailCodeResultResponses[i].code + ':' + vailCodeResultResponses[i].errMsg
+        }else if (data.status == 5) {
+          this.scanResultType = "warning"
+          this.result = this.result + (isBlank(this.result) ? '' : ';') + vailCodeResultResponses[i].code + ':' + vailCodeResultResponses[i].errMsg
         }
       }
       if (!isBlank(this.result)) {
@@ -345,6 +429,7 @@ export default {
           this.detailList = res.data.list || []
           this.checkCodeList = this.detailList.map(item => item.code)
           this.resultTotal = res.data.total || 0;
+          this.codeQuery.selectType = 2
         } else {
           this.$message.error(res.message)
           this.detailList = []
@@ -407,6 +492,9 @@ export default {
           this.closeCodeCheckDialog()
           this.$message.success("校验完成")
         }else {
+          if (this.orderData.checkCodeConfirm == 1){
+            this.closeCodeCheckDialog()
+          }
           this.$message.error(res.message)
         }
       }).catch(() => {
@@ -417,28 +505,24 @@ export default {
       this.codeQuery = {
         billNo: null,
         code: null,
+        selectType:2,
         page: 1,
         limit: 10
       }
       this.errVisible = false
       this.successVisible = true
     },
-    rowStyle({ row, rowIndex }) {
+    rowStyle({row, rowIndex}) {
       let rowBackground = {}
-      if (this.checkCodeEndList.length == 0) {
-        rowBackground.color = '#F56C6C'
-        rowBackground.height = '38px'
-        return rowBackground
-      }
-      if (this.checkCodeEndList.includes(row.code)) {
+      if (row.scanCodeCheckStatus == 1) {
         rowBackground.color = '#56a717'
       }
-      if (!this.checkCodeEndList.includes(row.code)) {
-        rowBackground.color = '#F56C6C'
+      if (row.scanCodeCheckStatus == 3) {
+        rowBackground.color = '#E6A23C';
       }
-      rowBackground.height = '38px'
-      return rowBackground
-    }
+      rowBackground.height = "38px"
+      return rowBackground;
+    },
   },
   created() {
     this.filterQuery.billNo = this.orderData.billNo
diff --git a/src/views/collect/DialogScanCodeDetail.vue b/src/views/collect/DialogScanCodeDetail.vue
index 7d80b4d7..37220b9f 100644
--- a/src/views/collect/DialogScanCodeDetail.vue
+++ b/src/views/collect/DialogScanCodeDetail.vue
@@ -3,30 +3,31 @@
     <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
               :row-style="rowStyle"
               border
-              ref="multipleTable">
-<!--      <el-table-column-->
-<!--        type="selection"-->
-<!--        width="55">-->
-<!--      </el-table-column>-->
+              ref="multipleTable"
+    >
+      <!--      <el-table-column-->
+      <!--        type="selection"-->
+      <!--        width="55">-->
+      <!--      </el-table-column>-->
       <el-table-column label="序号" type="index" width="55"></el-table-column>
       <el-table-column
         label="追溯码"
-        prop="udiCode"
+        prop="code"
         width="280"
         show-overflow-tooltip
       ></el-table-column>
-<!--      <el-table-column-->
-<!--        label="产品通用名"-->
-<!--        prop="productName"-->
-<!--        width="160"-->
-<!--        show-overflow-tooltip-->
-<!--      ></el-table-column>-->
-<!--      <el-table-column-->
-<!--        label="规格型号"-->
-<!--        prop="ggxh"-->
-<!--        width="160"-->
-<!--        show-overflow-tooltip-->
-<!--      ></el-table-column>-->
+      <!--      <el-table-column-->
+      <!--        label="产品通用名"-->
+      <!--        prop="productName"-->
+      <!--        width="160"-->
+      <!--        show-overflow-tooltip-->
+      <!--      ></el-table-column>-->
+      <!--      <el-table-column-->
+      <!--        label="规格型号"-->
+      <!--        prop="ggxh"-->
+      <!--        width="160"-->
+      <!--        show-overflow-tooltip-->
+      <!--      ></el-table-column>-->
       <el-table-column
         label="批次号"
         prop="batchNo"
@@ -39,18 +40,18 @@
       <!--        width="120"-->
       <!--        show-overflow-tooltip-->
       <!--      ></el-table-column>-->
-      <el-table-column
-        label="扫码数量"
-        prop="scanCount"
-        width="80"
-        show-overflow-tooltip
-      ></el-table-column>
-<!--      <el-table-column-->
-<!--        label="实际数量"-->
-<!--        prop="reCount"-->
-<!--        width="80"-->
-<!--        show-overflow-tooltip-->
-<!--      ></el-table-column>-->
+      <!--<el-table-column-->
+      <!--  label="扫码数量"-->
+      <!--  prop="scanCount"-->
+      <!--  width="80"-->
+      <!--  show-overflow-tooltip-->
+      <!--&gt;</el-table-column>-->
+      <!--      <el-table-column-->
+      <!--        label="实际数量"-->
+      <!--        prop="reCount"-->
+      <!--        width="80"-->
+      <!--        show-overflow-tooltip-->
+      <!--      ></el-table-column>-->
       <el-table-column
         label="生产日期"
         prop="productDate"
@@ -77,88 +78,89 @@
       <!--        show-overflow-tooltip-->
       <!--      ></el-table-column>-->
 
-<!--      <el-table-column label="操作" width="140" fixed="right">-->
-<!--        <template slot-scope="scope">-->
-<!--          <el-button-->
-<!--            type="text"-->
-<!--            size="small"-->
-<!--            @click.native.stop="deleteCode(scope.$index, scope.row)"-->
-<!--          >减一-->
-<!--          </el-button-->
-<!--          >-->
-<!--          &lt;!&ndash;          <el-button&ndash;&gt;-->
-<!--          &lt;!&ndash;            type="text"&ndash;&gt;-->
-<!--          &lt;!&ndash;            size="small"&ndash;&gt;-->
-<!--          &lt;!&ndash;            :disabled="scope.row.relId!=null"&ndash;&gt;-->
-<!--          &lt;!&ndash;            @click.native.stop="bindRl(scope.row)"&ndash;&gt;-->
-<!--          &lt;!&ndash;          >绑定产品&ndash;&gt;-->
-<!--          &lt;!&ndash;          </el-button&ndash;&gt;-->
-<!--          &lt;!&ndash;          >&ndash;&gt;-->
-<!--          &lt;!&ndash;          <el-button&ndash;&gt;-->
-<!--          &lt;!&ndash;            type="text"&ndash;&gt;-->
-<!--          &lt;!&ndash;            size="small"&ndash;&gt;-->
-<!--          &lt;!&ndash;            :disabled="scope.row.supId!=null"&ndash;&gt;-->
-<!--          &lt;!&ndash;            @click.native.stop="handleUnitClick(scope.row)"&ndash;&gt;-->
-<!--          &lt;!&ndash;          >绑定供应商&ndash;&gt;-->
-<!--          &lt;!&ndash;          </el-button&ndash;&gt;-->
-<!--          &lt;!&ndash;          >&ndash;&gt;-->
-<!--          <el-button-->
-<!--            type="text"-->
-<!--            size="small"-->
-<!--            @click.native.stop="editCode(scope.row)"-->
-<!--          >编辑-->
-<!--          </el-button-->
-<!--          >-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <!--      <el-table-column label="操作" width="140" fixed="right">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <el-button-->
+      <!--            type="text"-->
+      <!--            size="small"-->
+      <!--            @click.native.stop="deleteCode(scope.$index, scope.row)"-->
+      <!--          >减一-->
+      <!--          </el-button-->
+      <!--          >-->
+      <!--          &lt;!&ndash;          <el-button&ndash;&gt;-->
+      <!--          &lt;!&ndash;            type="text"&ndash;&gt;-->
+      <!--          &lt;!&ndash;            size="small"&ndash;&gt;-->
+      <!--          &lt;!&ndash;            :disabled="scope.row.relId!=null"&ndash;&gt;-->
+      <!--          &lt;!&ndash;            @click.native.stop="bindRl(scope.row)"&ndash;&gt;-->
+      <!--          &lt;!&ndash;          >绑定产品&ndash;&gt;-->
+      <!--          &lt;!&ndash;          </el-button&ndash;&gt;-->
+      <!--          &lt;!&ndash;          >&ndash;&gt;-->
+      <!--          &lt;!&ndash;          <el-button&ndash;&gt;-->
+      <!--          &lt;!&ndash;            type="text"&ndash;&gt;-->
+      <!--          &lt;!&ndash;            size="small"&ndash;&gt;-->
+      <!--          &lt;!&ndash;            :disabled="scope.row.supId!=null"&ndash;&gt;-->
+      <!--          &lt;!&ndash;            @click.native.stop="handleUnitClick(scope.row)"&ndash;&gt;-->
+      <!--          &lt;!&ndash;          >绑定供应商&ndash;&gt;-->
+      <!--          &lt;!&ndash;          </el-button&ndash;&gt;-->
+      <!--          &lt;!&ndash;          >&ndash;&gt;-->
+      <!--          <el-button-->
+      <!--            type="text"-->
+      <!--            size="small"-->
+      <!--            @click.native.stop="editCode(scope.row)"-->
+      <!--          >编辑-->
+      <!--          </el-button-->
+      <!--          >-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
     </el-table>
-    <!--<pagination-->
-    <!--  v-show="total>0"-->
-    <!--  :total="total"-->
-    <!--  :limit.sync="filterQuery.limit"-->
-    <!--  :page.sync="filterQuery.page"-->
-    <!--  @pagination="handleCurrentChange"-->
-    <!--&gt;</pagination>-->
-<!--    <el-row v-if="viewType==7">-->
-<!--      <el-col span="10">-->
-<!--        <div style="float: left">-->
-<!--          <td>-->
-<!--            <div style="background-color: #FC4A45;width: 10px;height: 10px"></div>-->
-<!--          </td>-->
-<!--          <td><span>红色:多余条码</span></td>-->
-<!--          <td>-->
-<!--            <div style="background-color: #F4BD25;width: 10px;height: 10px;margin-left: 15px"></div>-->
-<!--          </td>-->
-<!--          <td>-->
-<!--            <span>黄色:包含多余条码</span>-->
-<!--          </td>-->
+    <pagination
+      v-show="codeTotal>0"
+      :total="codeTotal"
+      :limit.sync="codeQuery.limit"
+      :page.sync="codeQuery.page"
+      @pagination="getCodeList"
+    ></pagination>
+    <!--    <el-row v-if="viewType==7">-->
+    <!--      <el-col span="10">-->
+    <!--        <div style="float: left">-->
+    <!--          <td>-->
+    <!--            <div style="background-color: #FC4A45;width: 10px;height: 10px"></div>-->
+    <!--          </td>-->
+    <!--          <td><span>红色:多余条码</span></td>-->
+    <!--          <td>-->
+    <!--            <div style="background-color: #F4BD25;width: 10px;height: 10px;margin-left: 15px"></div>-->
+    <!--          </td>-->
+    <!--          <td>-->
+    <!--            <span>黄色:包含多余条码</span>-->
+    <!--          </td>-->
 
-<!--        </div>-->
-<!--      </el-col>-->
+    <!--        </div>-->
+    <!--      </el-col>-->
 
 
-<!--    </el-row>-->
+    <!--    </el-row>-->
 
   </div>
 </template>
 
 <script>
-import {deleteCodesTempById, errorCodeList, updateCodeBindSup} from "@/api/inout/order";
+import { deleteCodesTempById, errorCodeList, updateCodeBindSup } from '@/api/inout/order'
 import { getCodeDetail } from '@/api/collect/collectOrder'
 
-import {parseTime} from "@/utils/coTools";
-import {getCheckDetailCodes} from "@/api/inout/orderDetailCode";
+import { parseTime } from '@/utils/coTools'
+import { getCheckDetailCodes } from '@/api/inout/orderDetailCode'
+import { getCodeEndList } from '@/api/collect/IoCollectCodeSelect'
 
 export default {
-  name: "PanelDestroyCodeDetail",
+  name: 'PanelDestroyCodeDetail',
   props: {
     prescribeData: {
       type: Object,
-      required: true,
+      required: true
     },
     refreshPanel: {
       type: Function,
-      required: true,
+      required: true
     },
     // selectRlTitle: {
     //   type: Object,
@@ -174,7 +176,7 @@ export default {
     // },
     viewType: {
       type: Object,
-      required: true,
+      required: true
     }
 
   },
@@ -182,8 +184,8 @@ export default {
     return {
       loading: false,
       query: {
-        code: "",
-        corpOrderId: "",
+        code: '',
+        corpOrderId: ''
       },
       codeDetail: null,
       codeArray: [],
@@ -194,66 +196,87 @@ export default {
       editCodeVisible: false,
       editOriginCodeVisible: false,
       fromCorp: null,
+      codeQuery: {
+        code: '',
+        billNo: '',
+        page: 1,
+        limit: 20,
+        selectType: 1,
+        relId: ''
+      },
+      codeTotal:0
     }
   },
   methods: {
     getCodeList() {
-      this.loading = true;
-
-      getCodeDetail({ id:this.prescribeData.id }) //查找该单号下的所有条码
-          .then((response) => {
-            this.codeArray = response.data || [];
-            this.loading = false;
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-          });
-
+      this.loading = true
+      //
+      // getCodeDetail({ id:this.prescribeData.id }) //查找该单号下的所有条码
+      //     .then((response) => {
+      //       this.codeArray = response.data || [];
+      //       this.loading = false;
+      //     })
+      //     .catch(() => {
+      //       this.loading = false;
+      //       this.list = [];
+      //     });
+      this.codeQuery.billNo = this.prescribeData.orderIdFk
+      this.codeQuery.relId = this.prescribeData.relId
+      getCodeEndList(this.codeQuery).then(res => {
+        if (res.code == 20000) {
+          this.codeArray = res.data.list || []
+          this.codeTotal= res.data.total || 0
+          this.loading = false
+        } else {
+          this.loading = false
+          this.codeTotal = 0
+          this.codeArray = []
+        }
+      })
 
     },
 
     deleteCode(index, row) {
-      this.$confirm("是否确定移除一个条码?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm('是否确定移除一个条码?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       }).then(() => {
-        this.loading = true;
+        this.loading = true
         let tQuery = {
           id: row.id
         }
         deleteCodesTempById(tQuery)
           .then((response) => {
             if (response.code === 20000) {
-              this.refreshPanel();
+              this.refreshPanel()
             } else {
-              this.$message.error(response.message);
+              this.$message.error(response.message)
             }
-            this.loading = false;
-          });
+            this.loading = false
+          })
       }).catch(() => {
-      });
+      })
     },
 
     bindRl(val) {
-      this.curRow = val;
-      this.fromCorp = this.idQuery.fromCorp;
-      this.selectRlVisible = true;
+      this.curRow = val
+      this.fromCorp = this.idQuery.fromCorp
+      this.selectRlVisible = true
     },
 
     handleUnitClick(row) {
-      this.curRow = row;
-      this.dialogTableVisible = true;
+      this.curRow = row
+      this.dialogTableVisible = true
     },
 
     editCode(row) {
-      this.editTitle = "编辑条码";
-      this.codeDetail = row;
-      this.editCodeVisible = true;
+      this.editTitle = '编辑条码'
+      this.codeDetail = row
+      this.editCodeVisible = true
     },
 
-    rowStyle({row, rowIndex}) {
+    rowStyle({ row, rowIndex }) {
       // let rowBackground = {};
       // if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.relId)) {
       //   rowBackground.color = '#f60303';
@@ -270,77 +293,78 @@ export default {
       let query = {
         id: this.curRow.id,
         relId: row.id,
-        mySupId: row.unitFk,
-      };
+        mySupId: row.unitFk
+      }
       updateCodeBindSup(query).then((response) => {
         if (response.code == 20000) {
-          this.$message.success("绑定成功");
-          this.orderFormData.id = this.curRow.orderId;
-          this.closeBindDialog();
-          this.getCodeList();
+          this.$message.success('绑定成功')
+          this.orderFormData.id = this.curRow.orderId
+          this.closeBindDialog()
+          this.getCodeList()
         } else {
           if (response.code == 503) {
-            this.curRow = response.data;
-            this.orderFormData.id = this.curRow.orderId;
-            this.getCodeList();
-            this.selectUnitTitle = response.message;
-            this.handleUnitClick(response.data);
-          } else
-            this.$message.error(response.message);
+            this.curRow = response.data
+            this.orderFormData.id = this.curRow.orderId
+            this.getCodeList()
+            this.selectUnitTitle = response.message
+            this.handleUnitClick(response.data)
+          } else {
+            this.$message.error(response.message)
+          }
         }
       }).catch(() => {
 
-      });
+      })
     },
 
     selectSupUnit(row) {
       let query = {
         id: this.curRow.id,
-        supId: row.erpId,
-      };
+        supId: row.erpId
+      }
       updateCodeBindSup(query).then((response) => {
         if (response.code == 20000) {
-          this.$message.success("绑定成功");
-          this.idQuery.id = this.curRow.orderId;
-          this.getCodeList();
-          this.refreshPanel();
+          this.$message.success('绑定成功')
+          this.idQuery.id = this.curRow.orderId
+          this.getCodeList()
+          this.refreshPanel()
         } else {
-          this.$message.error(response.message);
+          this.$message.error(response.message)
         }
       }).catch(() => {
-      });
+      })
     },
 
-
     closeBindDialog() {
-      this.selectRlVisible = false;
-      this.dialogTableVisible = false;
-      this.refreshPanel();
+      this.selectRlVisible = false
+      this.dialogTableVisible = false
+      this.refreshPanel()
     },
 
     closeCodeDialog() {
-      this.editCodeVisible = false;
-      this.editOriginCodeVisible = false;
-      this.refreshPanel();
+      this.editCodeVisible = false
+      this.editOriginCodeVisible = false
+      this.refreshPanel()
     },
 
     repeatAddCode(editData) {
-      let tQuery = editData;
-      tQuery.orderId = this.orderFormData.id;
-      tQuery.actDate = parseTime(this.orderFormData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
-      tQuery.action = this.orderFormData.action;
-      this.closeCodeDialog();
+      let tQuery = editData
+      tQuery.orderId = this.orderFormData.id
+      tQuery.actDate = parseTime(this.orderFormData.actDate, '{y}-{m}-{d} {h}:{i}:{s}')
+      tQuery.action = this.orderFormData.action
+      this.closeCodeDialog()
 
-    },
+    }
 
   },
   created() {
-    if (this.prescribeData.id != null)
-      this.getCodeList();
+    console.log('hahhahahah', this.prescribeData)
+    if (this.prescribeData.id != null) {
+      this.getCodeList()
+    }
   },
 
-  components: {
-  },
+  components: {}
 }
 </script>