add 细胞类型

src/api/admin/data-contracts.ts

@@ -8313,3 +8313,65 @@ export interface FeedMediumDtoGetPageOutput {
   modifiedTime: string
   isDeleted: boolean
 }
+
+export interface CellDto {
+  cellName: string
+  cellNo: string
+  status: boolean
+  id: number
+  createdTime: string
+  modifiedTime: string
+  isDeleted: boolean
+}
+
+export interface CellDtoListServiceResponse {
+  success: boolean
+  code: number
+  message: string
+  data: CellDto[]
+}
+
+export interface CellDtoServiceResponse {
+  success: boolean
+  code: number
+  message: string
+  data: CellDto
+}
+
+export interface PageInputCellDtoGetPageInput {
+  /** 动态查询条件 */
+  dynamicFilter?: any
+  /** 排序字段 */
+  sort?: any
+  /** 当前页码 */
+  currentPage?: number
+  /** 每页条数 */
+  pageSize?: number
+  /** 查询条件 */
+  filter?: CellDtoGetPageInput
+}
+
+export interface CellDtoGetPageInput {
+  keyWord?: string
+  stDate?: string
+  edDate?: string
+}
+
+export interface PageOutputCellDtoGetPageOutput {
+  total: number
+  list: CellDto[]
+}
+
+export interface ResultOutputPageOutputCellDtoGetPageOutput {
+  success: boolean
+  code: number
+  message: string
+  data: PageOutputCellDtoGetPageOutput
+}
+
+export interface ResultOutputCellDtoGetOutput {
+  success: boolean
+  code: number
+  message: string
+  data: CellDto
+}

src/api/admin/item-def-cell.ts

@@ -0,0 +1,162 @@
+/* eslint-disable */
+/* tslint:disable */
+/*
+ * ---------------------------------------------------------------
+ * ## THIS FILE WAS GENERATED VIA SWAGGER-TYPESCRIPT-API        ##
+ * ##                                                           ##
+ * ## AUTHOR: adademo / https://github.com/adademo/swagger-typescript-api ##
+ * ## SOURCE: https://github.com/adademo/swagger-typescript-api ##
+ * ---------------------------------------------------------------
+ */
+
+import {
+  CellDto,
+  CellDtoListServiceResponse,
+  CellDtoServiceResponse,
+  PageInputCellDtoGetPageInput,
+  ResultOutputCellDtoGetOutput,
+  ResultOutputPageOutputCellDtoGetPageOutput,
+  ResultOutputInt64,
+} from './data-contracts'
+import { ContentType, HttpClient, RequestParams } from './http-client'
+import { AxiosResponse } from 'axios'
+
+/**
+ * 细胞类型
+ */
+export class ItemDefCellApi<SecurityDataType = unknown> extends HttpClient<SecurityDataType> {
+  /**
+   * No description
+   *
+   * @tags cell
+   * @name Get
+   * @summary 获取细胞类型详情
+   * @request GET:/api/admin/item-def-cell/get
+   * @secure
+   */
+  get = (
+    query?: {
+      /** @format int64 */
+      id?: number
+    },
+    params: RequestParams = {}
+  ) =>
+    this.request<CellDtoServiceResponse, any>({
+      path: `/api/admin/item-def-cell/get`,
+      method: 'GET',
+      query: query,
+      secure: true,
+      format: 'json',
+      ...params,
+    })
+
+  /**
+   * No description
+   *
+   * @tags cell
+   * @name GetPage
+   * @summary 获取细胞类型分页列表
+   * @request POST:/api/admin/item-def-cell/get-page
+   * @secure
+   */
+  getPage = (data: PageInputCellDtoGetPageInput, params: RequestParams = {}) =>
+    this.request<ResultOutputPageOutputCellDtoGetPageOutput, any>({
+      path: `/api/admin/item-def-cell/get-page`,
+      method: 'POST',
+      body: data,
+      secure: true,
+      type: ContentType.Json,
+      format: 'json',
+      ...params,
+    })
+
+  /**
+   * No description
+   *
+   * @tags cell
+   * @name Add
+   * @summary 新增细胞类型
+   * @request POST:/api/admin/item-def-cell/add
+   * @secure
+   */
+  add = (data: CellDto, params: RequestParams = {}) =>
+    this.request<CellDtoServiceResponse, any>({
+      path: `/api/admin/item-def-cell/add`,
+      method: 'POST',
+      body: data,
+      secure: true,
+      type: ContentType.Json,
+      format: 'json',
+      ...params,
+    })
+
+  /**
+   * No description
+   *
+   * @tags cell
+   * @name Update
+   * @summary 修改细胞类型
+   * @request PUT:/api/admin/item-def-cell/update
+   * @secure
+   */
+  update = (data: CellDto, params: RequestParams = {}) =>
+    this.request<CellDtoServiceResponse, any>({
+      path: `/api/admin/item-def-cell/update`,
+      method: 'PUT',
+      body: data,
+      secure: true,
+      type: ContentType.Json,
+      format: 'json',
+      ...params,
+    })
+
+  /**
+   * No description
+   *
+   * @tags cell
+   * @name Delete
+   * @summary 彻底删除细胞类型
+   * @request DELETE:/api/admin/item-def-cell/delete
+   * @secure
+   */
+  delete = (
+    query?: {
+      /** @format int64 */
+      id?: number
+    },
+    params: RequestParams = {}
+  ) =>
+    this.request<CellDtoServiceResponse, any>({
+      path: `/api/admin/item-def-cell/delete`,
+      method: 'DELETE',
+      query: query,
+      secure: true,
+      format: 'json',
+      ...params,
+    })
+
+  /**
+   * No description
+   *
+   * @tags cell
+   * @name SoftDelete
+   * @summary 删除细胞类型
+   * @request DELETE:/api/admin/item-def-cell/soft-delete
+   * @secure
+   */
+  softDelete = (
+    query?: {
+      /** @format int64 */
+      id?: number
+    },
+    params: RequestParams = {}
+  ) =>
+    this.request<CellDtoServiceResponse, any>({
+      path: `/api/admin/item-def-cell/soft-delete`,
+      method: 'DELETE',
+      query: query,
+      secure: true,
+      format: 'json',
+      ...params,
+    })
+}

src/utils/mitt.ts

@@ -11,5 +11,6 @@ export interface MittType {
   // ... existing code ...
   refreshFeedMedium: void
   refreshBasicMedium: void
+  refreshCell: void
   // ... existing code ...
 }

src/views/admin/cell/components/CellForm.vue

@@ -0,0 +1,98 @@
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    :title="title"
+    width="500px"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    append-to-body
+    destroy-on-close
+    draggable
+  >
+    <el-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      label-width="100px"
+      @submit.prevent
+    >
+      <el-form-item label="细胞编号" prop="cellNo">
+        <el-input v-model="form.cellNo" placeholder="请输入细胞编号" />
+      </el-form-item>
+      <el-form-item label="细胞名称" prop="cellName">
+        <el-input v-model="form.cellName" placeholder="请输入细胞名称" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-switch v-model="form.status" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="onSubmit">确 定</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, watch } from 'vue'
+import { CellDto } from '/@/api/admin/data-contracts'
+import { ItemDefCellApi } from '/@/api/admin/item-def-cell'
+import eventBus from '/@/utils/mitt'
+
+const props = defineProps({
+  title: {
+    type: String,
+    default: ''
+  }
+})
+
+const dialogVisible = ref(false)
+const formRef = ref()
+
+const form = reactive<Partial<CellDto>>({
+  cellNo: '',
+  cellName: '',
+  status: true
+})
+
+const rules = {
+  cellNo: [{ required: true, message: '请输入细胞编号', trigger: 'blur' }],
+  cellName: [{ required: true, message: '请输入细胞名称', trigger: 'blur' }],
+  status: [{ required: true, message: '请选择状态', trigger: 'change' }]
+}
+
+const open = (row: Partial<CellDto>) => {
+  dialogVisible.value = true
+  Object.assign(form, row)
+}
+
+const onSubmit = async () => {
+  if (!formRef.value) return
+  await formRef.value.validate(async (valid: boolean) => {
+    if (valid) {
+      const submitData = {
+        ...form,
+        id: form.id || 0
+      }
+      if (submitData.id) {
+        await new ItemDefCellApi().update(submitData as CellDto, { loading: true })
+      } else {
+        await new ItemDefCellApi().add(submitData as CellDto, { loading: true })
+      }
+      dialogVisible.value = false
+      eventBus.emit('refreshCell')
+    }
+  })
+}
+
+defineExpose({
+  open
+})
+</script>
+
+<style scoped lang="scss">
+:deep(.el-form-item__label) {
+  text-align: right;
+  padding-right: 12px;
+}
+</style>

src/views/admin/cell/index.vue

@@ -0,0 +1,221 @@
+<template>
+  <MyLayout>
+    <el-card v-show="state.showQuery" class="my-query-box mt8" shadow="never" :body-style="{ paddingBottom: '0' }">
+      <el-form :inline="true" label-width="auto" @submit.stop.prevent>
+        <el-form-item label="关键词">
+          <el-input v-model="state.filter.keyWord" placeholder="细胞编号、细胞名称" @keyup.enter="onQuery" />
+        </el-form-item>
+        <el-form-item label="开始时间">
+          <el-date-picker
+            v-model="state.filter.stDate"
+            type="datetime"
+            placeholder="选择开始时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            style="width: 180px"
+          />
+        </el-form-item>
+        <el-form-item label="结束时间">
+          <el-date-picker
+            v-model="state.filter.edDate"
+            type="datetime"
+            placeholder="选择结束时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            style="width: 180px"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="ele-Search" @click="onQuery"> 查询 </el-button>
+          <el-button v-auth="'api:admin:item-def-cell:add'" type="primary" icon="ele-Plus" @click="onAdd"> 新增 </el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <el-card class="my-fill mt8" shadow="never">
+      <div class="my-tools-box mb8 my-flex my-flex-between">
+        <div>
+        </div>
+      </div>
+      <el-table
+        v-if="state.showCellList"
+        :data="state.cellListData"
+        style="width: 100%"
+        v-loading="state.loading"
+        border
+      >
+        <el-table-column prop="cellNo" label="细胞编号" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="cellName" label="细胞名称" min-width="120" show-overflow-tooltip />
+        <el-table-column label="状态" width="80" align="center" show-overflow-tooltip>
+          <template #default="{ row }">
+            <el-tag type="success" v-if="row.status">启用</el-tag>
+            <el-tag type="danger" v-else>禁用</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" min-width="200" show-overflow-tooltip>
+          <template #default="{ row }">
+            {{ formatDate(new Date(row.createdTime), 'YYYY-mm-dd HH:MM:SS') }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="modifiedTime" label="修改时间" min-width="200" show-overflow-tooltip>
+          <template #default="{ row }">
+            {{ formatDate(new Date(row.modifiedTime), 'YYYY-mm-dd HH:MM:SS') }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="200" fixed="right" header-align="center" align="center">
+          <template #default="{ row }">
+            <el-button
+              v-if="auth('api:admin:item-def-cell:update')"
+              icon="ele-EditPen"
+              size="small"
+              text
+              type="primary"
+              @click="onEdit(row)"
+              >编辑</el-button
+            >
+            <el-button
+              v-if="auth('api:admin:item-def-cell:soft-delete')"
+              icon="ele-Delete"
+              size="small"
+              text
+              type="danger"
+              @click="onDelete(row)"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div class="my-flex my-flex-end" style="margin-top: 10px">
+        <el-pagination
+          v-model:current-page="state.pageInput.currentPage"
+          v-model:page-size="state.pageInput.pageSize"
+          :total="state.total"
+          :page-sizes="[10, 20, 50, 100]"
+          size="small"
+          background
+          @size-change="onSizeChange"
+          @current-change="onCurrentChange"
+          layout="total, sizes, prev, pager, next, jumper"
+        />
+      </div>
+    </el-card>
+
+    <cell-form ref="cellFormRef" :title="state.cellFormTitle"></cell-form>
+  </MyLayout>
+</template>
+
+<script lang="ts" setup name="admin/cell">
+import { ref, reactive, onMounted, getCurrentInstance, onBeforeMount, defineAsyncComponent } from 'vue'
+import { CellDto, PageInputCellDtoGetPageInput } from '/@/api/admin/data-contracts'
+import { ItemDefCellApi } from '/@/api/admin/item-def-cell'
+import eventBus from '/@/utils/mitt'
+import { auth } from '/@/utils/authFunction'
+import { formatDate } from '/@/utils/formatTime'
+
+// 引入组件
+const CellForm = defineAsyncComponent(() => import('./components/CellForm.vue'))
+
+const { proxy } = getCurrentInstance() as any
+
+const cellFormRef = ref()
+
+const state = reactive({
+  loading: false,
+  cellFormTitle: '',
+  filter: {
+    keyWord: '',
+    stDate: '',
+    edDate: ''
+  },
+  total: 0,
+  pageInput: {
+    currentPage: 1,
+    pageSize: 20,
+    filter: {
+      keyWord: '',
+      stDate: '',
+      edDate: ''
+    }
+  } as PageInputCellDtoGetPageInput,
+  cellListData: [] as Array<CellDto>,
+  showQuery: true,
+  showCellList: true,
+})
+
+onMounted(() => {
+  Query()
+  eventBus.off('refreshCell')
+  eventBus.on('refreshCell', () => {
+    Query()
+  })
+})
+
+onBeforeMount(() => {
+  eventBus.off('refreshCell')
+})
+
+const onChangeCellList = () => {
+  state.showCellList = !state.showCellList
+  if (state.showCellList) {
+    Query()
+  }
+}
+
+const onQuery = () => {
+  Query()
+}
+
+const Query = async () => {
+  state.loading = true
+  state.pageInput.filter = state.filter
+  const res = await new ItemDefCellApi().getPage(state.pageInput).catch(() => {
+    state.loading = false
+  })
+
+  state.cellListData = res?.data?.list ?? []
+  state.total = res?.data?.total ?? 0
+  state.loading = false
+}
+
+const onAdd = () => {
+  state.cellFormTitle = '新增细胞类型'
+  cellFormRef.value.open({
+    id: 0,
+    cellNo: '',
+    cellName: '',
+    status: true,
+    createdTime: '',
+    modifiedTime: '',
+    isDeleted: false
+  })
+}
+
+const onEdit = (row: CellDto) => {
+  state.cellFormTitle = '编辑细胞类型'
+  cellFormRef.value.open(row)
+}
+
+const onDelete = (row: CellDto) => {
+  proxy.$modal
+    .confirmDelete(`确定要删除细胞类型【${row.cellName}】?`)
+    .then(async () => {
+      await new ItemDefCellApi().softDelete({ id: row.id }, { loading: true })
+      Query()
+    })
+    .catch(() => {})
+}
+
+const onSizeChange = (val: number) => {
+  state.pageInput.currentPage = 1
+  state.pageInput.pageSize = val
+  onQuery()
+}
+
+const onCurrentChange = (val: number) => {
+  state.pageInput.currentPage = val
+  onQuery()
+}
+</script>
+
+<style scoped lang="scss"></style>

src/views/admin/feedliquid/components/FeedingMediumForm.vue

@@ -6,6 +6,8 @@
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     append-to-body
+    destroy-on-close
+    draggable
   >
     <el-form
       ref="formRef"