提交merge1.3

openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue

@@ -129,7 +129,11 @@
                 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"
@@ -206,12 +210,18 @@
           </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"
@@ -253,8 +263,18 @@
             <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"
+                      :width="1000"
+                      :modelValue="item.name"
+                      @focus="popoverListhandleFocus(item.name)"
+                    >
+>>>>>>> v1.3
                       <template #popover-content="{}">
                         <medicineList
                           @selectRow="(row) => selectRow(row, index)"
@@ -280,7 +300,11 @@
                       "
                     />
                   </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">
@@ -369,6 +393,7 @@ const { unit_code, med_chrgitm_type, fin_type_code, activity_category_code, chrg
     'chrgitm_lv'
   );
 
+const isTemplateActive = ref(true);
 const title = ref('');
 const visible = ref(false);
 const emits = defineEmits(['submit']); // 声明自定义事件
@@ -384,7 +409,10 @@ 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' }],
@@ -426,6 +454,10 @@ const props = defineProps({
     type: Object,
     required: false,
   },
+  isEditInfoDisable: {
+    type: Number,
+    required: false,
+  },
 });
 
 // 表单数组，初始一条记录
@@ -490,6 +522,7 @@ function show() {
   exeOrganizations.value = props.exeOrganizations;
   typeEnumOptions.value = props.typeEnumOptions;
   form.value.categoryCode = props.currentCategoryEnum;
+  form.value.isEditInfoDisable = props.isEditInfoDisable;
   visible.value = true;
 }
 
@@ -645,10 +678,26 @@ function handleSearch(value) {
   medicineSearchKey.value = value;
 }
 
+<<<<<<< HEAD
+=======
+function popoverListhandleFocus(value) {
+  // debugger;
+  console.log(value);
+  if (value === '') {
+    return;
+  }
+  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();
 }