diff --git a/src/components/charge/AssociationIdCode.vue b/src/components/charge/AssociationIdCode.vue
new file mode 100644
index 0000000..0d5ef18
--- /dev/null
+++ b/src/components/charge/AssociationIdCode.vue
@@ -0,0 +1,218 @@
+<template>
+  <Mask  :height="600" :width="700" :is-show="show">
+    <CloseBtn @click="show = false"></CloseBtn>
+    <el-card>
+      <div class="panel">
+        <div class="header">
+          请勾选该追溯码关联的发药项目商品
+        </div>
+        <div class="code">
+          <div class="before-code">
+            {{ traceabilityCode.slice(0, 7) }}
+          </div>
+          <div class="after-code">
+            {{ traceabilityCode.slice(7, traceabilityCode.length) }}
+          </div>
+        </div>
+
+
+        <div class="table">
+          <table class="simple-table">
+            <thead>
+            <tr>
+              <th>选择</th>
+              <th>发药项目</th>
+              <th>产品标识码</th>
+              <th>系统处理</th>
+            </tr>
+            </thead>
+
+            <tbody>
+            <tr v-for="(item,index) in tableData">
+              <td><input class="blue-radio" type="radio" :value="item.id" v-model="selected"/></td>
+              <td>{{ item.name }}</td>
+              <td>
+                <IdCodeListShow :idCodeList="item.idCode" v-if="item.idCode && item.idCode.length > 0"/>
+                <div v-else>未关联</div>
+              </td>
+              <td style="width: 300px;">
+                <template v-if="selected === item.id">
+                  关联产品标识码，采集追溯码自动识别商品
+                </template>
+              </td>
+            </tr>
+            </tbody>
+
+          </table>
+        </div>
+      </div>
+      <template #footer>
+        <el-button @click="addIdCode" type="primary">确定</el-button>
+        <el-button @click="show = false" type="primary">关闭</el-button>
+      </template>
+    </el-card>
+  </Mask>
+</template>
+<script setup lang="ts">
+
+import Mask from "@/components/Mask.vue";
+import {ref} from "vue"
+import IdCodeListShow from "@/components/retail/IdCodeListShow.vue";
+import CloseBtn from "@/components/CloseBtn.vue";
+import {post} from "@/utils/request.ts";
+import {ElMessage} from "element-plus";
+
+interface TableItem {
+  id: string;
+  name: string;
+  idCode?: string[] | undefined; // 可选属性，默认为 undefined
+  gatherNumber?: number;
+  retailNumber?: number;
+  packagingUnit?: string;
+  minPackagingUnit?: string;
+  selectedUnit?: string;
+  minPackagingNumber?: number;
+  traceAbilityCodeList?: { code: string; number: number }[];
+}
+
+
+const show = ref(false);
+const traceabilityCode = ref("");
+const tableData = ref<TableItem[]>([]);
+const init = (newIdCode: any, newTableDate: any) => {
+  traceabilityCode.value = newIdCode;
+  tableData.value = newTableDate;
+  console.log(tableData)
+  show.value = true;
+}
+const selected = ref()
+defineExpose({init})
+const addIdCode = ()=>{
+  if (traceabilityCode.value ==""){
+    return;
+  }
+  let idCode = traceabilityCode.value.slice(0, 7);
+  post("goods/goods/addIdCode",{goodsId:selected.value,idCode:idCode}).then((res:any)=>{
+      show.value = false;
+      for (let subItem of tableData.value){
+        if (subItem.id === selected.value){
+          subItem.idCode?.push(idCode);
+          break
+        }
+      }
+  })
+  const selectedItem = tableData.value.find((item: any) => item.id === selected.value);
+  if(!selectedItem){
+    return
+  }
+  addTraceabilityCode(selectedItem)
+
+}
+const getGatherNumber=(item:any)=>{
+  let gatherNumber = 0;
+  for (let subItem of item.traceAbilityCodeList){
+    gatherNumber+=subItem.number;
+  }
+ item.gatherNumber = gatherNumber;
+}
+const emit = defineEmits(["addIdCode"])
+const addTraceabilityCode = (item: any) => {
+  if (!item.traceAbilityCodeList) {
+    item.traceAbilityCodeList = []
+  }
+  if (item.retailNumber == item.gatherNumber) {
+    ElMessage({
+      message: '采集数量已满',
+      type: 'warning',
+    })
+    return
+  }
+  const index = item.traceAbilityCodeList.findIndex((codeObj: any) => codeObj.code === traceabilityCode.value);
+  if (index == -1 && item.selectedUnit == item.packagingUnit){
+    item.traceAbilityCodeList.push({
+      code: traceabilityCode.value,
+      number: 1
+    })
+    traceabilityCode.value = "";
+    getGatherNumber(item)
+    emit("addIdCode")
+    return;
+  }
+  if (index == -1&& item.selectedUnit == item.minPackagingUnit){
+    let needCodeCount = item.retailNumber - item.gatherNumber;
+    let number = 1;
+    if (needCodeCount >= item.minPackagingNumber){
+      number = item.minPackagingNumber;
+    }
+    if (needCodeCount < item.minPackagingNumber){
+      number = needCodeCount;
+    }
+    item.traceAbilityCodeList.push({
+      code: traceabilityCode.value,
+      number: number
+    })
+    traceabilityCode.value = "";
+    getGatherNumber(item)
+    emit("addIdCode")
+    return;
+  }
+  if(item.selectedUnit == item.packagingUnit){
+    //没拆零 追溯码只能用一次
+    ElMessage({
+      message: '该追溯码已达到最大使用限制',
+      type: 'warning',
+    })
+    return;
+  }else {
+    //拆零每一个追溯码最多使用minPackagingNumber次
+    if (item.traceAbilityCodeList[index].number == item.minPackagingNumber) {
+      ElMessage({
+        message: '该追溯码已达到最大使用限制',
+        type: 'warning',
+      })
+      return;
+    }
+    item.traceAbilityCodeList[index].number += 1;
+  }
+  traceabilityCode.value = "";
+  getGatherNumber(item)
+  emit("addIdCode")
+}
+</script>
+<style scoped lang="scss">
+.panel {
+  height: 400px;
+  .header {
+    margin-top: 20px;
+    font-size: 24px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .code {
+    height: 50px;
+    display: flex;
+    font-size: 24px;
+    justify-content: center;
+    align-items: center;
+
+    .before-code {
+      color: #7a8794;
+
+    }
+
+    .after-code {
+      margin-left: 10px;
+    }
+  }
+  .table {
+    .simple-table {
+      .blue-radio {
+        accent-color: #28addd;
+      }
+    }
+  }
+}
+
+</style>
\ No newline at end of file
diff --git a/src/components/charge/CheckoutDetail.vue b/src/components/charge/CheckoutDetail.vue
index 11c24c5..67ba9aa 100644
--- a/src/components/charge/CheckoutDetail.vue
+++ b/src/components/charge/CheckoutDetail.vue
@@ -28,11 +28,11 @@
             <tr v-for="(item,index) in list" :key="index">
               <td>{{ item.name }}</td>
               <td>
-                <IdCodeListShow :idCodeList="item.idCode" v-if="item.idCode.length>0"/>
+                <IdCodeListShow :idCodeList="item.idCode" v-if="item.idCode&&item.idCode.length>0"/>
                 <div v-else>未关联</div>
               </td>
-              <td>{{ item.retailNumber }}{{ item.selectedUnit }}</td>
-              <td>{{ item.gatherNumber }}/{{ item.retailNumber }}</td>
+              <td>{{ item.selectedNum }}{{ item.selectedUnit }}</td>
+              <td>{{ item.traceAbilityCodeList ? item.traceAbilityCodeList.length : 0 }}/{{ item.shouldNumber }}</td>
               <td>
                 <TraceabilityCodeAdd :item="item"/>
               </td>
@@ -57,10 +57,11 @@
 import Mask from "@/components/Mask.vue";
 import CloseBtn from "@/components/CloseBtn.vue";
 import {nextTick, ref} from "vue";
-import IdCodeListShow from "@/components/retail/IdCodeListShow.vue";
-import AssociationIdCode from "@/components/retail/AssociationIdCode.vue";
-import TraceabilityCodeAdd from "@/components/retail/TraceabilityCodeAdd.vue";
+import IdCodeListShow from "@/components/charge/IdCodeListShow.vue";
+import AssociationIdCode from "@/components/charge/AssociationIdCode.vue";
+import TraceabilityCodeAdd from "@/components/charge/TraceabilityCodeAdd.vue";
 import {ElMessage, ElMessageBox} from "element-plus";
+import {Monitor} from '@element-plus/icons-vue'
 import {post} from "@/utils/request.ts";
 
 
@@ -97,7 +98,7 @@ const saveRetail = () => {
 const checkTraceCode = () => {
   for (let i = 0; i < list.value.length; i++) {
     const item = list.value[i];
-    if (item.gatherNumber !== item.retailNumber) {
+    if (!item.traceAbilityCodeList || item.shouldNumber !== item.traceAbilityCodeList.length) {
       return false;
     }
   }
@@ -117,6 +118,7 @@ const addTraceAbilityCode = () => {
   for (let i = 0; i < list.value.length; i++) {
     let item = list.value[i];
     let idCode = inputIdCode.value.slice(0, 7);
+    if (!item.idCode) break
     if (item.idCode.includes(idCode)) {
       addTraceabilityCodeDo(item);
       return true
@@ -130,7 +132,9 @@ const addTraceabilityCodeDo = (item: any) => {
   if (!item.traceAbilityCodeList) {
     item.traceAbilityCodeList = []
   }
-  if (item.retailNumber == item.gatherNumber) {
+  let traceAbilityCodeListList = item.traceAbilityCodeList.length
+
+  if (traceAbilityCodeListList == item.shouldNumber) {
     ElMessage({
       message: '采集数量已满',
       type: 'warning',
@@ -138,61 +142,19 @@ const addTraceabilityCodeDo = (item: any) => {
     return
   }
   const index = item.traceAbilityCodeList.findIndex((codeObj: any) => codeObj.code === inputIdCode.value);
-  if (index == -1 && item.selectedUnit == item.packagingUnit) {
-    item.traceAbilityCodeList.push({
-      code: inputIdCode.value,
-      number: 1
-    })
-    cleanInputIdCode()
-    getGatherNumber(item)
-    return;
-  }
-  if (index == -1 && item.selectedUnit == item.minPackagingUnit) {
-
-    let needCodeCount = item.retailNumber - item.gatherNumber;
-    let number = 1;
-    if (needCodeCount >= item.minPackagingNumber) {
-      number = item.minPackagingNumber;
-    }
-    if (needCodeCount < item.minPackagingNumber) {
-      number = needCodeCount;
-    }
-    item.traceAbilityCodeList.push({
-      code: inputIdCode.value,
-      number: number
-    })
-    cleanInputIdCode()
-    getGatherNumber(item)
-    return;
-  }
-  if (item.selectedUnit == item.packagingUnit) {
-    //没拆零 追溯码只能用一次
+  if (index != -1) {
     ElMessage({
-      message: '该追溯码已达到最大使用限制',
+      message: '该追溯码已采集',
       type: 'warning',
     })
-    return;
-  } else {
-    //拆零每一个追溯码最多使用minPackagingNumber次
-    if (item.traceAbilityCodeList[index].number == item.minPackagingNumber) {
-      ElMessage({
-        message: '该追溯码已达到最大使用限制',
-        type: 'warning',
-      })
-      return;
-    }
-    item.traceAbilityCodeList[index].number += 1;
+    return
   }
+  item.traceAbilityCodeList.push(inputIdCode.value)
   cleanInputIdCode()
   getGatherNumber(item)
-  console.log("item", item)
 }
 const getGatherNumber = (item: any) => {
-  let gatherNumber = 0;
-  for (let subItem of item.traceAbilityCodeList) {
-    gatherNumber += subItem.number;
-  }
-  item.gatherNumber = gatherNumber;
+  item.shouldNumber = item.traceAbilityCodeList?item.traceAbilityCodeList.length:0;
 }
 
 const cleanInputIdCode = () => {
diff --git a/src/components/charge/IdCodeListShow.vue b/src/components/charge/IdCodeListShow.vue
new file mode 100644
index 0000000..051d33a
--- /dev/null
+++ b/src/components/charge/IdCodeListShow.vue
@@ -0,0 +1,47 @@
+<script setup lang="ts">
+const props = defineProps({
+  idCodeList: {
+    type: Array,
+    default: () => []
+  }
+})
+</script>
+
+<template>
+  <el-popover
+      title="已关联的追溯码产品标识码："
+      placement="bottom-start"
+      trigger="hover"
+      width="250px"
+  >
+    <template #reference>
+      <div class="id-code-panel">
+        <div class="code" v-if="props.idCodeList.length >0">{{props.idCodeList[0]}}</div>
+        <div class="number" v-if="props.idCodeList.length >1">
+          +{{props.idCodeList.length-1}}
+        </div>
+
+      </div>
+    </template>
+    <template #default>
+      <div class="id-code-detail">
+        <div class="item" v-for="(item,index) in props.idCodeList" :key="index">
+          {{index+1}}.{{item}}
+
+        </div>
+      </div>
+    </template>
+  </el-popover>
+
+</template>
+
+<style scoped lang="scss">
+.id-code-panel{
+  display: flex;
+  .number{
+    margin-left: 10px;
+    color: green;
+  }
+
+}
+</style>
\ No newline at end of file
diff --git a/src/components/charge/TotalPrice.vue b/src/components/charge/TotalPrice.vue
index a3eafa7..bae6619 100644
--- a/src/components/charge/TotalPrice.vue
+++ b/src/components/charge/TotalPrice.vue
@@ -21,7 +21,7 @@ const totalAmount = defineModel<any>()
     <div class="footer">
       <div>总金额：<span class="text icon">￥</span><span class="text">{{ totalAmount || '0' }}</span></div>
       <div class="btn-group" v-if="status  == 0">
-        <el-button type="primary" disabled @click="openCheckOut()">追溯码</el-button>
+        <el-button type="primary" @click="openCheckOut()">追溯码</el-button>
         <el-button type="primary" @click="save">收费</el-button>
       </div>
     </div>
diff --git a/src/components/charge/TraceabilityCodeAdd.vue b/src/components/charge/TraceabilityCodeAdd.vue
new file mode 100644
index 0000000..bca698b
--- /dev/null
+++ b/src/components/charge/TraceabilityCodeAdd.vue
@@ -0,0 +1,174 @@
+<template>
+  <el-popover
+      title="追溯码："
+      placement="bottom-start"
+      trigger="click"
+      width="300px"
+  >
+    <template #reference>
+      <el-input
+          placeholder="追溯码"
+          clearable
+          v-model="inputTraceabilityCode"
+          style="width: 300px;"
+          @keydown.enter="addTraceabilityCodeDo(props.item)"
+      ></el-input>
+    </template>
+    <template #default>
+      <div v-for="(subItem,index) in item.traceAbilityCodeList" class="list">
+        <div class="code"> {{ subItem.code }}</div>
+        <div class="remove" @click="removeTraceAbility(item)">
+          <el-icon>
+            <CloseBold/>
+          </el-icon>
+        </div>
+      </div>
+    </template>
+  </el-popover>
+</template>
+<script setup lang="ts">
+import {ref,watch} from "vue";
+import {ElMessage, ElMessageBox} from "element-plus";
+import {CloseBold} from "@element-plus/icons-vue";
+import {post} from "@/utils/request.ts";
+interface TraceAbilityCode {
+  code: string;
+  number: number;
+  showNumberInput?: boolean;
+}
+const props = defineProps({
+  item: {
+    type: Object as () => {
+      id?: number|undefined;
+      traceAbilityCodeList: TraceAbilityCode[];
+      retailNumber: number;
+      gatherNumber: number;
+      selectedUnit: string;
+      idCode: string[];
+      packagingUnit: string;
+      minPackagingUnit: string;
+      minPackagingNumber: number;
+    },
+    default: () => ({
+      traceAbilityCodeList: [],
+      retailNumber: 0,
+      gatherNumber: 0,
+      selectedUnit: "",
+      idCode:[],
+      packagingUnit: "",
+      minPackagingUnit: "",
+      minPackagingNumber: 0,
+    }),
+  },
+})
+const getGatherNumber = (item: any) => {
+  item.shouldNumber = item.traceAbilityCodeList?item.traceAbilityCodeList.length:0;
+}
+const inputTraceabilityCode = ref("");
+const addTraceabilityCodeDo = (item: any) => {
+  if (!item.traceAbilityCodeList) {
+    item.traceAbilityCodeList = []
+  }
+  let traceAbilityCodeListList = item.traceAbilityCodeList.length
+
+  if (traceAbilityCodeListList == item.shouldNumber) {
+    ElMessage({
+      message: '采集数量已满',
+      type: 'warning',
+    })
+    return
+  }
+  const index = item.traceAbilityCodeList.findIndex((codeObj: any) => codeObj.code === inputTraceabilityCode.value);
+  if (index != -1) {
+    ElMessage({
+      message: '该追溯码已采集',
+      type: 'warning',
+    })
+    return
+  }
+  item.traceAbilityCodeList.push(inputTraceabilityCode.value)
+  inputTraceabilityCode.value = "";
+  getGatherNumber(item)
+}
+const removeTraceAbility = (item: any) => {
+  item.traceAbilityCodeList.splice(item.traceAbilityCodeList.findIndex((codeObj: any) => codeObj.code === inputTraceabilityCode.value), 1)
+  getGatherNumber(item)
+}
+const changeNumber=ref(0);
+const openNumberInput = (subItem: any) => {
+  subItem.showNumberInput = true;
+  changeNumber.value = subItem.number;
+}
+const handleNumberChange = (subItem:any)=>{
+  let limit = 1;
+  if (props.item.selectedUnit == props.item.minPackagingUnit){
+    limit = props.item.minPackagingNumber;
+  }
+  if (changeNumber.value>limit) {
+    ElMessage({
+      message: '单个追溯码采集数量超过限制',
+      type: 'warning',
+    })
+   subItem.showNumberInput = false;
+    return
+  }
+  // 可以在这里添加具体的处理逻辑
+  let totalNumber = 0;
+  for (let subItem of props.item.traceAbilityCodeList) {
+    totalNumber += subItem.number;
+  }
+  totalNumber = totalNumber - subItem.number + changeNumber.value;
+  if (totalNumber > props.item.retailNumber) {
+    ElMessage({
+      message: '采集数量超过上限',
+      type: 'warning',
+    })
+    subItem.showNumberInput = false;
+    return;
+  }
+  subItem.number = changeNumber.value;
+}
+const addIdCode = (idCode:any)=>{
+  if (idCode==null || idCode.value ==""){
+    return;
+  }
+  if (props.item.idCode.includes(idCode)){
+    return;
+  }
+  ElMessageBox.confirm(
+      `当前标识码未绑定是否确认绑定标识码？`,
+      'Warning',
+      {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+    post("goods/goods/addIdCode",{goodsId:props.item.id,idCode:idCode}).then((res:any)=>{
+      props.item.idCode.push(idCode);
+    })
+  })
+}
+</script>
+<style scoped lang="scss">
+.list {
+  display: flex;
+
+  .code {
+    width: 100px;
+  }
+
+  .number {
+    width: 100px;
+  }
+
+  .remove {
+    font-size: 16px;
+    width: 50px;
+
+    &:hover {
+      color: #409eff;
+    }
+  }
+}
+
+</style>
\ No newline at end of file
diff --git a/src/components/common/goods/GoodsDetail.vue b/src/components/common/goods/GoodsDetail.vue
index b42fc40..5e2cd6d 100644
--- a/src/components/common/goods/GoodsDetail.vue
+++ b/src/components/common/goods/GoodsDetail.vue
@@ -48,7 +48,7 @@
       <el-table-column prop="number" label="数量">
         <template #default="scope">
           <div v-if="props.status">
-            <el-input-number v-model="scope.row.selectedNum" :min="0" @change="handleNumChange"
+            <el-input-number v-model="scope.row.selectedNum" :min="0" @change="handleNumChange(scope.row)"
                              size="small"></el-input-number>
             <el-dropdown>
               <span style="line-height: 30px;margin-left: 10px">{{ scope.row.selectedUnit }}</span>
@@ -152,6 +152,10 @@ const goodsSelect = (row: any) => {
   row.selectedNum = 1
   row.selectedUnit = row.packagingUnit
   row.selectedPrice = row.unitPrice
+  row.shouldNumber  = 1;
+  row.idCode = row.idCode.split(",")
+
+
   if (goodsDetail.value.find((i: any) => i.id == row.id)) {
     ElMessage.warning("数据已存在,只能加数量")
     goodsDetail.value.find((i: any) => i.id == row.id).selectedNum += 1
@@ -174,7 +178,16 @@ const selectUnit = (item: any, unit: any) => {
 
 }
 const emit = defineEmits(["totalPriceChange", 'focus'])
-const handleNumChange = () => {
+const handleNumChange = (row:any) => {
+  //应采数量
+  let shouldNumber = 0;
+  if (row.selectedUnit == row.packagingUnit) {
+    shouldNumber = row.selectedNum
+  } else {
+    shouldNumber = Math.ceil(row.selectedNum / row.minPackagingNumber)
+  }
+  row.shouldNumber = shouldNumber
+
   emit('totalPriceChange')
 }
 const getTotalPrice = () => {
diff --git a/src/components/common/service/ServiceDetail.vue b/src/components/common/service/ServiceDetail.vue
index 634d997..a366ef5 100644
--- a/src/components/common/service/ServiceDetail.vue
+++ b/src/components/common/service/ServiceDetail.vue
@@ -112,6 +112,7 @@ const emit = defineEmits(['totalPriceChange', 'focus'])
 const serviceSelect = (row: any) => {
   row.selectedNum = 1
   row.selectedUnit = row.unit
+
   row.selectedPrice = row.unitPrice
   if (itemDetail.value.find((i: any) => i.id == row.id)) {
     ElMessage.warning("数据已存在,只能加数量")
diff --git a/src/views/charge/index.vue b/src/views/charge/index.vue
index 20e7c4d..e525aca 100644
--- a/src/views/charge/index.vue
+++ b/src/views/charge/index.vue
@@ -54,7 +54,7 @@
                        @totalPriceChange="getOrderTotalPrice"></GoodsDetail>
         </div>
         <div class="bottom">
-          <TotalPrice v-model="formData.totalPrice" @save="charge" :status="formData.status"></TotalPrice>
+          <TotalPrice v-model="formData.totalPrice" @save="charge" :status="formData.status" @openCheckOut ="openCheckoutDetail(formData.goodsDetail)"></TotalPrice>
         </div>
       </el-scrollbar>
     </div>
@@ -67,6 +67,7 @@
       </div>
     </div>
   </div>
+  <CheckoutDetail ref="checkoutDetailRef"></CheckoutDetail>
   <Settlement
       ref="settlementRef"
       v-model="socialCard"
@@ -126,14 +127,7 @@ const checkTraceCode = (goodsList: any[]) => {
 
   for (let i = 0; i < goodsList.length; i++) {
     const item = goodsList[i];
-    //应采数量
-    let shouldNumber = 0;
-    if (item.selectedUnit == item.packagingUnit) {
-      shouldNumber = item.selectedNum
-    } else {
-      shouldNumber = Math.ceil(item.selectedNum / item.minPackagingNumber)
-    }
-    if (!item.traceAbilityCodeList || shouldNumber != item.traceAbilityCodeList.length) {
+    if (!item.traceAbilityCodeList || item.shouldNumber != item.traceAbilityCodeList.length) {
       return false;
     }else {
       ElMessage({
@@ -190,6 +184,17 @@ const checkTraceCode = (goodsList: any[]) => {
   const clickItem = async (item: any, status: any) => {
     statusDisabled.value = status
     formData.value = await post('medical/record/getByDiagnosisCode', {diagnosisCode: item.code})
+    //添加追溯码应采字段
+    for (let i =0;i<formData.value.goodsDetail.length;i++){
+      let goodsItem =formData.value.goodsDetail[i]
+      if (goodsItem.packagingUnit == goodsItem.selectedUnit){
+        goodsItem.shouldNumber = goodsItem.selectedNum;
+      }else {
+        goodsItem.shouldNumber = Math.ceil(goodsItem.selectedNum / goodsItem.minPackagingNumber);
+      }
+      goodsItem.idCode = goodsItem.idCode?.split(",")
+    }
+
     getOrderTotalPrice()
     nextTick(() => {
       let list = JSON.parse(formData.value.diagnosisMedicalRecord.diagnosisDetail)