提交merge1.3

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();
 }