提交merge1.3

2025-12-27 15:30:40 +08:00
parent 088861f66e
commit 3c497417dc
167 changed files with 0 additions and 17577 deletions
--- a/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
@@ -94,14 +94,6 @@
                v-model="form.unitCode"
                clearable
                filterable
-<<<<<<< HEAD
-                remote
-                reserve-keyword
-                :remote-method="handleUnitCodeSearch"
-                :loading="unitCodeLoading"
-                @focus="handleUnitCodeFocus"
-=======
->>>>>>> v1.3
                @change="handleUnitCodeChange"
                :disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
              >
@@ -269,11 +261,7 @@
                clearable
                filterable
                style="width: 240px"
-<<<<<<< HEAD
-                :disabled="form.isEditInfoDisable === 1"
-=======
                :disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
->>>>>>> v1.3
              >
                <el-option
                  v-for="dict in med_chrgitm_type"
@@ -479,12 +467,7 @@ function getDeptTree() {

 /** 查询地点下拉树结构 */
 function getLocationTree() {
-<<<<<<< HEAD
-  locationTreeSelect({ formList: '11,16,17' }).then((response) => {
-    console.log(response, 'response查询部门下拉树结构');
-=======
  locationTreeSelect({ formList: '11,16' }).then((response) => {
->>>>>>> v1.3
    locationOptions.value = response.data.records;
  });
 }
--- a/openhis-ui-vue3/src/views/catalog/device/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/device/index.vue
@@ -103,12 +103,7 @@
          :data="deviceList"
          @selection-change="handleSelectionChange"
          width="90%"
-<<<<<<< HEAD
-        />
-        <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange" width="90%" border resizable-column>
-=======
        >
->>>>>>> v1.3
          <el-table-column type="selection" width="50" align="center" />
          <el-table-column
            label="编码"
@@ -116,11 +111,7 @@
            key="busNo"
            prop="busNo"
            :show-overflow-tooltip="true"
-<<<<<<< HEAD
-            width="200"
-=======
            width="150"
->>>>>>> v1.3
          />
          <el-table-column
            label="器材名称"
@@ -128,9 +119,6 @@
            key="name"
            prop="name"
            :show-overflow-tooltip="true"
-<<<<<<< HEAD
-            width="200"
-=======
            width="100"
          />
          <el-table-column
@@ -140,7 +128,6 @@
            prop="size"
            width="100"
            :show-overflow-tooltip="true"
->>>>>>> v1.3
          />
          <!-- <el-table-column
            label="拼音"
@@ -174,17 +161,6 @@
            width="100"
          />
          <el-table-column
-<<<<<<< HEAD
-            label="包装规格"
-            align="center"
-            key="size"
-            prop="size"
-            width="200"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-=======
->>>>>>> v1.3
            label="拆零比"
            align="center"
            key="partPercent"
@@ -206,11 +182,7 @@
            key="minUnitCode_dictText"
            prop="minUnitCode_dictText"
            :show-overflow-tooltip="true"
-<<<<<<< HEAD
-            width="120"
-=======
            width="100"
->>>>>>> v1.3
          />
          <!-- <el-table-column
            label="所属科室"
--- a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
@@ -129,11 +129,7 @@
                clearable
                filterable
                style="width: 240px"
-<<<<<<< HEAD
-                :disabled="form.isEditInfoDisable === 1"
-=======
                :disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
->>>>>>> v1.3
              >
                <el-option
                  v-for="dict in med_chrgitm_type"
@@ -210,18 +206,9 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="财务类型" prop="itemTypeCode">
-<<<<<<< HEAD
-              <el-select
-                v-model="form.itemTypeCode"
-                clearable
-                filterable
-                :disabled="form.isEditInfoDisable === 1"
-              >
-=======
              <el-select v-model="form.itemTypeCode" clearable filterable>
                <!-- :disabled="form.isEditInfoDisable === 1" -->

->>>>>>> v1.3
                <el-option
                  v-for="category in fin_type_code"
                  :key="category.value"
@@ -263,10 +250,6 @@
            <el-row :gutter="24">
              <el-col :span="8">
                <el-form-item label="诊疗子项">
-<<<<<<< HEAD
-                  <div v-if="form.isEditInfoDisable === 0" style="position: relative">
-                    <PopoverList @search="handleSearch" :width="1000" :modelValue="item.name">
-=======
                  <div style="position: relative">
                    <PopoverList
                      @search="handleSearch"
@@ -274,7 +257,6 @@
                      :modelValue="item.name"
                      @focus="popoverListhandleFocus(item.name)"
                    >
->>>>>>> v1.3
                      <template #popover-content="{}">
                        <medicineList
                          @selectRow="(row) => selectRow(row, index)"
@@ -300,11 +282,7 @@
                      "
                    />
                  </div>
-<<<<<<< HEAD
-                  <span v-else>{{ item.name || '' }}</span>
-=======
                  <!-- <span v-else>{{ item.name || '' }}</span> -->
->>>>>>> v1.3
                </el-form-item>
              </el-col>
              <el-col :span="8">
@@ -409,10 +387,6 @@ const diagnosisTreatmentList = ref([]);
 const data = reactive({
  form: {},
  rules: {
-<<<<<<< HEAD
-    busNo: [{ required: true, message: "编码不能为空", trigger: "blur" }],
-=======
->>>>>>> v1.3
    name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
    categoryCode: [{ required: true, message: '诊疗目录不能为空', trigger: 'blur' }],
    permittedUnitCode: [{ required: true, message: '使用单位不能为空', trigger: 'blur' }],
@@ -678,8 +652,6 @@ function handleSearch(value) {
  medicineSearchKey.value = value;
 }

-<<<<<<< HEAD
-=======
 function popoverListhandleFocus(value) {
  // debugger;
  console.log(value);
@@ -689,15 +661,11 @@ function popoverListhandleFocus(value) {
  medicineSearchKey.value = value;
 }

->>>>>>> v1.3
 function selectRow(row, index) {
  treatmentItems.value[index].name = row.name;
  treatmentItems.value[index].adviceDefinitionId = row.id;
  treatmentItems.value[index].retailPrice = row.retailPrice || 0;
-<<<<<<< HEAD
-=======
  medicineSearchKey.value = '';
->>>>>>> v1.3
  calculateTotalPrice();
 }

--- a/openhis-ui-vue3/src/views/catalog/disease/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/disease/index.vue
@@ -101,86 +101,6 @@
          </el-col> -->
        </el-row>

-<<<<<<< HEAD
-        <!-- 添加外层滚动容器，确保表格可以水平滚动 -->
-        <div class="table-scroll-container">
-          <!-- 移除style="width: 100%"，让Element UI表格根据内容自动调整 -->
-          <el-table v-loading="loading" :data="diseaseList" @selection-change="handleSelectionChange" border resizable>
-            <el-table-column type="selection" width="50" align="center" />
-            <!-- 使用prop属性并设置合适的最小宽度，启用列宽调整 -->
-            <el-table-column label="编码" align="center" prop="conditionCode" min-width="150" />
-            <!-- 名称列使用标准配置 -->
-            <el-table-column
-              label="名称"
-              align="center"
-              prop="name"
-              min-width="280"
-            />
-            <!-- 其他列使用标准配置 -->
-            <el-table-column
-              label="疾病分类"
-              align="center"
-              prop="sourceEnum_enumText"
-              min-width="180"
-            />
-            <el-table-column
-              label="拼音助记码"
-              align="center"
-              prop="pyStr"
-              min-width="220"
-            />
-            <el-table-column
-              label="类型"
-              align="center"
-              prop="typeCode_dictText"
-              min-width="120"
-            />
-            <el-table-column
-              label="医保编码"
-              align="center"
-              prop="ybNo"
-              min-width="180"
-            />
-            <el-table-column
-              label="医保标记"
-              align="center"
-              prop="ybMatchFlag_enumText"
-              min-width="150"
-            />
-            <el-table-column
-              label="医保对码标志"
-              align="center"
-              prop="ybMatchFlag_enumText"
-              min-width="150"
-            />
-            <el-table-column
-              label="状态"
-              align="center"
-              prop="statusEnum_enumText"
-              min-width="150"
-            />
-            <el-table-column
-              label="描述"
-              align="center"
-              prop="description"
-              min-width="250"
-            />
-            <el-table-column
-              label="操作"
-              align="center"
-              min-width="120"
-              class-name="small-padding"
-            >
-              <template #default="scope">
-                <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-                  >编辑</el-button
-                >
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-          <pagination
-=======
        <el-table v-loading="loading" :data="diseaseList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="50" align="center" />
          <el-table-column label="编码" align="center" key="conditionCode" prop="conditionCode" />
@@ -259,7 +179,6 @@
          </el-table-column>
        </el-table>
        <pagination
->>>>>>> v1.3
          v-show="total > 0"
          :total="total"
          v-model:page="queryParams.pageNo"
--- a/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
@@ -121,15 +121,7 @@
              </el-col>
              <el-col :span="6">
                <el-form-item label="规格" prop="totalVolume">
-<<<<<<< HEAD
-                  <el-input
-                    v-model="form.totalVolume"
-                    placeholder=""
-                    clearable
-                  />
-=======
                  <el-input v-model="form.totalVolume" placeholder="" clearable />
->>>>>>> v1.3
                </el-form-item>
              </el-col>
              <el-col :span="6">
@@ -464,11 +456,7 @@
                    clearable
                    filterable
                    style="width: 240px"
-<<<<<<< HEAD
-                    :disabled="form.isEditInfoDisable === 1"
-=======
                    :disabled="form.isEditInfoDisable === 1 || form.isEditInfoDisable === 2"
->>>>>>> v1.3
                  >
                    <el-option
                      v-for="dict in med_chrgitm_type"
@@ -877,25 +865,13 @@ function setValue(row) {
    approvalNumber: formatValue(row.approvalNo), // 批准文号
    manufacturerText: formatValue(row.manufacturerName), // 生产厂家
    basicFlag: formatValue(row.essentialDrugFlag), // 基药标识
-<<<<<<< HEAD
-    // injectFlag: row.,  // 注射药物
-    // childrenFlag: row.pediatricUse,  // 儿童用药标志
-    // selfFlag: row.,  // 自制药标识
-    // activeFlag: row.,  // 是否活性
-=======
->>>>>>> v1.3
    restrictedFlag: formatValue(row.restrictedFlag), // 限制使用
    restrictedScope: formatValue(row.restrictedScope), // 限制使用范围
    rxFlag: formatValue(row.rxFlag), // 处方标志
    chrgitmLv: formatValue(
      row.insuranceClass == '甲' ? '1' : row.insuranceClass == '乙' ? '2' : '3'
    ), // 医保等级
-<<<<<<< HEAD
-    // antibioticFlag: row.,  // 抗生素
-  };  
-=======
  };
->>>>>>> v1.3
  setFlag(form.value);
 }

@@ -912,11 +888,6 @@ function formatValue(str) {

 // 显示弹框
 function edit() {
-<<<<<<< HEAD
-  // getList();
-  console.log(props, '22222'); 
-=======
->>>>>>> v1.3
  title.value = '编辑药品';
  reset();
  activeName.value = 'basic'; 
@@ -973,20 +944,10 @@ function setFlag(data) {
 function reset() {
  form.value = {
    id: undefined,
-<<<<<<< HEAD
-    medicineCode: '',
-    medicineName: '',
-    tradeName: '',
-    spec: '',
-    manufacturer: '',
-    rxFlag: '0', // 默认设置为非处方
-    dose: undefined,
-=======
    medicationDefId: undefined,
    locationId: undefined,
    activeFlag: undefined,
    doseFrom: undefined,
->>>>>>> v1.3
    rateCode: undefined,
    approvalNumber: undefined,
    name: undefined,
@@ -1032,12 +993,8 @@ function reset() {
    thoPartAttributeEnum: undefined,
    usageLimit: undefined,
    basicFlag: undefined,
-<<<<<<< HEAD
-    chrgitmLv: '3',
-=======
    rxFlag: undefined,
    chrgitmLv: '3', // 默认设置为自费
->>>>>>> v1.3
  };
  antibioticForm.value = {
    antibioticCode: undefined,
@@ -1084,16 +1041,9 @@ function submitForm() {
  
  proxy.$refs['medicationRef'].validate((valid) => {
    if (valid) {
-<<<<<<< HEAD
-      // 处理抗生素相关字段
-      if (form.value.activeFlag == 1) {
-        form.value.antibioticCode = antibioticForm.value.antibioticCode === undefined ? '3' : antibioticForm.value.antibioticCode;
-        form.value.restrictedEnum = antibioticForm.value.restrictedEnum === undefined ? '4' : antibioticForm.value.restrictedEnum;
-=======
      if (form.value.activeFlag == true) {
        form.value.antibioticCode = antibioticForm.value.antibioticCode;
        form.value.restrictedEnum = antibioticForm.value.restrictedEnum;
->>>>>>> v1.3
        form.value.minRateCode = antibioticForm.value.minRateCode;
        form.value.maxRateCode = antibioticForm.value.maxRateCode;
        form.value.dddUnitCode = antibioticForm.value.dddUnitCode;
--- a/openhis-ui-vue3/src/views/catalog/medicine/index.vue
+++ b/openhis-ui-vue3/src/views/catalog/medicine/index.vue
@@ -155,11 +155,8 @@
            :show-overflow-tooltip="true"
            min-width="110"
            width="200px"
-<<<<<<< HEAD
-=======
            sortable
            :sort-by="(row) => getPinyinFirstLetter(row)"
->>>>>>> v1.3
          />
          <el-table-column
            label="规格"