提交merge1.3

openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/index.vue

@@ -25,16 +25,6 @@
           v-model="queryParams.medCategoryCodes"
           placeholder="请选择药品类别"
           clearable
-<<<<<<< HEAD
-          style="width: 150px"
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="categoryCode in item_category_code"
-            :key="categoryCode.value"
-            :label="categoryCode.label"
-            :value="categoryCode.value"
-=======
           multiple
           filterable
           style="width: 260px"
@@ -47,7 +37,6 @@
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
->>>>>>> v1.3
           />
         </el-select>
       </el-form-item>
@@ -100,11 +89,7 @@
           />
         </el-select>
       </el-form-item>
-<<<<<<< HEAD
-      <el-form-item label="库存范围：" prop="zeroFlag">
-=======
       <el-form-item label="库存范围" prop="zeroFlag">
->>>>>>> v1.3
         <el-select
           v-model="queryParams.zeroFlag"
           placeholder="请选择库存范围"
@@ -120,11 +105,7 @@
           />
         </el-select>
       </el-form-item>
-<<<<<<< HEAD
-      <el-form-item label="仓库药房：" prop="locationId">
-=======
       <el-form-item label="仓库药房" prop="locationId">
->>>>>>> v1.3
         <el-select
           v-model="locationId"
           placeholder="请选择仓库药房"
@@ -141,11 +122,7 @@
           />
         </el-select>
       </el-form-item>
-<<<<<<< HEAD
-      <el-form-item label="供应商：" prop="supplierId">
-=======
       <el-form-item label="供应商" prop="supplierId">
->>>>>>> v1.3
         <el-select
           v-model="supplierId"
           placeholder="请选择供应商"
@@ -162,8 +139,6 @@
           />
         </el-select>
       </el-form-item>
-<<<<<<< HEAD
-=======
       <el-form-item label="备份日期" prop="backUpDate">
         <el-date-picker
           v-model="queryParams.backUpDate"
@@ -174,7 +149,6 @@
           style="width: 150px"
         />
       </el-form-item>
->>>>>>> v1.3
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -303,11 +277,7 @@
         :show-overflow-tooltip="true"
       >
         <template #default="scope">
-<<<<<<< HEAD
-          <span>{{ scope.row.purchasePrice?.toFixed(2) + ' 元' }}</span>
-=======
           <span>{{ scope.row.purchasePrice?.toFixed(3) + ' 元' }}</span>
->>>>>>> v1.3
         </template>
       </el-table-column>
       <el-table-column
@@ -320,11 +290,7 @@
         :show-overflow-tooltip="true"
       >
         <template #default="scope">
-<<<<<<< HEAD
-          <span>{{ scope.row.salePrice?.toFixed(2) + ' 元' }}</span>
-=======
           <span>{{ scope.row.salePrice?.toFixed(3) + ' 元' }}</span>
->>>>>>> v1.3
         </template>
       </el-table-column>
       <el-table-column
@@ -337,11 +303,7 @@
         :show-overflow-tooltip="true"
       >
         <template #default="scope">
-<<<<<<< HEAD
-          <span>{{ scope.row.totalPurchasePrice?.toFixed(2) + ' 元' }}</span>
-=======
           <span>{{ scope.row.totalPurchasePrice?.toFixed(3) + ' 元' }}</span>
->>>>>>> v1.3
         </template>
       </el-table-column>
       <el-table-column
@@ -354,11 +316,7 @@
         :show-overflow-tooltip="true"
       >
         <template #default="scope">
-<<<<<<< HEAD
-          <span>{{ scope.row.totalSalePrice?.toFixed(2) + ' 元' }}</span>
-=======
           <span>{{ scope.row.totalSalePrice?.toFixed(3) + ' 元' }}</span>
->>>>>>> v1.3
         </template>
       </el-table-column>
       <el-table-column
@@ -508,31 +466,18 @@ import {
   cancelSupply,
   stopSupply,
   productPageTotal,
-<<<<<<< HEAD
-=======
   productBackupPageTotal,
   getproductReturnBackUpPage,
->>>>>>> v1.3
 } from './statisticalManagent';
 import traceabilityCodeManagement from './traceabilityCodeManagement.vue';
 import { formatDateStr } from '@/utils/index';
 import { getSupplierList } from '@/api/public';
 import { useStore } from '@/store/store';
-<<<<<<< HEAD
-=======
 import { computed, watch } from 'vue';
->>>>>>> v1.3
 const store = useStore();
 
 const { proxy } = getCurrentInstance();
 
-<<<<<<< HEAD
-const { item_category_code, inventory_range } = proxy.useDict(
-  'item_category_code',
-  'inventory_range'
-);
-
-=======
 const { item_category_code, inventory_range, device_category_code, med_category_code } =
   proxy.useDict(
     'item_category_code',
@@ -546,7 +491,6 @@ const medCategoryCodeOptions = computed(() => {
 const deviceCategoryCodeOptions = computed(() => {
   return [{ value: 'all', label: '全部' }, ...device_category_code.value];
 });
->>>>>>> v1.3
 const purchaseinventoryList = ref([]);
 const visible = ref(false);
 const recordInfo = ref({});
@@ -597,9 +541,6 @@ watch(
   },
   { immediate: true } // 修正拼写错误
 );
-<<<<<<< HEAD
-
-=======
 watch(
   () => queryParams.value.backUpDate,
   (newValue, oldValue) => {
@@ -648,7 +589,6 @@ function handleChangeDeviceCategoryCode(value) {
     queryParams.value.devCategoryCodes = value || [];
   }
 }
->>>>>>> v1.3
 function getPharmacyCabinetLists() {
   getPharmacyCabinetList().then((response) => {
     locationIdList.value = response.data;
@@ -660,18 +600,6 @@ function getPharmacyCabinetLists() {
     chrgitmLv_enumTextOptions.value = response.data.chrgitmLvOptions;
   });
 }
-<<<<<<< HEAD
-/** 查询调拨管理项目列表 */
-function getList() {
-  console.log(store.remainingDays, '1');
-
-  loading.value = true;
-  salePriceTotal.value = 0;
-  priceTotal.value = 0;
-  queryParams.value.locationIds = locationId.value.join(',');
-  queryParams.value.supplierIds = supplierId.value.join(',');
-  getproductReturnPage(queryParams.value).then((res) => {
-=======
 /** 查询备份日期库存明细列表 */
 function getBackUpList() {
   loading.value = true;
@@ -695,7 +623,6 @@ function getBackUpList() {
     backUpDate: undefined,
   };
   getproductReturnBackUpPage(params).then((res) => {
->>>>>>> v1.3
     loading.value = false;
     purchaseinventoryList.value = res.data.records;
     if (purchaseinventoryList.value && purchaseinventoryList.value.length > 0) {
@@ -707,9 +634,6 @@ function getBackUpList() {
     }
     total.value = res.data.total;
   });
-<<<<<<< HEAD
-  productPageTotal(queryParams.value).then((res) => {
-=======
   productBackupPageTotal(params).then((res) => {
     salePriceTotal.value = res.data.purchasePriceStatistics;
     priceTotal.value = res.data.salePriceStatistics;
@@ -746,7 +670,6 @@ function getList() {
     total.value = res.data.total;
   });
   productPageTotal(params).then((res) => {
->>>>>>> v1.3
     salePriceTotal.value = res.data.purchasePriceStatistics;
     priceTotal.value = res.data.salePriceStatistics;
   });