提交merge1.3

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

@@ -1,32 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="100px">
-<<<<<<< HEAD
-    </el-form>
-    <el-table
-      v-loading="loading"
-      :data="basicInformationDetailsList"
-      @selection-change="handleSelectionChange"
-      height="calc(100vh - 300px)"
-    >
-      <el-table-column type="selection" width="50" align="center" />
-      <el-table-column
-        label="序号"
-        align="center"
-        key="no"
-        prop="no"
-        width="200"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="数据上报日期"
-        align="center"
-        key="dataReportingDate"
-        prop="dataReportingDate"
-        width="200"
-        :show-overflow-tooltip="true"
-      >
-=======
       <el-form-item label="药品类别：" prop="itemTypeCode">
         <el-select multiple v-model="queryParams.itemTypeCode" clearable style="width: 200px">
           <el-option v-for="category in itemList" :key="category.value" :label="category.label"
@@ -58,68 +32,11 @@
       <el-table-column label="序号" align="center" key="no" prop="no" width="200" :show-overflow-tooltip="true" />
       <el-table-column label="数据上报日期" align="center" key="dataReportingDate" prop="dataReportingDate" width="200"
         :show-overflow-tooltip="true">
->>>>>>> v1.3
         <template #default="scope">
           <span>{{ parseTime(scope.row.occurrenceTime) }}</span>
         </template>
       </el-table-column>
       <!-- itemTable -->
-<<<<<<< HEAD
-      <el-table-column
-        label="省级行政区划代码"
-        align="center"
-        key="provinceCodes"
-        prop="provinceCodes"
-        width="200"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="组织机构代码"
-        align="center"
-        key="organizationCode"
-        prop="organizationCode"
-        width="200"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="医疗机构代码"
-        align="center"
-        key="medicalCode"
-        prop="medicalCode"
-        width="200"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="组织机构名称"
-        align="center"
-        key="organizationName"
-        prop="organizationName"
-        width="200"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="年度药品总收入(元)"
-        align="center"
-        key="yearMedicineTotalRevenue"
-        prop="yearMedicineTotalRevenue"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="实有床位数"
-        align="center"
-        key="actualBedsNo"
-        prop="actualBedsNo"
-        :show-overflow-tooltip="true"
-      />
-    </el-table>
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-=======
       <el-table-column label="省级行政区划代码" align="center" key="provinceCodes" prop="provinceCodes" width="200"
         :show-overflow-tooltip="true" />
       <el-table-column label="组织机构代码" align="center" key="organizationCode" prop="organizationCode" width="200"
@@ -135,19 +52,10 @@
     </el-table>
     <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
       @pagination="getList" />
->>>>>>> v1.3
   </div>
 </template>
 
 <script setup name="basicInformationDetails">
-<<<<<<< HEAD
-import {
-  getReportBasicInformationDetails,
-} from './statisticalManagent';
-
-const basicInformationDetailsList = ref([]);
-const loading = ref(true);
-=======
 import { ElMessage } from 'element-plus';
 import {
   getReportBasicInformationDetails,
@@ -156,7 +64,6 @@ import { onMounted } from 'vue';
 
 const basicInformationDetailsList = ref([]);
 const loading = ref(false);
->>>>>>> v1.3
 const ids = ref([]);
 const single = ref(true);
 const multiple = ref(true);
@@ -164,11 +71,7 @@ const total = ref(0);
 const approvalTime = ref([]);
 const supplierListOptions = ref([]);
 const locationIdList = ref([]);
-<<<<<<< HEAD
-
-=======
 const occurrenceTime = ref([]);
->>>>>>> v1.3
 const data = reactive({
   form: {},
   queryParams: {
@@ -177,19 +80,13 @@ const data = reactive({
     searchKey: undefined,
     occurrenceTimeSTime: undefined,
     occurrenceTimeETime: undefined,
-<<<<<<< HEAD
-=======
     occurrenceTime,
     itemTypeCode:[]
->>>>>>> v1.3
   },
   rules: {},
 });
 
 const { queryParams, form, rules } = toRefs(data);
-<<<<<<< HEAD
-
-=======
 const { proxy } = getCurrentInstance();
 const { fin_type_code } = proxy.useDict(
   'fin_type_code'
@@ -211,19 +108,10 @@ onMounted(() => {
   console.log("fin_type_code:",fin_type_code);
   
 })
->>>>>>> v1.3
 function getList() {
   loading.value = true;
   getReportBasicInformationDetails(queryParams.value).then((res) => {
     loading.value = false;
-<<<<<<< HEAD
-    basicInformationDetailsList.value = res.data.records;
-    total.value = res.data.total;
-  });
-}
-
-getList();
-=======
     basicInformationDetailsList.value = res.data
   });
 }
@@ -258,7 +146,6 @@ function handleExport() {
     `年度药品总收入_${proxy.formatDateStr(new Date(), 'YYYY-MM-DD')}.xlsx`
   );
 }
->>>>>>> v1.3
 </script>
 <style scoped>
 .custom-tree-node {