解决合并冲突并优化代码结构

openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockBatch/index.vue

@@ -701,7 +701,6 @@ import {
   addBatch, //保存批量盘点
   productStocktakingApproved,
   reject,
-<<<<<<< HEAD
   getpharmacyCabinetList
 } from "../components/api";
 import PopoverList from "@/components/OpenHis/popoverList/index.vue";
@@ -709,14 +708,6 @@ import MedicineList from "../components/medicineList.vue";
 import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue'
 import { formatDate,formatDateymd } from "@/utils/index";
 import { ref } from "vue";
-=======
-} from '../components/api';
-import PopoverList from '@/components/OpenHis/popoverList/index.vue';
-import MedicineList from '../components/medicineList.vue';
-import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue';
-import { formatDate, formatDateymd } from '@/utils/index';
-import { ref } from 'vue';
->>>>>>> upstream/develop
 
 const router = useRouter();
 const route = useRoute();
@@ -2174,13 +2165,7 @@ function getStockReceiptTypeList() {
     console.log('详情页查询下拉树response1111111', response);
 
     // categoryListOptions.value = response.data.categoryListOptions; // 药品类型
-<<<<<<< HEAD
     profitReasonOptions.value =  response.data.profitReasonOptions; // 盈亏原因
-=======
-    profitReasonOptions.value = response.data.profitReasonOptions; // 盈亏原因
-    // receiptHeaderForm.purposeTypeEnum = warehous_type.value[0].value // 仓库类型默认值
-    // handleChangePurposeTypeEnum(receiptHeaderForm.purposeTypeEnum)
->>>>>>> upstream/develop
     // cabinetListOptionsBk.value = response.data.purposeTypeListOptions; // 盘点仓库列表（未过滤）
 
     // purposeTypeListOptions.value = cabinetListOptionsBk.value.filter(item => item.formEnum === receiptHeaderForm.purposeTypeEnum) // 盘点仓库列表
@@ -2291,7 +2276,6 @@ function totalQuantityChange(rowData, index, value) {
   editBatchTransfer(index);
 }
 // 切换仓库类型获取药房/药库列表   目的仓库切换
-<<<<<<< HEAD
 function handleChangePurposeTypeEnum(value,type) {
   // 确保value是数字类型
   const numValue = Number(value);
@@ -2315,26 +2299,6 @@ function handleChangePurposeTypeEnum(value,type) {
       console.error('获取仓库列表失败:', error);
       purposeTypeListOptions.value = [];
       freightListOptions.value = [];
-=======
-function handleChangePurposeTypeEnum(value, type) {
-  if (value == 16) {
-    getPharmacyList().then((res) => {
-      purposeTypeListOptions.value = res.data;
-      if (!route.query.supplyBusNo && !type) {
-        receiptHeaderForm.purposeLocationId = '';
-        receiptHeaderForm.purposeLocationId1 = '';
-      }
-      // getinitValue()
-    });
-  } else if (value == 11) {
-    getDispensaryList().then((res) => {
-      purposeTypeListOptions.value = res.data;
-      if (!route.query.supplyBusNo && !type) {
-        receiptHeaderForm.purposeLocationId = '';
-        receiptHeaderForm.purposeLocationId1 = '';
-      }
-      // getinitValue()
->>>>>>> upstream/develop
     });
   } else if (numValue === 17) {
       // 处理耗材库类型