Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue

src/views/biz/nuBaseInfo/NuBaseInfo.api.ts

@@ -1,14 +1,10 @@
 import { defHttp } from '/@/utils/http/axios';
-import { useMessage } from "/@/hooks/web/useMessage";
+import { useMessage } from '/@/hooks/web/useMessage';
-
-const { createConfirm } = useMessage();
 
 enum Api {
   list = '/nuBaseInfo/nuBaseInfo/list',
-  save='/nuBaseInfo/nuBaseInfo/add',
+  save = '/nuBaseInfo/nuBaseInfo/add',
-  edit='/nuBaseInfo/nuBaseInfo/edit',
+  edit = '/nuBaseInfo/nuBaseInfo/edit',
-  deleteOne = '/nuBaseInfo/nuBaseInfo/delete',
-  deleteBatch = '/nuBaseInfo/nuBaseInfo/deleteBatch',
   importExcel = '/nuBaseInfo/nuBaseInfo/importExcel',
   exportXls = '/nuBaseInfo/nuBaseInfo/exportXls',
 }
@@ -30,37 +26,6 @@ export const getImportUrl = Api.importExcel;
  */
 export const list = (params) => defHttp.get({ url: Api.list, params });
 
-/**
- * 删除单个
- * @param params
- * @param handleSuccess
- */
-export const deleteOne = (params,handleSuccess) => {
-  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
-    handleSuccess();
-  });
-}
-
-/**
- * 批量删除
- * @param params
- * @param handleSuccess
- */
-export const batchDelete = (params, handleSuccess) => {
-  createConfirm({
-    iconType: 'warning',
-    title: '确认删除',
-    content: '是否删除选中数据',
-    okText: '确认',
-    cancelText: '取消',
-    onOk: () => {
-      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
-        handleSuccess();
-      });
-    }
-  });
-}
-
 /**
  * 保存或者更新
  * @param params
@@ -69,4 +34,4 @@ export const batchDelete = (params, handleSuccess) => {
 export const saveOrUpdate = (params, isUpdate) => {
   let url = isUpdate ? Api.edit : Api.save;
   return defHttp.post({ url: url, params }, { isTransformResponse: false });
-}
+};

src/views/biz/nuBaseInfo/NuBaseInfo.data.ts

@@ -13,7 +13,7 @@ export const columns: BasicColumn[] = [
   {
     title: '护理单元编码',
     align: "center",
-    dataIndex: 'code'
+    dataIndex: 'nuId'
   },
   {
     title: '区域标签',

src/views/biz/nuBaseInfo/NuBaseInfoList.vue

@@ -37,22 +37,6 @@
     <BasicTable @register="registerTable">
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" v-auth="'nuBaseInfo:nu_base_info:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-        <a-button  type="primary" v-auth="'nuBaseInfo:nu_base_info:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-        <j-upload-button  type="primary" v-auth="'nuBaseInfo:nu_base_info:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-        <a-dropdown v-if="selectedRowKeys.length > 0">
-          <template #overlay>
-            <a-menu>
-              <a-menu-item key="1" @click="batchHandleDelete">
-                <Icon icon="ant-design:delete-outlined"></Icon>
-                删除
-              </a-menu-item>
-            </a-menu>
-          </template>
-          <a-button v-auth="'nuBaseInfo:nu_base_info:deleteBatch'">批量操作
-            <Icon icon="mdi:chevron-down"></Icon>
-          </a-button>
-        </a-dropdown>
       </template>
       <!--操作栏-->
       <template #action="{ record }">
@@ -159,20 +143,6 @@
     registerModal.value.edit(record);
   }
    
-  /**
-   * 删除事件
-   */
-  async function handleDelete(record) {
-    await deleteOne({ id: record.id }, handleSuccess);
-  }
-   
-  /**
-   * 批量删除事件
-   */
-  async function batchHandleDelete() {
-    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
-  }
-   
   /**
    * 成功回调
    */
@@ -193,14 +163,6 @@
       {
         label: '详情',
         onClick: handleDetail.bind(null, record),
-      }, {
-        label: '删除',
-        popConfirm: {
-          title: '是否确认删除',
-          confirm: handleDelete.bind(null, record),
-          placement: 'topLeft',
-        },
-        auth: 'nuBaseInfo:nu_base_info:delete'
       }
     ];
   }

src/views/biz/nuBaseInfo/components/NuBaseInfoForm.vue

@@ -11,15 +11,15 @@
               </a-form-item>
             </a-col>
             <a-col :span="24">
-              <a-form-item label="护理单元编码" v-bind="validateInfos.code" id="NuBaseInfoForm-code" name="code">
+              <a-form-item label="护理单元编码" v-bind="validateInfos.nuId" id="NuBaseInfoForm-nuId" name="nuId">
-                <a-input v-model:value="formData.code" placeholder="编码自动生成" allow-clear :disabled="!formData.code"
+                <a-input v-model:value="formData.nuId" placeholder="编码自动生成" allow-clear :disabled="true"
-                  :readonly="formData.code"></a-input>
+                  :readonly="formData.nuId"></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="24">
               <a-form-item label="区域标签" v-bind="validateInfos.areaFlag" id="NuBaseInfoForm-areaFlag" name="areaFlag">
-                <j-dict-select-tag v-model:value="formData.areaFlag" dictCode="nu_type" placeholder="请选择区域标签ID"
+                <j-dict-select-tag v-model:value="formData.areaFlag" dictCode="nu_type" :disabled="true"
-                  allow-clear />
+                  placeholder="请选择区域标签ID" allow-clear />
               </a-form-item>
             </a-col>
             <!-- <a-col :span="24">
@@ -54,7 +54,7 @@ const emit = defineEmits(['register', 'ok']);
 const formData = reactive<Record<string, any>>({
   id: '',
   nuName: '',
-  code: '',
+  nuId: '',
   areaFlag: '',
   status: '',
 });