提交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([]);

openhis-ui-vue3/src/views/basicmanage/warehouseLocation/components/api.js

@@ -36,12 +36,8 @@ export function updateWarehouse(data) {
   // 删除
   export function deleteWarehouse(data) {
     return request({
-<<<<<<< HEAD
-      url: '/base-data-manage/location/location',
-=======
       // url: '/base-data-manage/location/location?locationId=' + data.locationId,
       url: '/base-data-manage/location/location?busNo=' + data.busNo,
->>>>>>> v1.3
       method: 'delete',
       params: {
         locationId: data.locationId,

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

@@ -292,38 +292,12 @@ function submitForm() {
 
 // 删除
 function handelDelete(data) {
-<<<<<<< HEAD
-  proxy.$modal.confirm('是否确认删除该仓库位置?', '提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(() => {
-    loading.value = true;
-    deleteWarehouse({ locationId: data.id, busNo: data.busNo }).then((res) => {
-      if (res.code === 200) {
-        proxy.$modal.msgSuccess('删除成功');
-        getPageList();
-      } else {
-        // 检查错误信息是否与药品数据关联有关
-        if (res.msg && res.msg.includes('药品')) {
-          proxy.$modal.msgError('该仓库名称已有药品信息请核对确认');
-        } else {
-          proxy.$modal.msgError('删除失败：' + (res.msg || '未知错误'));
-        }
-      }
-    }).catch(() => {
-      proxy.$modal.msgError('删除失败');
-    }).finally(() => {
-      loading.value = false;
-    });
-=======
   loading.value = true;
   console.log(data, 'data');
   deleteWarehouse({ busNo: data.busNo }).then((res) => {
     proxy.$modal.msgSuccess('操作成功');
     loading.value = false;
     getPageList();
->>>>>>> v1.3
   });
 }
 // // 停用