提交merge1.3

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