From b1727de5dc1f38d39a96677574001d8f17a63f19 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 19 Dec 2024 11:34:11 +0800
Subject: [PATCH] =?UTF-8?q?12/19=20=E5=8D=95=E6=8D=AE=E5=AE=A1=E6=A0=B8=20?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E8=AF=A6=E6=83=851.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/workplace/busTypeManage.vue   | 13 +++--
 src/views/basic/workplace/workplaceManage.vue | 13 +++--
 src/views/collect/DialogCheckCode.vue         | 13 +++--
 .../collect/IocCollectOrderCheckCode.vue      | 53 +++++++++++++++----
 src/views/collect/PanelOrderEndSearch.vue     | 15 +++++-
 5 files changed, 78 insertions(+), 29 deletions(-)

diff --git a/src/views/basic/workplace/busTypeManage.vue b/src/views/basic/workplace/busTypeManage.vue
index 042fec2f..c0893980 100644
--- a/src/views/basic/workplace/busTypeManage.vue
+++ b/src/views/basic/workplace/busTypeManage.vue
@@ -353,13 +353,12 @@ export default {
         3: '用户所属仓库',
       },
       consignees: {
-        1: '原始单据的收货方',
-        2: '原始单据的发货方',
-        3: '供应商',
-        4: '客户',
-        5: '特殊往来',
-        6: '内部科室',
-        7: '填写',
+        1: '客户',
+        2: '供应商',
+        3: '内部科室',
+        4: '特殊往来',
+        5: '原始单据的收货方',
+        6: '原始单据的发货方',
       },
       userList: [],
       userLoading: false,
diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue
index 763faf96..2993fb75 100644
--- a/src/views/basic/workplace/workplaceManage.vue
+++ b/src/views/basic/workplace/workplaceManage.vue
@@ -912,13 +912,12 @@ export default {
         'true' : '是',
       },
       consignees: {
-        1: '原始单据的收货方',
-        2: '原始单据的发货方',
-        3: '供应商',
-        4: '客户',
-        5: '特殊往来',
-        6: '内部科室',
-        7: '填写',
+        1: '客户',
+        2: '供应商',
+        3: '内部科室',
+        4: '特殊往来',
+        5: '原始单据的收货方',
+        6: '原始单据的发货方',
       },
       userList: [],
       userLoading: false,
diff --git a/src/views/collect/DialogCheckCode.vue b/src/views/collect/DialogCheckCode.vue
index edf73198..c96a21c1 100644
--- a/src/views/collect/DialogCheckCode.vue
+++ b/src/views/collect/DialogCheckCode.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card>
-      <el-button-group  style="display: flex; justify-content: flex-end;">
+      <el-button-group  style="display: flex; justify-content: flex-end;" v-if="type == 1">
         <el-button
           type="primary"
           @click.native="confirmCheckOrder()"
@@ -11,7 +11,7 @@
       <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">-->
-        <el-row :gutter="0" style="margin-top: 5px">
+        <el-row :gutter="0" style="margin-top: 5px" v-if="type == 1">
           <el-col :span="20">
             <el-form-item prop="code" label="扫码校验" label-width="80px">
               <el-input
@@ -40,7 +40,7 @@
           </el-col>
         </el-row>
         <el-alert
-          v-if="successVisible"
+          v-if="successVisible && type == 1"
           :title="scanTitle"
           :type="scanResultType"
           :closable="false"
@@ -57,7 +57,7 @@
         <!--  :description="warnResult">-->
         <!--</el-alert>-->
         <el-alert
-          v-if="errVisible"
+          v-if="errVisible && type == 1"
           title="错误信息:"
           type="error"
           :closable="false"
@@ -154,6 +154,11 @@ export default {
       type: Function,
       required: true
     },
+    type: {
+      type: Object,
+      default: null,
+      required: true
+    },
   },
   data() {
     return {
diff --git a/src/views/collect/IocCollectOrderCheckCode.vue b/src/views/collect/IocCollectOrderCheckCode.vue
index 4338673d..e4afc661 100644
--- a/src/views/collect/IocCollectOrderCheckCode.vue
+++ b/src/views/collect/IocCollectOrderCheckCode.vue
@@ -154,6 +154,30 @@
             @pagination="getCodeList"
           ></pagination>
         </el-tab-pane>
+        <el-tab-pane>
+          <span slot="label">单据 {{ orderData.billNo }}-业务详情</span>
+          <el-table :data="busDataList" style="width: 100%;" highlight-current-row="true" border ref="multipleTable"
+          >
+            <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column label="药品编码" prop="nameCode"></el-table-column>
+            <el-table-column label="产品通用名称" prop="cpmctymc" width="120"></el-table-column>
+            <el-table-column label="批准文号" prop="zczbhhzbapzbh"></el-table-column>
+            <el-table-column label="包装规格" prop="spec" width="80"></el-table-column>
+            <el-table-column label="批次号" prop="batchNo"></el-table-column>
+            <el-table-column label="生产日期" prop="productDate"></el-table-column>
+            <el-table-column label="失效日期" prop="expireDate"></el-table-column>
+            <el-table-column label="医保编码" prop="ybbm"></el-table-column>
+            <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
+            <!--<el-table-column label="扫码数量" prop="scanActCount"></el-table-column>-->
+          </el-table>
+          <pagination
+            v-show="busDataTotal>0"
+            :total="busDataTotal"
+            :limit.sync="busQuery.limit"
+            :page.sync="busQuery.page"
+            @pagination="getBizDetailList"
+          ></pagination>
+        </el-tab-pane>
       </el-tabs>
 
 
@@ -198,6 +222,13 @@ export default {
         page: 1,
         limit: 10
       },
+      busQuery: {
+        billNo: null,
+        orderIdFk: null,
+        code: null,
+        page: 1,
+        limit: 10
+      },
       filterQuery: {
         code: '',
         billNo: null,
@@ -216,7 +247,9 @@ export default {
       curRow: null,
       codeList: [],
 
-      checkCodeList: []
+      checkCodeList: [],
+      busDataList:[],
+      busDataTotal:0
 
     }
   },
@@ -273,6 +306,7 @@ export default {
           this.$refs.inputRef.select()
           this.scanCode = ''
           this.getCodeList()
+          this.getBizDetailList()
         }else {
           this.$refs.inputRef.focus()
           this.$refs.inputRef.select()
@@ -303,21 +337,19 @@ export default {
       })
     },
     getBizDetailList() {
-      let preQuery = {}
-      if (this.filterQuery == null) {
-        return
-      }
-      if (this.filterQuery != null) {
-        preQuery = {
 
-          orderIdFk: this.filterQuery.billNo
-        }
+      if (this.orderData != null) {
+        // this.codeQuery.page = 1
+        this.busQuery.orderIdFk = this.orderData.billNo
+        // this.codeQuery.bizIdFk = this.bizId
       }
-      orderDetail(preQuery).then(res => {
+      orderDetail(this.busQuery).then(res => {
         if (res.code != 20000) {
           this.$message.error(res.message)
           return
         }
+        this.busDataList = res.data.list
+        this.busDataTotal = res.data.total
       }).catch(() => {
         this.$message.error('数据加载失败')
       })
@@ -505,6 +537,7 @@ export default {
       }
 
     },
+
     batchVailCode(params) {
       // batchVailCode(params).then((res) => {
       //   if (res.code === 20000) {
diff --git a/src/views/collect/PanelOrderEndSearch.vue b/src/views/collect/PanelOrderEndSearch.vue
index e0d9e8c3..b72c1d86 100644
--- a/src/views/collect/PanelOrderEndSearch.vue
+++ b/src/views/collect/PanelOrderEndSearch.vue
@@ -273,7 +273,7 @@
     </el-tabs>
 
     <el-dialog
-      title="扫码校验"
+      :title="scanTitleMap[scanTitle]"
       :visible.sync="codeCheckVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
@@ -285,6 +285,7 @@
       <DialogCheckCode
         :orderData="curRow"
         :closeCodeCheckDialog="closeCodeCheckDialog"
+        :type="scanTitle"
       >
 
       </DialogCheckCode>
@@ -414,6 +415,11 @@ export default {
 
       //码校验数据
 
+      scanTitle: 1,
+      scanTitleMap: {
+        1 : '扫码校验',
+        2 : '校验详情'
+      }
     }
   },
 
@@ -562,6 +568,13 @@ export default {
 
     //码校验
     codeCheckClick(_this,row){
+      _this.scanTitle = 1
+      _this.curRow = row
+      _this.codeCheckVisible = true
+    },
+    //校验详情
+    codeCheckDetail(_this,row){
+      _this.scanTitle = 2
       _this.curRow = row
       _this.codeCheckVisible = true
     },