提交merge1.3

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

@@ -1,6 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="100px">
+<<<<<<< HEAD
     </el-form>
     <el-table
       v-loading="loading"
@@ -25,11 +26,45 @@
         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"
+            :value="category.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="选择年份：">
+        <el-date-picker v-model="queryParams.occurrenceTime" type="year" value-format="YYYY" placeholder="选择日期"
+          style="width: 200px" />
+      </el-form-item>
+    </el-form>
+    <el-row :gutter="10" style="margin-left: 20px; margin-right: 0px; margin-bottom: 5px">
+      <el-col :span="1.5">
+        <!-- v-hasPermi="['system:user:import']" -->
+        <el-button type="primary" plain icon="Search" @click="handleQuery">查询</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <!-- v-hasPermi="['system:user:export']" -->
+        <el-button type="warning" plain icon="CircleClose" @click="handleClear">重置</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <!-- v-hasPermi="['system:user:export']" -->
+        <el-button type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+      </el-col>
+    </el-row>
+    <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">
+>>>>>>> v1.3
         <template #default="scope">
           <span>{{ parseTime(scope.row.occurrenceTime) }}</span>
         </template>
       </el-table-column>
       <!-- itemTable -->
+<<<<<<< HEAD
       <el-table-column
         label="省级行政区划代码"
         align="center"
@@ -84,16 +119,44 @@
       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"
+        :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" />
+>>>>>>> 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,
+} from './statisticalManagent';
+import { onMounted } from 'vue';
+
+const basicInformationDetailsList = ref([]);
+const loading = ref(false);
+>>>>>>> v1.3
 const ids = ref([]);
 const single = ref(true);
 const multiple = ref(true);
@@ -101,7 +164,11 @@ const total = ref(0);
 const approvalTime = ref([]);
 const supplierListOptions = ref([]);
 const locationIdList = ref([]);
+<<<<<<< HEAD
 
+=======
+const occurrenceTime = ref([]);
+>>>>>>> v1.3
 const data = reactive({
   form: {},
   queryParams: {
@@ -110,22 +177,88 @@ 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'
+);
+const itemList = ref([])
+watch(
+  () => fin_type_code.value, // 监听 fin_type_code 的值变化
+  (newDict) => {
+    // 确保 newDict 是数组（避免初始值为 undefined）
+    if (Array.isArray(newDict) && newDict.length > 0) {
+      itemList.value = newDict.filter(item => 
+        item.label === "西药" || item.label === "中成药" || item.label === "中草药"|| item.label === "外购药品"
+      );
+    }
+  },
+  { immediate: true } // 组件挂载时立即执行一次（处理字典已缓存的情况）
+);
+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
+  });
+}
+
+// getList();
+/** 搜索按钮操作 */
+function handleQuery() {
+  if(!queryParams.value.itemTypeCode?.length){
+    ElMessage.warning("请选择药品类型")
+  }else if(queryParams.value.occurrenceTime == null){
+    ElMessage.warning("请选择时间")
+  }else {
+    queryParams.value.occurrenceTime = occurrenceTime.value;
+    // queryParams.value.searchKey = row.
+    queryParams.value.pageNo = 1;
+    getList();
+  }
+}
+function handleClear() {
+  // 清空查询条件
+  queryParams.value.occurrenceTime = '';
+  proxy.resetForm('queryRef');
+  getList();
+}
+// 导出
+function handleExport() {
+  proxy.downloadGet(
+    '/report-manage/report/excel-out/1',
+    {
+      ...queryParams.value,
+    },
+    `年度药品总收入_${proxy.formatDateStr(new Date(), 'YYYY-MM-DD')}.xlsx`
+  );
+}
+>>>>>>> v1.3
 </script>
 <style scoped>
 .custom-tree-node {