Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web

src/components/common/goods/GoodsDetail.vue

@@ -157,7 +157,7 @@ const goodsSelect = (row: any) => {
   row.selectedUnit = row.packagingUnit
   row.selectedPrice = row.unitPrice
   row.shouldNumber  = 1;
-  row.idCode = row.idCode.split(",")
+  row.idCode = row.idCode?.split(",")
 
 
   if (goodsDetail.value.find((i: any) => i.id == row.id)) {

src/components/inventory/purchase/AddOrder.vue

@@ -293,7 +293,6 @@ let confirm = async () => {
     }
     //生产批号
     for (let i = 0; i < table_list.value.length; i++) {
-      debugger
       if (!table_list.value[i].productionBatchCode) {
         ElMessage.error('生产批号不能为空')
         return

src/components/registration/Edit.vue

@@ -236,7 +236,6 @@ const close = () => {
 }
 const form = ref()
 const save = () => {
-  debugger
   let data = {
     ...edit_data.value,
     psnNo: socialCard.value?.data?.baseinfo.psn_no,

src/views/charge/index.vue

@@ -88,6 +88,8 @@ 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";
@@ -221,105 +223,44 @@ const checkTraceCode = (goodsList: any[]) => {
     nextTick(() => {
       chargeQueueRef.value?.getOrderList()
     })
-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 = [
+onMounted(() => {
-  {
-    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})
-  formData.value.doctorId = formData.value.patientRegistration.organizationDoctorId
-  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 = () => {
   getDockerList()
   list()
-  nextTick(() => {
+})
-    chargeQueueRef.value?.getOrderList()
+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
+}
+
+
+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 orderCanceled = () => {
-  nextTick(() => {
-    chargeQueueRef.value?.getOrderList()
-  })
-
-  }
-
-
-  onMounted(() => {
-    getDockerList()
-    list()
-  })
-  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
-  }
-
-
-  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 getStatus=(status:any)=>{
   statusDisabled.value = status
   formData.value = {