Ver código fonte

完成formList组件

linan 4 anos atrás
pai
commit
9887682cd0

+ 121 - 0
src/components/formList/formList.vue

@@ -0,0 +1,121 @@
+<template>
+    <div>
+        <el-button
+            v-show="value[lable[0]].length == 0"
+            @click="plus"
+            type="primary"
+            icon="el-icon-plus"
+            circle
+        ></el-button>
+        <el-row
+            type="flex"
+            :gutter="10"
+            align="middle"
+            v-for="(item, index) in listLength"
+            :key="index"
+            style="margin:15px"
+        >
+            <el-col :style="{width: lableWidth}" class="label">{{ lable[0] }}:</el-col>
+            <el-col :style="{width: inputWidth}">
+                <el-input v-model="value[lable[0]][index]"></el-input>
+            </el-col>
+            <el-col :style="{width: lableWidth}" class="label">{{ lable[1] }}:</el-col>
+            <el-col :style="{width: inputWidth}">
+                <el-input v-model="value[lable[1]][index]"></el-input>
+            </el-col>
+            <el-col :style="{width: '120px'}">
+                <el-button
+                    v-show="listLength.length == index+1"
+                    @click="plus"
+                    type="primary"
+                    icon="el-icon-plus"
+                    circle
+                ></el-button>
+                <el-button
+                    v-show="listLength.length > 1 && listLength.length==index + 1"
+                    @click="minus"
+                    icon="el-icon-minus"
+                    circle
+                ></el-button>
+            </el-col>
+        </el-row>
+    </div>
+</template>
+
+
+<script>
+/* 
+v-model  数据结构 {key: Array, val: Array}  key 和 val 字段可自定义
+lableWidth lable的宽 统一设置 默认值100px
+inputWidth input的宽 统一设置 默认值200px
+
+事件
+*/
+export default {
+    name: "formList",
+    data() {
+        return {};
+    },
+    computed: {
+        lable() {
+            return Object.keys(this.value) || ["key", "value"];
+        },
+        listLength() {
+            let kL = this.value[this.lable[0]].length;
+            let vL = this.value[this.lable[1]].length;
+            let arr = [];
+            if (kL < vL) {
+                arr[vL - 1] = undefined;
+            } else {
+                arr[kL - 1] = undefined;
+            }
+            return arr;
+        }
+    },
+    props: {
+        value: undefined,
+        lableWidth: {
+            type: String,
+            default: "100px"
+        },
+        inputWidth: {
+            type: String,
+            default: "200px"
+        }
+    },
+    created() {},
+    methods: {
+        minus() {
+            // 保证数组长度一致
+            let keyArr = this.value[this.lable[0]];
+            let valArr = this.value[this.lable[1]];
+            if (keyArr.length > valArr.length) {
+                valArr[keyArr.length - 1] = undefined;
+            } else if (keyArr.length < valArr.length) {
+                keyArr[valArr.length - 1] = undefined;
+            }
+            keyArr.pop();
+            valArr.pop();
+        },
+        plus() {
+            // 保证数组长度一致
+            let keyArr = this.value[this.lable[0]];
+            let valArr = this.value[this.lable[1]];
+            if (keyArr.length > valArr.length) {
+                valArr[keyArr.length - 1] = undefined;
+            } else if (keyArr.length < valArr.length) {
+                keyArr[valArr.length - 1] = undefined;
+            }
+            keyArr.push("");
+            valArr.push("");
+        }
+    }
+};
+</script>
+
+<style lang="scss" scope>
+.label {
+    text-align: right;
+    color: #444;
+}
+</style>

+ 0 - 1
src/main.js

@@ -16,7 +16,6 @@ Vue.prototype.$moment = moment;
 
 Vue.use(vueModuleLoader, { store }).use(ElementUI);
 
-
 const app = new Vue({
 	router,
 	store,

+ 5 - 32
src/router/routes.js

@@ -4,13 +4,7 @@ import firmInfo from '@/views/fileInfo/firmInfo.vue'
 import pastureInfo from '@/views/fileInfo/pastureInfo.vue'
 import areaInfo from '@/views/fileInfo/areaInfo.vue'
 import workerInfo from '@/views/fileInfo/workerInfo.vue'
-
-/* 繁殖管理 */
-import seedSheepFile from '@/views/breed/seedSheepFile.vue'
-import commoditySheepFile from '@/views/breed/commoditySheepFile.vue'
-import collectSeedLog from '@/views/breed/collectSeedLog.vue'
-import matingSuccLog from '@/views/breed/matingSuccLog.vue'
-import matingLog from '@/views/breed/matingLog.vue'
+import test from '@/views/fileInfo/test.vue'
 
 
 export default [
@@ -39,32 +33,11 @@ export default [
 				name: 'workerInfo',
 				component: workerInfo
 			},
-			/* 繁殖管理 */
-			{
-				path: 'seedSheepFile',
-				name: 'seedSheepFile',
-				component: seedSheepFile
-			},
-			{
-				path: 'commoditySheepFile',
-				name: 'commoditySheepFile',
-				component: commoditySheepFile
-			},
 			{
-				path: 'collectSeedLog',
-				name: 'collectSeedLog',
-				component: collectSeedLog
-			},
-			{
-				path: 'matingSuccLog',
-				name: 'matingSuccLog',
-				component: matingSuccLog
-			},
-			{
-				path: 'matingLog',
-				name: 'matingLog',
-				component: matingLog
-			},
+				path: 'test',
+				name: 'test',
+				component: test
+			}
 		]
 	},
 ]

+ 1 - 59
src/store/index.js

@@ -1,20 +1,11 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
 import publicType from './publicType.js' // 公共的类型 
-import { reqWorkerList, reqBuildList } from "@/api/fileInfo.js";
-import { reqBasicsInfoList, reqStoreList } from "@/api/material.js";
-import { reqBatchList } from "@/api/production.js";
-
 Vue.use(Vuex)
 
 export default new Vuex.Store({
 	strict: true,
 	state: {
-		workerList: [{ id: 1 }], // 员工列表 (加{id:1} 是为了防止刷新时报错,因为设置默认值时用到过)
-		areaList: [{ id: 1 }],  // 栋舍列表
-		drugBasicsList: [{ id: 1 }],  // 基础药品列表
-		batchList: [],  // 批次列表
-		storeList: [],  // 库存列表
 		...publicType
 	},
 	getters: {},
@@ -24,55 +15,6 @@ export default new Vuex.Store({
 		}
 	},
 	actions: {
-		/* 获取员工列表 登录后再 home、workerInfo时调用了*/
-		getWorkerList({ commit }) {
-			reqWorkerList({
-				searchStr: '',
-				pageSize: 1000,
-				pageNum: 1
-			}).then(res => {
-				commit('setState', ['workerList', res.content])
-			})
-		},
-		/* 获取栋舍列表 登录后在  home、areaInfo时调用了*/
-		getAreaList({ commit }) {
-			reqBuildList({
-				searchStr: '',
-				pageSize: 1000,
-				pageNum: 1
-			}).then(res => {
-				commit('setState', ['areaList', res.content])
-			})
-		},
-		/* 获取基础药品列表 登录后在  home时调用了*/
-		getDrugBasicsList({ commit }) {
-			reqBasicsInfoList({
-				searchStr: '',
-				pageSize: 1000,
-				pageNum: 1
-			}).then(res => {
-				commit('setState', ['drugBasicsList', res.content])
-			})
-		},
-		/* 获取批次列表 登录后在 home、batch.vue时调用了*/
-		getBatchList({ commit }) {
-			reqBatchList({
-				searchStr: '',
-				pageSize: 1000,
-				pageNum: 1
-			}).then(res => {
-				commit('setState', ['batchList', res.content])
-			})
-		},
-		/* 获取库存列表 登录后在 storeList.vue时调用了*/
-		getStoreList({ commit }) {
-			reqStoreList({
-				searchStr: '',
-				pageSize: 1000,
-				pageNum: 1
-			}).then(res => {
-				commit('setState', ['storeList', res.content])
-			})
-		}
+		
 	}
 })

+ 1 - 10
src/views/Home/Home.vue

@@ -115,16 +115,7 @@ export default {
         
     },
     mounted() {
-        // 获取员工列表 给后面下拉选择器使用
-        this.$store.dispatch('getWorkerList')
-        // 获取栋舍列表 给后面下拉选择器使用
-        this.$store.dispatch('getAreaList')
-        // 获取基础药品列表 给后面下拉选择器使用
-        this.$store.dispatch('getDrugBasicsList')
-        // 获取批次列表 给后面下拉选择器使用
-        this.$store.dispatch('getBatchList')
-        // 获取库存列表 给后面下拉选择器使用
-        this.$store.dispatch('getStoreList')
+     
     },
     methods: {
         // 收取菜单按钮

+ 178 - 12
src/views/Home/mencCofig.js

@@ -20,34 +20,200 @@ export const menuData = [
             {
                 optionName: '员工信息',
                 routerName: "workerInfo"
+            },
+            {
+                optionName: 'test',
+                routerName: "test"
+            }
+        ]
+    },
+    {
+        optionName: "智能养殖",
+        iconClassName: "el-icon-files",
+        disabled: false, // 是否禁用
+        childList: [
+            {
+                optionName: '主要信息',
+                routerName: "workerInfo"
+            },
+            {
+                optionName: '种羊等级分布',
+                routerName: "firmInfo"
+            },
+            {
+                optionName: '牧场存栏',
+                routerName: "pastureInfo"
+            },
+            {
+                optionName: '消息提醒',
+                routerName: "areaInfo"
+            },
+
+            {
+                optionName: '羊粪价格',
+                routerName: "test"
+            },
+            {
+                optionName: '种羊销量',
+                routerName: "test"
+            },
+            {
+                optionName: '牧场销售',
+                routerName: "test"
+            },
+            {
+                optionName: '温度湿度',
+                routerName: "test"
+            }
+        ]
+    },
+    {
+        optionName: "屠宰管控",
+        iconClassName: "el-icon-files",
+        disabled: false, // 是否禁用
+        childList: [
+            {
+                optionName: '主要信息',
+                routerName: "workerInfo"
+            },
+            {
+                optionName: '企业采购',
+                routerName: "firmInfo"
+            },
+            {
+                optionName: '检疫合格率',
+                routerName: "pastureInfo"
+            },
+            {
+                optionName: '成本比例',
+                routerName: "areaInfo"
+            },
+            {
+                optionName: '产品库存',
+                routerName: "workerInfo"
+            },
+            {
+                optionName: '死淘数量',
+                routerName: "test"
+            },
+            {
+                optionName: '排酸损耗',
+                routerName: "test"
+            },
+            {
+                optionName: '销售统计',
+                routerName: "test"
+            },
+            {
+                optionName: '在场批次',
+                routerName: "test"
             }
         ]
     },
     {
-        optionName: "繁殖管理",
-        iconClassName: "el-icon-magic-stick",
+        optionName: "产品管控",
+        iconClassName: "el-icon-files",
+        disabled: false, // 是否禁用
+        childList: [
+            {
+                optionName: '主要信息',
+                routerName: "workerInfo"
+            },
+            {
+                optionName: '羊皮价格',
+                routerName: "firmInfo"
+            },
+            {
+                optionName: '羊血价格',
+                routerName: "pastureInfo"
+            },
+            {
+                optionName: '羊杂销售额',
+                routerName: "areaInfo"
+            },
+            {
+                optionName: '仓库使用率',
+                routerName: "workerInfo"
+            },
+            {
+                optionName: '产品库存',
+                routerName: "test"
+            },
+            {
+                optionName: '出售量排行',
+                routerName: "test"
+            },
+            {
+                optionName: '客户购买排行',
+                routerName: "test"
+            },
+            {
+                optionName: '历史出库量',
+                routerName: "test"
+            },
+            {
+                optionName: '历史入库量',
+                routerName: "test"
+            },
+            {
+                optionName: '出库申请记录',
+                routerName: "test"
+            },
+            {
+                optionName: '价格',
+                routerName: "test"
+            }
+        ]
+    },
+    {
+        optionName: "鲜肉储运",
+        iconClassName: "el-icon-files",
         disabled: false, // 是否禁用
         childList: [
             {
-                optionName: '种羊档案',
-                routerName: "seedSheepFile"
+                optionName: '主要信息',
+                routerName: "workerInfo"
             },
             {
-                optionName: '商品羊档案',
-                routerName: "commoditySheepFile"
+                optionName: '胴体销售价',
+                routerName: "firmInfo"
             },
             {
-                optionName: '采精记录',
-                routerName: "collectSeedLog"
+                optionName: '胴体销售金额',
+                routerName: "pastureInfo"
             },
             {
-                optionName: '查情记录',
-                routerName: "matingSuccLog"
+                optionName: '季度销售额',
+                routerName: "areaInfo"
             },
             {
-                optionName: '配种记录',
-                routerName: "matingLog"
+                optionName: '累计销售金额',
+                routerName: "workerInfo"
             },
+            {
+                optionName: '运输任务',
+                routerName: "test"
+            },
+            {
+                optionName: '销售利润分析',
+                routerName: "workerInfo"
+            },
+            {
+                optionName: '产品销售分析',
+                routerName: "workerInfo"
+            },
+            {
+                optionName: '地区销量排行',
+                routerName: "workerInfo"
+            },
+            {
+                optionName: '种羊销售价格',
+                routerName: "workerInfo"
+            },
+            {
+                optionName: '生产追溯',
+                routerName: "workerInfo"
+            }
         ]
     },
     

+ 0 - 285
src/views/breed/collectSeedLog.vue

@@ -1,285 +0,0 @@
-<template>
-    <div class="collectSeedLog">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">采精记录</h2>
-        <header id="header">
-            <el-row type="flex" :gutter="20">
-                <el-col :span="4">
-                    <el-input v-model="search" placeholder="请输入"></el-input>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary" @click="getSemenList">查找</el-button>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary" @click="add">新增</el-button>
-                </el-col>
-            </el-row>
-        </header>
-        <section>
-            <article class="table">
-                <el-table
-                    :data="tableData"
-                    tooltip-effect="dark"
-                    style="width: 100%"
-                >
-                    <el-table-column prop="id" label="序号"></el-table-column>
-                    <el-table-column prop="sheepId" label="种公羊编码"></el-table-column>
-                    <el-table-column label="等级">
-                        <template v-slot="scope">
-                            <div v-for="item in $store.state['seedSheedLevel']" :key="item.value">
-                                <span v-if="item.value == scope.row['level']">{{ item.label }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="采精时间" width="180">
-                        <template v-slot="scope">
-                            <span>{{ scope.row['opeTime'].substr(0,10) }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="yield" label="射精量(ml)"></el-table-column>
-                    <el-table-column label="密度">
-                        <template v-slot="scope">
-                            <div v-for="item in $store.state['seedDensity']" :key="item.value">
-                                <span v-if="item.value == scope.row['density']">{{ item.label }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="vigour" label="活力"></el-table-column>
-                    <el-table-column label="色泽">
-                        <template v-slot="scope">
-                            <div v-for="item in $store.state['seedColor']" :key="item.value">
-                                <span v-if="item.value == scope.row['color']">{{ item.label }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="times" label="倍数"></el-table-column>
-                    <el-table-column prop="total" label="精液总量(ml)"></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['opeUser']">{{ `${item.name}(${item.position})` }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="操作" width="150">
-                        <template v-slot="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>
-                        </template>
-                    </el-table-column>
-                </el-table>
-
-                <el-row type="flex" justify="end">
-                    <el-col :span="8" class="pagination">
-                        <el-pagination
-                            @current-change="pageChange"
-                            background
-                            layout="prev, pager, next"
-                            :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="addSemen" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="种公羊编号">
-                            <el-input v-model="formData.sheepId"></el-input>
-                        </el-form-item>
-                        <el-form-item label="等级">
-                            <el-select v-model="formData.level" placeholder="请选择">
-                                <el-option
-                                    v-for="item in $store.state['seedSheedLevel']"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="采精时间">
-                            <el-date-picker
-                                v-model="formData.opeTime"
-                                type="date"
-                                value-format="yyyy-MM-dd HH:mm:ss"
-                                placeholder="选择日期"
-                            ></el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="射精量(ml)">
-                            <el-input v-model="formData.yield"></el-input>
-                        </el-form-item>
-                        <el-form-item label="密度">
-                            <el-radio-group v-model="formData.density">
-                                <el-radio
-                                    v-for="item in $store.state['seedDensity']"
-                                    :key="item.value"
-                                    :label="item.value"
-                                >{{ item.label }}</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                        <el-form-item label="活力">
-                            <el-input v-model="formData.vigour"></el-input>
-                        </el-form-item>
-                        <el-form-item label="色泽">
-                            <el-radio-group v-model="formData.color">
-                                <el-radio
-                                    v-for="item in $store.state['seedColor']"
-                                    :key="item.value"
-                                    :label="item.value"
-                                >{{ item.label }}</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                        <el-form-item label="倍数">
-                            <el-input v-model="formData.times"></el-input>
-                        </el-form-item>
-                        <el-form-item label="精液总量(ml)">
-                            <el-input v-model="formData.total"></el-input>
-                        </el-form-item>
-                        <el-form-item label="操作人">
-                            <el-select v-model="formData.opeUser" 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('addSemen')">保 存</el-button>
-                        </el-form-item>
-                    </el-form>
-                </el-col>
-            </el-row>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-import {
-    reqSemenList,
-    reqAddOrUpdateSemen,
-    reqDelSemen
-} from "@/api/breed.js";
-
-const pageSize = 10;
-const rules = {};
-
-export default {
-    name: "collectSeedLog",
-    data() {
-        return {
-            search: "",
-            pageNum: 1,
-            tableData: [],
-            totalPages: 0,
-            isShow: false,
-            formData: {
-                sheepId: "12",
-                level: this.$store.state['seedSheedLevel'][0].value,
-                opeTime: this.$moment().format('YYYY-MM-DD HH:mm:ss'),
-                yield: "0.4",
-                density: this.$store.state['seedDensity'][0].value,
-                vigour: "0.8",
-                color: this.$store.state['seedColor'][0].value,
-                times: "8",
-                total: "3",
-                opeUser: this.$store.state['workerList'][0].id
-            },
-            rules
-        };
-    },
-    created() {
-        // 采精记录列表
-        this.getSemenList();
-    },
-    methods: {
-        submitForm(formName) {
-            this.$refs[formName].validate(valid => {
-                if (valid) {
-                    reqAddOrUpdateSemen(this.formData)
-                        .then(res => {
-                            // 采精记录列表
-                            this.getSemenList();
-                            // this.$message.success("成功!");
-                            if (res.errCode) {
-                                this.$message.error(res.errMsg);
-                            } else {
-                                this.$message.success("成功!");
-                            }
-                            // this.isShow = false
-                        })
-                        .catch(err => {
-                            console.log(err);
-                            this.$message.error("失败!");
-                        });
-                } else {
-                    return false;
-                }
-            });
-        },
-        // 采精记录列表
-        getSemenList() {
-            reqSemenList({
-                searchStr: this.search,
-                pageSize,
-                pageNum: this.pageNum
-            })
-                .then(res => {
-                    this.tableData = res.content;
-                    this.totalPages = res.totalPages;
-                })
-                .catch(err => {
-                    console.log(err);
-                });
-        },
-        add() {
-            this.isShow = true;
-            // 有id是update 没id是add
-            delete this.formData.id;
-        },
-        edit(row) {
-            this.formData = row;
-            this.isShow = true;
-        },
-        del(row) {
-            reqDelSemen(row.id)
-                .then(res => {
-                    // 采精记录列表
-                    this.getSemenList();
-                    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("删除失败!");
-                });
-        },
-        pageChange(p) {
-            console.log(p);
-            this.pageNum = p;
-            // 采精记录列表
-            this.getSemenList();
-        }
-    }
-};
-</script>
-
-<style lang="scss" scoped>
-#header {
-    margin-bottom: 15px;
-}
-.table {
-    .pagination {
-        margin-top: 20px;
-    }
-}
-</style>

+ 0 - 215
src/views/breed/commoditySheepFile.vue

@@ -1,215 +0,0 @@
-<template>
-    <!-- commoditySheepFile -->
-    <div class="CommoditySheepFile">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">商品羊档案</h2>
-        <header id="header">
-            <el-row type="flex" :gutter="20">
-                <el-col :span="4">
-                    <el-input v-model="search" placeholder="请选择"></el-input>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary" @click="getCommoditySheepFileList">查找</el-button>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary" @click="add">新增</el-button>
-                </el-col>
-            </el-row>
-        </header>
-        <section>
-            <article class="table">
-                <el-table :data="tableData" tooltip-effect="dark" style="width: 100%">
-                    <el-table-column prop="id" label="商品羊编码"></el-table-column>
-
-                    <el-table-column prop="fatherId" label="父亲ID"></el-table-column>
-                    <el-table-column prop="motherId" label="母亲ID"></el-table-column>
-                    <el-table-column prop="birthWeight" label="出生重量(kg)"></el-table-column>
-                    <el-table-column label="出生时间">
-                        <template v-slot="scope">
-                            <span>{{ scope.row['birthday'].substr(0,10) }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="status" label="状态">
-                        <template v-slot="scope">
-                            <div v-for="item in $store.state['prductSheedStatus']" :key="item.value">
-                                <span v-if="item.value == scope.row['status']">{{ item.label }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column label="操作" width="150">
-                        <template slot-scope="scope">
-                            <el-popconfirm title="是否删除此设备的信息?" @onConfirm="del(scope.row)">
-                                <el-button slot="reference" type="text" size="small">删除</el-button>
-                            </el-popconfirm>
-                        </template>
-                    </el-table-column>
-                </el-table>
-
-                <el-row type="flex" justify="end">
-                    <el-col :span="8" class="pagination">
-                        <el-pagination
-                            @current-change="pageChange"
-                            background
-                            layout="prev, pager, next"
-                            :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="addCommoditySheepFile" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="商品羊编码">
-                            <el-input v-model="formData.id"></el-input>
-                        </el-form-item>
-                        <el-form-item label="母亲ID">
-                            <el-input v-model="formData.motherId"></el-input>
-                        </el-form-item>
-                        <el-form-item label="出生重量">
-                            <el-input v-model="formData.birthWeight"></el-input>
-                        </el-form-item>
-                        <el-form-item label="出生时间">
-                            <el-date-picker
-                                v-model="formData.birthday"
-                                type="date"
-                                value-format="yyyy-MM-dd HH:mm:ss"
-                                placeholder="选择日期"
-                            ></el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="状态">
-                            <el-select v-model="formData.status" placeholder="请选择">
-                                <el-option
-                                    v-for="item in $store.state['prductSheedStatus']"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-
-                        <el-form-item>
-                            <el-button @click="isShow=false">取 消</el-button>
-                            <el-button type="primary" @click="submitForm('addCommoditySheepFile')">保 存</el-button>
-                        </el-form-item>
-                    </el-form>
-                </el-col>
-            </el-row>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-import {
-    reqCommoditySheepFileList,
-    reqAddCommoditySheepFile,
-    reqDelCommoditySheepFile
-} from "@/api/breed.js";
-
-const pageSize = 10;
-const rules = {};
-
-export default {
-    name: "CommoditySheepFile",
-    data() {
-        return {
-            search: "",
-            pageNum: 1,
-            tableData: [],
-            totalPages: 0,
-            isShow: false,
-            formData: {
-                id: "5300",
-                motherId: "1003",
-                birthWeight: "3.3",
-                birthday: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
-                status: this.$store.state["prductSheedStatus"][0].value
-            },
-            rules
-        };
-    },
-    created() {
-        // 商品羊档案列表
-        this.getCommoditySheepFileList();
-    },
-    methods: {
-        submitForm(formName) {
-            this.$refs[formName].validate(valid => {
-                if (valid) {
-                    reqAddCommoditySheepFile(this.formData)
-                        .then(res => {
-                            // 商品羊档案列表
-                            this.getCommoditySheepFileList();
-                            // this.$message.success("成功!");
-                            if (res.errCode) {
-                                this.$message.error(res.errMsg);
-                            } else {
-                                this.$message.success("成功");
-                            }
-                            // this.isShow = false
-                        })
-                        .catch(err => {
-                            console.log(err);
-                            this.$message.error("失败!");
-                        });
-                } else {
-                    return false;
-                }
-            });
-        },
-        // 商品羊档案列表
-        getCommoditySheepFileList() {
-            reqCommoditySheepFileList({
-                searchStr: this.search,
-                pageSize,
-                pageNum: this.pageNum
-            })
-                .then(res => {
-                    this.tableData = res.content;
-                    this.totalPages = res.totalPages;
-                })
-                .catch(err => {
-                    console.log(err);
-                });
-        },
-        add() {
-            this.isShow = true;
-        },
-        del(row) {
-            reqDelCommoditySheepFile(row.id)
-                .then(res => {
-                    // 商品羊档案列表
-                    this.getCommoditySheepFileList();
-                    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(err);
-                });
-        },
-        pageChange(p) {
-            this.pageNum = p;
-            // 商品羊档案列表
-            this.getCommoditySheepFileList();
-        }
-    }
-};
-</script>
-
-<style lang="scss" scoped>
-#header {
-    margin-bottom: 15px;
-}
-.table {
-    .pagination {
-        margin-top: 20px;
-    }
-}
-</style>

+ 0 - 263
src/views/breed/matingLog.vue

@@ -1,263 +0,0 @@
-<template>
-    <div class="matingLog">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">配种记录</h2>
-        <header id="header">
-            <el-row type="flex" :gutter="20">
-                <el-col :span="4">
-                    <el-input v-model="search" placeholder="请选择"></el-input>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary" @click="getMatingList">查找</el-button>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary" @click="add">新增</el-button>
-                </el-col>
-            </el-row>
-        </header>
-        <section>
-            <article class="table">
-                <el-table :data="tableData" tooltip-effect="dark" style="width: 100%">
-                    <el-table-column prop="id" label="序号"></el-table-column>
-
-                    <el-table-column prop="femaleSheepId" label="种母羊编码"></el-table-column>
-
-                    <el-table-column label="种母羊等级">
-                        <template v-slot="scope">
-                            <div v-for="item in $store.state['seedSheedLevel']" :key="item.value">
-                                <span v-if="item.value == scope.row['femaleLevel']">{{ item.label }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column prop="maleSheepId" label="种公羊编码"></el-table-column>
-
-                    <el-table-column label="种公羊等级">
-                        <template v-slot="scope">
-                            <div v-for="item in $store.state['seedSheedLevel']" :key="item.value">
-                                <span v-if="item.value == scope.row['maleLevel']">{{ item.label }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column label="配种时间">
-                        <template v-slot="scope">
-                            <span>{{ scope.row['opeTime'].substr(0,10) }}</span>
-                        </template>
-                    </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['opeUser']"
-                                >{{ `${item.name}(${item.position})` }}</span>
-                            </div>
-                        </template>
-                    </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>
-                        </template>
-                    </el-table-column>
-                </el-table>
-
-                <el-row type="flex" justify="end">
-                    <el-col :span="8" class="pagination">
-                        <el-pagination
-                            @current-change="pageChange"
-                            background
-                            layout="prev, pager, next"
-                            :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="addMating" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="种母羊编码">
-                            <el-input v-model="formData.femaleSheepId"></el-input>
-                        </el-form-item>
-
-                        <el-form-item label="种母羊等级">
-                            <el-select v-model="formData.femaleLevel" placeholder="请选择">
-                                <el-option
-                                    v-for="item in $store.state['seedSheedLevel']"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-
-                        <el-form-item label="种公羊编码">
-                            <el-input v-model="formData.maleSheepId"></el-input>
-                        </el-form-item>
-
-                        <el-form-item label="种公羊等级">
-                            <el-select v-model="formData.maleLevel" placeholder="请选择">
-                                <el-option
-                                    v-for="item in $store.state['seedSheedLevel']"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-
-                        <el-form-item label="配种时间">
-                            <el-date-picker
-                                v-model="formData.opeTime"
-                                type="date"
-                                value-format="yyyy-MM-dd HH:mm:ss"
-                                placeholder="选择日期"
-                            ></el-date-picker>
-                        </el-form-item>
-
-                        <el-form-item label="操作人">
-                            <el-select v-model="formData.opeUser" 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('addMating')">保 存</el-button>
-                        </el-form-item>
-                    </el-form>
-                </el-col>
-            </el-row>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-import {
-    reqMatingList,
-    reqAddOrUpdateMating,
-    reqDelMating
-} from "@/api/breed.js";
-
-const pageSize = 10;
-const rules = {};
-
-export default {
-    name: "matingLog",
-    data() {
-        return {
-            search: "",
-            pageNum: 1,
-            tableData: [],
-            totalPages: 0,
-            isShow: false,
-            formData: {
-                femaleSheepId: "182",
-                femaleLevel: this.$store.state["seedSheedLevel"][0].value,
-                maleSheepId: "121",
-                maleLevel: this.$store.state["seedSheedLevel"][0].value,
-                opeTime: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
-                opeUser: this.$store.state["workerList"][0].id
-            },
-            rules
-        };
-    },
-    created() {
-        // 配种记录列表
-        this.getMatingList();
-    },
-    methods: {
-        submitForm(formName) {
-            this.$refs[formName].validate(valid => {
-                if (valid) {
-                    reqAddOrUpdateMating(this.formData)
-                        .then(res => {
-                            // 配种记录列表
-                            this.getMatingList();
-                            // this.$message.success("成功!");
-                            if (res.errCode) {
-                                this.$message.error(res.errMsg);
-                            } else {
-                                this.$message.success("成功");
-                            }
-                            // this.isShow = false
-                        })
-                        .catch(err => {
-                            console.log(err);
-                            this.$message.error("失败!");
-                        });
-                } else {
-                    return false;
-                }
-            });
-        },
-        // 配种记录列表
-        getMatingList() {
-            reqMatingList({
-                searchStr: this.search,
-                pageSize,
-                pageNum: this.pageNum
-            })
-                .then(res => {
-                    this.tableData = res.content;
-                    this.totalPages = res.totalPages;
-                })
-                .catch(err => {
-                    console.log(err);
-                });
-        },
-        add() {
-            this.isShow = true;
-            // 有id是update 没id是add
-            delete this.formData.id;
-        },
-        edit(row) {
-            this.formData = row;
-            this.isShow = true;
-        },
-        del(row) {
-            reqDelMating(row.id)
-                .then(res => {
-                    // 配种记录列表
-                    this.getMatingList();
-                    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("删除失败!");
-                });
-        },
-        pageChange(p) {
-            this.pageNum = p;
-            // 配种记录列表
-            this.getMatingList();
-        }
-    }
-};
-</script>
-
-<style lang="scss" scoped>
-#header {
-    margin-bottom: 15px;
-}
-.table {
-    .pagination {
-        margin-top: 20px;
-    }
-}
-</style>

+ 0 - 259
src/views/breed/matingSuccLog.vue

@@ -1,259 +0,0 @@
-<template>
-    <div class="matingSSuccLog">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">查情记录</h2>
-        <header id="header">
-            <el-row type="flex" :gutter="20">
-                <el-col :span="4">
-                    <el-input v-model="search" placeholder="请选择"></el-input>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary" @click="getmatingSList">查找</el-button>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary" @click="add">新增</el-button>
-                </el-col>
-            </el-row>
-        </header>
-        <section>
-            <article class="table">
-                <el-table
-                    :data="tableData"
-                    tooltip-effect="dark"
-                    style="width: 100%"
-                >
-                    <el-table-column prop="id" label="序号"></el-table-column>
-
-                    <el-table-column prop="sheepId" label="种母羊编号"></el-table-column>
-
-                    <el-table-column label="种母羊等级">
-                        <template v-slot="scope">
-                            <div v-for="item in $store.state['seedSheedLevel']" :key="item.value">
-                                <span v-if="item.value == scope.row['level']">{{ item.label }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column label="查情时间">
-                        <template v-slot="scope">
-                            <span>{{ scope.row['opeTime'].substr(0,10) }}</span>
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column label="是否发情">
-                        <template v-slot="scope">
-                            <div v-for="item in $store.state['estrusStatus']" :key="item.value">
-                                <span v-if="item.value == scope.row['ifEstrus']">{{ item.label }}</span>
-                            </div>
-                        </template>
-                    </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['opeUser']"
-                                >{{ `${item.name}(${item.position})` }}</span>
-                            </div>
-                        </template>
-                    </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>
-                        </template>
-                    </el-table-column>
-                </el-table>
-
-                <el-row type="flex" justify="end">
-                    <el-col :span="8" class="pagination">
-                        <el-pagination
-                            @current-change="pageChange"
-                            background
-                            layout="prev, pager, next"
-                            :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="addmatingS" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="种母羊编码">
-                            <el-input v-model="formData.sheepId"></el-input>
-                        </el-form-item>
-
-                        <el-form-item label="等级">
-                            <el-select v-model="formData.level" placeholder="请选择">
-                                <el-option
-                                    v-for="item in $store.state['seedSheedLevel']"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-
-                        <el-form-item label="查情时间">
-                            <el-date-picker
-                                v-model="formData.opeTime"
-                                type="date"
-                                value-format="yyyy-MM-dd HH:mm:ss"
-                                placeholder="选择日期"
-                            ></el-date-picker>
-                        </el-form-item>
-
-                        <el-form-item label="是否发情">
-                            <el-radio-group v-model="formData.ifEstrus">
-                                <el-radio
-                                    v-for="item in $store.state['estrusStatus']"
-                                    :key="item.value"
-                                    :label="item.value"
-                                >{{ item.label }}</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-
-                        <el-form-item label="操作人">
-                            <el-select v-model="formData.opeUser" 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('addmatingS')">保 存</el-button>
-                        </el-form-item>
-                    </el-form>
-                </el-col>
-            </el-row>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-import {
-    reqmatingSList,
-    reqAddOrUpdatematingS,
-    reqDelmatingS
-} from "@/api/breed.js";
-
-const pageSize = 10;
-const rules = {};
-
-export default {
-    name: "matingSSuccLog",
-    data() {
-        return {
-            search: "",
-            pageNum: 1,
-            tableData: [],
-            totalPages: 0,
-            isShow: false,
-            formData: {
-                sheepId: "182",
-                level: this.$store.state['seedSheedLevel'][0].value,
-                opeTime: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
-                ifEstrus: this.$store.state['estrusStatus'][0].value,
-                opeUser: this.$store.state['workerList'][0].id,
-            },
-            rules
-        };
-    },
-    created() {
-        // 查情记录列表
-        this.getmatingSList();
-    },
-    methods: {
-        submitForm(formName) {
-            this.$refs[formName].validate(valid => {
-                if (valid) {
-                    reqAddOrUpdatematingS(this.formData)
-                        .then(res => {
-                            // 查情记录列表
-                            this.getmatingSList();
-                            // this.$message.success("成功!");
-                            if (res.errCode) {
-                                this.$message.error(res.errMsg);
-                            } else {
-                                this.$message.success("成功");
-                            }
-                            // this.isShow = false
-                        })
-                        .catch(err => {
-                            console.log(err);
-                            this.$message.error("失败!");
-                        });
-                } else {
-                    return false;
-                }
-            });
-        },
-        // 查情记录列表
-        getmatingSList() {
-            reqmatingSList({
-                searchStr: this.search,
-                pageSize,
-                pageNum: this.pageNum
-            })
-                .then(res => {
-                    this.tableData = res.content;
-                    this.totalPages = res.totalPages;
-                })
-                .catch(err => {
-                    console.log(err);
-                });
-        },
-        add() {
-            this.isShow = true;
-            // 有id是update 没id是add
-            delete this.formData.id;
-        },
-        edit(row) {
-            this.formData = row;
-            this.isShow = true;
-        },
-        del(row) {
-            reqDelmatingS(row.id)
-                .then(res => {
-                    // 查情记录列表
-                    this.getmatingSList();
-                    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("删除失败!");
-                });
-        },
-        pageChange(p) {
-            this.pageNum = p;
-            // 查情记录列表
-            this.getmatingSList();
-        }
-    }
-};
-</script>
-
-<style lang="scss" scoped>
-#header {
-    margin-bottom: 15px;
-}
-.table {
-    .pagination {
-        margin-top: 20px;
-    }
-}
-</style>

+ 0 - 244
src/views/breed/offFieldLog.vue

@@ -1,244 +0,0 @@
-<template>
-    <div class="offFieldLog">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">离场记录</h2>
-        <header id="header">
-            <el-row type="flex" :gutter="20">
-                <el-col :span="4">
-                    <el-input v-model="search" placeholder="请选择"></el-input>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary" @click="getOffFieldList">查找</el-button>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary" @click="add">新增</el-button>
-                </el-col>
-            </el-row>
-        </header>
-        <section>
-            <article class="table">
-                <el-table
-                    :data="tableData"
-                    tooltip-effect="dark"
-                    style="width: 100%"
-                >
-                    <el-table-column prop="id" label="序号"></el-table-column>
-                    <el-table-column prop="sheepId" label="羊只编码"></el-table-column>
-                    <el-table-column label="离场时间">
-                        <template v-slot="scope">
-                            <span>{{ scope.row['opeTime'].substr(0,10) }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="ageOfDay" label="日龄(天)"></el-table-column>
-                    <el-table-column prop="weight" label="离场体重(kg)"></el-table-column>
-                    <el-table-column label="离场原因">
-                        <template v-slot="scope">
-                            <span v-if="scope.row['cause'] == 1">淘汰</span>
-                            <span v-if="scope.row['cause'] == 2">淘汰</span>
-                        </template>
-                    </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['opeUser']"
-                                >{{ item.name }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="remark" 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>
-                        </template>
-                    </el-table-column>
-                </el-table>
-
-                <el-row type="flex" justify="end">
-                    <el-col :span="8" class="pagination">
-                        <el-pagination
-                            @current-change="pageChange"
-                            background
-                            layout="prev, pager, next"
-                            :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="addOffField" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="羊只编码">
-                            <el-input v-model="formData.sheepId"></el-input>
-                        </el-form-item>
-
-                        <el-form-item label="离场时间">
-                            <el-date-picker
-                                v-model="formData.opeTime"
-                                type="date"
-                                value-format="yyyy-MM-dd HH:mm:ss"
-                                placeholder="选择日期"
-                            ></el-date-picker>
-                        </el-form-item>
-
-                        <el-form-item label="日龄">
-                            <el-input v-model="formData.ageOfDay"></el-input>
-                        </el-form-item>
-
-                        <el-form-item label="离场体重(kg)">
-                            <el-input v-model="formData.weight"></el-input>
-                        </el-form-item>
-
-                        <el-form-item label="离场原因">
-                            <el-radio-group v-model="formData.cause">
-                                <el-radio :label="1">淘汰</el-radio>
-                                <el-radio :label="2">死亡</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-
-                        <el-form-item label="饲养员">
-                            <el-select v-model="formData.opeUser" 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 label="备注">
-                            <el-input type="testarea" v-model="formData.remark"></el-input>
-                        </el-form-item>
-
-                        <el-form-item>
-                            <el-button @click="isShow=false">取 消</el-button>
-                            <el-button type="primary" @click="submitForm('addOffField')">保 存</el-button>
-                        </el-form-item>
-                    </el-form>
-                </el-col>
-            </el-row>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-import {
-    reqOffFieldList,
-    reqAddOrUpdateOffField,
-    reqDelOffField
-} from "@/api/breed.js";
-
-const pageSize = 10;
-const rules = {};
-
-export default {
-    name: "OffFieldLog",
-    data() {
-        return {
-            search: "",
-            pageNum: 1,
-            tableData: [],
-            totalPages: 0,
-            isShow: false,
-            formData: {
-                sheepId: "182",
-                opeTime: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
-                ageOfDay: '32',
-                weight: 5.8,
-                cause: 1,
-                opeUser: this.$store.state['workerList'][0].id,
-                remark: "这只小羊不乖!!"
-            },
-            rules
-        };
-    },
-    created() {
-        // 离场记录  列表
-        this.getOffFieldList();
-    },
-    methods: {
-        submitForm(formName) {
-            this.$refs[formName].validate(valid => {
-                if (valid) {
-                    reqAddOrUpdateOffField(this.formData)
-                        .then(res => {
-                            // 离场记录 列表
-                            this.getOffFieldList();
-                            this.$message.success("成功!");
-                            // this.isShow = false
-                        })
-                        .catch(err => {
-                            console.log(err);
-                            this.$message.error("失败!");
-                        });
-                } else {
-                    return false;
-                }
-            });
-        },
-        // 离场记录 列表
-        getOffFieldList() {
-            reqOffFieldList({
-                searchStr: this.search,
-                pageSize,
-                pageNum: this.pageNum
-            })
-                .then(res => {
-                    this.tableData = res.content;
-                    this.totalPages = res.totalPages;
-                })
-                .catch(err => {
-                    console.log(err);
-                });
-        },
-        add() {
-            this.isShow = true;
-            // 有id是update 没id是add
-            delete this.formData.id;
-        },
-        edit(row) {
-            this.formData = row;
-            this.isShow = true;
-        },
-        del(row) {
-            reqDelOffField(row.id)
-                .then(res => {
-                    // 离场记录 列表
-                    this.getOffFieldList();
-                    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(err);
-                });
-        },
-        pageChange(p) {
-            this.pageNum = p;
-            // 离场记录 列表
-            this.getOffFieldList();
-        }
-    }
-};
-</script>
-
-<style lang="scss" scoped>
-#header {
-    margin-bottom: 15px;
-}
-.table {
-    .pagination {
-        margin-top: 20px;
-    }
-}
-</style>

+ 0 - 253
src/views/breed/parturitionLog.vue

@@ -1,253 +0,0 @@
-<template>
-    <div class="parturitionLog">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">分娩记录</h2>
-        <header id="header">
-            <el-row type="flex" :gutter="20">
-                <el-col :span="4">
-                    <el-input v-model="search" placeholder="请选择"></el-input>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary" @click="getParturitionList">查找</el-button>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary" @click="add">新增</el-button>
-                </el-col>
-            </el-row>
-        </header>
-        <section>
-            <article class="table">
-                <el-table
-                    :data="tableData"
-                    tooltip-effect="dark"
-                    style="width: 100%"
-                >
-                    <el-table-column prop="id" label="序号"></el-table-column>
-                    <el-table-column prop="sheepId" label="种母羊编号"></el-table-column>
-                    <el-table-column label="分娩时间" width="180">
-                        <template v-slot="scope">
-                            <span>{{ scope.row['opeTime'].substr(0,10) }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="number" label="产羔个数"></el-table-column>
-                    <el-table-column prop="averageWeight" label="羔羊均重(kg)"></el-table-column>
-                    <el-table-column prop="healthyNum" label="健仔数"></el-table-column>
-                    <el-table-column prop="weakNum" label="弱仔数"></el-table-column>
-                    <el-table-column prop="mummyNum" label="木乃伊"></el-table-column>
-                    <el-table-column prop="deadNum" 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['opeUser']"
-                                >{{ `${item.name}(${item.position})` }}</span>
-                            </div>
-                        </template>
-                    </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>
-                        </template>
-                    </el-table-column>
-                </el-table>
-
-                <el-row type="flex" justify="end">
-                    <el-col :span="8" class="pagination">
-                        <el-pagination
-                            @current-change="pageChange"
-                            background
-                            layout="prev, pager, next"
-                            :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="addParturition" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="种母羊编码">
-                            <el-input v-model="formData.sheepId"></el-input>
-                        </el-form-item>
-
-                        <el-form-item label="分娩时间">
-                            <el-date-picker
-                                v-model="formData.opeTime"
-                                type="date"
-                                value-format="yyyy-MM-dd HH:mm:ss"
-                                placeholder="选择日期"
-                            ></el-date-picker>
-                        </el-form-item>
-
-                        <el-form-item label="产羔个数">
-                            <el-input-number v-model="formData.number" :min="0" :max="5" label="描述文字"></el-input-number>
-                        </el-form-item>
-
-                        <el-form-item label="羔羊均重(kg)">
-                            <el-input v-model="formData.averageWeight"></el-input>
-                        </el-form-item>
-
-                        <el-form-item label="健仔数">
-                            <el-input-number v-model="formData.healthyNum" :min="0" :max="5" label="描述文字"></el-input-number>
-                        </el-form-item>
-
-                        <el-form-item label="弱仔数">
-                            <el-input-number v-model="formData.weakNum" :min="0" :max="5" label="描述文字"></el-input-number>
-                        </el-form-item>
-
-                        <el-form-item label="木乃伊">
-                            <el-input-number v-model="formData.mummyNum" :min="0" :max="5" label="描述文字"></el-input-number>
-                        </el-form-item>
-
-                        <el-form-item label="死羔数">
-                            <el-input-number v-model="formData.deadNum" :min="0" :max="5" label="描述文字"></el-input-number>
-                        </el-form-item>
-
-                        <el-form-item label="操作人">
-                            <el-select v-model="formData.opeUser" 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('addParturition')">保 存</el-button>
-                        </el-form-item>
-                    </el-form>
-                </el-col>
-            </el-row>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-import {
-    reqParturitionList,
-    reqAddOrUpdateParturition,
-    reqDelParturition
-} from "@/api/breed.js";
-
-const pageSize = 10;
-const rules = {};
-
-export default {
-    name: "parturitionLog",
-    data() {
-        return {
-            search: "",
-            pageNum: 1,
-            tableData: [],
-            totalPages: 0,
-            isShow: false,
-            formData: {
-                sheepId: "182",
-                opeTime: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
-                number: 1,
-                averageWeight: '3.1',
-                healthyNum: 1,
-                weakNum: 0,
-                mummyNum: 0,
-                deadNum: 0,
-                opeUser: this.$store.state['workerList'][0].id,
-            },
-            rules
-        };
-    },
-    created() {
-        // 分娩记录列表
-        this.getParturitionList();
-    },
-    methods: {
-        submitForm(formName) {
-            this.$refs[formName].validate(valid => {
-                if (valid) {
-                    reqAddOrUpdateParturition(this.formData)
-                        .then(res => {
-                            // 分娩记录列表
-                            this.getParturitionList();
-                            // this.$message.success("成功!");
-                            if (res.errCode) {
-                                this.$message.error(res.errMsg);
-                            } else {
-                                this.$message.success("成功");
-                            }
-                            // this.isShow = false
-                        })
-                        .catch(err => {
-                            console.log(err);
-                            this.$message.error(err);
-                        });
-                } else {
-                    return false;
-                }
-            });
-        },
-        // 分娩记录列表
-        getParturitionList() {
-            reqParturitionList({
-                searchStr: this.search,
-                pageSize,
-                pageNum: this.pageNum
-            })
-                .then(res => {
-                    this.tableData = res.content;
-                    this.totalPages = res.totalPages;
-                })
-                .catch(err => {
-                    console.log(err);
-                });
-        },
-        add() {
-            this.isShow = true;
-            // 有id是update 没id是add
-            delete this.formData.id;
-        },
-        edit(row) {
-            this.formData = row;
-            this.isShow = true;
-        },
-        del(row) {
-            reqDelParturition(row.id)
-                .then(res => {
-                    // 分娩记录列表
-                    this.getParturitionList();
-                    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(err);
-                });
-        },
-        pageChange(p) {
-            this.pageNum = p;
-            // 分娩记录列表
-            this.getParturitionList();
-        }
-    }
-};
-</script>
-
-<style lang="scss" scoped>
-#header {
-    margin-bottom: 15px;
-}
-.table {
-    .pagination {
-        margin-top: 20px;
-    }
-}
-</style>

+ 0 - 281
src/views/breed/pregnancyTestLog.vue

@@ -1,281 +0,0 @@
-<template>
-    <div class="pregnancyTestLog">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">妊检记录</h2>
-        <header id="header">
-            <el-row type="flex" :gutter="20">
-                <el-col :span="4">
-                    <el-input v-model="search" placeholder="请选择"></el-input>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary" @click="getPregnancyTestList">查找</el-button>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary" @click="add">新增</el-button>
-                </el-col>
-            </el-row>
-        </header>
-        <section>
-            <article class="table">
-                <el-table
-                    :data="tableData"
-                    tooltip-effect="dark"
-                    style="width: 100%"
-                >
-                    <el-table-column prop="id" label="序号"></el-table-column>
-
-                    <el-table-column prop="sheepId" label="种母羊编号"></el-table-column>
-
-                    <el-table-column label="妊检时间">
-                        <template v-slot="scope">
-                            <span>{{ scope.row['opeTime'].substr(0,10) }}</span>
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column label="状态">
-                        <template v-slot="scope">
-                            <div v-for="item in $store.state['fetationStatus']" :key="item.value">
-                                <span v-if="item.value == scope.row['status']">{{ item.label }}</span>
-                            </div>
-                        </template>
-                    </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['opeUser']"
-                                >{{ `${item.name}(${item.position})` }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column prop="position" label="当前位置"></el-table-column>
-
-                    <el-table-column prop="number" label="怀胎个数"></el-table-column>
-
-                    <el-table-column prop="remark" 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>
-                        </template>
-                    </el-table-column>
-                </el-table>
-
-                <el-row type="flex" justify="end">
-                    <el-col :span="8" class="pagination">
-                        <el-pagination
-                            @current-change="pageChange"
-                            background
-                            layout="prev, pager, next"
-                            :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="addPregnancyTest"
-                        :model="formData"
-                        :rules="rules"
-                        label-width="140px"
-                    >
-                        <el-form-item label="种母羊编码">
-                            <el-input v-model="formData.sheepId"></el-input>
-                        </el-form-item>
-
-                        <el-form-item label="妊检时间">
-                            <el-date-picker
-                                v-model="formData.opeTime"
-                                type="date"
-                                value-format="yyyy-MM-dd HH:mm:ss"
-                                placeholder="选择日期"
-                            ></el-date-picker>
-                        </el-form-item>
-
-                        <el-form-item label="状态">
-                            <!-- <el-radio-group v-model="formData.ifEstrus">
-                                <el-radio
-                                    v-for="item in $store.state['fetationStatus']"
-                                    :key="item.value"
-                                    :label="item.value"
-                                >{{ item.label }}</el-radio>
-                            </el-radio-group> -->
-                            <el-select v-model="formData.status" placeholder="请选择">
-                                <el-option
-                                    v-for="item in $store.state['fetationStatus']"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-
-                        <el-form-item label="操作人">
-                            <el-select v-model="formData.opeUser" 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 label="当前位置">
-                            <el-select v-model="formData.position" filterable placeholder="请选择">
-                                <el-option
-                                    v-for="item in $store.state['areaList']"
-                                    :key="item.id"
-                                    :label="item.name"
-                                    :value="item.name"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-
-                        <el-form-item label="怀胎个数">
-                            <el-input v-model="formData.number"></el-input>
-                        </el-form-item>
-
-                        <el-form-item label="备注">
-                            <el-input type="textarea" v-model="formData.remark"></el-input>
-                        </el-form-item>
-
-                        <el-form-item>
-                            <el-button @click="isShow=false">取 消</el-button>
-                            <el-button type="primary" @click="submitForm('addPregnancyTest')">保 存</el-button>
-                        </el-form-item>
-                    </el-form>
-                </el-col>
-            </el-row>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-import {
-    reqPregnancyTestList,
-    reqAddOrUpdatePregnancyTest,
-    reqDelPregnancyTest
-} from "@/api/breed.js";
-
-const pageSize = 10;
-const rules = {};
-
-export default {
-    name: "pregnancyTestLog",
-    data() {
-        return {
-            search: "",
-            pageNum: 1,
-            tableData: [],
-            totalPages: 0,
-            isShow: false,
-            formData: {
-                sheepId: "182",
-                opeTime: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
-                status: this.$store.state['fetationStatus'][0].value,
-                opeUser: this.$store.state['workerList'][0].id,
-                position: null,
-                number: '2',
-                remark: '这只羊怀孕了',
-            },
-            rules
-        };
-    },
-    created() {
-        // 妊检记录列表
-        this.getPregnancyTestList();
-    },
-    methods: {
-        submitForm(formName) {
-            this.$refs[formName].validate(valid => {
-                if (valid) {
-                    reqAddOrUpdatePregnancyTest(this.formData)
-                        .then(res => {
-                            // 妊检记录列表
-                            this.getPregnancyTestList();
-                            // this.$message.success("成功!");
-                            if (res.errCode) {
-                                this.$message.error(res.errMsg);
-                            } else {
-                                this.$message.success("成功");
-                            }
-                            // this.isShow = false
-                        })
-                        .catch(err => {
-                            console.log(err);
-                            this.$message.error(err);
-                        });
-                } else {
-                    return false;
-                }
-            });
-        },
-        // 妊检记录列表
-        getPregnancyTestList() {
-            reqPregnancyTestList({
-                searchStr: this.search,
-                pageSize,
-                pageNum: this.pageNum
-            })
-                .then(res => {
-                    this.tableData = res.content;
-                    this.totalPages = res.totalPages;
-                })
-                .catch(err => {
-                    console.log(err);
-                });
-        },
-        add() {
-            this.isShow = true;
-            // 有id是update 没id是add
-            delete this.formData.id;
-        },
-        edit(row) {
-            this.formData = row;
-            this.isShow = true;
-        },
-        del(row) {
-            reqDelPregnancyTest(row.id)
-                .then(res => {
-                    // 妊检记录列表
-                    this.getPregnancyTestList();
-                    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(err);
-                });
-        },
-        pageChange(p) {
-            this.pageNum = p;
-            // 妊检记录列表
-            this.getPregnancyTestList();
-        }
-    }
-};
-</script>
-
-<style lang="scss" scoped>
-#header {
-    margin-bottom: 15px;
-}
-.table {
-    .pagination {
-        margin-top: 20px;
-    }
-}
-</style>

+ 0 - 303
src/views/breed/seedSheepFile.vue

@@ -1,303 +0,0 @@
-<template>
-    <div class="seedSheepFile">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">种羊档案</h2>
-        <header id="header">
-            <el-row type="flex" :gutter="20">
-                <el-col :span="4">
-                    <el-input v-model="searchStr" placeholder="请选择"></el-input>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary" @click="getSeedSheepList">查找</el-button>
-                </el-col>
-                <el-col :span="10">
-                    <el-button type="primary" @click="add">新增档案</el-button>暂时别删,要测试删除的话,先自己新增几条数据,别删已经存在的,这关乎到系谱信息档案
-                </el-col>
-                <el-col :span="4">
-                    <el-button-group>
-                        <el-button :type="sheepType==0?'primary':''" @click="shiftSheepType(0)">种母羊</el-button>
-                        <el-button :type="sheepType==1?'primary':''" @click="shiftSheepType(1)">种公羊</el-button>
-                    </el-button-group>
-                </el-col>
-            </el-row>
-        </header>
-        <section>
-            <article class="table">
-                <el-table :data="tableData" tooltip-effect="dark" style="width: 100%">
-                    <el-table-column prop="id" label="种羊编码" width="100"></el-table-column>
-                    <el-table-column label="入场时间" width="200">
-                        <template v-slot="scope">
-                            <span>{{ scope.row['entryTime'].substr(0,10) }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="dayOfAge" label="入场日龄"></el-table-column>
-                    <el-table-column label="种羊来源">
-                        <template v-slot="scope">
-                            <div v-for="item in $store.state['seedSheedSource']" :key="item.value">
-                                <span v-if="item.value == scope.row['source']">{{ item.label }}</span>
-                            </div>
-                        </template>
-                    </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['seedSheedStatus']" :key="item.value">
-                                <span v-if="item.value == scope.row['status']">{{ item.label }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="cost" label="成本价格(元)"></el-table-column>
-                    <el-table-column prop="weight" label="体重(kg)"></el-table-column>
-                    <el-table-column prop="feederName" 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 label="等级评级">
-                        <template v-slot="scope">
-                            <div v-for="item in $store.state['seedSheedLevel']" :key="item.value">
-                                <span v-if="item.value == scope.row['level']">{{ item.label }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="操作" width="150">
-                        <template v-slot="scope">
-                            <el-popconfirm title="是否删除此设备的信息?" @onConfirm="del(scope.row)">
-                                <el-button slot="reference" type="text" size="small">删除</el-button>
-                            </el-popconfirm>
-                        </template>
-                    </el-table-column>
-                </el-table>
-
-                <el-row type="flex" justify="end">
-                    <el-col :span="8" class="pagination">
-                        <el-pagination
-                            @current-change="pageChange"
-                            background
-                            layout="prev, pager, next"
-                            :page-count="Number(totalPages)"
-                        ></el-pagination>
-                    </el-col>
-                </el-row>
-            </article>
-        </section>
-
-        <el-dialog title="新增种羊档案" :visible.sync="isShow" width="45%">
-            <el-row type="flex">
-                <el-col :span="15">
-                    <el-form
-                        ref="addSeedSheepForm"
-                        :model="formData"
-                        :rules="rules"
-                        label-width="140px"
-                    >
-                        <el-form-item label="种羊编码">
-                            <el-input v-model="formData.id"></el-input>
-                        </el-form-item>
-
-                        <el-form-item label="日龄">
-                            <el-input v-model="formData.dayOfAge"></el-input>
-                        </el-form-item>
-
-                        <el-form-item label="种羊来源">
-                            <el-radio-group v-model="formData.source">
-                                <el-radio
-                                    v-for="item in $store.state['seedSheedSource']"
-                                    :key="item.value"
-                                    :label="item.value"
-                                >{{ item.label }}</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-
-                        <el-form-item label="当前位置">
-                            <el-select v-model="formData.position" filterable placeholder="请选择">
-                                <el-option
-                                    v-for="item in $store.state['areaList']"
-                                    :key="item.id"
-                                    :label="item.name"
-                                    :value="item.name"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-
-                        <el-form-item v-if="sheepType==0" label="当前状态" >
-                            <el-select v-model="formData.status" filterable placeholder="请选择">
-                                <el-option
-                                    v-for="item in $store.state['seedSheedStatus']"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item v-if="sheepType==1" label="当前状态">
-                            <el-select v-model="formData.status" filterable placeholder="请选择">
-                                <el-option
-                                    v-for="item in $store.state['seedRamSheedStatus']"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-
-                        <el-form-item label="成本价格(元)">
-                            <el-input v-model="formData.cost"></el-input>
-                        </el-form-item>
-
-                        <el-form-item label="体重(kg)">
-                            <el-input v-model="formData.weight"></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 label="等级评级">
-                            <el-radio-group v-model="formData.level">
-                                <el-radio
-                                    v-for="item in $store.state['seedSheedLevel']"
-                                    :key="item.value"
-                                    :label="item.value"
-                                >{{ item.label }}</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-
-                        <el-form-item>
-                            <el-button @click="isShow=false">取 消</el-button>
-                            <el-button type="primary" @click="submitForm('addSeedSheepForm')">保 存</el-button>
-                        </el-form-item>
-                    </el-form>
-                </el-col>
-            </el-row>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-import {
-    reqSeedSheepList,
-    reqAddSeedSheepFile,
-    reqDelSeedSheepFile
-} from "@/api/breed.js";
-
-const pageSize = 10;
-const rules = {};
-
-export default {
-    data() {
-        return {
-            page: 1,
-            searchStr: "",
-            sheepType: 0,
-            tableData: [],
-            totalPages: 0,
-            isShow: false,
-            rules,
-            formData: {
-                id: '',
-                dayOfAge: "222",
-                source: 1,
-                position: "",
-                status: null,
-                cost: 3000,
-                weight: 48,
-                feeder: this.$store.state["workerList"][0].id,
-                level: 1
-            }
-        };
-    },
-    created() {
-        this.getSeedSheepList();
-    },
-    methods: {
-        submitForm(formName) {
-            this.$refs[formName].validate(valid => {
-                if (valid) {
-                    // 新增种羊档案
-                    this.formData.gender = this.sheepType
-                    reqAddSeedSheepFile(this.formData)
-                        .then(res => {
-                            // 获取种羊档案列表
-                            this.getSeedSheepList();
-                            // this.$message.success("新增种羊档案成功!");
-                            if (res.errCode) {
-                                this.$message.error(res.errMsg);
-                            } else {
-                                this.$message.success("成功");
-                            }
-                        })
-                        .catch(err => {
-                            console.log(err);
-                            this.$message.error(err);
-                        });
-                } else {
-                    return false;
-                }
-            });
-        },
-        // 获取种羊档案列表
-        getSeedSheepList() {
-            reqSeedSheepList({
-                pageNum: this.page,
-                pageSize,
-                gender: this.sheepType,
-                searchStr: this.searchStr
-            })
-                .then(res => {
-                    this.tableData = res.content;
-                    this.totalPages = res.totalPages;
-                })
-                .catch(err => {
-                    console.log(err);
-                });
-        },
-        // 羊类型切换
-        shiftSheepType(sheepType) {
-            if(sheepType == this.sheepType) return
-            this.sheepType = sheepType
-            this.getSeedSheepList()
-        },
-
-        add() {
-            this.isShow = true;
-        },
-        del(row) {
-            reqDelSeedSheepFile({ id: row.id })
-                .then(res => {
-                    this.getSeedSheepList();
-                    this.$message.success("删除种羊档案成功!");
-                })
-                .catch(err => {
-                    console.log(err);
-                    this.$message.error("删除种羊档案失败!");
-                });
-        },
-        pageChange(p) {
-            this.page = p;
-            this.getSeedSheepList();
-        }
-    }
-};
-</script>
-
-<style lang="scss" scoped>
-#header {
-    margin-bottom: 15px;
-}
-.table {
-    .pagination {
-        margin-top: 20px;
-    }
-}
-</style>

+ 0 - 283
src/views/breed/shiftFieldLog.vue

@@ -1,283 +0,0 @@
-<template>
-    <div class="shiftFieldLog">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">转舍记录</h2>
-        <header id="header">
-            <el-row type="flex" :gutter="20">
-                <el-col :span="4">
-                    <el-input v-model="search" placeholder="请选择"></el-input>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary" @click="getShiftFieldList">查找</el-button>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary" @click="add">新增</el-button>
-                </el-col>
-            </el-row>
-        </header>
-        <section>
-            <article class="table">
-                <el-table
-                    :data="tableData"
-                    tooltip-effect="dark"
-                    style="width: 100%"
-                >
-                    <el-table-column prop="id" label="序号"></el-table-column>
-                    <el-table-column prop="sheepId" label="羊只编码"></el-table-column>
-                    <el-table-column label="转舍时间" width="180">
-                        <template v-slot="scope">
-                            <span>{{ scope.row['opeTime'].substr(0,10) }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="转出栋舍">
-                        <template v-slot="scope">
-                            <div v-for="item in $store.state['areaList']" :key="item.value">
-                                <span
-                                    v-if="item.id == scope.row['fromBuilding']"
-                                >{{ item.name }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="fromEnclosure" label="转出栏位"></el-table-column>
-
-                    <el-table-column label="转入栋舍">
-                        <template v-slot="scope">
-                            <div v-for="item in $store.state['areaList']" :key="item.value">
-                                <span
-                                    v-if="item.id == scope.row['toBuilding']"
-                                >{{ item.name }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="toEnclosure" label="转入栏位"></el-table-column>
-
-                    <el-table-column prop="weight" label="转出重量(kg)"></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['opeUser']"
-                                >{{ item.name }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="remark" 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>
-                        </template>
-                    </el-table-column>
-                </el-table>
-
-                <el-row type="flex" justify="end">
-                    <el-col :span="8" class="pagination">
-                        <el-pagination
-                            @current-change="pageChange"
-                            background
-                            layout="prev, pager, next"
-                            :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="addShiftField" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="羊只编码">
-                            <el-input v-model="formData.sheepId"></el-input>
-                        </el-form-item>
-
-                        <el-form-item label="转舍时间">
-                            <el-date-picker
-                                v-model="formData.opeTime"
-                                type="date"
-                                value-format="yyyy-MM-dd HH:mm:ss"
-                                placeholder="选择日期"
-                            ></el-date-picker>
-                        </el-form-item>
-
-                        <el-form-item label="转出栋舍">
-                            <el-select v-model="formData.opeUser" placeholder="请选择">
-                                <el-option
-                                    v-for="item in $store.state['areaList']"
-                                    :key="item.id"
-                                    :label="`${item.name}`"
-                                    :value="item.id"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="转出栏位">
-                            <el-input v-model="formData.fromEnclosure"></el-input>
-                        </el-form-item>
-
-                        <el-form-item label="转入栋舍">
-                            <el-select v-model="formData.toBuilding" placeholder="请选择">
-                                <el-option
-                                    v-for="item in $store.state['areaList']"
-                                    :key="item.id"
-                                    :label="`${item.name}`"
-                                    :value="item.id"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="转入栏位">
-                            <el-input v-model="formData.toEnclosure"></el-input>
-                        </el-form-item>
-
-                        <el-form-item label="转出重量(kg)">
-                            <el-input v-model="formData.weight"></el-input>
-                        </el-form-item>
-
-                        <el-form-item label="操作人">
-                            <el-select v-model="formData.opeUser" 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 label="备注">
-                            <el-input type="testarea" v-model="formData.remark"></el-input>
-                        </el-form-item>
-
-                        <el-form-item>
-                            <el-button @click="isShow=false">取 消</el-button>
-                            <el-button type="primary" @click="submitForm('addShiftField')">保 存</el-button>
-                        </el-form-item>
-                    </el-form>
-                </el-col>
-            </el-row>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-import {
-    reqShiftFieldList,
-    reqAddOrUpdateShiftField,
-    reqDelShiftField
-} from "@/api/breed.js";
-
-const pageSize = 10;
-const rules = {};
-
-export default {
-    name: "shiftFieldLog",
-    data() {
-        return {
-            search: "",
-            pageNum: 1,
-            tableData: [],
-            totalPages: 0,
-            isShow: false,
-            formData: {
-                sheepId: "182",
-                opeTime: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
-                fromBuilding: this.$store.state['areaList'][0].id,
-                fromEnclosure: '01号栏位',
-                toBuilding: this.$store.state['areaList'][0].id,
-                toEnclosure: '02号栏位',
-                weight: '42',
-                opeUser: this.$store.state['workerList'][0].id,
-                remark: "这只羊不乖!!"
-            },
-            rules
-        };
-    },
-    created() {
-        // 转舍记录  列表
-        this.getShiftFieldList();
-    },
-    methods: {
-        submitForm(formName) {
-            this.$refs[formName].validate(valid => {
-                if (valid) {
-                    reqAddOrUpdateShiftField(this.formData)
-                        .then(res => {
-                            // 转舍记录 列表
-                            this.getShiftFieldList();
-                            // this.$message.success("成功!");
-                            if (res.errCode) {
-                                this.$message.error(res.errMsg);
-                            } else {
-                                this.$message.success("成功");
-                            }
-                            // this.isShow = false
-                        })
-                        .catch(err => {
-                            console.log(err);
-                            this.$message.error(err);
-                        });
-                } else {
-                    return false;
-                }
-            });
-        },
-        // 转舍记录 列表
-        getShiftFieldList() {
-            reqShiftFieldList({
-                searchStr: this.search,
-                pageSize,
-                pageNum: this.pageNum
-            })
-                .then(res => {
-                    this.tableData = res.content;
-                    this.totalPages = res.totalPages;
-                })
-                .catch(err => {
-                    console.log(err);
-                });
-        },
-        add() {
-            this.isShow = true;
-            // 有id是update 没id是add
-            delete this.formData.id;
-        },
-        edit(row) {
-            this.formData = row;
-            this.isShow = true;
-        },
-        del(row) {
-            reqDelShiftField(row.id)
-                .then(res => {
-                    // 转舍记录 列表
-                    this.getShiftFieldList();
-                    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(err);
-                });
-        },
-        pageChange(p) {
-            this.pageNum = p;
-            // 转舍记录 列表
-            this.getShiftFieldList();
-        }
-    }
-};
-</script>
-
-<style lang="scss" scoped>
-#header {
-    margin-bottom: 15px;
-}
-.table {
-    .pagination {
-        margin-top: 20px;
-    }
-}
-</style>

+ 0 - 236
src/views/breed/weaningLog.vue

@@ -1,236 +0,0 @@
-<template>
-    <div class="weaningLog">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">断奶信息</h2>
-        <header id="header">
-            <el-row type="flex" :gutter="20">
-                <el-col :span="4">
-                    <el-input v-model="search" placeholder="请选择"></el-input>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary" @click="getWeaningList">查找</el-button>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary" @click="add">新增</el-button>
-                </el-col>
-            </el-row>
-        </header>
-        <section>
-            <article class="table">
-                <el-table
-                    :data="tableData"
-                    tooltip-effect="dark"
-                    style="width: 100%"
-                >
-                    <el-table-column prop="id" label="序号"></el-table-column>
-                    <el-table-column label="断奶时间">
-                        <template v-slot="scope">
-                            <span>{{ scope.row['opeTime'].substr(0,10) }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="sheepId" label="种母羊编码"></el-table-column>
-                    <el-table-column prop="number" label="羔羊数量(只)"></el-table-column>
-                    <el-table-column prop="weight" label="断奶均重量(kg)"></el-table-column>
-                    <el-table-column prop="cost" 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['opeUser']"
-                                >{{ `${item.name}(${item.position})` }}</span>
-                            </div>
-                        </template>
-                    </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>
-                        </template>
-                    </el-table-column>
-                </el-table>
-
-                <el-row type="flex" justify="end">
-                    <el-col :span="8" class="pagination">
-                        <el-pagination
-                            @current-change="pageChange"
-                            background
-                            layout="prev, pager, next"
-                            :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="addWeaning" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="种母羊编码">
-                            <el-input v-model="formData.sheepId"></el-input>
-                        </el-form-item>
-
-                        <el-form-item label="断奶时间">
-                            <el-date-picker
-                                v-model="formData.opeTime"
-                                type="date"
-                                value-format="yyyy-MM-dd HH:mm:ss"
-                                placeholder="选择日期"
-                            ></el-date-picker>
-                        </el-form-item>
-
-                        <el-form-item label="羔羊数量">
-                            <el-input-number v-model="formData.number" :min="0" :max="5" label="描述文字"></el-input-number>
-                        </el-form-item>
-
-                        <el-form-item label="断奶均重量(kg)">
-                            <el-input v-model="formData.weight"></el-input>
-                        </el-form-item>
-
-                        <el-form-item label="断奶成本">
-                            <el-input v-model="formData.cost"></el-input>
-                        </el-form-item>
-
-                        <el-form-item label="操作人">
-                            <el-select v-model="formData.opeUser" 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('addWeaning')">保 存</el-button>
-                        </el-form-item>
-                    </el-form>
-                </el-col>
-            </el-row>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-import {
-    reqWeaningList,
-    reqAddOrUpdateWeaning,
-    reqDelWeaning
-} from "@/api/breed.js";
-
-const pageSize = 10;
-const rules = {};
-
-export default {
-    name: "weaningLog",
-    data() {
-        return {
-            search: "",
-            pageNum: 1,
-            tableData: [],
-            totalPages: 0,
-            isShow: false,
-            formData: {
-                opeTime: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
-                sheepId: "182",
-                number: 1,
-                weight: '3.1',
-                cost: '482',
-                opeUser: this.$store.state['workerList'][0].id,
-            },
-            rules
-        };
-    },
-    created() {
-        // 断奶信息列表
-        this.getWeaningList();
-    },
-    methods: {
-        submitForm(formName) {
-            this.$refs[formName].validate(valid => {
-                if (valid) {
-                    reqAddOrUpdateWeaning(this.formData)
-                        .then(res => {
-                            // 断奶信息列表
-                            this.getWeaningList();
-                            // this.$message.success("成功!");
-                            if (res.errCode) {
-                                this.$message.error(res.errMsg);
-                            } else {
-                                this.$message.success("成功");
-                            }
-                            // this.isShow = false
-                        })
-                        .catch(err => {
-                            console.log(err);
-                            this.$message.error(err);
-                        });
-                } else {
-                    return false;
-                }
-            });
-        },
-        // 断奶信息列表
-        getWeaningList() {
-            reqWeaningList({
-                searchStr: this.search,
-                pageSize,
-                pageNum: this.pageNum
-            })
-                .then(res => {
-                    this.tableData = res.content;
-                    this.totalPages = res.totalPages;
-                })
-                .catch(err => {
-                    console.log(err);
-                });
-        },
-        add() {
-            this.isShow = true;
-            // 有id是update 没id是add
-            delete this.formData.id;
-        },
-        edit(row) {
-            this.formData = row;
-            this.isShow = true;
-        },
-        del(row) {
-            reqDelWeaning(row.id)
-                .then(res => {
-                    // 断奶信息列表
-                    this.getWeaningList();
-                    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(err);
-                });
-        },
-        pageChange(p) {
-            console.log(p);
-            this.pageNum = p;
-            // 断奶信息列表
-            this.getWeaningList();
-        }
-    }
-};
-</script>
-
-<style lang="scss" scoped>
-#header {
-    margin-bottom: 15px;
-}
-.table {
-    .pagination {
-        margin-top: 20px;
-    }
-}
-</style>

+ 32 - 0
src/views/fileInfo/test.vue

@@ -0,0 +1,32 @@
+<template>
+    <div class="workerInfo">
+        <formList v-model="data"></formList>
+    </div>
+</template>
+
+<script>
+import formList from '@/components/formList/formList'
+
+export default {
+    name: "test",
+    components: {formList},
+    data() {
+        return {
+            data: {
+                keys: [1,2,3,4,5],
+                vals: [1,2,3,4,5]
+            }
+        };
+    },
+    created() {
+        
+    },
+    methods: {
+       
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+
+</style>