src/api/sheep_file/sheep_file.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询羊只档案列表
+// 查询羊只基本信息列表
 export function listSheep_file(query) {
   return request({
     url: '/sheep_file/sheep_file/list',
@@ -9,7 +9,7 @@ export function listSheep_file(query) {
   })
 }
 
-// 查询羊只档案详细
+// 查询羊只基本信息详细
 export function getSheep_file(id) {
   return request({
     url: '/sheep_file/sheep_file/' + id,
@@ -17,8 +17,25 @@ export function getSheep_file(id) {
   })
 }
 
+// 新增羊只基本信息
+export function addSheep_file(data) {
+  return request({
+    url: '/sheep_file/sheep_file',
+    method: 'post',
+    data: data
+  })
+}
 
-// 删除羊只档案
+// 修改羊只基本信息
+export function updateSheep_file(data) {
+  return request({
+    url: '/sheep_file/sheep_file',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除羊只基本信息
 export function delSheep_file(id) {
   return request({
     url: '/sheep_file/sheep_file/' + id,

src/views/sheepfold_management/sheepfold_management/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="牧场" prop="ranchId">
+      <el-form-item label="牧场id" prop="ranchId">
-        <el-select v-model="queryParams.ranchId" placeholder="请选择牧场" style="width:200px" clearable>
+        <el-select v-model="queryParams.ranchId" placeholder="请选择牧场id" clearable>
           <el-option
             v-for="dict in da_ranch"
             :key="dict.value"
@@ -11,8 +11,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="羊舍类型" prop="sheepfoldTypeId">
+      <el-form-item label="羊舍类型id" prop="sheepfoldTypeId">
-        <el-select v-model="queryParams.sheepfoldTypeId" placeholder="请选择羊舍类型"  style="width:200px"  clearable>
+        <el-select v-model="queryParams.sheepfoldTypeId" placeholder="请选择羊舍类型id" clearable>
           <el-option
             v-for="dict in bas_sheepfold_type"
             :key="dict.value"
@@ -37,7 +37,7 @@
           v-hasPermi="['sheepfold_management:sheepfold_management:add']"
         >新增</el-button>
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -46,7 +46,7 @@
           @click="handleUpdate"
           v-hasPermi="['sheepfold_management:sheepfold_management:edit']"
         >修改</el-button>
-      </el-col> -->
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -69,27 +69,28 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="sheepfold_managementList" @selection-change="handleSelectionChange" border>
+    <el-table v-loading="loading" :data="sheepfold_managementList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="羊舍id" align="center" prop="id" />
-      <el-table-column label="牧场" align="center" prop="ranchId">
+      <el-table-column label="牧场id" align="center" prop="ranchId">
         <template #default="scope">
           <dict-tag :options="da_ranch" :value="scope.row.ranchId"/>
         </template>
       </el-table-column>
       <el-table-column label="羊舍名称" align="center" prop="sheepfoldName" />
-      <el-table-column label="羊舍类型" align="center" prop="sheepfoldTypeId">
+      <el-table-column label="羊舍类型id" align="center" prop="sheepfoldTypeId">
         <template #default="scope">
           <dict-tag :options="bas_sheepfold_type" :value="scope.row.sheepfoldTypeId"/>
         </template>
       </el-table-column>
       <el-table-column label="羊舍编号" align="center" prop="sheepfoldNo" />
       <el-table-column label="排号" align="center" prop="rowNo" />
-      <el-table-column label="栏号" align="center" prop="columns" />
+      <el-table-column label="栏数" align="center" prop="columns" />
       <el-table-column label="备注" align="center" prop="comment" />
+      <el-table-column label="是否删除" align="center" prop="isDelete" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['sheepfold_management:sheepfold_management:edit']">修改</el-button> -->
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['sheepfold_management:sheepfold_management:edit']">修改</el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['sheepfold_management:sheepfold_management:remove']">删除</el-button>
         </template>
       </el-table-column>
@@ -106,8 +107,8 @@
     <!-- 添加或修改羊舍管理对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="sheepfold_managementRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="牧场" prop="ranchId">
+        <el-form-item label="牧场id" prop="ranchId">
-          <el-select v-model="form.ranchId" placeholder="请选择牧场">
+          <el-select v-model="form.ranchId" placeholder="请选择牧场id">
             <el-option
               v-for="dict in da_ranch"
               :key="dict.value"
@@ -116,10 +117,10 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="羊舍名称" prop="sheepfoldName">
+        <el-form-item label="羊舍名称" prop="sheepfoldName">
           <el-input v-model="form.sheepfoldName" placeholder="请输入羊舍名称" />
-        </el-form-item> -->
+        </el-form-item>
-        <el-form-item label="羊舍类型" prop="sheepfoldTypeId">
+        <el-form-item label="羊舍类型id" prop="sheepfoldTypeId">
           <el-select v-model="form.sheepfoldTypeId" placeholder="请选择羊舍类型id">
             <el-option
               v-for="dict in bas_sheepfold_type"
@@ -132,49 +133,18 @@
         <el-form-item label="羊舍编号" prop="sheepfoldNo">
           <el-input v-model="form.sheepfoldNo" placeholder="请输入羊舍编号" />
         </el-form-item>
-        <!-- <el-form-item label="排号" prop="rowNo">
+        <el-form-item label="排号" prop="rowNo">
           <el-input v-model="form.rowNo" placeholder="请输入排号" />
-        </el-form-item> -->
-
-        <el-form-item label="排数" prop="rowCount">
-          <el-input-number 
-            v-model="form.rowCount" 
-            :min="1" 
-            :max="10" 
-            @change="handleRowCountChange"
-            placeholder="请输入排数" 
-          />
         </el-form-item>
-
+        <el-form-item label="栏数" prop="columns">
-        <!-- <el-form-item label="栏号" prop="columns">
           <el-input v-model="form.columns" placeholder="请输入栏数" />
-        </el-form-item> -->
+        </el-form-item>
-
-
-        <!-- 动态栏位数配置 -->
-        <div v-for="(row, index) in form.rowsConfig" :key="index" class="row-config">
-          <el-form-item 
-            :label="`${String.fromCharCode(65 + index)}排栏位数`" 
-            :prop="`rowsConfig.${index}.columnCount`" 
-            :rules="{
-              required: true, 
-              message: `请填写${String.fromCharCode(65 + index)}排栏位数`, 
-              trigger: 'blur'
-            }"
-          >
-            <el-input-number 
-              v-model="row.columnCount" 
-              :min="1" 
-              :max="99" 
-              placeholder="请输入栏位数" 
-            />
-          </el-form-item>
-        </div>
-
-
         <el-form-item label="备注" prop="comment">
           <el-input v-model="form.comment" placeholder="请输入备注" />
         </el-form-item>
+        <el-form-item label="是否删除" prop="isDelete">
+          <el-input v-model="form.isDelete" placeholder="请输入是否删除" />
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -203,58 +173,19 @@ const total = ref(0)
 const title = ref("")
 
 const data = reactive({
-    form: {
+  form: {},
-    id: null,
-    ranchId: null,
-    sheepfoldName: null,
-    sheepfoldTypeId: null,
-    sheepfoldNo: null,
-    rowCount: 1, // 默认1排
-    rowsConfig: [{ columnCount: 1 }], // 默认1栏
-    comment: null
-  },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     ranchId: null,
     sheepfoldTypeId: null,
   },
-   rules: {
+  rules: {
-    rowCount: [
-      { required: true, message: "排数不能为空", trigger: "blur" },
-      { type: 'number', min: 1, max: 10, message: '排数在1-10之间', trigger: 'blur' }
-    ],
-    sheepfoldNo: [
-      { required: true, message: "羊舍编号不能为空", trigger: "blur" }
-    ],
-    ranchId: [
-      { required: true, message: "牧场不能为空", trigger: "blur" }
-    ],
-    sheepfoldTypeId: [
-      { required: true, message: "羊舍类型不能为空", trigger: "blur" }
-    ]
   }
 })
 
 const { queryParams, form, rules } = toRefs(data)
 
-// 排数变化处理
-const handleRowCountChange = (count) => {
-  // 确保count是数字
-  count = Number(count)
-  
-  // 重置rowsConfig
-  form.value.rowsConfig = []
-  
-  // 根据排数生成配置项
-  for (let i = 0; i < count; i++) {
-    form.value.rowsConfig.push({
-      rowLetter: String.fromCharCode(65 + i), // A, B, C...
-      columnCount: 1 // 默认1栏
-    })
-  }
-}
-
 /** 查询羊舍管理列表 */
 function getList() {
   loading.value = true
@@ -279,9 +210,10 @@ function reset() {
     sheepfoldName: null,
     sheepfoldTypeId: null,
     sheepfoldNo: null,
-    rowCount: 1,
+    rowNo: null,
-    rowsConfig: [{ columnCount: 1 }],
+    columns: null,
-    comment: null
+    comment: null,
+    isDelete: null
   }
   proxy.resetForm("sheepfold_managementRef")
 }
@@ -313,25 +245,14 @@ function handleAdd() {
 }
 
 /** 修改按钮操作 */
-// function handleUpdate(row) {
+function handleUpdate(row) {
-//   reset()
+  reset()
-//   const _id = row.id || ids.value
+  const _id = row.id || ids.value
-//   getSheepfold_management(_id).then(response => {
+  getSheepfold_management(_id).then(response => {
-//     form.value = response.data
+    form.value = response.data
-//     // 修改时不需要rowsConfig
+    open.value = true
-//     if (form.value.rowsConfig) {
+    title.value = "修改羊舍管理"
-//       delete form.value.rowsConfig
+  })
-//       delete form.value.rowCount
-//     }
-//     open.value = true
-//     title.value = "修改羊舍管理"
-//   })
-// }
-/**查找字典 */
-function findDictLabelByValue(dictOptions, value) {
-  const formattedValue = String(value);
-  const foundOption = dictOptions.value.find(option => option.value === formattedValue);
-  return foundOption ? foundOption.label : '';
 }
 
 /** 提交按钮 */
@@ -339,46 +260,17 @@ function submitForm() {
   proxy.$refs["sheepfold_managementRef"].validate(valid => {
     if (valid) {
       if (form.value.id != null) {
-        // 修改操作 - 单条记录
         updateSheepfold_management(form.value).then(response => {
           proxy.$modal.msgSuccess("修改成功")
           open.value = false
           getList()
         })
       } else {
-        // 新增操作 - 多条记录
+        addSheepfold_management(form.value).then(response => {
-        const requests = []
+          proxy.$modal.msgSuccess("新增成功")
-        const ranchName = findDictLabelByValue(da_ranch, form.value.ranchId)
+          open.value = false
-        const typeName = findDictLabelByValue(bas_sheepfold_type, form.value.sheepfoldTypeId)
+          getList()
-        
-        // 生成每条记录的数据
-        form.value.rowsConfig.forEach(rowConfig => {
-          for (let i = 1; i <= rowConfig.columnCount; i++) {
-            const columnNo = i.toString().padStart(2, '0') // 01, 02, 03...
-            const record = {
-              ranchId: form.value.ranchId,
-              sheepfoldTypeId: form.value.sheepfoldTypeId,
-              sheepfoldNo: form.value.sheepfoldNo,
-              rowNo: rowConfig.rowLetter,
-              columns: columnNo,
-              comment: form.value.comment,
-              // 自动生成羊舍名称：羊舍编号 + 类型 + 排号栏号
-              sheepfoldName: `${form.value.sheepfoldNo}号-${typeName}-${rowConfig.rowLetter}${columnNo}`
-            }
-            requests.push(addSheepfold_management(record))
-          }
         })
-        
-        // 执行所有新增请求
-        Promise.all(requests)
-          .then(() => {
-            proxy.$modal.msgSuccess(`新增成功，共添加${requests.length}条记录`)
-            open.value = false
-            getList()
-          })
-          .catch(error => {
-            proxy.$modal.msgError("部分记录添加失败：" + error.message)
-          })
       }
     }
   })
@@ -404,14 +296,3 @@ function handleExport() {
 
 getList()
 </script>
-
-
-<style scoped>
-.row-config {
-  margin-bottom: 15px;
-  padding: 10px;
-  border: 1px solid #ebeef5;
-  border-radius: 4px;
-  background-color: #f5f7fa;
-}
-</style>

vite.config.js

@@ -1,5 +1,5 @@
-import path from 'path'
 import { defineConfig, loadEnv } from 'vite'
+import path from 'path'
 import createVitePlugins from './vite/plugins'
 
 const baseUrl = 'http://localhost:8080' // 后端接口
@@ -42,7 +42,7 @@ export default defineConfig(({ mode, command }) => {
     },
     // vite 相关配置
     server: {
-      port: 81,
+      port: 80,
       host: true,
       open: true,
       proxy: {