From 4dcd203c10b00653e850ba1d79819d0baa3650aa Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Tue, 18 Feb 2025 15:16:04 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=EF=BC=8C=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=BC=A0=E9=80=92=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/IocCollectOrderCheckCode.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/collect/IocCollectOrderCheckCode.vue b/src/views/collect/IocCollectOrderCheckCode.vue
index fa27c20e..eccd61c4 100644
--- a/src/views/collect/IocCollectOrderCheckCode.vue
+++ b/src/views/collect/IocCollectOrderCheckCode.vue
@@ -204,7 +204,7 @@
       <selectPrescribeDialog
         ref="childRef"
         :workPlaceCode="null"
-        :busType="this.orderData.busType"
+        :busType="this.$route.query.busType"
         :fromCorp="this.orderData.fromCorp"
         :confirmSelect="this.confirmSelect"
         :closeDialog="this.closeDialog"
@@ -229,7 +229,7 @@ import {
 } from '@/api/collect/collectOrder'
 import {checkCollectOrderManCode, draftOrder, finishCheckOrder, updateOrder} from '@/api/collect/splitCreateOrder'
 import selectPrescribeDialog from "@/views/collect/selectCollectOrderDialog";
-import { getSet } from '@/api/collect/collectSet'
+import {getSet} from '@/api/collect/collectSet'
 
 export default {
   name: 'IocCollectOrderCheckCode',
@@ -337,7 +337,7 @@ export default {
       if (this.filterQuery.udiCode.includes(';')) {
         const codeArray = this.filterQuery.udiCode.split(';')
         const verify = this.verifyScanCount(codeArray)
-        if (verify){
+        if (verify) {
           this.filterQuery.udiCodeList = codeArray
           this.filterQuery.udiCode = ''
           this.filterQuery.orderIdFk = this.orderData.billNo
@@ -875,7 +875,9 @@ export default {
       this.scanTitle = '扫码结果:'
       this.scanResultType = 'success'
       this.curRow = null
-      this.orderData = {}
+      this.orderData = {
+        busType: this.$route.query.busType
+      }
       this.codeCount = 0
       this.workplaceId = Number(this.$route.query.workplaceId)
       this.codeList = []
@@ -889,7 +891,7 @@ export default {
       this.getInputFocus()
       this.selectSysParam()
     },
-    verifyScanCount(codeArray){
+    verifyScanCount(codeArray) {
       //判断扫码数量是否超出或少于设置扫码数量
       if (this.collectSet.scanMaxCount != null && this.collectSet.scanMaxCount != 0) {
         if (this.collectSet.scanMaxCount > codeArray.length) {

From db75cca9e052c1318fe68b60996df21eb7d6e08c Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 18 Feb 2025 16:53:25 +0800
Subject: [PATCH 2/9] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/IoCreateOrder.vue           |  7 +-
 .../collect/IocCollectOrderCheckCode.vue      | 87 +++++++++++++------
 2 files changed, 67 insertions(+), 27 deletions(-)

diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 95ce0742..84d34db8 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -26,7 +26,7 @@
             </el-button>
             <el-button size="mini" type="primary" @click.native="deleteCode" :loading="submitLoading"
                        v-if="splitType=='out' && labelName == 1" style="margin-right: 8px;border-radius: 5%;"
-                       v-show="isLinkDisabled" :disabled="orderFormData.billNo == null"
+                       v-show="isLinkDisabled" :disabled="orderFormData.billNo == null || redMesg"
             >扫码剔除
             </el-button>
             <el-button size="mini" type="primary" @click.native="overdeleteCode" :loading="submitLoading"
@@ -40,7 +40,8 @@
             >选入已完成单据
             </el-button>
             <el-button size="mini" type="primary" @click.native="chooseDraftOrder()" :loading="submitLoading"
-                       style="margin-right: 8px;border-radius: 5%;" v-show="isLinkDisabled"
+                       style="margin-right: 8px;border-radius: 5%;" v-show="isLinkDisabled "
+                       :disabled="redMesg"
             >选入单据
             </el-button>
             <el-button size="mini" type="primary" @click.native="delOrder()" :loading="submitLoading"
@@ -50,10 +51,12 @@
             </el-button>
             <el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading"
                        v-show="isLinkDisabled" style="margin-right: 8px;border-radius: 5%;"
+                       :disabled="redMesg"
             >保存
             </el-button>
             <el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
                        v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;"
+                       :disabled="redMesg"
             >上货完成
             </el-button>
             <!-- <el-button size="mini" type="primary" @click.native="" :loading="submitLoading" v-show="isLinkDisabled"
diff --git a/src/views/collect/IocCollectOrderCheckCode.vue b/src/views/collect/IocCollectOrderCheckCode.vue
index eccd61c4..a9715c35 100644
--- a/src/views/collect/IocCollectOrderCheckCode.vue
+++ b/src/views/collect/IocCollectOrderCheckCode.vue
@@ -136,6 +136,52 @@
 
       <el-tabs type="border-card" style="margin: 15px">
         <!--单据业务详情-->
+
+        <el-tab-pane>
+          <span slot="label">单据 {{ orderData.billNo }}-业务详情</span>
+          <el-table :data="busDataList" 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="cpmctymc" width="120"></el-table-column>
+            <el-table-column label="制剂规格" prop="prepnSpec" width="80"></el-table-column>
+            <el-table-column label="包装规格" prop="spec" width="80"></el-table-column>
+<!--            <el-table-column label="扫码数量" prop="scanActCount" width="80"></el-table-column>-->
+<!--            <el-table-column label="单据数量" prop="count" width="80"></el-table-column>-->
+            <!-- 扫码数量列 -->
+            <el-table-column label="扫码数量" width="80">
+              <template slot-scope="scope">
+        <span :style="getScanActCountStyle(scope.row)">
+          <strong>{{ scope.row.scanActCount }}</strong>
+        </span>
+              </template>
+            </el-table-column>
+            <!-- 单据数量列 -->
+            <el-table-column label="单据数量" prop="count" width="80">
+              <template slot-scope="scope">
+                <strong>{{ scope.row.count }}</strong>
+              </template>
+            </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="zczbhhzbapzbh"></el-table-column>
+            <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
+            <el-table-column label="医保编码" prop="ybbm"></el-table-column>
+            <el-table-column label="药品编码" prop="nameCode"></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-tab-pane>
           <span slot="label">单据 {{ orderData.billNo }}-追溯码详情</span>
           <el-table :data="detailList" style="width: 100%;" highlight-current-row="true" border ref="multipleTable"
@@ -162,31 +208,7 @@
             @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="count" 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>
 
 
@@ -298,6 +320,21 @@ export default {
     }
   },
   methods: {
+    getScanActCountStyle(row) {
+      const progress = row.scanActCount / row.count;
+      let color;
+      if (progress < 0.5) {
+        color = 'red'; // 进度小于50%为红色
+      } else if (progress < 1.0) {
+        color = 'orange'; // 进度在50%到100%之间为橙色
+      } else {
+        color = 'green'; // 进度达到或超过100%为绿色
+      }
+      return {
+        color,
+        fontWeight: 'bold', // 字号加粗
+      };
+    },
     enterKey() {
       // this.result = "\n"
       this.errResult = ''

From a9e1c44d777d1aff1426a8372a13c177b201a18a Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 18 Feb 2025 17:05:41 +0800
Subject: [PATCH 3/9] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/IoCreateOrder.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 84d34db8..25cceb13 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -26,7 +26,7 @@
             </el-button>
             <el-button size="mini" type="primary" @click.native="deleteCode" :loading="submitLoading"
                        v-if="splitType=='out' && labelName == 1" style="margin-right: 8px;border-radius: 5%;"
-                       v-show="isLinkDisabled" :disabled="orderFormData.billNo == null || redMesg"
+                       v-show="isLinkDisabled" :disabled="orderFormData.billNo == null || (splitType=='out' && redMesg)"
             >扫码剔除
             </el-button>
             <el-button size="mini" type="primary" @click.native="overdeleteCode" :loading="submitLoading"
@@ -41,7 +41,7 @@
             </el-button>
             <el-button size="mini" type="primary" @click.native="chooseDraftOrder()" :loading="submitLoading"
                        style="margin-right: 8px;border-radius: 5%;" v-show="isLinkDisabled "
-                       :disabled="redMesg"
+                       :disabled="splitType=='out' && redMesg"
             >选入单据
             </el-button>
             <el-button size="mini" type="primary" @click.native="delOrder()" :loading="submitLoading"
@@ -51,12 +51,12 @@
             </el-button>
             <el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading"
                        v-show="isLinkDisabled" style="margin-right: 8px;border-radius: 5%;"
-                       :disabled="redMesg"
+                       :disabled="splitType=='out' && redMesg"
             >保存
             </el-button>
             <el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
                        v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;"
-                       :disabled="redMesg"
+                       :disabled="splitType=='out' && redMesg"
             >上货完成
             </el-button>
             <!-- <el-button size="mini" type="primary" @click.native="" :loading="submitLoading" v-show="isLinkDisabled"

From 5212a6986ffc07913b6f0f18182be38530d231d8 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 18 Feb 2025 18:06:32 +0800
Subject: [PATCH 4/9] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/IocCollectOrderCheckCode.vue | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/views/collect/IocCollectOrderCheckCode.vue b/src/views/collect/IocCollectOrderCheckCode.vue
index a9715c35..0178da34 100644
--- a/src/views/collect/IocCollectOrderCheckCode.vue
+++ b/src/views/collect/IocCollectOrderCheckCode.vue
@@ -549,6 +549,21 @@ export default {
             this.codeCount = this.codeCount + query.udiCodeList.length
             this.checkCodeEnd()
           } else {
+
+            if ( this.busDataList.length > 0){
+              this.busDataList.forEach(item => {
+                // 检查 item 的 id 是否与 bizId 匹配
+                if (item.id == res.data.bizIdFk) {
+                  // 如果匹配，递增计数器
+                  if ( item.scanActCount == null){
+                    item.scanActCount = 1;
+                  }else {
+                    item.scanActCount += 1;
+                  }
+                }
+              });
+            }
+
             //如果校验成功
             this.codeCount = this.codeCount + 1
             this.checkCodeList.push(res.data.code)

From ac928a91efac198f67785dc7889081e292d65150 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 18 Feb 2025 18:19:23 +0800
Subject: [PATCH 5/9] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IocCollectOrderCheckCode.vue      | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/views/collect/IocCollectOrderCheckCode.vue b/src/views/collect/IocCollectOrderCheckCode.vue
index 0178da34..b779a055 100644
--- a/src/views/collect/IocCollectOrderCheckCode.vue
+++ b/src/views/collect/IocCollectOrderCheckCode.vue
@@ -140,7 +140,7 @@
         <el-tab-pane>
           <span slot="label">单据 {{ orderData.billNo }}-业务详情</span>
           <el-table :data="busDataList" style="width: 100%;" highlight-current-row="true" border ref="multipleTable"
-                    :row-style="rowStyle"
+                    :row-style="rowStyleBiz"
           >
             <el-table-column label="序号" type="index"></el-table-column>
             <el-table-column label="产品通用名称" prop="cpmctymc" width="120"></el-table-column>
@@ -321,17 +321,17 @@ export default {
   },
   methods: {
     getScanActCountStyle(row) {
-      const progress = row.scanActCount / row.count;
-      let color;
-      if (progress < 0.5) {
-        color = 'red'; // 进度小于50%为红色
-      } else if (progress < 1.0) {
-        color = 'orange'; // 进度在50%到100%之间为橙色
-      } else {
-        color = 'green'; // 进度达到或超过100%为绿色
-      }
+      // const progress = row.scanActCount / row.count;
+      // let color;
+      // if (progress < 0.5) {
+      //   color = 'red'; // 进度小于50%为红色
+      // } else if (progress < 1.0) {
+      //   color = 'orange'; // 进度在50%到100%之间为橙色
+      // } else {
+      //   color = 'green'; // 进度达到或超过100%为绿色
+      // }
       return {
-        color,
+        // color,
         fontWeight: 'bold', // 字号加粗
       };
     },
@@ -982,6 +982,20 @@ export default {
       return rowBackground
     }
   },
+  rowStyleBiz({row, rowIndex}) {
+    let rowBackground = {}
+    const progress = row.scanActCount / row.count;
+
+    if (row.scanActCount == null || row.scanActCount == 0) {
+      rowBackground.color = 'red'; // 进度小于50%为红色
+    } else if (progress < 1.0) {
+      rowBackground.color = 'orange'; // 进度在50%到100%之间为橙色
+    } else {
+      rowBackground.color = 'green'; // 进度达到或超过100%为绿色
+    }
+    rowBackground.height = '38px'
+    return rowBackground
+  },
   watch: {
     resetKey(newVal, oldVal) {
       this.$refs.inputRef.focus()

From 32483c414b0ea8d8db8b46af2f2ef161fef457f9 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 18 Feb 2025 18:28:01 +0800
Subject: [PATCH 6/9] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IocCollectOrderCheckCode.vue      | 55 ++++++++++++++-----
 1 file changed, 40 insertions(+), 15 deletions(-)

diff --git a/src/views/collect/IocCollectOrderCheckCode.vue b/src/views/collect/IocCollectOrderCheckCode.vue
index b779a055..f6630fcd 100644
--- a/src/views/collect/IocCollectOrderCheckCode.vue
+++ b/src/views/collect/IocCollectOrderCheckCode.vue
@@ -171,7 +171,32 @@
             <el-table-column label="医保编码" prop="ybbm"></el-table-column>
             <el-table-column label="药品编码" prop="nameCode"></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: red;width: 10px;height: 10px;"></div>
+                </td>
+                <td>
+                  <span style="color:red"><pre>未扫码  </pre></span>
+                </td>
+                <td>
+                  <div style="background-color: orange;width: 10px;height: 10px;"></div>
+                </td>
+                <td>
+                  <span style="color:orange"><pre>部分扫码  </pre></span>
+                </td>
 
+
+                <td>
+                  <div style="background-color: green;width: 10px;height: 10px;"></div>
+                </td>
+                <td>
+                  <span style="color:green"><pre>已完全扫码</pre></span>
+                </td>
+              </div>
+            </el-col>
+          </el-row>
           <pagination
             v-show="busDataTotal>0"
             :total="busDataTotal"
@@ -979,23 +1004,23 @@ export default {
         rowBackground.color = '#F56C6C'
       }
       rowBackground.height = '38px'
-      return rowBackground
-    }
-  },
-  rowStyleBiz({row, rowIndex}) {
-    let rowBackground = {}
-    const progress = row.scanActCount / row.count;
+      return rowBackground;
+    },
+    rowStyleBiz({row, rowIndex}) {
+      let rowBackground = {}
+      const progress = row.scanActCount / row.count;
 
-    if (row.scanActCount == null || row.scanActCount == 0) {
-      rowBackground.color = 'red'; // 进度小于50%为红色
-    } else if (progress < 1.0) {
-      rowBackground.color = 'orange'; // 进度在50%到100%之间为橙色
-    } else {
-      rowBackground.color = 'green'; // 进度达到或超过100%为绿色
+      if (row.scanActCount == null || row.scanActCount == 0) {
+        rowBackground.color = 'red'; // 进度小于50%为红色
+      } else if (progress < 1.0) {
+        rowBackground.color = 'orange'; // 进度在50%到100%之间为橙色
+      } else {
+        rowBackground.color = 'green'; // 进度达到或超过100%为绿色
+      }
+      rowBackground.height = '38px'
+      return rowBackground
     }
-    rowBackground.height = '38px'
-    return rowBackground
-  },
+    },
   watch: {
     resetKey(newVal, oldVal) {
       this.$refs.inputRef.focus()

From 282a9f69627c41ee5735fbf4f3702551c216f3a1 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 18 Feb 2025 18:30:43 +0800
Subject: [PATCH 7/9] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/IocCollectOrderCheckCode.vue | 18 +++++++++---------
 src/views/collect/IocCollectOrderVerify.vue    |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/collect/IocCollectOrderCheckCode.vue b/src/views/collect/IocCollectOrderCheckCode.vue
index f6630fcd..e7943242 100644
--- a/src/views/collect/IocCollectOrderCheckCode.vue
+++ b/src/views/collect/IocCollectOrderCheckCode.vue
@@ -175,24 +175,24 @@
             <el-col span="24">
               <div style="float: right">
                 <td>
-                  <div style="background-color: red;width: 10px;height: 10px;"></div>
+                  <div style="background-color: #F56C6C;width: 10px;height: 10px;"></div>
                 </td>
                 <td>
-                  <span style="color:red"><pre>未扫码  </pre></span>
+                  <span style="color: #6d6d6d;"><pre>未扫码  </pre></span>
                 </td>
                 <td>
-                  <div style="background-color: orange;width: 10px;height: 10px;"></div>
+                  <div style="background-color: #E6A23C;width: 10px;height: 10px;"></div>
                 </td>
                 <td>
-                  <span style="color:orange"><pre>部分扫码  </pre></span>
+                  <span style="color: #6d6d6d;"><pre>部分扫码  </pre></span>
                 </td>
 
 
                 <td>
-                  <div style="background-color: green;width: 10px;height: 10px;"></div>
+                  <div style="background-color: #67C23A;width: 10px;height: 10px;"></div>
                 </td>
                 <td>
-                  <span style="color:green"><pre>已完全扫码</pre></span>
+                  <span style="color: #6d6d6d;"><pre>已完全扫码</pre></span>
                 </td>
               </div>
             </el-col>
@@ -1011,11 +1011,11 @@ export default {
       const progress = row.scanActCount / row.count;
 
       if (row.scanActCount == null || row.scanActCount == 0) {
-        rowBackground.color = 'red'; // 进度小于50%为红色
+        rowBackground.color = '#F56C6C'; // 进度小于50%为红色
       } else if (progress < 1.0) {
-        rowBackground.color = 'orange'; // 进度在50%到100%之间为橙色
+        rowBackground.color = '#E6A23C'; // 进度在50%到100%之间为橙色
       } else {
-        rowBackground.color = 'green'; // 进度达到或超过100%为绿色
+        rowBackground.color = '#56a717'; // 进度达到或超过100%为绿色
       }
       rowBackground.height = '38px'
       return rowBackground
diff --git a/src/views/collect/IocCollectOrderVerify.vue b/src/views/collect/IocCollectOrderVerify.vue
index 6661c0d2..21d3f5e8 100644
--- a/src/views/collect/IocCollectOrderVerify.vue
+++ b/src/views/collect/IocCollectOrderVerify.vue
@@ -128,10 +128,10 @@
           <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: #F56C6C;width: 10px;height: 10px;"></div>-->
+<!--                </td>-->
+<!--                <td><span style="color: #6d6d6d;"><pre>未赋码  </pre></span></td>-->
 
 
                 <td>

From 582f7cf488db280431284fc3a0ab49a0ffb56b39 Mon Sep 17 00:00:00 2001
From: qiuyt <zane0312@foxmail.com>
Date: Wed, 19 Feb 2025 14:48:44 +0800
Subject: [PATCH 8/9] =?UTF-8?q?1=E3=80=81=E4=B8=8A=E4=BC=A0=E5=8C=BB?=
 =?UTF-8?q?=E4=BF=9D=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=202=E3=80=81=E5=B7=A5=E4=BD=8D=E4=B8=8A=E8=B4=A7=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/CollectOrderStatsNew.vue | 98 +++++++++++-----------
 src/views/collect/newCreateCodeDetail.vue  | 63 +++++++-------
 2 files changed, 83 insertions(+), 78 deletions(-)

diff --git a/src/views/collect/CollectOrderStatsNew.vue b/src/views/collect/CollectOrderStatsNew.vue
index 68c182ca..f2b96801 100644
--- a/src/views/collect/CollectOrderStatsNew.vue
+++ b/src/views/collect/CollectOrderStatsNew.vue
@@ -1,55 +1,58 @@
 <template>
   <div class="app-container home">
     <div>
-<!--      <h2>单据上传统计</h2>-->
-<!--      <el-divider/>-->
-      <el-card>
+      <div class="mt10 grid-container grid-container1">
 
 
-        <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form"
-                 size="mini" label-width="100px"
-        >
+        <el-card class="grid-item" body-style="padding:0px;height:100%"  >
+
           <el-row >
-            <el-col :span="8">
-              <el-form-item label="时间统计:">
-                <el-date-picker
-
-                  :picker-options="pickerOptions"
-                  v-model="actDateRange"
-                  type="daterange"
-                  format="yyyy 年 MM 月 dd 日"
-                  style="width: 90%"
-                  value-format="yyyy-MM-dd"
-                  range-separator="至"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                >
-                </el-date-picker>
-
-              </el-form-item>
-
-            </el-col>
-            <el-form-item >
-
-              <el-button-group>
-                <el-button
-                  type="primary"
-                  icon="el-icon-refresh"
-                  @click="onReset"
-                >重置
-                </el-button>
-                <el-button type="primary" icon="el-icon-search" @click="onSubmit(this)"
-                >查询
-                </el-button
-                >
-              </el-button-group>
-
-            </el-form-item>
+            <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form"
+                     size="mini" label-width="100px"
+            >
+              <el-row >
+                <el-col :span="8">
+                  <el-form-item label="时间统计:">
+                    <el-date-picker
+
+                      :picker-options="pickerOptions"
+                      v-model="actDateRange"
+                      type="daterange"
+                      format="yyyy 年 MM 月 dd 日"
+                      style="width: 90%"
+                      value-format="yyyy-MM-dd"
+                      range-separator="至"
+                      start-placeholder="开始日期"
+                      end-placeholder="结束日期"
+                    >
+                    </el-date-picker>
+
+                  </el-form-item>
+
+                </el-col>
+                <el-form-item >
+
+                  <el-button-group>
+                    <el-button
+                      type="primary"
+                      icon="el-icon-refresh"
+                      @click="onReset"
+                    >重置
+                    </el-button>
+                    <el-button type="primary" icon="el-icon-search" @click="onSubmit(this)"
+                    >查询
+                    </el-button
+                    >
+                  </el-button-group>
+
+                </el-form-item>
+              </el-row>
+            </el-form>
           </el-row>
-        </el-form>
+        </el-card>
 
-      </el-card>
-      <div class="mt10 grid-container grid-container3" style="height: 20%">
+      </div>
+      <div class="mt10 grid-container grid-container3">
 
 
         <el-card class="grid-item" body-style="padding:0px;height:100%"  >
@@ -482,7 +485,7 @@ export default {
       let piedata = {
         name: "医保上传率",
         type: "pie",
-        radius: ["42%", "65%", "65%"],
+        radius: ["40%", "65%", "65%"],
         avoidLabelOverlap: false,
         itemStyle: {
           borderRadius: 4,
@@ -574,8 +577,8 @@ export default {
               },
             },
             labelLine: {
-              length: 20, // 第一段线 长度
-              length2: 36, // 第二段线 长度
+              length: 10, // 第一段线 长度
+              length2: 18, // 第二段线 长度
               show: true,
 
             },
@@ -819,7 +822,6 @@ export default {
 
 .grid-container1 {
   grid-template-columns: repeat(1, 1fr);
-  padding: 10px;
 }
 
 
diff --git a/src/views/collect/newCreateCodeDetail.vue b/src/views/collect/newCreateCodeDetail.vue
index f90d0643..1cb3e3e1 100644
--- a/src/views/collect/newCreateCodeDetail.vue
+++ b/src/views/collect/newCreateCodeDetail.vue
@@ -1,18 +1,18 @@
 <template>
   <div>
     <el-row :gutter="30">
-      <el-col :span="15" style="border: 1px solid #e3dfe1; padding:15px; height: 700px; margin-left: 20px;">
+      <el-col :span="15" style="border: 1px solid #e3dfe1; padding:15px; height: 700px; margin-left: 20px; overflow-y: scroll;">
         <h2 style="font-weight: bold;">上货信息</h2>
         <div v-for="(item, index) in detailList" :key="index" class="product-info">
           <div class="info-item">
-          <p>产品通用名: {{ item.coName }}</p>
-          <p>规格: {{ item.bzgg }}</p>
-          <p>产品标识: {{ item.nameCode }}</p>
-          <p>批次号: {{ item.batchNo }}</p>
+          <p class="p-title">产品通用名: {{ item.coName }}</p>
+          <p class="p-title">规格: {{ item.bzgg }}</p>
+            <p class="p-title">产品标识: {{ item.nameCode }}</p>
+            <p class="p-title">批次号: {{ item.batchNo }}</p>
           </div>
           <div class="count-items">
-          <p>扫码数量: <span class="scan-count">{{ item.count }}</span></p>
-          <p>实际数量: <span class="actual-count">{{ item.reCount }}{{ item.prepnUnit }}</span></p>
+            <p class="p-title">扫码数量: <span class="scan-count">{{ item.count }}</span></p>
+            <p class="p-title">实际数量: <span class="actual-count">{{ item.reCount }}{{ item.prepnUnit }}</span></p>
           </div>
         </div>
 
@@ -21,44 +21,44 @@
         <h2 style="font-weight: bold;">扫码明细({{codeCount}})</h2>
         <!--<el-divider></el-divider>-->
         <div style=" border-top: 1px solid #ccc;">
-          <el-table v-loading="loading" :data="codeArray" style="width: 100%;margin-top: 20px" max-height="350"
+          <el-table v-loading="loading" :data="codeArray" style="width: 100%; margin-top: 20px" max-height="600px"
                     ref="multipleTable">
             <!--      <el-table-column-->
             <!--        type="selection"-->
             <!--        width="55">-->
             <!--      </el-table-column>-->
-            <el-table-column label="序号" type="index" width="55">
+            <el-table-column label="序号" type="index" width="55" style="text-align: right;">
 
             </el-table-column>
             <el-table-column
               label="追溯码"
               prop="code"
               show-overflow-tooltip
-            >
+              style="text-align: right;">
               <template slot-scope="scope">
                 <div style="font-size: 20px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
                   {{ scope.row.code }}
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="操作" width="100" fixed="right">
-              <template slot-scope="scope">
-                <el-button
-                  type="text"
-                  size="small"
-                  @click.native.stop="deleteCode(scope.$index, scope.row)"
-                >减一
-                </el-button
-                >
-                <el-button
-                  type="text"
-                  size="small"
-                  @click.native.stop="editCode(scope.row)"
-                >编辑
-                </el-button
-                >
-              </template>
-            </el-table-column>
+<!--            <el-table-column label="操作" width="100" fixed="right">-->
+<!--              <template slot-scope="scope">-->
+<!--                <el-button-->
+<!--                  type="text"-->
+<!--                  size="small"-->
+<!--                  @click.native.stop="deleteCode(scope.$index, scope.row)"-->
+<!--                >减一-->
+<!--                </el-button-->
+<!--                >-->
+<!--                <el-button-->
+<!--                  type="text"-->
+<!--                  size="small"-->
+<!--                  @click.native.stop="editCode(scope.row)"-->
+<!--                >编辑-->
+<!--                </el-button-->
+<!--                >-->
+<!--              </template>-->
+<!--            </el-table-column>-->
           </el-table>
 
         </div>
@@ -286,13 +286,16 @@ export default {
 
 .scan-count {
   color: red;
-  font-size: 45px;
+  font-size: 65px;
   font-weight: bold; /* 添加这行代码，使字体加粗 */
 }
 
 .actual-count {
   color: green;
-  font-size: 24px;
+  font-size: 38px;
 }
+.p-title{
+  font-size: 24px;
 
+}
 </style>

From 4ac2651d7a257ef25532539156c067b6007975dd Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Wed, 19 Feb 2025 15:47:33 +0800
Subject: [PATCH 9/9] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/IoSplitFifoRemind.vue  |  2 +-
 src/views/collect/PannelOrderBizCard.vue | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/collect/IoSplitFifoRemind.vue b/src/views/collect/IoSplitFifoRemind.vue
index 3ff04afe..d8ff5e81 100644
--- a/src/views/collect/IoSplitFifoRemind.vue
+++ b/src/views/collect/IoSplitFifoRemind.vue
@@ -118,7 +118,7 @@
           >查询
           </el-button
           >
-          <el-button type="primary" icon="el-icon-search" @click="allExport()"
+          <el-button type="primary" icon="el-icon-printer" @click="allExport()"
           >导出上货推荐单
           </el-button
           >
diff --git a/src/views/collect/PannelOrderBizCard.vue b/src/views/collect/PannelOrderBizCard.vue
index 8e70a6f9..3a76c029 100644
--- a/src/views/collect/PannelOrderBizCard.vue
+++ b/src/views/collect/PannelOrderBizCard.vue
@@ -5,19 +5,19 @@
         <el-card :body-style="{margin:'20px'}"
                  style="margin:20px 20px 20px 20px;;background-color: #e1f3fb;border-radius: 12px; position: relative;">
           <div style="display: flex; justify-content: space-between; align-items: center; height: 26px; /* 约为 200px 的 1/3 */" >
-            <p>产品名称：</p> <p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.cpmctymc }}</p>
+            <p>产品通用名：</p> <p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.cpmctymc }}</p>
           </div>
           <div style="display: flex; justify-content: space-between; align-items: center; height: 26px; /* 约为 200px 的 1/3 */" >
-            <p>层级标识：</p><p style="font-size: 16px;background-color: #e1f3fb;font-weight: bold;">{{ info.nameCode }}</p>
+            <p>包装规格：</p><p style="font-size: 16px;background-color: #e1f3fb;font-weight: bold;">{{ info.ggxh }}</p>
           </div>
           <div style="display: flex; justify-content: space-between; align-items: center; height: 26px; /* 约为 200px 的 1/3 */" >
-            <p>规格型号：</p><p style="font-size: 16px;background-color: #e1f3fb;font-weight: bold;">{{ info.ggxh }}</p>
+            <p>制剂规格：</p><p style="font-size: 16px;background-color: #e1f3fb;font-weight: bold;">{{ info.prepnSpec }}</p>
           </div>
           <div style="display: flex; justify-content: space-between; align-items: center; height: 26px; /* 约为 200px 的 1/3 */" >
-            <p>使用单位：</p><p style="font-size: 16px;background-color: #e1f3fb;font-weight: bold;">{{ info.measureUnit }}</p>
+            <p>批次号：</p><p style="font-size: 16px;background-color: #e1f3fb;font-weight: bold;">{{ info.batchNo }}</p>
           </div>
           <div style="display: flex; justify-content: space-between; align-items: center; height: 26px; /* 约为 200px 的 1/3 */" >
-            <p>槽位：</p><p style="font-size: 16px;background-color: #e1f3fb;font-weight: bold;">{{ info.queueCode }}</p>
+            <p>摆放位置：</p><p style="font-size: 16px;background-color: #e1f3fb;font-weight: bold;">{{ info.queueCode }}</p>
           </div>
           <div style="display: flex; justify-content: space-between; align-items: center; height: 26px; /* 约为 200px 的 1/3 */" >
             <p></p><p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;margin-top: 80px"><i  class="el-icon-s-opportunity"></i>