提交merge1.3

openhis-ui-vue3/src/views/basicmanage/pharmacyDepartment/index.vue

@@ -104,14 +104,6 @@
                   style="width: 200px"
                   :class="{ 'error-border': scope.row.error }"
                 >
-<<<<<<< HEAD
-                  <el-option
-                    v-for="dict in med_category_code"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  />
-=======
                   <template v-if="scope.row.itemCode == '1'">
                     <el-option
                       v-for="dict in med_category_code"
@@ -128,7 +120,6 @@
                       :value="dict.value"
                     />
                   </template>
->>>>>>> v1.3
                 </el-select>
               </div>
             </template>
@@ -226,15 +217,11 @@ import {
   deletePharmacyDepartment,
 } from './components/pharmacyDepartment';
 const { proxy } = getCurrentInstance();
-<<<<<<< HEAD
-const { med_category_code } = proxy.useDict('med_category_code');
-=======
 const { distribution_category_code, med_category_code, device_category_code } = proxy.useDict(
   'distribution_category_code',
   'med_category_code',
   'device_category_code'
 );
->>>>>>> v1.3
 import { nextTick } from 'vue';
 
 const diagnosisTreatmentList = ref([]);