From 243d5ced2c9cd4bd9768b7c2d60a5419b7e26970 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Mon, 12 May 2025 16:59:35 +0800
Subject: [PATCH 1/3] dev

---
 src/views/charge/index.vue | 178 ++++++++++++-------------------------
 1 file changed, 59 insertions(+), 119 deletions(-)

diff --git a/src/views/charge/index.vue b/src/views/charge/index.vue
index f38401e..e185953 100644
--- a/src/views/charge/index.vue
+++ b/src/views/charge/index.vue
@@ -18,7 +18,7 @@
                       @selectedCallBack="diagnosisSelect"
                       ref="diagnosisSearchRef"
                       :show-header="false"
-                      :disabled="statusDisabled==1||formData.status==1"
+                      :disabled="statusDisabled==1"
 
                   >
                   </DiagnosisSearchInput>
@@ -30,7 +30,7 @@
                       @change="handleChange"
                       clearable
                       style="width: 100%"
-                      :disabled="statusDisabled==1||formData.status==1"
+                      :disabled="formData.status == 1"
                   >
                     <el-option
                         v-for="item in doctorList"
@@ -47,11 +47,11 @@
         </div>
         <div style="margin-top: 24px">
           <ServiceDetail v-model="formData.itemDetail" :status="formData.status == 0"
-                         @totalPriceChange="getOrderTotalPrice" :statusDisabled="statusDisabled==1"></ServiceDetail>
+                         @totalPriceChange="getOrderTotalPrice"></ServiceDetail>
         </div>
         <div style="margin-top: 24px">
           <GoodsDetail v-model="formData.goodsDetail" :status="formData.status == 0"
-                       @totalPriceChange="getOrderTotalPrice" :statusDisabled="statusDisabled==1"></GoodsDetail>
+                       @totalPriceChange="getOrderTotalPrice"></GoodsDetail>
         </div>
         <div class="bottom">
           <TotalPrice v-model="formData.totalPrice" @save="charge" :status="formData.status" @openCheckOut ="openCheckoutDetail(formData.goodsDetail)"></TotalPrice>
@@ -139,89 +139,21 @@ const checkTraceCode = (goodsList: any[]) => {
   }
   return true;
 }
-  const checkoutDetailRef = ref()
-  const openCheckoutDetail = (goodsList: any[]) => {
-    if (!goodsList || goodsList.length == 0) {
-      ElMessage({
-        message: '没有商品信息，请先选择需要售卖的商品',
-        type: 'info',
-        plain: true,
-      });
-      return
-    }
-    nextTick(() => {
-      checkoutDetailRef.value.init(goodsList);
-    })
+const checkoutDetailRef = ref()
+const openCheckoutDetail = (goodsList: any[]) => {
+  if (!goodsList || goodsList.length == 0) {
+    ElMessage({
+      message: '没有商品信息，请先选择需要售卖的商品',
+      type: 'info',
+      plain: true,
+    });
+    return
   }
+  nextTick(() => {
+    checkoutDetailRef.value.init(goodsList);
+  })
+}
 
-  const saveAndCharge = () => {
-    post('charge/save', {data: {...formData.value, doctorId: doctorId.value}}).then((res: any) => {
-      formData.value.code = res
-      nextTick(() => {
-        settlementRef.value?.init(res)
-      })
-    })
-  }
-  const diagnosisSearchRef = ref()
-  const diagnosisSearchApi = "social/diagnose/search"
-  const diagnosisShowConfig = [
-    {
-      label: "诊断名称",
-      prop: "name",
-    },
-    {
-      label: "诊断编码",
-      prop: "code",
-    }
-  ]
-  const diagnosisSelect = (list: any) => {
-    const diagnosisNames = list.map((item: any) => item.name).join(',')
-    formData.value.diagnosisMedicalRecord.diagnosisDetail = JSON.stringify(list)
-    formData.value.diagnosisMedicalRecord.diagnosisSummary = diagnosisNames
-  }
-  const recordsConsumptionRef = ref<any>("")
-  const patientCardRef = ref()
-  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)
-      let nList = formData.value.diagnosisMedicalRecord.diagnosisSummary.split(',')
-      diagnosisSearchRef.value?.init(list, nList);
-      recordsConsumptionRef.value?.init(formData.value.patientInfo.id);
-      patientCardRef.value?.init(formData.value.registrationId);
-    })
-  }
-  const dockerList = ref<any[]>([])
-  const getDockerList = () => {
-    let query = {
-      role: 1
-    }
-    post('organization/member/search', {query: query}).then((res: any) => {
-      dockerList.value = res
-    })
-  }
-  const orderCompleted = () => {
-    nextTick(() => {
-      chargeQueueRef.value?.getOrderList()
-    })
-  }
-  const orderCanceled = () => {
-    nextTick(() => {
-      chargeQueueRef.value?.getOrderList()
-    })
 const saveAndCharge = () => {
   post('charge/save', {data: {...formData.value, doctorId: doctorId.value}}).then((res: any) => {
     formData.value.code = res
@@ -252,7 +184,17 @@ const patientCardRef = ref()
 const clickItem = async (item: any, status: any) => {
   statusDisabled.value = status
   formData.value = await post('medical/record/getByDiagnosisCode', {diagnosisCode: item.code})
-  formData.value.doctorId = formData.value.patientRegistration.organizationDoctorId
+  //添加追溯码应采字段
+  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)
@@ -272,8 +214,6 @@ const getDockerList = () => {
   })
 }
 const orderCompleted = () => {
-  getDockerList()
-  list()
   nextTick(() => {
     chargeQueueRef.value?.getOrderList()
   })
@@ -283,46 +223,46 @@ const orderCanceled = () => {
     chargeQueueRef.value?.getOrderList()
   })
 
-  }
+}
 
 
-  onMounted(() => {
-    getDockerList()
-    list()
+onMounted(() => {
+  getDockerList()
+  list()
+})
+const getOrderTotalPrice = () => {
+  let totalPrice = 0
+  formData.value.itemDetail?.forEach((item: any) => {
+    totalPrice += item.selectedPrice * item.selectedNum
   })
-  const getOrderTotalPrice = () => {
-    let totalPrice = 0
-    formData.value.itemDetail?.forEach((item: any) => {
-      totalPrice += item.selectedPrice * item.selectedNum
-    })
-    formData.value.goodsDetail.forEach((item: any) => {
-      totalPrice += item.selectedPrice * item.selectedNum
-    })
-    formData.value.preTotalPrice = totalPrice
-    formData.value.totalPrice = totalPrice
-  }
+  formData.value.goodsDetail.forEach((item: any) => {
+    totalPrice += item.selectedPrice * item.selectedNum
+  })
+  formData.value.preTotalPrice = totalPrice
+  formData.value.totalPrice = totalPrice
+}
 
 
-  const props = {
-    expandTrigger: 'hover' as const,
-  }
+const props = {
+  expandTrigger: 'hover' as const,
+}
 
-  const doctorId = ref<any>('')
-  const handleChange = (value: any) => {
-    doctorId.value = value[value.length - 1]
-  }
+const doctorId = ref<any>('')
+const handleChange = (value: any) => {
+  doctorId.value = value[value.length - 1]
+}
 
-  const cardTypeList = ref<any>(Object.entries(psnCertTypes).map(([id, name]) => ({id, name})))
-  const doctorList = ref<any>([])
-  const sectionDoctorOption = ref<any>('')
-  const list = () => {
-    post(apiConfig.OrganizationMemberSearch, {query: {role: 1}}).then((res: any) => {
-      doctorList.value = res
-    })
-  }
+const cardTypeList = ref<any>(Object.entries(psnCertTypes).map(([id, name]) => ({id, name})))
+const doctorList = ref<any>([])
+const sectionDoctorOption = ref<any>('')
+const list = () => {
+  post(apiConfig.OrganizationMemberSearch, {query: {role: 1}}).then((res: any) => {
+    doctorList.value = res
+  })
+}
 
 const getStatus=(status:any)=>{
-  statusDisabled.value = status
+  console.log(111)
   formData.value = {
     patientInfo: {},
     diagnosisMedicalRecord: {},

From 2562377b7fc398995e7e8f4bd10b603f4385dd40 Mon Sep 17 00:00:00 2001
From: NiuZiYuan <niuziyuan@jizhiweb.cn>
Date: Mon, 12 May 2025 17:01:30 +0800
Subject: [PATCH 2/3] dev

---
 src/components/inventory/GoodsSearch.vue      |  3 +-
 .../inventory/purchase/AddOrder.vue           | 38 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/components/inventory/GoodsSearch.vue b/src/components/inventory/GoodsSearch.vue
index 5488449..63a54a5 100644
--- a/src/components/inventory/GoodsSearch.vue
+++ b/src/components/inventory/GoodsSearch.vue
@@ -25,9 +25,10 @@ const handleSelect = (item: any) => {
     unitPrice: goods.unitPrice,
     packagingUnit: goods.packagingUnit,
     minPackagingUnit: goods.minPackagingUnit,
-
+    idCode: (goods.idCode&&goods.idCode != "")?goods.idCode.split(","):[],
     goodId: goods.id,
     name: goods.name,
+    traceabilityCodeList:[],
     wholeNumber: 0,
     purchaseUnitPrice: goods.purchaseUnitPrice,
     disassemblyPrice : goods.disassemblyPrice
diff --git a/src/components/inventory/purchase/AddOrder.vue b/src/components/inventory/purchase/AddOrder.vue
index 32dfaa4..b4283ae 100644
--- a/src/components/inventory/purchase/AddOrder.vue
+++ b/src/components/inventory/purchase/AddOrder.vue
@@ -133,8 +133,19 @@
                   size="small" style="width: 100px;"/>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="100">
+          <el-table-column label="商品追溯码" width="150">
             <template #default="scope">
+              <el-input
+                  v-model="scope.row.traceabilityCode"
+                  placeholder="商品追溯码"
+                  style="width: 100px"
+                  size="small"/>
+            </template>
+
+          </el-table-column>
+          <el-table-column label="操作" width="150">
+            <template #default="scope">
+              <el-button size="small" @click="openCheckoutDetail(scope.row)" type="danger" plain>溯源码</el-button>
               <el-button size="small" @click="removeTableRow(scope.row)" type="danger" plain>移除</el-button>
             </template>
           </el-table-column>
@@ -157,7 +168,7 @@
   <!--  <Mask :is-show="is_add" :top="100">-->
   <!--    <Edit ref="editRef" @close="is_add = false;"/>-->
   <!--  </Mask>-->
-
+  <CheckoutDetail ref="checkoutDetailRef"   @confirm="confirmTrace"></CheckoutDetail>
 </template>
 
 <script lang="ts" setup>
@@ -167,9 +178,11 @@ import Edit from "@/components/inventory/goods/Edit.vue";
 import Mask from "@/components/common/Mask.vue";
 import {ElMessage} from "element-plus";
 import GoodsSearch from "@/components/inventory/GoodsSearch.vue";
+import CheckoutDetail from "@/components/inventory/CheckoutDetail.vue";
 import {Search} from "@element-plus/icons-vue";
 
 const orderForm = ref()
+const checkoutDetailRef = ref<any>(false);
 const formRules = ref({
   shippingCode: [{required: true, message: '请输入货单号', trigger: 'blur'}],
   purchaseDate: [{required: true, message: '请选择采购日期', trigger: 'change'}],
@@ -264,6 +277,7 @@ function getFormattedDate() {
 }
 
 let confirm = async () => {
+  console.log('table_list.value++++++++++++++',table_list.value)
   // 进行表单验证
   try {
     await orderForm.value.validate()
@@ -359,6 +373,26 @@ const init = () => {
   getSupplierList()
   getUserInfo()
 }
+// 追溯码代码
+const openCheckoutDetail = (row: any) => {
+  let goodlist = []
+  goodlist.push(row)
+  nextTick(() => {
+    checkoutDetailRef.value.init(goodlist);
+  })
+}
+//追溯码页面回调
+const confirmTrace = (data: any) => {
+  let index = findIndexForTableList(data[0].goodId);
+  table_list.value[index] = data[0]
+  checkoutDetailRef.value.close();
+  // table_list.value.forEach((item: any) => {
+  //   if(item.goodId === data[0].goodId){
+  //     item = data[0]
+  //     table_list.value.
+  //   }
+  // })
+}
 defineExpose({init})
 </script>
 <style scoped lang="scss">

From 23e66702779f52693b3268c7d72d375351422b01 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Mon, 12 May 2025 17:02:50 +0800
Subject: [PATCH 3/3] dev

---
 src/views/charge/index.vue | 178 +++++++------------------------------
 1 file changed, 33 insertions(+), 145 deletions(-)

diff --git a/src/views/charge/index.vue b/src/views/charge/index.vue
index 97f709e..9925d8e 100644
--- a/src/views/charge/index.vue
+++ b/src/views/charge/index.vue
@@ -54,7 +54,7 @@
                        @totalPriceChange="getOrderTotalPrice" :statusDisabled="statusDisabled==1"></GoodsDetail>
         </div>
         <div class="bottom">
-          <TotalPrice v-model="formData.totalPrice" @save="charge" :status="formData.status" @openCheckOut ="openCheckoutDetail(formData.goodsDetail)"></TotalPrice>
+          <TotalPrice v-model="formData.totalPrice" @edit="saveAndCharge" :status="!(statusDisabled)&&formData.status==0"></TotalPrice>
         </div>
       </el-scrollbar>
     </div>
@@ -67,7 +67,6 @@
       </div>
     </div>
   </div>
-  <CheckoutDetail ref="checkoutDetailRef" @confirm ="saveAndCharge"></CheckoutDetail>
   <Settlement
       ref="settlementRef"
       v-model="socialCard"
@@ -88,11 +87,11 @@ import DiagnosisSearchInput from "@/components/outpatient/DiagnosisSearchInput.v
 import Settlement from "@/components/charge/Settlement.vue";
 import TotalPrice from "@/components/charge/TotalPrice.vue";
 import psnCertTypes from "@/assets/config/directory/psnCertTypes.json"
+import {getKey} from "@/utils/discrotyUtil.ts";
+import antys from "@/assets/config/directory/antys.json"
 import RecordsLog from "@/components/charge/RecordsLog.vue";
 import PatientCard from "@/components/charge/PatientCard.vue";
 import {apiConfig} from "@/assets/config/apiConfig.ts";
-import CheckoutDetail from "@/components/charge/CheckoutDetail.vue";
-import {ElMessage} from "element-plus";
 
 const socialCard = ref<any>({payInfo: {}})
 const formData = ref<any>({
@@ -111,116 +110,6 @@ const delDraft = () => {
   })
 }
 const settlementRef = ref()
-const charge = () => {
-
-  if (checkTraceCode(formData.value.goodsDetail)) {
-    //保存订单
-    saveAndCharge()
-  } else {
-    //打开追溯码详情页
-    openCheckoutDetail(formData.value.goodsDetail)
-  }
-}
-
-
-const checkTraceCode = (goodsList: any[]) => {
-
-  for (let i = 0; i < goodsList.length; i++) {
-    const item = goodsList[i];
-    if (!item.traceAbilityCodeList || item.shouldNumber != item.traceAbilityCodeList.length) {
-      ElMessage({
-        message: `${item.name}的追溯码采集未完成`,
-        type: 'warning',
-      })
-      return false;
-    }
-  }
-  return true;
-
-}
-  const checkoutDetailRef = ref()
-  const openCheckoutDetail = (goodsList: any[]) => {
-    if (!goodsList || goodsList.length == 0) {
-      ElMessage({
-        message: '没有商品信息，请先选择需要售卖的商品',
-        type: 'info',
-        plain: true,
-      });
-      return
-    }
-    nextTick(() => {
-      checkoutDetailRef.value.init(goodsList);
-    })
-  }
-
-  const saveAndCharge = () => {
-    post('charge/save', {data: {...formData.value, doctorId: doctorId.value}}).then((res: any) => {
-      formData.value.code = res
-      nextTick(() => {
-        settlementRef.value?.init(res)
-      })
-    })
-  }
-  const diagnosisSearchRef = ref()
-  const diagnosisSearchApi = "social/diagnose/search"
-  const diagnosisShowConfig = [
-    {
-      label: "诊断名称",
-      prop: "name",
-    },
-    {
-      label: "诊断编码",
-      prop: "code",
-    }
-  ]
-  const diagnosisSelect = (list: any) => {
-    const diagnosisNames = list.map((item: any) => item.name).join(',')
-    formData.value.diagnosisMedicalRecord.diagnosisDetail = JSON.stringify(list)
-    formData.value.diagnosisMedicalRecord.diagnosisSummary = diagnosisNames
-  }
-  const recordsConsumptionRef = ref<any>("")
-  const patientCardRef = ref()
-  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)
-      let nList = formData.value.diagnosisMedicalRecord.diagnosisSummary.split(',')
-      diagnosisSearchRef.value?.init(list, nList);
-      recordsConsumptionRef.value?.init(formData.value.patientInfo.id);
-      patientCardRef.value?.init(formData.value.registrationId);
-    })
-  }
-  const dockerList = ref<any[]>([])
-  const getDockerList = () => {
-    let query = {
-      role: 1
-    }
-    post('organization/member/search', {query: query}).then((res: any) => {
-      dockerList.value = res
-    })
-  }
-  const orderCompleted = () => {
-    nextTick(() => {
-      chargeQueueRef.value?.getOrderList()
-    })
-  }
-  const orderCanceled = () => {
-    nextTick(() => {
-      chargeQueueRef.value?.getOrderList()
-    })
 const saveAndCharge = () => {
   post('charge/save', {data: {...formData.value, doctorId: doctorId.value}}).then((res: any) => {
     formData.value.code = res
@@ -282,44 +171,43 @@ const orderCanceled = () => {
     chargeQueueRef.value?.getOrderList()
   })
 
-  }
+}
 
 
-  onMounted(() => {
-    getDockerList()
-    list()
+onMounted(() => {
+  getDockerList()
+  list()
+})
+const getOrderTotalPrice = () => {
+  let totalPrice = 0
+  formData.value.itemDetail?.forEach((item: any) => {
+    totalPrice += item.selectedPrice * item.selectedNum
   })
-  const getOrderTotalPrice = () => {
-    let totalPrice = 0
-    formData.value.itemDetail?.forEach((item: any) => {
-      totalPrice += (item.selectedPrice*100 * item.selectedNum*100)/10000
-    })
-    formData.value.goodsDetail.forEach((item: any) => {
-      totalPrice += (item.selectedPrice*100 * item.selectedNum*100)/10000
-    })
-    formData.value.preTotalPrice = totalPrice
-    formData.value.totalPrice = totalPrice
-  }
+  formData.value.goodsDetail.forEach((item: any) => {
+    totalPrice += item.selectedPrice * item.selectedNum
+  })
+  formData.value.preTotalPrice = totalPrice
+  formData.value.totalPrice = totalPrice
+}
 
 
-  const props = {
-    expandTrigger: 'hover' as const,
-  }
+const props = {
+  expandTrigger: 'hover' as const,
+}
 
-  const doctorId = ref<any>('')
-  const handleChange = (value: any) => {
-    doctorId.value = value[value.length - 1]
-  }
-
-  const cardTypeList = ref<any>(Object.entries(psnCertTypes).map(([id, name]) => ({id, name})))
-  const doctorList = ref<any>([])
-  const sectionDoctorOption = ref<any>('')
-  const list = () => {
-    post(apiConfig.OrganizationMemberSearch, {query: {role: 1}}).then((res: any) => {
-      doctorList.value = res
-    })
-  }
+const doctorId = ref<any>('')
+const handleChange = (value: any) => {
+  doctorId.value = value[value.length - 1]
+}
 
+const cardTypeList = ref<any>(Object.entries(psnCertTypes).map(([id, name]) => ({id, name})))
+const doctorList = ref<any>([])
+const sectionDoctorOption = ref<any>('')
+const list = () => {
+  post(apiConfig.OrganizationMemberSearch, {query: {role: 1}}).then((res: any) => {
+    doctorList.value = res
+  })
+}
 const getStatus=(status:any)=>{
   statusDisabled.value = status
   formData.value = {