去除冗余代码

src/api/production.js

@@ -1,6 +1,10 @@
 import { ajax } from "../sdk/ajax";
 
 
-/* 登录 */
-export const reqLogin = (data) => ajax("post", "/core/auth/login", data)
+/* 批次管理  Batch*/
+export const reqBatchList = (data) => ajax("post", "/farm-huyang/batch/list", data)
+
+export const reqAddBatch = (data) => ajax("post", "/farm-huyang/semen/create", data)
+
+export const reqDelBatch = (id) => ajax("post", "/farm-huyang/semen/delete", {id})
 

src/views/antiepidemic/illnessLog.vue

@@ -190,7 +190,6 @@ export default {
                 status: this.$store.state["cureStatus"][0].value,
                 remark: "备注"
             },
-            isAdd: false,
             rules
         };
     },

src/views/antiepidemic/immuneLog.vue

@@ -100,7 +100,6 @@ export default {
             formData: {
                 vaccineStyle: this.$store.state["vaccineStyle"][0].value
             },
-            isAdd: false,
             rules
         };
     },

src/views/antiepidemic/immunePlan.vue

@@ -209,7 +209,6 @@ export default {
                 remark: "备注"
             },
             timeForm: {},
-            isAdd: false,
             rules
         };
     },

src/views/antiepidemic/immuneProce.vue

@@ -179,7 +179,6 @@ export default {
                 bodyPart: "注射部位",
                 remark: "备注"
             },
-            isAdd: false,
             rules
         };
     },

src/views/breed/collectSeedLog.vue

@@ -186,7 +186,6 @@ export default {
                 total: "3",
                 opeUser: this.$store.state['workerList'][0].id
             },
-            isAdd: false,
             rules
         };
     },

src/views/breed/matingLog.vue

@@ -167,7 +167,6 @@ export default {
                 opeTime: this.$moment().format('YYYY-MM-DD HH:mm:ss'),
                 opeUser: this.$store.state['workerList'][0].id
             },
-            isAdd: false,
             rules
         };
     },

src/views/breed/matingSuccLog.vue

@@ -161,7 +161,6 @@ export default {
                 ifEstrus: this.$store.state['estrusStatus'][0].value,
                 opeUser: this.$store.state['workerList'][0].id,
             },
-            isAdd: false,
             rules
         };
     },

src/views/breed/offFieldLog.vue

@@ -146,7 +146,6 @@ export default {
                 opeUser: this.$store.state['workerList'][0].id,
                 remark: "这只小羊不乖！！"
             },
-            isAdd: false,
             rules
         };
     },

src/views/breed/parturitionLog.vue

@@ -155,7 +155,6 @@ export default {
                 deadNum: 0,
                 opeUser: this.$store.state['workerList'][0].id,
             },
-            isAdd: false,
             rules
         };
     },

src/views/breed/pregnancyTestLog.vue

@@ -176,7 +176,6 @@ export default {
                 number: '2',
                 remark: '这只羊怀孕了',
             },
-            isAdd: false,
             rules
         };
     },

src/views/breed/shiftFieldLog.vue

@@ -185,7 +185,6 @@ export default {
                 opeUser: this.$store.state['workerList'][0].id,
                 remark: "这只羊不乖！！"
             },
-            isAdd: false,
             rules
         };
     },

src/views/breed/weaningLog.vue

@@ -137,7 +137,6 @@ export default {
                 cost: '482',
                 opeUser: this.$store.state['workerList'][0].id,
             },
-            isAdd: false,
             rules
         };
     },

src/views/fileInfo/areaInfo.vue

@@ -113,7 +113,6 @@ export default {
                 capacity: "156",
                 manager: this.$store.state.workerList[0].id
             },
-            isAdd: false,
             rules
         };
     },

src/views/fileInfo/workerInfo.vue

@@ -131,7 +131,6 @@ export default {
                 birthPlace: "浙江",
                 duty: "保育一舍,保育二舍"
             },
-            isAdd: false,
             rules
         };
     },

src/views/harmless/harmlessConfirm.vue

@@ -127,7 +127,6 @@ export default {
                 position: "无害化冷库",
                 status: this.$store.state['harmlessConfirmStatus'][0].value
             },
-            isAdd: false,
             rules
         };
     },

src/views/harmless/intelligentHint.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="intelligentHint">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">无害化确认</h2>
+        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">智能提醒</h2>
         <header class="header">
             <div class="left">
                 <E-Cold-Store class="chart_a"></E-Cold-Store>
@@ -18,8 +18,6 @@
                         <el-step title="生产无害化处理单"></el-step>
                     </el-steps>
                 </div>
-                
-                
             </div>
         </header>
         <footer class="footer">
@@ -128,13 +126,15 @@ export default {
             box-sizing: border-box;
             border-radius: 10px;
             align-items: center;
-
             .left {
                 font-size: 30px;
                 margin-left: 20px;
                 margin-right: 20px;
             }
             .right {
+                display: flex;
+                flex-direction: column;
+                justify-content: space-around;
                 .top {
                     font-size: 20px;
                     font-weight: 600;
@@ -142,6 +142,7 @@ export default {
                 }
                 .middle {
                     font-size: 16px;
+                    margin: 10px 0;
                     color: #999;
                 }
                 .bottom {

src/views/production/batch.vue

@@ -1,67 +1,41 @@
 <template>
-    <div class="batch">
+    <div class="collectSeedLog">
         <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">批次管理</h2>
-
         <header id="header">
-            
-            <el-row type="flex">
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1区" value="11"></el-option>
-                        <el-option label="2区" value="22"></el-option>
-                    </el-select>
-                </el-col>
+            <el-row type="flex" :gutter="20">
                 <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1舍" value="13"></el-option>
-                        <el-option label="2舍" value="24"></el-option>
-                    </el-select>
+                    <el-input v-model="search" placeholder="请输入"></el-input>
                 </el-col>
                 <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="可用" value="15"></el-option>
-                        <el-option label="可用" value="26"></el-option>
-                    </el-select>
+                    <el-button type="primary" @click="getBatchList">查找</el-button>
                 </el-col>
                 <el-col :span="4">
-                    <el-button type="primary">查找</el-button>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary">新增</el-button>
+                    <el-button type="primary" @click="add">新增</el-button>
                 </el-col>
             </el-row>
         </header>
         <section>
             <article class="table">
                 <el-table
-                    ref="multipleTable"
                     :data="tableData"
                     tooltip-effect="dark"
                     style="width: 100%"
-                    @selection-change="handleSelectionChange"
                 >
-                    <el-table-column type="selection" width="55"></el-table-column>
-                    <el-table-column prop="a" label="屠宰批次"></el-table-column>
-                    <el-table-column prop="b" label="产品名称"></el-table-column>
-                    <el-table-column prop="c" label="排酸时间"></el-table-column>
-                    <el-table-column prop="d" label="排酸前重量"></el-table-column>
-                    <el-table-column prop="e" label="排酸后重量"></el-table-column>
-                    <el-table-column prop="f" label="排酸损耗"></el-table-column>
-                    <el-table-column prop="g" label="负责人员"></el-table-column>
-                    <!-- <el-table-column label="操作" width="150">
-                        <template slot-scope="scope">
-                            <el-button @click="edit(scope.row)" type="text" size="small">编辑</el-button>
-                            <el-popconfirm title="是否删除此设备的信息？" @onConfirm="del(scope.row)">
-                                <el-button slot="reference" type="text" size="small">删除</el-button>
-                            </el-popconfirm>
+                    <el-table-column prop="id" label="序号"></el-table-column>
+                    <el-table-column prop="batchNo" label="批次编码"></el-table-column>
+                    <el-table-column prop="created" label="生成时间"></el-table-column>
+                    <el-table-column prop="number" label="羊只数量"></el-table-column>
+                    <el-table-column prop="avgWeight" label="平均体重(kg)"></el-table-column>
+                    <el-table-column prop="avgDay" label="平均日龄"></el-table-column>
+                    <el-table-column prop="position" label="当前位置"></el-table-column>
+                    <el-table-column label="操作人">
+                        <template v-slot="scope">
+                            <div v-for="item in $store.state['workerList']" :key="item.value">
+                                <span v-if="item.id == scope.row['feeder']">{{ `${item.name}(${item.position})` }}</span>
+                            </div>
                         </template>
-                    </el-table-column> -->
+                    </el-table-column>
                 </el-table>
-                <div style="margin-top: 20px">
-                    <el-button @click="toggleSelection([tableData[1], tableData[2]])">切换第二、第三行的选中状态</el-button>
-                    <el-button @click="toggleSelection()">取消选择</el-button>
-                    <el-button @click="inStore">入待宰栏</el-button>
-                </div>
 
                 <el-row type="flex" justify="end">
                     <el-col :span="8" class="pagination">
@@ -69,97 +43,137 @@
                             @current-change="pageChange"
                             background
                             layout="prev, pager, next"
-                            :page-count="10"
+                            :page-count="Number(totalPages)"
                         ></el-pagination>
                     </el-col>
                 </el-row>
             </article>
         </section>
+
+        <el-dialog title="新增/编辑" :visible.sync="isShow" width="40%">
+            <el-row type="flex">
+                <el-col :span="20">
+                    <el-form ref="addBatch" :model="formData" :rules="rules" label-width="140px">
+                        <el-form-item label="种公羊编号">
+                            <el-input v-model="formData.sheepIds"></el-input>
+                        </el-form-item>
+                        <el-form-item label="操作人">
+                            <el-select v-model="formData.feeder" filterable placeholder="请选择">
+                                <el-option
+                                    v-for="item in $store.state['workerList']"
+                                    :key="item.id"
+                                    :label="`${item.name}(${item.position})`"
+                                    :value="item.id"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item>
+                            <el-button @click="isShow=false">取 消</el-button>
+                            <el-button type="primary" @click="submitForm('addBatch')">保 存</el-button>
+                        </el-form-item>
+                    </el-form>
+                </el-col>
+            </el-row>
+        </el-dialog>
     </div>
 </template>
 
 <script>
+import {
+    reqBatchList,
+    reqAddBatch,
+    reqDelBatch
+} from "@/api/production.js";
 
-const pageSize = 10
-const tableData = [
-                {
-                    a: "15463",
-                    b: "胴体",
-                    c: "2020-07-14",
-                    d: "49kg",
-                    e: "48kg",
-                    f: "1.6%",
-                    g: "张小刚",
-                },
-                {
-                    a: "15463",
-                    b: "带骨羊前腿",
-                    c: "2020-07-14",
-                    d: "49kg",
-                    e: "48kg",
-                    f: "1.6%",
-                    g: "张小刚",
-                },
-                {
-                    a: "15463",
-                    b: "羔羊肉卷",
-                    c: "2020-07-14",
-                    d: "49kg",
-                    e: "48kg",
-                    f: "1.6%",
-                    g: "张小刚",
-                },
-                {
-                    a: "15463",
-                    b: "胴体",
-                    c: "2020-07-14",
-                    d: "49kg",
-                    e: "48kg",
-                    f: "1.6%",
-                    g: "张小刚",
-                },
-                {
-                    a: "15463",
-                    b: "羔羊肉卷",
-                    c: "2020-07-14",
-                    d: "49kg",
-                    e: "48kg",
-                    f: "1.6%",
-                    g: "张小刚",
-                },
-                
-                
-            ]
+const pageSize = 10;
+const rules = {};
 
 export default {
+    name: "collectSeedLog",
     data() {
         return {
-            value: "",
-            multipleSelection: [],
-            page: 1,
-            tableData
+            search: "",
+            pageNum: 1,
+            tableData: [],
+            totalPages: 0,
+            isShow: false,
+            formData: {
+                sheepIds: "12,123,568,454,456",
+                feeder: null
+            },
+            rules
         };
     },
-    created() {},
+    created() {
+        // 入库管理列表
+        this.getBatchList();
+    },
     methods: {
-        toggleSelection(rows) {
-            if (rows) {
-                rows.forEach(row => {
-                    this.$refs.multipleTable.toggleRowSelection(row);
+        submitForm(formName) {
+            this.$refs[formName].validate(valid => {
+                if (valid) {
+                    reqAddBatch(this.formData)
+                        .then(res => {
+                            // 入库管理列表
+                            this.getBatchList();
+                            this.$message.success("成功！");
+                            // this.isShow = false
+                        })
+                        .catch(err => {
+                            console.log(err);
+                            this.$message.error("失败！");
+                        });
+                } else {
+                    return false;
+                }
+            });
+        },
+        // 入库管理列表
+        getBatchList() {
+            reqBatchList({
+                searchStr: this.search,
+                pageSize,
+                pageNum: this.pageNum
+            })
+                .then(res => {
+                    this.tableData = res.content;
+                    this.totalPages = res.totalPages;
+                })
+                .catch(err => {
+                    console.log(err);
                 });
-            } else {
-                this.$refs.multipleTable.clearSelection();
-            }
         },
-        // 入待宰栏
-        inStore() {},
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
+        add() {
+            this.isShow = true;
+            // 有id是update 没id是add
+            delete this.formData.id;
+        },
+        edit(row) {
+            this.formData = row;
+            this.isShow = true;
+        },
+        del(row) {
+            reqDelBatch(row.id)
+                .then(res => {
+                    // 入库管理列表
+                    this.getBatchList();
+                    if (res.code == "success") {
+                        this.$message.success(res.msg);
+                    }
+                    if (res.errCode == "delete failed") {
+                        this.$message.error(res.errMsg);
+                    }
+                })
+                .catch(err => {
+                    console.log(err);
+                    this.$message.error("删除失败！");
+                });
         },
-        edit(row) {},
-        del(row) {},
         pageChange(p) {
             console.log(p);
+            this.pageNum = p;
+            // 入库管理列表
+            this.getBatchList();
         }
     }
 };