.

src/views/aaaaaaaa.vue

@@ -1,52 +0,0 @@
-<template>
-    <div>
-        <el-form>
-            <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-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-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>
-    </div>
-</template>
-
-
-<script>
-export default {
-    name: "Af",
-    data() {
-        return {
-            opeTime: this.$moment().format("YYYY-MM-DD"),
-            aa: this.$store.state['dispatchStatus'][0].value,
-        };
-    },
-    created() {},
-    methods: {
-        
-    }
-};
-</script>

src/views/antiepidemic/illnessLog.vue

@@ -180,14 +180,14 @@ export default {
             totalPages: 0,
             isShow: false,
             formData: {
-                sheepId: "192",
+                sheepId: "",
                 regTime: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
-                disease: "羔羊大肠杆菌病",
+                disease: "",
                 ifIsolation: 0,
                 medicineId: null,
-                opeUser: this.$store.state["workerList"][0].id,
-                status: this.$store.state["cureStatus"][0].value,
-                remark: "备注"
+                opeUser: null,
+                status: null,
+                remark: ""
             },
             rules
         };
@@ -208,8 +208,19 @@ export default {
                                 this.$message.error(res.errMsg);
                             } else {
                                 this.$message.success("新增成功！");
+                                this.formData = {
+                                    sheepId: "",
+                                    regTime: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
+                                    disease: "",
+                                    ifIsolation: 0,
+                                    medicineId: null,
+                                    opeUser: null,
+                                    status: null,
+                                    remark: ""
+                                }
+                                this.isShow = false
                             }
-                            // this.isShow = false
+                            
                         })
                         .catch(err => {
                             console.log(err);

src/views/antiepidemic/immunePlan.vue

@@ -200,14 +200,14 @@ export default {
             target: this.$store.state["sheepType"][2].value, // 按钮绑定的
             sheepTypeArr: [this.$store.state["sheepType"][1].value],
             formData: {
-                target: this.$store.state["sheepType"][0].value,
-                batchNo: "1922",
+                target: null,
+                batchNo: "",
                 performTime: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
-                number: "200",
-                medicineId: 1,
-                method: "羊皮下注射",
-                opeUser: this.$store.state["workerList"][0].id,
-                remark: "备注"
+                number: "",
+                medicineId: null,
+                method: "",
+                opeUser: null,
+                remark: ""
             },
             timeForm: {},
             rules
@@ -235,8 +235,18 @@ export default {
                                 this.$message.error(res.errMsg);
                             } else {
                                 this.$message.success("新增成功！");
+                                this.isShow = false
+                                this.formData = {
+                                    target: null,
+                                    batchNo: "",
+                                    performTime: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
+                                    number: "",
+                                    medicineId: null,
+                                    method: "",
+                                    opeUser: null,
+                                    remark: ""
+                                }
                             }
-                            // this.isShow = false
                         })
                         .catch(err => {
                             console.log(err);

src/views/antiepidemic/immuneProce.vue

@@ -169,15 +169,15 @@ export default {
             target: this.$store.state["sheepType"][0].value,  // 按钮绑定的
             sheepTypeArr: [this.$store.state["sheepType"][1].value],
             formData: {
-                vaccineStyle: this.$store.state["vaccineStyle"][1].value,
-                target: this.$store.state["sheepType"][0].value,
-                vaccineName: "山羊口疮弱毒细胞冻干苗",
-                disease: "山羊口疮",
-                vaccineTime: "怀孕母羊分娩前20-30天和10-20天各注射1次",
-                vaccineDosage: "2",
-                unit: "ml",
-                bodyPart: "注射部位",
-                remark: "备注"
+                vaccineStyle: null,
+                target: null,
+                vaccineName: "",
+                disease: "",
+                vaccineTime: "",
+                vaccineDosage: "",
+                unit: "",
+                bodyPart: "",
+                remark: ""
             },
             rules
         };
@@ -204,6 +204,8 @@ export default {
                                 this.$message.error(res.errMsg);
                             } else {
                                 this.$message.success("成功！");
+                                this.formData = {}
+                                this.isShow = false
                             }
                             // this.isShow = false
                         })

src/views/breed/collectSeedLog.vue

@@ -179,16 +179,16 @@ export default {
             totalPages: 0,
             isShow: false,
             formData: {
-                sheepId: "12",
-                level: this.$store.state['seedSheedLevel'][0].value,
+                sheepId: "",
+                level: null,
                 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
+                yield: "",
+                density: null,
+                vigour: "",
+                color: null,
+                times: "",
+                total: "",
+                opeUser: null
             },
             rules
         };
@@ -210,6 +210,18 @@ export default {
                                 this.$message.error(res.errMsg);
                             } else {
                                 this.$message.success("成功！");
+                                this.formData = {
+                                    sheepId: "",
+                                    level: null,
+                                    opeTime: this.$moment().format('YYYY-MM-DD HH:mm:ss'),
+                                    yield: "",
+                                    density: null,
+                                    vigour: "",
+                                    color: null,
+                                    times: "",
+                                    total: "",
+                                    opeUser: null
+                                }
                             }
                             // this.isShow = false
                         })

src/views/breed/commoditySheepFile.vue

@@ -1,14 +1,24 @@
 <template>
     <!-- commoditySheepFile -->
     <div class="CommoditySheepFile">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">商品羊档案</h2>
+        <h2
+            style="
+                margin-bottom: 20px;
+                padding-bottom: 7px;
+                border-bottom: 2px solid #ddd;
+            "
+        >
+            商品羊档案
+        </h2>
         <header 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-button type="primary" @click="getCommoditySheepFileList"
+                        >查找</el-button
+                    >
                 </el-col>
                 <el-col :span="4">
                     <el-button type="primary" @click="add">新增</el-button>
@@ -17,29 +27,63 @@
         </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
+                    :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
+                        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>
+                            <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
+                                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
+                                title="是否删除此设备的信息？"
+                                @onConfirm="del(scope.row)"
+                            >
+                                <el-button
+                                    slot="reference"
+                                    type="text"
+                                    size="small"
+                                    >删除</el-button
+                                >
                             </el-popconfirm>
                         </template>
                     </el-table-column>
@@ -61,7 +105,12 @@
         <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
+                        ref="addCommoditySheepFile"
+                        :model="formData"
+                        :rules="rules"
+                        label-width="140px"
+                    >
                         <el-form-item label="商品羊编码">
                             <el-input v-model="formData.id"></el-input>
                         </el-form-item>
@@ -80,9 +129,14 @@
                             ></el-date-picker>
                         </el-form-item>
                         <el-form-item label="状态">
-                            <el-select v-model="formData.status" placeholder="请选择">
+                            <el-select
+                                v-model="formData.status"
+                                placeholder="请选择"
+                            >
                                 <el-option
-                                    v-for="item in $store.state['prductSheedStatus']"
+                                    v-for="item in $store.state[
+                                        'prductSheedStatus'
+                                    ]"
                                     :key="item.value"
                                     :label="item.label"
                                     :value="item.value"
@@ -91,8 +145,12 @@
                         </el-form-item>
 
                         <el-form-item>
-                            <el-button @click="isShow=false">取 消</el-button>
-                            <el-button type="primary" @click="submitForm('addCommoditySheepFile')">保 存</el-button>
+                            <el-button @click="isShow = false">取 消</el-button>
+                            <el-button
+                                type="primary"
+                                @click="submitForm('addCommoditySheepFile')"
+                                >保 存</el-button
+                            >
                         </el-form-item>
                     </el-form>
                 </el-col>
@@ -105,7 +163,7 @@
 import {
     reqCommoditySheepFileList,
     reqAddCommoditySheepFile,
-    reqDelCommoditySheepFile
+    reqDelCommoditySheepFile,
 } from "@/api/breed.js";
 
 const pageSize = 10;
@@ -121,13 +179,13 @@ export default {
             totalPages: 0,
             isShow: false,
             formData: {
-                id: "5300",
-                motherId: "1003",
-                birthWeight: "3.3",
+                id: "",
+                motherId: "",
+                birthWeight: "",
                 birthday: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
-                status: this.$store.state["prductSheedStatus"][0].value
+                status: null,
             },
-            rules
+            rules,
         };
     },
     created() {
@@ -136,10 +194,10 @@ export default {
     },
     methods: {
         submitForm(formName) {
-            this.$refs[formName].validate(valid => {
+            this.$refs[formName].validate((valid) => {
                 if (valid) {
                     reqAddCommoditySheepFile(this.formData)
-                        .then(res => {
+                        .then((res) => {
                             // 商品羊档案列表
                             this.getCommoditySheepFileList();
                             // this.$message.success("成功！");
@@ -147,10 +205,20 @@ export default {
                                 this.$message.error(res.errMsg);
                             } else {
                                 this.$message.success("成功");
+                                this.formData = {
+                                    id: "",
+                                    motherId: "",
+                                    birthWeight: "",
+                                    birthday: this.$moment().format(
+                                        "YYYY-MM-DD HH:mm:ss"
+                                    ),
+                                    status: null,
+                                };
+                                this.isShow = false;
                             }
                             // this.isShow = false
                         })
-                        .catch(err => {
+                        .catch((err) => {
                             console.log(err);
                             this.$message.error("失败！");
                         });
@@ -164,13 +232,13 @@ export default {
             reqCommoditySheepFileList({
                 searchStr: this.search,
                 pageSize,
-                pageNum: this.pageNum
+                pageNum: this.pageNum,
             })
-                .then(res => {
+                .then((res) => {
                     this.tableData = res.content;
                     this.totalPages = res.totalPages;
                 })
-                .catch(err => {
+                .catch((err) => {
                     console.log(err);
                 });
         },
@@ -179,7 +247,7 @@ export default {
         },
         del(row) {
             reqDelCommoditySheepFile(row.id)
-                .then(res => {
+                .then((res) => {
                     // 商品羊档案列表
                     this.getCommoditySheepFileList();
                     if (res.code == "success") {
@@ -189,7 +257,7 @@ export default {
                         this.$message.error(res.errMsg);
                     }
                 })
-                .catch(err => {
+                .catch((err) => {
                     console.log(err);
                     this.$message.error(err);
                 });
@@ -198,8 +266,8 @@ export default {
             this.pageNum = p;
             // 商品羊档案列表
             this.getCommoditySheepFileList();
-        }
-    }
+        },
+    },
 };
 </script>
 

src/views/breed/matingLog.vue

@@ -162,12 +162,12 @@ export default {
             totalPages: 0,
             isShow: false,
             formData: {
-                femaleSheepId: "182",
-                femaleLevel: this.$store.state["seedSheedLevel"][0].value,
-                maleSheepId: "121",
-                maleLevel: this.$store.state["seedSheedLevel"][0].value,
+                femaleSheepId: "",
+                femaleLevel: null,
+                maleSheepId: "",
+                maleLevel: null,
                 opeTime: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
-                opeUser: this.$store.state["workerList"][0].id
+                opeUser: null
             },
             rules
         };
@@ -189,6 +189,8 @@ export default {
                                 this.$message.error(res.errMsg);
                             } else {
                                 this.$message.success("成功");
+                                this.formData = {}
+                                this.isShow = false
                             }
                             // this.isShow = false
                         })

src/views/breed/matingSuccLog.vue

@@ -159,11 +159,11 @@ export default {
             totalPages: 0,
             isShow: false,
             formData: {
-                sheepId: "182",
-                level: this.$store.state['seedSheedLevel'][0].value,
+                sheepId: "",
+                level: null,
                 opeTime: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
-                ifEstrus: this.$store.state['estrusStatus'][0].value,
-                opeUser: this.$store.state['workerList'][0].id,
+                ifEstrus: null,
+                opeUser: null,
             },
             rules
         };
@@ -185,8 +185,9 @@ export default {
                                 this.$message.error(res.errMsg);
                             } else {
                                 this.$message.success("成功");
+                                this.formData = {}
+                                this.isShow = false
                             }
-                            // this.isShow = false
                         })
                         .catch(err => {
                             console.log(err);

src/views/breed/offFieldLog.vue

@@ -147,13 +147,13 @@ export default {
             totalPages: 0,
             isShow: false,
             formData: {
-                sheepId: "182",
+                sheepId: "",
                 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: "这只小羊不乖！！"
+                ageOfDay: '',
+                weight: null,
+                cause: null,
+                opeUser: null,
+                remark: ""
             },
             rules
         };
@@ -171,7 +171,8 @@ export default {
                             // 离场记录 列表
                             this.getOffFieldList();
                             this.$message.success("成功！");
-                            // this.isShow = false
+                            this.formData = {}
+                            this.isShow = false
                         })
                         .catch(err => {
                             console.log(err);

src/views/breed/parturitionLog.vue

@@ -1,13 +1,23 @@
 <template>
     <div class="parturitionLog">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">分娩记录</h2>
+        <h2
+            style="
+                margin-bottom: 20px;
+                padding-bottom: 7px;
+                border-bottom: 2px solid #ddd;
+            "
+        >
+            分娩记录
+        </h2>
         <header 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-button type="primary" @click="getParturitionList"
+                        >查找</el-button
+                    >
                 </el-col>
                 <el-col :span="4">
                     <el-button type="primary" @click="add">新增</el-button>
@@ -22,32 +32,71 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号"></el-table-column>
-                    <el-table-column prop="sheepId" 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>
+                            <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
+                        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
+                                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-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>
@@ -69,7 +118,12 @@
         <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
+                        ref="addParturition"
+                        :model="formData"
+                        :rules="rules"
+                        label-width="140px"
+                    >
                         <el-form-item label="种母羊编码">
                             <el-input v-model="formData.sheepId"></el-input>
                         </el-form-item>
@@ -84,31 +138,62 @@
                         </el-form-item>
 
                         <el-form-item label="产羔个数">
-                            <el-input-number v-model="formData.number" :min="0" :max="5" label="描述文字"></el-input-number>
+                            <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-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-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-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-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-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-select
+                                v-model="formData.opeUser"
+                                filterable
+                                placeholder="请选择"
+                            >
                                 <el-option
                                     v-for="item in $store.state['workerList']"
                                     :key="item.id"
@@ -119,8 +204,12 @@
                         </el-form-item>
 
                         <el-form-item>
-                            <el-button @click="isShow=false">取 消</el-button>
-                            <el-button type="primary" @click="submitForm('addParturition')">保 存</el-button>
+                            <el-button @click="isShow = false">取 消</el-button>
+                            <el-button
+                                type="primary"
+                                @click="submitForm('addParturition')"
+                                >保 存</el-button
+                            >
                         </el-form-item>
                     </el-form>
                 </el-col>
@@ -133,7 +222,7 @@
 import {
     reqParturitionList,
     reqAddOrUpdateParturition,
-    reqDelParturition
+    reqDelParturition,
 } from "@/api/breed.js";
 
 const pageSize = 10;
@@ -149,17 +238,17 @@ export default {
             totalPages: 0,
             isShow: false,
             formData: {
-                sheepId: "182",
+                sheepId: "",
                 opeTime: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
-                number: 1,
-                averageWeight: '3.1',
-                healthyNum: 1,
+                number: null,
+                averageWeight: "",
+                healthyNum: 0,
                 weakNum: 0,
                 mummyNum: 0,
                 deadNum: 0,
-                opeUser: this.$store.state['workerList'][0].id,
+                opeUser: null,
             },
-            rules
+            rules,
         };
     },
     created() {
@@ -168,10 +257,10 @@ export default {
     },
     methods: {
         submitForm(formName) {
-            this.$refs[formName].validate(valid => {
+            this.$refs[formName].validate((valid) => {
                 if (valid) {
                     reqAddOrUpdateParturition(this.formData)
-                        .then(res => {
+                        .then((res) => {
                             // 分娩记录列表
                             this.getParturitionList();
                             // this.$message.success("成功！");
@@ -179,10 +268,23 @@ export default {
                                 this.$message.error(res.errMsg);
                             } else {
                                 this.$message.success("成功");
+                                this.formData = {
+                                    sheepId: "",
+                                    opeTime: this.$moment().format(
+                                        "YYYY-MM-DD HH:mm:ss"
+                                    ),
+                                    number: 0,
+                                    averageWeight: "",
+                                    healthyNum: 0,
+                                    weakNum: 0,
+                                    mummyNum: 0,
+                                    deadNum: 0,
+                                    opeUser: null,
+                                };
+                                this.isShow = false;
                             }
-                            // this.isShow = false
                         })
-                        .catch(err => {
+                        .catch((err) => {
                             console.log(err);
                             this.$message.error(err);
                         });
@@ -196,13 +298,13 @@ export default {
             reqParturitionList({
                 searchStr: this.search,
                 pageSize,
-                pageNum: this.pageNum
+                pageNum: this.pageNum,
             })
-                .then(res => {
+                .then((res) => {
                     this.tableData = res.content;
                     this.totalPages = res.totalPages;
                 })
-                .catch(err => {
+                .catch((err) => {
                     console.log(err);
                 });
         },
@@ -217,7 +319,7 @@ export default {
         },
         del(row) {
             reqDelParturition(row.id)
-                .then(res => {
+                .then((res) => {
                     // 分娩记录列表
                     this.getParturitionList();
                     if (res.code == "success") {
@@ -227,7 +329,7 @@ export default {
                         this.$message.error(res.errMsg);
                     }
                 })
-                .catch(err => {
+                .catch((err) => {
                     console.log(err);
                     this.$message.error(err);
                 });
@@ -236,8 +338,8 @@ export default {
             this.pageNum = p;
             // 分娩记录列表
             this.getParturitionList();
-        }
-    }
+        },
+    },
 };
 </script>
 

src/views/breed/pregnancyTestLog.vue

@@ -1,13 +1,23 @@
 <template>
     <div class="pregnancyTestLog">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">妊检记录</h2>
+        <h2
+            style="
+                margin-bottom: 20px;
+                padding-bottom: 7px;
+                border-bottom: 2px solid #ddd;
+            "
+        >
+            妊检记录
+        </h2>
         <header 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-button type="primary" @click="getPregnancyTestList"
+                        >查找</el-button
+                    >
                 </el-col>
                 <el-col :span="4">
                     <el-button type="primary" @click="add">新增</el-button>
@@ -23,43 +33,79 @@
                 >
                     <el-table-column prop="id" label="序号"></el-table-column>
 
-                    <el-table-column prop="sheepId" 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>
+                            <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
+                                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
+                                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="position"
+                        label="当前位置"
+                    ></el-table-column>
 
-                    <el-table-column prop="number" 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
+                        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-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>
@@ -108,9 +154,14 @@
                                     :label="item.value"
                                 >{{ item.label }}</el-radio>
                             </el-radio-group> -->
-                            <el-select v-model="formData.status" placeholder="请选择">
+                            <el-select
+                                v-model="formData.status"
+                                placeholder="请选择"
+                            >
                                 <el-option
-                                    v-for="item in $store.state['fetationStatus']"
+                                    v-for="item in $store.state[
+                                        'fetationStatus'
+                                    ]"
                                     :key="item.value"
                                     :label="item.label"
                                     :value="item.value"
@@ -119,7 +170,11 @@
                         </el-form-item>
 
                         <el-form-item label="操作人">
-                            <el-select v-model="formData.opeUser" filterable placeholder="请选择">
+                            <el-select
+                                v-model="formData.opeUser"
+                                filterable
+                                placeholder="请选择"
+                            >
                                 <el-option
                                     v-for="item in $store.state['workerList']"
                                     :key="item.id"
@@ -130,7 +185,11 @@
                         </el-form-item>
 
                         <el-form-item label="当前位置">
-                            <el-select v-model="formData.position" filterable placeholder="请选择">
+                            <el-select
+                                v-model="formData.position"
+                                filterable
+                                placeholder="请选择"
+                            >
                                 <el-option
                                     v-for="item in $store.state['areaList']"
                                     :key="item.id"
@@ -145,12 +204,19 @@
                         </el-form-item>
 
                         <el-form-item label="备注">
-                            <el-input type="textarea" v-model="formData.remark"></el-input>
+                            <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-button @click="isShow = false">取 消</el-button>
+                            <el-button
+                                type="primary"
+                                @click="submitForm('addPregnancyTest')"
+                                >保 存</el-button
+                            >
                         </el-form-item>
                     </el-form>
                 </el-col>
@@ -163,7 +229,7 @@
 import {
     reqPregnancyTestList,
     reqAddOrUpdatePregnancyTest,
-    reqDelPregnancyTest
+    reqDelPregnancyTest,
 } from "@/api/breed.js";
 
 const pageSize = 10;
@@ -179,15 +245,15 @@ export default {
             totalPages: 0,
             isShow: false,
             formData: {
-                sheepId: "182",
+                sheepId: "",
                 opeTime: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
-                status: this.$store.state['fetationStatus'][0].value,
-                opeUser: this.$store.state['workerList'][0].id,
+                status: null,
+                opeUser: null,
                 position: null,
-                number: '2',
-                remark: '这只羊怀孕了',
+                number: "",
+                remark: "",
             },
-            rules
+            rules,
         };
     },
     created() {
@@ -196,10 +262,10 @@ export default {
     },
     methods: {
         submitForm(formName) {
-            this.$refs[formName].validate(valid => {
+            this.$refs[formName].validate((valid) => {
                 if (valid) {
                     reqAddOrUpdatePregnancyTest(this.formData)
-                        .then(res => {
+                        .then((res) => {
                             // 妊检记录列表
                             this.getPregnancyTestList();
                             // this.$message.success("成功！");
@@ -207,10 +273,21 @@ export default {
                                 this.$message.error(res.errMsg);
                             } else {
                                 this.$message.success("成功");
+                                this.formData = {};
+                                this.isShow = {
+                                    sheepId: "",
+                                    opeTime: this.$moment().format(
+                                        "YYYY-MM-DD HH:mm:ss"
+                                    ),
+                                    status: null,
+                                    opeUser: null,
+                                    position: null,
+                                    number: "",
+                                    remark: "",
+                                };
                             }
-                            // this.isShow = false
                         })
-                        .catch(err => {
+                        .catch((err) => {
                             console.log(err);
                             this.$message.error(err);
                         });
@@ -224,13 +301,13 @@ export default {
             reqPregnancyTestList({
                 searchStr: this.search,
                 pageSize,
-                pageNum: this.pageNum
+                pageNum: this.pageNum,
             })
-                .then(res => {
+                .then((res) => {
                     this.tableData = res.content;
                     this.totalPages = res.totalPages;
                 })
-                .catch(err => {
+                .catch((err) => {
                     console.log(err);
                 });
         },
@@ -245,7 +322,7 @@ export default {
         },
         del(row) {
             reqDelPregnancyTest(row.id)
-                .then(res => {
+                .then((res) => {
                     // 妊检记录列表
                     this.getPregnancyTestList();
                     if (res.code == "success") {
@@ -255,7 +332,7 @@ export default {
                         this.$message.error(res.errMsg);
                     }
                 })
-                .catch(err => {
+                .catch((err) => {
                     console.log(err);
                     this.$message.error(err);
                 });
@@ -264,8 +341,8 @@ export default {
             this.pageNum = p;
             // 妊检记录列表
             this.getPregnancyTestList();
-        }
-    }
+        },
+    },
 };
 </script>
 

src/views/breed/seedSheepFile.vue

@@ -1,13 +1,26 @@
 <template>
     <div class="seedSheepFile">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">种羊档案</h2>
+        <h2
+            style="
+                margin-bottom: 20px;
+                padding-bottom: 7px;
+                border-bottom: 2px solid #ddd;
+            "
+        >
+            种羊档案
+        </h2>
         <header id="header">
             <el-row type="flex" :gutter="20">
                 <el-col :span="4">
-                    <el-input v-model="searchStr" placeholder="请选择"></el-input>
+                    <el-input
+                        v-model="searchStr"
+                        placeholder="请选择"
+                    ></el-input>
                 </el-col>
                 <el-col :span="4">
-                    <el-button type="primary" @click="getSeedSheepList">查找</el-button>
+                    <el-button type="primary" @click="getSeedSheepList"
+                        >查找</el-button
+                    >
                 </el-col>
                 <el-col :span="10">
                     <!-- 暂时别删，要测试删除的话，先自己新增几条数据，别删已经存在的，这关乎到系谱信息档案 -->
@@ -15,59 +28,117 @@
                 </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
+                            :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
+                    :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>
+                            <span>{{
+                                scope.row["entryTime"].substr(0, 10)
+                            }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="dayOfAge" label="入场日龄"></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
+                                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
+                        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
+                                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="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
+                                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
+                                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
+                                title="是否删除此设备的信息？"
+                                @onConfirm="del(scope.row)"
+                            >
+                                <el-button
+                                    slot="reference"
+                                    type="text"
+                                    size="small"
+                                    >删除</el-button
+                                >
                             </el-popconfirm>
                         </template>
                     </el-table-column>
@@ -106,15 +177,22 @@
                         <el-form-item label="种羊来源">
                             <el-radio-group v-model="formData.source">
                                 <el-radio
-                                    v-for="item in $store.state['seedSheedSource']"
+                                    v-for="item in $store.state[
+                                        'seedSheedSource'
+                                    ]"
                                     :key="item.value"
                                     :label="item.value"
-                                >{{ item.label }}</el-radio>
+                                    >{{ item.label }}</el-radio
+                                >
                             </el-radio-group>
                         </el-form-item>
 
                         <el-form-item label="当前位置">
-                            <el-select v-model="formData.position" filterable placeholder="请选择">
+                            <el-select
+                                v-model="formData.position"
+                                filterable
+                                placeholder="请选择"
+                            >
                                 <el-option
                                     v-for="item in $store.state['areaList']"
                                     :key="item.id"
@@ -124,20 +202,32 @@
                             </el-select>
                         </el-form-item>
 
-                        <el-form-item v-if="sheepType==0" label="当前状态" >
-                            <el-select v-model="formData.status" filterable placeholder="请选择">
+                        <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']"
+                                    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-form-item v-if="sheepType == 1" label="当前状态">
+                            <el-select
+                                v-model="formData.status"
+                                filterable
+                                placeholder="请选择"
+                            >
                                 <el-option
-                                    v-for="item in $store.state['seedRamSheedStatus']"
+                                    v-for="item in $store.state[
+                                        'seedRamSheedStatus'
+                                    ]"
                                     :key="item.value"
                                     :label="item.label"
                                     :value="item.value"
@@ -154,7 +244,11 @@
                         </el-form-item>
 
                         <el-form-item label="饲养员">
-                            <el-select v-model="formData.feeder" filterable placeholder="请选择">
+                            <el-select
+                                v-model="formData.feeder"
+                                filterable
+                                placeholder="请选择"
+                            >
                                 <el-option
                                     v-for="item in $store.state['workerList']"
                                     :key="item.id"
@@ -167,16 +261,23 @@
                         <el-form-item label="等级评级">
                             <el-radio-group v-model="formData.level">
                                 <el-radio
-                                    v-for="item in $store.state['seedSheedLevel']"
+                                    v-for="item in $store.state[
+                                        'seedSheedLevel'
+                                    ]"
                                     :key="item.value"
                                     :label="item.value"
-                                >{{ item.label }}</el-radio>
+                                    >{{ 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-button @click="isShow = false">取 消</el-button>
+                            <el-button
+                                type="primary"
+                                @click="submitForm('addSeedSheepForm')"
+                                >保 存</el-button
+                            >
                         </el-form-item>
                     </el-form>
                 </el-col>
@@ -189,13 +290,14 @@
 import {
     reqSeedSheepList,
     reqAddSeedSheepFile,
-    reqDelSeedSheepFile
+    reqDelSeedSheepFile,
 } from "@/api/breed.js";
 
 const pageSize = 10;
 const rules = {};
 
 export default {
+    name: "seedSheepFile",
     data() {
         return {
             page: 1,
@@ -206,16 +308,16 @@ export default {
             isShow: false,
             rules,
             formData: {
-                id: '',
-                dayOfAge: "222",
+                id: "",
+                dayOfAge: "",
                 source: 1,
                 position: "",
                 status: null,
-                cost: 3000,
-                weight: 48,
-                feeder: this.$store.state["workerList"][0].id,
-                level: 1
-            }
+                cost: null,
+                weight: null,
+                feeder: null,
+                level: null,
+            },
         };
     },
     created() {
@@ -223,12 +325,12 @@ export default {
     },
     methods: {
         submitForm(formName) {
-            this.$refs[formName].validate(valid => {
+            this.$refs[formName].validate((valid) => {
                 if (valid) {
                     // 新增种羊档案
-                    this.formData.gender = this.sheepType
+                    this.formData.gender = this.sheepType;
                     reqAddSeedSheepFile(this.formData)
-                        .then(res => {
+                        .then((res) => {
                             // 获取种羊档案列表
                             this.getSeedSheepList();
                             // this.$message.success("新增种羊档案成功！");
@@ -236,9 +338,21 @@ export default {
                                 this.$message.error(res.errMsg);
                             } else {
                                 this.$message.success("成功");
+                                this.formData = {
+                                    id: "",
+                                    dayOfAge: "",
+                                    source: 1,
+                                    position: "",
+                                    status: null,
+                                    cost: null,
+                                    weight: null,
+                                    feeder: null,
+                                    level: null,
+                                };
+                                this.isShow = false
                             }
                         })
-                        .catch(err => {
+                        .catch((err) => {
                             console.log(err);
                             this.$message.error(err);
                         });
@@ -253,21 +367,21 @@ export default {
                 pageNum: this.page,
                 pageSize,
                 gender: this.sheepType,
-                searchStr: this.searchStr
+                searchStr: this.searchStr,
             })
-                .then(res => {
+                .then((res) => {
                     this.tableData = res.content;
                     this.totalPages = res.totalPages;
                 })
-                .catch(err => {
+                .catch((err) => {
                     console.log(err);
                 });
         },
         // 羊类型切换
         shiftSheepType(sheepType) {
-            if(sheepType == this.sheepType) return
-            this.sheepType = sheepType
-            this.getSeedSheepList()
+            if (sheepType == this.sheepType) return;
+            this.sheepType = sheepType;
+            this.getSeedSheepList();
         },
 
         add() {
@@ -275,11 +389,11 @@ export default {
         },
         del(row) {
             reqDelSeedSheepFile({ id: row.id })
-                .then(res => {
+                .then((res) => {
                     this.getSeedSheepList();
                     this.$message.success("删除种羊档案成功！");
                 })
-                .catch(err => {
+                .catch((err) => {
                     console.log(err);
                     this.$message.error("删除种羊档案失败！");
                 });
@@ -287,8 +401,8 @@ export default {
         pageChange(p) {
             this.page = p;
             this.getSeedSheepList();
-        }
-    }
+        },
+    },
 };
 </script>
 

src/views/breed/shiftFieldLog.vue

@@ -1,13 +1,23 @@
 <template>
     <div class="shiftFieldLog">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">转舍记录</h2>
+        <h2
+            style="
+                margin-bottom: 20px;
+                padding-bottom: 7px;
+                border-bottom: 2px solid #ddd;
+            "
+        >
+            转舍记录
+        </h2>
         <header 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-button type="primary" @click="getShiftFieldList"
+                        >查找</el-button
+                    >
                 </el-col>
                 <el-col :span="4">
                     <el-button type="primary" @click="add">新增</el-button>
@@ -22,50 +32,91 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号"></el-table-column>
-                    <el-table-column prop="sheepId" 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>
+                            <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">
+                            <div
+                                v-for="item in $store.state['areaList']"
+                                :key="item.value"
+                            >
                                 <span
                                     v-if="item.id == scope.row['fromBuilding']"
-                                >{{ item.name }}</span>
+                                    >{{ item.name }}</span
+                                >
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="fromEnclosure" label="转出栏位"></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">
+                            <div
+                                v-for="item in $store.state['areaList']"
+                                :key="item.value"
+                            >
                                 <span
                                     v-if="item.id == scope.row['toBuilding']"
-                                >{{ item.name }}</span>
+                                    >{{ item.name }}</span
+                                >
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="toEnclosure" label="转入栏位"></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
+                        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
+                                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
+                        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-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>
@@ -87,7 +138,12 @@
         <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
+                        ref="addShiftField"
+                        :model="formData"
+                        :rules="rules"
+                        label-width="140px"
+                    >
                         <el-form-item label="羊只编码">
                             <el-input v-model="formData.sheepId"></el-input>
                         </el-form-item>
@@ -102,7 +158,10 @@
                         </el-form-item>
 
                         <el-form-item label="转出栋舍">
-                            <el-select v-model="formData.opeUser" placeholder="请选择">
+                            <el-select
+                                v-model="formData.opeUser"
+                                placeholder="请选择"
+                            >
                                 <el-option
                                     v-for="item in $store.state['areaList']"
                                     :key="item.id"
@@ -112,11 +171,16 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="转出栏位">
-                            <el-input v-model="formData.fromEnclosure"></el-input>
+                            <el-input
+                                v-model="formData.fromEnclosure"
+                            ></el-input>
                         </el-form-item>
 
                         <el-form-item label="转入栋舍">
-                            <el-select v-model="formData.toBuilding" placeholder="请选择">
+                            <el-select
+                                v-model="formData.toBuilding"
+                                placeholder="请选择"
+                            >
                                 <el-option
                                     v-for="item in $store.state['areaList']"
                                     :key="item.id"
@@ -134,7 +198,11 @@
                         </el-form-item>
 
                         <el-form-item label="操作人">
-                            <el-select v-model="formData.opeUser" filterable placeholder="请选择">
+                            <el-select
+                                v-model="formData.opeUser"
+                                filterable
+                                placeholder="请选择"
+                            >
                                 <el-option
                                     v-for="item in $store.state['workerList']"
                                     :key="item.id"
@@ -145,12 +213,19 @@
                         </el-form-item>
 
                         <el-form-item label="备注">
-                            <el-input type="testarea" v-model="formData.remark"></el-input>
+                            <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-button @click="isShow = false">取 消</el-button>
+                            <el-button
+                                type="primary"
+                                @click="submitForm('addShiftField')"
+                                >保 存</el-button
+                            >
                         </el-form-item>
                     </el-form>
                 </el-col>
@@ -163,7 +238,7 @@
 import {
     reqShiftFieldList,
     reqAddOrUpdateShiftField,
-    reqDelShiftField
+    reqDelShiftField,
 } from "@/api/breed.js";
 
 const pageSize = 10;
@@ -179,17 +254,17 @@ export default {
             totalPages: 0,
             isShow: false,
             formData: {
-                sheepId: "182",
+                sheepId: "",
                 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: "这只羊不乖！！"
+                fromBuilding: null,
+                fromEnclosure: "",
+                toBuilding: null,
+                toEnclosure: "",
+                weight: "",
+                opeUser: null,
+                remark: "",
             },
-            rules
+            rules,
         };
     },
     created() {
@@ -198,10 +273,10 @@ export default {
     },
     methods: {
         submitForm(formName) {
-            this.$refs[formName].validate(valid => {
+            this.$refs[formName].validate((valid) => {
                 if (valid) {
                     reqAddOrUpdateShiftField(this.formData)
-                        .then(res => {
+                        .then((res) => {
                             // 转舍记录 列表
                             this.getShiftFieldList();
                             // this.$message.success("成功！");
@@ -209,10 +284,23 @@ export default {
                                 this.$message.error(res.errMsg);
                             } else {
                                 this.$message.success("成功");
+                                this.formData = {
+                                    sheepId: "",
+                                    opeTime: this.$moment().format(
+                                        "YYYY-MM-DD HH:mm:ss"
+                                    ),
+                                    fromBuilding: null,
+                                    fromEnclosure: "",
+                                    toBuilding: null,
+                                    toEnclosure: "",
+                                    weight: "",
+                                    opeUser: null,
+                                    remark: "",
+                                };
+                                this.isShow = false;
                             }
-                            // this.isShow = false
                         })
-                        .catch(err => {
+                        .catch((err) => {
                             console.log(err);
                             this.$message.error(err);
                         });
@@ -226,13 +314,13 @@ export default {
             reqShiftFieldList({
                 searchStr: this.search,
                 pageSize,
-                pageNum: this.pageNum
+                pageNum: this.pageNum,
             })
-                .then(res => {
+                .then((res) => {
                     this.tableData = res.content;
                     this.totalPages = res.totalPages;
                 })
-                .catch(err => {
+                .catch((err) => {
                     console.log(err);
                 });
         },
@@ -247,7 +335,7 @@ export default {
         },
         del(row) {
             reqDelShiftField(row.id)
-                .then(res => {
+                .then((res) => {
                     // 转舍记录 列表
                     this.getShiftFieldList();
                     if (res.code == "success") {
@@ -257,7 +345,7 @@ export default {
                         this.$message.error(res.errMsg);
                     }
                 })
-                .catch(err => {
+                .catch((err) => {
                     console.log(err);
                     this.$message.error(err);
                 });
@@ -266,8 +354,8 @@ export default {
             this.pageNum = p;
             // 转舍记录 列表
             this.getShiftFieldList();
-        }
-    }
+        },
+    },
 };
 </script>
 

src/views/breed/weaningLog.vue

@@ -1,13 +1,23 @@
 <template>
     <div class="weaningLog">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">断奶信息</h2>
+        <h2
+            style="
+                margin-bottom: 20px;
+                padding-bottom: 7px;
+                border-bottom: 2px solid #ddd;
+            "
+        >
+            断奶信息
+        </h2>
         <header 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-button type="primary" @click="getWeaningList"
+                        >查找</el-button
+                    >
                 </el-col>
                 <el-col :span="4">
                     <el-button type="primary" @click="add">新增</el-button>
@@ -24,27 +34,57 @@
                     <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>
+                            <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
+                        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
+                                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-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>
@@ -66,7 +106,12 @@
         <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
+                        ref="addWeaning"
+                        :model="formData"
+                        :rules="rules"
+                        label-width="140px"
+                    >
                         <el-form-item label="种母羊编码">
                             <el-input v-model="formData.sheepId"></el-input>
                         </el-form-item>
@@ -81,7 +126,12 @@
                         </el-form-item>
 
                         <el-form-item label="羔羊数量">
-                            <el-input-number v-model="formData.number" :min="0" :max="5" label="描述文字"></el-input-number>
+                            <el-input-number
+                                v-model="formData.number"
+                                :min="0"
+                                :max="5"
+                                label="描述文字"
+                            ></el-input-number>
                         </el-form-item>
 
                         <el-form-item label="断奶均重量(kg)">
@@ -93,7 +143,11 @@
                         </el-form-item>
 
                         <el-form-item label="操作人">
-                            <el-select v-model="formData.opeUser" filterable placeholder="请选择">
+                            <el-select
+                                v-model="formData.opeUser"
+                                filterable
+                                placeholder="请选择"
+                            >
                                 <el-option
                                     v-for="item in $store.state['workerList']"
                                     :key="item.id"
@@ -104,8 +158,12 @@
                         </el-form-item>
 
                         <el-form-item>
-                            <el-button @click="isShow=false">取 消</el-button>
-                            <el-button type="primary" @click="submitForm('addWeaning')">保 存</el-button>
+                            <el-button @click="isShow = false">取 消</el-button>
+                            <el-button
+                                type="primary"
+                                @click="submitForm('addWeaning')"
+                                >保 存</el-button
+                            >
                         </el-form-item>
                     </el-form>
                 </el-col>
@@ -118,7 +176,7 @@
 import {
     reqWeaningList,
     reqAddOrUpdateWeaning,
-    reqDelWeaning
+    reqDelWeaning,
 } from "@/api/breed.js";
 
 const pageSize = 10;
@@ -135,13 +193,13 @@ export default {
             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,
+                sheepId: "",
+                number: 0,
+                weight: "",
+                cost: "",
+                opeUser: null,
             },
-            rules
+            rules,
         };
     },
     created() {
@@ -150,10 +208,10 @@ export default {
     },
     methods: {
         submitForm(formName) {
-            this.$refs[formName].validate(valid => {
+            this.$refs[formName].validate((valid) => {
                 if (valid) {
                     reqAddOrUpdateWeaning(this.formData)
-                        .then(res => {
+                        .then((res) => {
                             // 断奶信息列表
                             this.getWeaningList();
                             // this.$message.success("成功！");
@@ -161,10 +219,21 @@ export default {
                                 this.$message.error(res.errMsg);
                             } else {
                                 this.$message.success("成功");
+                                this.formData = {
+                                    opeTime: this.$moment().format(
+                                        "YYYY-MM-DD HH:mm:ss"
+                                    ),
+                                    sheepId: "",
+                                    number: 0,
+                                    weight: "",
+                                    cost: "",
+                                    opeUser: null,
+                                };
+                                this.isShow = false;
                             }
                             // this.isShow = false
                         })
-                        .catch(err => {
+                        .catch((err) => {
                             console.log(err);
                             this.$message.error(err);
                         });
@@ -178,13 +247,13 @@ export default {
             reqWeaningList({
                 searchStr: this.search,
                 pageSize,
-                pageNum: this.pageNum
+                pageNum: this.pageNum,
             })
-                .then(res => {
+                .then((res) => {
                     this.tableData = res.content;
                     this.totalPages = res.totalPages;
                 })
-                .catch(err => {
+                .catch((err) => {
                     console.log(err);
                 });
         },
@@ -199,7 +268,7 @@ export default {
         },
         del(row) {
             reqDelWeaning(row.id)
-                .then(res => {
+                .then((res) => {
                     // 断奶信息列表
                     this.getWeaningList();
                     if (res.code == "success") {
@@ -209,7 +278,7 @@ export default {
                         this.$message.error(res.errMsg);
                     }
                 })
-                .catch(err => {
+                .catch((err) => {
                     console.log(err);
                     this.$message.error(err);
                 });
@@ -219,8 +288,8 @@ export default {
             this.pageNum = p;
             // 断奶信息列表
             this.getWeaningList();
-        }
-    }
+        },
+    },
 };
 </script>
 

src/views/cultivateSeed/gradeAssess.vue

@@ -87,18 +87,6 @@ export default {
             pageNum: 1,
             tableData: [],
             totalPages: 0,
-            formData: {
-                saleNo: "20200814001",
-                saleTime: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
-                saleBatch: "12380",
-                number: 4,
-                weight: 204.8,
-                price: 65,
-                opeUser: null,
-                buyer: "乔一飞",
-                sum: 0.0,
-                remark: "备注"
-            },
             rules
         };
     },
@@ -106,14 +94,6 @@ export default {
         // 等级评定列表
         this.getGradeAssessList();
     },
-    watch: {
-        "formData.weight"(v, ov) {
-            this.formData.sum = (v * this.formData.price).toFixed(2);
-        },
-        "formData.price"(v, ov) {
-            this.formData.sum = (this.formData.weight * v).toFixed(2);
-        }
-    },
     methods: {
         // 等级评定列表
         getGradeAssessList() {

src/views/device/deviceFault.vue

@@ -1,13 +1,23 @@
 <template>
-    <div class="DvFault">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">设备故障</h2>
+    <div class="deviceFault">
+        <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="getDvFaultList">查找</el-button>
+                    <el-button type="primary" @click="getDvFaultList"
+                        >查找</el-button
+                    >
                 </el-col>
                 <el-col :span="4">
                     <el-button type="primary" @click="add">新增</el-button>
@@ -16,39 +26,79 @@
         </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
+                    :data="tableData"
+                    tooltip-effect="dark"
+                    style="width: 100%"
+                >
+                    <el-table-column
+                        prop="id"
+                        label="序号"
+                        width="100"
+                    ></el-table-column>
                     <!-- <el-table-column prop="farmId" label="农场ID"></el-table-column> -->
                     <el-table-column label="安装日期">
                         <template v-slot="scope">
-                            <span>{{ scope.row['installTime'] }}</span>
+                            <span>{{ scope.row["installTime"] }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="name" label="设备名称"></el-table-column>
+                    <el-table-column
+                        prop="name"
+                        label="设备名称"
+                    ></el-table-column>
                     <el-table-column label="设备类型">
                         <template v-slot="scope">
-                            <div v-for="item in $store.state['deviceType']" :key="item.value">
-                                <span v-if="item.value == scope.row['style']">{{ item.label }}</span>
+                            <div
+                                v-for="item in $store.state['deviceType']"
+                                :key="item.value"
+                            >
+                                <span v-if="item.value == scope.row['style']">{{
+                                    item.label
+                                }}</span>
                             </div>
                         </template>
                     </el-table-column>
                     <el-table-column label="设备状态">
                         <template v-slot="scope">
-                            <div v-for="item in $store.state['deviceStatus']" :key="item.value">
+                            <div
+                                v-for="item in $store.state['deviceStatus']"
+                                :key="item.value"
+                            >
                                 <el-tag
-                                    :type="scope.row['status']==3?'danger':scope.row['status']==2?'info':''"
+                                    :type="
+                                        scope.row['status'] == 3
+                                            ? 'danger'
+                                            : scope.row['status'] == 2
+                                            ? 'info'
+                                            : ''
+                                    "
                                     v-if="item.value == scope.row['status']"
                                     size="mini"
-                                >{{ item.label }}</el-tag>
+                                    >{{ item.label }}</el-tag
+                                >
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="code" label="产品编码"></el-table-column>
-                    <el-table-column prop="position" label="地址"></el-table-column>
+                    <el-table-column
+                        prop="code"
+                        label="产品编码"
+                    ></el-table-column>
+                    <el-table-column
+                        prop="position"
+                        label="地址"
+                    ></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
+                                title="是否删除此设备的信息？"
+                                @onConfirm="del(scope.row)"
+                            >
+                                <el-button
+                                    slot="reference"
+                                    type="text"
+                                    size="small"
+                                    >删除</el-button
+                                >
                             </el-popconfirm>
                         </template>
                     </el-table-column>
@@ -70,7 +120,12 @@
         <el-dialog title="新增/编辑" :visible.sync="isShow" width="40%">
             <el-row type="flex">
                 <el-col :span="20">
-                    <el-form ref="addDvFault" :model="formData" :rules="rules" label-width="140px">
+                    <el-form
+                        ref="addDvFault"
+                        :model="formData"
+                        :rules="rules"
+                        label-width="140px"
+                    >
                         <el-form-item label="安装日期">
                             <el-date-picker
                                 v-model="formData.installTime"
@@ -83,7 +138,11 @@
                             <el-input v-model="formData.name"></el-input>
                         </el-form-item>
                         <el-form-item label="设备类型">
-                            <el-select v-model="formData.style" filterable placeholder="请选择">
+                            <el-select
+                                v-model="formData.style"
+                                filterable
+                                placeholder="请选择"
+                            >
                                 <el-option
                                     v-for="item in $store.state['deviceType']"
                                     :key="item.value"
@@ -108,8 +167,12 @@
                             <el-input v-model="formData.position"></el-input>
                         </el-form-item>
                         <el-form-item>
-                            <el-button @click="isShow=false">取 消</el-button>
-                            <el-button type="primary" @click="submitForm('addDvFault')">保 存</el-button>
+                            <el-button @click="isShow = false">取 消</el-button>
+                            <el-button
+                                type="primary"
+                                @click="submitForm('addDvFault')"
+                                >保 存</el-button
+                            >
                         </el-form-item>
                     </el-form>
                 </el-col>
@@ -126,7 +189,7 @@ const rules = {};
 const farmId = 1;
 
 export default {
-    name: "DvFault",
+    name: "deviceFault",
     data() {
         let _this = this;
         return {
@@ -138,41 +201,24 @@ export default {
             formData: {
                 farmId,
                 installTime: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
-                name: "温度传感器",
+                name: "",
                 style: null,
-                // status: this.$store.state['deviceStatus'][0].value,
-                code: "6565464",
-                position: "分娩一舍"
+                code: "",
+                position: "",
             },
-            rules
+            rules,
         };
     },
     created() {
         // 设备故障列表
         this.getDvFaultList();
     },
-    watch: {
-        "formData.weight"(v, ov) {
-            if (Number(v).toString() == "NaN") {
-                this.$message.error("请输入数字");
-                return;
-            }
-            this.formData.sum = (v * this.formData.price).toFixed(2);
-        },
-        "formData.price"(v, ov) {
-            if (Number(v).toString() == "NaN") {
-                this.$message.error("请输入数字");
-                return;
-            }
-            this.formData.sum = (this.formData.weight * v).toFixed(2);
-        }
-    },
     methods: {
         submitForm(formName) {
-            this.$refs[formName].validate(valid => {
+            this.$refs[formName].validate((valid) => {
                 if (valid) {
                     reqAddDvFault(this.formData)
-                        .then(res => {
+                        .then((res) => {
                             // 设备故障列表
                             this.getDvFaultList();
                             // this.$message.success("成功！");
@@ -180,10 +226,20 @@ export default {
                                 this.$message.error(res.errMsg);
                             } else {
                                 this.$message.success("成功");
+                                this.formData = {
+                                    farmId,
+                                    installTime: this.$moment().format(
+                                        "YYYY-MM-DD HH:mm:ss"
+                                    ),
+                                    name: "",
+                                    style: null,
+                                    code: "",
+                                    position: "",
+                                };
+                                this.isShow = false;
                             }
-                            // this.isShow = false
                         })
-                        .catch(err => {
+                        .catch((err) => {
                             console.log(err);
                             this.$message.error("失败！");
                         });
@@ -198,13 +254,13 @@ export default {
                 searchStr: this.search,
                 farmId,
                 pageSize,
-                pageNum: this.pageNum
+                pageNum: this.pageNum,
             })
-                .then(res => {
+                .then((res) => {
                     this.tableData = res.content;
                     this.totalPages = res.totalPages;
                 })
-                .catch(err => {
+                .catch((err) => {
                     console.log(err);
                 });
         },
@@ -216,7 +272,7 @@ export default {
         del(row) {
             console.log(row);
             reqDelDvFault(row.id)
-                .then(res => {
+                .then((res) => {
                     // 设备故障列表
                     this.getDvFaultList();
                     if (res.code == "success") {
@@ -226,7 +282,7 @@ export default {
                         this.$message.error(res.errMsg);
                     }
                 })
-                .catch(err => {
+                .catch((err) => {
                     console.log(err);
                     this.$message.error("删除失败！");
                 });
@@ -235,8 +291,8 @@ export default {
             this.pageNum = p;
             // 设备故障列表
             this.getDvFaultList();
-        }
-    }
+        },
+    },
 };
 </script>
 

src/views/fileInfo/areaInfo.vue

@@ -109,9 +109,9 @@ export default {
             totalPages: 0,
             isShow: false,
             formData: {
-                name: "保育一舍",
-                capacity: "156",
-                manager: this.$store.state.workerList[0].id
+                name: "",
+                capacity: "",
+                manager: null
             },
             rules
         };
@@ -133,8 +133,9 @@ export default {
                                 this.$message.error(res.errMsg);
                             } else {
                                 this.$message.success("成功");
+                                this.formData = {}
+                                this.isShow = false;
                             }
-                            // this.isShow = false;
                         })
                         .catch(err => {
                             console.log(err);

src/views/fileInfo/workerInfo.vue

@@ -1,13 +1,23 @@
 <template>
     <div class="workerInfo">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">员工信息</h2>
+        <h2
+            style="
+                margin-bottom: 20px;
+                padding-bottom: 7px;
+                border-bottom: 2px solid #ddd;
+            "
+        >
+            员工信息
+        </h2>
         <header 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="getWorkerList">查找</el-button>
+                    <el-button type="primary" @click="getWorkerList"
+                        >查找</el-button
+                    >
                 </el-col>
                 <el-col :span="4">
                     <el-button type="primary" @click="add">新增</el-button>
@@ -21,32 +31,76 @@
                     tooltip-effect="dark"
                     style="width: 100%"
                 >
-                    <el-table-column prop="id" label="序号" width="80"></el-table-column>
-                    <el-table-column prop="name" label="姓名" width="80"></el-table-column>
+                    <el-table-column
+                        prop="id"
+                        label="序号"
+                        width="80"
+                    ></el-table-column>
+                    <el-table-column
+                        prop="name"
+                        label="姓名"
+                        width="80"
+                    ></el-table-column>
                     <el-table-column prop="gender" label="性别" width="80">
                         <template v-slot="scope">
-                            <span v-if="scope.row.gender==1">男</span>
-                            <span v-if="scope.row.gender==0">女</span>
+                            <span v-if="scope.row.gender == 1">男</span>
+                            <span v-if="scope.row.gender == 0">女</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="age" label="年龄" width="100"></el-table-column>
-                    <el-table-column prop="position" label="职位"></el-table-column>
-                    <el-table-column label="当前状态" >
+                    <el-table-column
+                        prop="age"
+                        label="年龄"
+                        width="100"
+                    ></el-table-column>
+                    <el-table-column
+                        prop="position"
+                        label="职位"
+                    ></el-table-column>
+                    <el-table-column label="当前状态">
                         <template v-slot="scope">
-                            <span v-if="scope.row['status']==1">在职</span>
+                            <span v-if="scope.row['status'] == 1">在职</span>
                             <span v-else>离职</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="phone" label="联系电话"></el-table-column>
-                    <el-table-column prop="birthPlace" label="户籍地"></el-table-column>
-                    <el-table-column prop="farmName" label="所属牧场"></el-table-column>
-                    <el-table-column prop="duty" label="责任区域"></el-table-column>
-                    <el-table-column prop="entryTime" label="入职时间" width="180"></el-table-column>
+                    <el-table-column
+                        prop="phone"
+                        label="联系电话"
+                    ></el-table-column>
+                    <el-table-column
+                        prop="birthPlace"
+                        label="户籍地"
+                    ></el-table-column>
+                    <el-table-column
+                        prop="farmName"
+                        label="所属牧场"
+                    ></el-table-column>
+                    <el-table-column
+                        prop="duty"
+                        label="责任区域"
+                    ></el-table-column>
+                    <el-table-column
+                        prop="entryTime"
+                        label="入职时间"
+                        width="180"
+                    ></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-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>
@@ -68,7 +122,12 @@
         <el-dialog title="新增/编辑" :visible.sync="isShow" width="40%">
             <el-row type="flex">
                 <el-col :span="20">
-                    <el-form ref="addWorker" :model="formData" :rules="rules" label-width="140px">
+                    <el-form
+                        ref="addWorker"
+                        :model="formData"
+                        :rules="rules"
+                        label-width="140px"
+                    >
                         <el-form-item label="姓名">
                             <el-input v-model="formData.name"></el-input>
                         </el-form-item>
@@ -103,8 +162,12 @@
                             <el-input v-model="formData.duty"></el-input>
                         </el-form-item>
                         <el-form-item>
-                            <el-button @click="isShow=false">取 消</el-button>
-                            <el-button type="primary" @click="submitForm('addWorker')">保 存</el-button>
+                            <el-button @click="isShow = false">取 消</el-button>
+                            <el-button
+                                type="primary"
+                                @click="submitForm('addWorker')"
+                                >保 存</el-button
+                            >
                         </el-form-item>
                     </el-form>
                 </el-col>
@@ -117,7 +180,7 @@
 import {
     reqWorkerList,
     reqAddOrUpdateWorker,
-    reqDelWorker
+    reqDelWorker,
 } from "@/api/fileInfo.js";
 
 const pageSize = 10;
@@ -133,17 +196,18 @@ export default {
             totalPages: 0,
             isShow: false,
             formData: {
-                name: "王炸",
+                name: "",
                 gender: 1,
-                age: "22",
-                farmName: "xx牧场",
-                position: "饲养员",
+                age: "",
+                farmName: "",
+                position: "",
                 status: 1,
-                phone: "18202780511",
-                birthPlace: "浙江",
-                duty: "保育一舍,保育二舍"
+                phone: "",
+                birthPlace: "",
+                // duty: "保育一舍,保育二舍"
+                duty: "",
             },
-            rules
+            rules,
         };
     },
     created() {
@@ -152,10 +216,10 @@ export default {
     },
     methods: {
         submitForm(formName) {
-            this.$refs[formName].validate(valid => {
+            this.$refs[formName].validate((valid) => {
                 if (valid) {
                     reqAddOrUpdateWorker(this.formData)
-                        .then(res => {
+                        .then((res) => {
                             // 入库管理列表
                             this.getWorkerList();
                             // this.$message.success("成功！");
@@ -163,10 +227,22 @@ export default {
                                 this.$message.error(res.errMsg);
                             } else {
                                 this.$message.success("成功");
+                                this.formData = {
+                                    name: "",
+                                    gender: 1,
+                                    age: "",
+                                    farmName: "",
+                                    position: "",
+                                    status: 1,
+                                    phone: "",
+                                    birthPlace: "",
+                                    // duty: "保育一舍,保育二舍"
+                                    duty: "",
+                                };
+                                this.isShow = false;
                             }
-                            this.isShow = false;
                         })
-                        .catch(err => {
+                        .catch((err) => {
                             console.log(err);
                             this.$message.error("失败！");
                         });
@@ -182,13 +258,13 @@ export default {
             reqWorkerList({
                 searchStr: this.search,
                 pageSize,
-                pageNum: this.pageNum
+                pageNum: this.pageNum,
             })
-                .then(res => {
+                .then((res) => {
                     this.tableData = res.content;
                     this.totalPages = res.totalPages;
                 })
-                .catch(err => {
+                .catch((err) => {
                     console.log(err);
                 });
         },
@@ -203,7 +279,7 @@ export default {
         },
         del(row) {
             reqDelWorker(row.id)
-                .then(res => {
+                .then((res) => {
                     // 入库管理列表
                     this.getWorkerList();
                     if (res.code == "success") {
@@ -213,7 +289,7 @@ export default {
                         this.$message.error(res.errMsg);
                     }
                 })
-                .catch(err => {
+                .catch((err) => {
                     console.log(err);
                     this.$message.error("删除失败！");
                 });
@@ -223,8 +299,8 @@ export default {
             this.pageNum = p;
             // 入库管理列表
             this.getWorkerList();
-        }
-    }
+        },
+    },
 };
 </script>
 

src/views/harmless/harmlessConfirm.vue

@@ -1,13 +1,23 @@
 <template>
     <div class="harmlessConfirm">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">无害化确认</h2>
+        <h2
+            style="
+                margin-bottom: 20px;
+                padding-bottom: 7px;
+                border-bottom: 2px solid #ddd;
+            "
+        >
+            无害化确认
+        </h2>
         <header 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="getHarmlessList">查找</el-button>
+                    <el-button type="primary" @click="getHarmlessList"
+                        >查找</el-button
+                    >
                 </el-col>
                 <el-col :span="4">
                     <el-button type="primary" @click="add">新增</el-button>
@@ -24,31 +34,71 @@
                     <el-table-column prop="id" label="序号"></el-table-column>
                     <el-table-column label="申报时间">
                         <template v-slot="scope">
-                            <span>{{ scope.row['reportTime'].substr(0,10) }}</span>
+                            <span>{{
+                                scope.row["reportTime"].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="cause" label="原因"></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="cause"
+                        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
+                                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="position"
+                        label="当前位置"
+                    ></el-table-column>
                     <el-table-column label="状态">
                         <template v-slot="scope">
-                            <div v-for="item in $store.state['harmlessConfirmStatus']" :key="item.value">
-                                <span v-if="item.value == scope.row['status']">{{ item.label }}</span>
+                            <div
+                                v-for="item in $store.state[
+                                    'harmlessConfirmStatus'
+                                ]"
+                                :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 v-slot="scope" >
-                            <el-popconfirm title="是否确认已处理？" @onConfirm="check(scope.row)">
-                                <el-button v-if="scope.row['status'] == $store.state['harmlessConfirmStatus'][0].value" slot="reference" type="text" size="small">确认</el-button>
+                        <template v-slot="scope">
+                            <el-popconfirm
+                                title="是否确认已处理？"
+                                @onConfirm="check(scope.row)"
+                            >
+                                <el-button
+                                    v-if="
+                                        scope.row['status'] ==
+                                        $store.state['harmlessConfirmStatus'][0]
+                                            .value
+                                    "
+                                    slot="reference"
+                                    type="text"
+                                    size="small"
+                                    >确认</el-button
+                                >
                             </el-popconfirm>
                         </template>
                     </el-table-column>
@@ -70,7 +120,12 @@
         <el-dialog title="新增/编辑" :visible.sync="isShow" width="40%">
             <el-row type="flex">
                 <el-col :span="20">
-                    <el-form ref="addHarmless" :model="formData" :rules="rules" label-width="140px">
+                    <el-form
+                        ref="addHarmless"
+                        :model="formData"
+                        :rules="rules"
+                        label-width="140px"
+                    >
                         <el-form-item label="申报时间">
                             <el-date-picker
                                 v-model="formData.reportTime"
@@ -83,13 +138,23 @@
                             <el-input v-model="formData.sheepId"></el-input>
                         </el-form-item>
                         <el-form-item label="数量">
-                            <el-input v-model.number="formData.number"></el-input>
+                            <el-input
+                                v-model.number="formData.number"
+                            ></el-input>
                         </el-form-item>
                         <el-form-item label="原因">
-                            <el-input type="textarea" autosize v-model="formData.cause"></el-input>
+                            <el-input
+                                type="textarea"
+                                autosize
+                                v-model="formData.cause"
+                            ></el-input>
                         </el-form-item>
                         <el-form-item label="处理人">
-                            <el-select v-model="formData.opeUser" filterable placeholder="请选择">
+                            <el-select
+                                v-model="formData.opeUser"
+                                filterable
+                                placeholder="请选择"
+                            >
                                 <el-option
                                     v-for="item in $store.state['workerList']"
                                     :key="item.id"
@@ -104,15 +169,22 @@
                         <el-form-item label="状态">
                             <el-radio-group v-model="formData.status">
                                 <el-radio
-                                    v-for="item in $store.state['harmlessConfirmStatus']"
+                                    v-for="item in $store.state[
+                                        'harmlessConfirmStatus'
+                                    ]"
                                     :key="item.value"
                                     :label="item.value"
-                                >{{ item.label }}</el-radio>
+                                    >{{ 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('addHarmless')">保 存</el-button>
+                            <el-button @click="isShow = false">取 消</el-button>
+                            <el-button
+                                type="primary"
+                                @click="submitForm('addHarmless')"
+                                >保 存</el-button
+                            >
                         </el-form-item>
                     </el-form>
                 </el-col>
@@ -125,7 +197,7 @@
 import {
     reqHarmlessList,
     reqAddHarmless,
-    reqCheckHarmless
+    reqCheckHarmless,
 } from "@/api/harmless.js";
 
 const pageSize = 10;
@@ -141,15 +213,15 @@ export default {
             totalPages: 0,
             isShow: false,
             formData: {
-                reportTime: this.$moment().format('YYYY-MM-DD HH:mm:ss'),
+                reportTime: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
                 sheepId: "12,192,33",
-                number: 3,
-                cause: "运损",
+                number: null,
+                cause: "",
                 opeUser: null,
-                position: "无害化冷库",
-                status: this.$store.state['harmlessConfirmStatus'][0].value
+                position: "",
+                status: null,
             },
-            rules
+            rules,
         };
     },
     created() {
@@ -157,27 +229,38 @@ export default {
         this.getHarmlessList();
     },
     watch: {
-        'formData.sheepId'(v) {
-            this.formData.sheepId = v.replace(/，/g, ',')
-            this.formData.number = v.split(',').length
-        }
+        "formData.sheepId"(v) {
+            this.formData.sheepId = v.replace(/，/g, ",");
+            this.formData.number = v.split(",").length;
+        },
     },
     methods: {
         submitForm(formName) {
-            this.$refs[formName].validate(valid => {
+            this.$refs[formName].validate((valid) => {
                 if (valid) {
                     reqAddHarmless(this.formData)
-                        .then(res => {
+                        .then((res) => {
                             // 无害化确认列表
                             this.getHarmlessList();
-                            if(res.errCode == "sheepId is wrong") {
+                            if (res.errCode == "sheepId is wrong") {
                                 this.$message.error(res.errMsg);
                             } else {
                                 this.$message.success("成功！");
+                                this.formData = {
+                                    reportTime: this.$moment().format(
+                                        "YYYY-MM-DD HH:mm:ss"
+                                    ),
+                                    sheepId: "12,192,33",
+                                    number: null,
+                                    cause: "",
+                                    opeUser: null,
+                                    position: "",
+                                    status: null,
+                                };
+                                this.isShow = false;
                             }
-                            // this.isShow = false
                         })
-                        .catch(err => {
+                        .catch((err) => {
                             console.log(err);
                             this.$message.error("失败！");
                         });
@@ -191,13 +274,13 @@ export default {
             reqHarmlessList({
                 searchStr: this.search,
                 pageSize,
-                pageNum: this.pageNum
+                pageNum: this.pageNum,
             })
-                .then(res => {
+                .then((res) => {
                     this.tableData = res.content;
                     this.totalPages = res.totalPages;
                 })
-                .catch(err => {
+                .catch((err) => {
                     console.log(err);
                 });
         },
@@ -208,7 +291,7 @@ export default {
         },
         check(row) {
             reqCheckHarmless(row.id)
-                .then(res => {
+                .then((res) => {
                     // 无害化确认列表
                     this.getHarmlessList();
                     if (res.code == "success") {
@@ -218,7 +301,7 @@ export default {
                         this.$message.error(res.errMsg);
                     }
                 })
-                .catch(err => {
+                .catch((err) => {
                     console.log(err);
                     this.$message.error("删除失败！");
                 });
@@ -228,8 +311,8 @@ export default {
             this.pageNum = p;
             // 无害化确认列表
             this.getHarmlessList();
-        }
-    }
+        },
+    },
 };
 </script>
 

src/views/production/dieWeedOut.vue

@@ -1,13 +1,23 @@
 <template>
-    <div class="DieWeedOut">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">死淘管理</h2>
+    <div class="dieWeedOut">
+        <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="getDieWeedOutList">查找</el-button>
+                    <el-button type="primary" @click="getDieWeedOutList"
+                        >查找</el-button
+                    >
                 </el-col>
                 <el-col :span="4">
                     <el-button type="primary" @click="add">新增</el-button>
@@ -22,21 +32,37 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号"></el-table-column>
-                    <el-table-column prop="sheepId" label="羊只编码"></el-table-column>
+                    <el-table-column
+                        prop="sheepId"
+                        label="羊只编码"
+                    ></el-table-column>
                     <el-table-column label="死淘时间">
                         <template v-slot="scope">
-                            <span>{{ scope.row['cullingTime'].substr(0,10) }}</span>
+                            <span>{{
+                                scope.row["cullingTime"].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
+                                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="cause" label="淘汰原因"></el-table-column>
-                    <el-table-column prop="remark" label="备注"></el-table-column>
+                    <el-table-column
+                        prop="cause"
+                        label="淘汰原因"
+                    ></el-table-column>
+                    <el-table-column
+                        prop="remark"
+                        label="备注"
+                    ></el-table-column>
                 </el-table>
 
                 <el-row type="flex" justify="end">
@@ -55,7 +81,12 @@
         <el-dialog title="新增" :visible.sync="isShow" width="40%">
             <el-row type="flex">
                 <el-col :span="20">
-                    <el-form ref="addDieWeedOut" :model="formData" :rules="rules" label-width="140px">
+                    <el-form
+                        ref="addDieWeedOut"
+                        :model="formData"
+                        :rules="rules"
+                        label-width="140px"
+                    >
                         <el-form-item label="羊只编码">
                             <el-input v-model="formData.sheepId"></el-input>
                         </el-form-item>
@@ -68,7 +99,11 @@
                             ></el-date-picker>
                         </el-form-item>
                         <el-form-item label="操作人">
-                            <el-select v-model="formData.opeUser" filterable placeholder="请选择">
+                            <el-select
+                                v-model="formData.opeUser"
+                                filterable
+                                placeholder="请选择"
+                            >
                                 <el-option
                                     v-for="item in $store.state['workerList']"
                                     :key="item.id"
@@ -78,14 +113,26 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="淘汰原因">
-                            <el-input type="textarea" autosize v-model="formData.cause"></el-input>
+                            <el-input
+                                type="textarea"
+                                autosize
+                                v-model="formData.cause"
+                            ></el-input>
                         </el-form-item>
                         <el-form-item label="备注">
-                            <el-input type="textarea" autosize v-model="formData.remark"></el-input>
+                            <el-input
+                                type="textarea"
+                                autosize
+                                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('addDieWeedOut')">保 存</el-button>
+                            <el-button @click="isShow = false">取 消</el-button>
+                            <el-button
+                                type="primary"
+                                @click="submitForm('addDieWeedOut')"
+                                >保 存</el-button
+                            >
                         </el-form-item>
                     </el-form>
                 </el-col>
@@ -95,16 +142,13 @@
 </template>
 
 <script>
-import {
-    reqDieWeedOutList,
-    reqAddDieWeedOut
-} from "@/api/production.js";
+import { reqDieWeedOutList, reqAddDieWeedOut } from "@/api/production.js";
 
 const pageSize = 10;
 const rules = {};
 
 export default {
-    name: "DieWeedOut",
+    name: "dieWeedOut",
     data() {
         return {
             search: "",
@@ -113,13 +157,13 @@ export default {
             totalPages: 0,
             isShow: false,
             formData: {
-                sheepId: "35",
-                cullingTime: this.$moment().format('YYYY-MM-DD HH:mm:ss'),
+                sheepId: "",
+                cullingTime: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
                 opeUser: null,
-                cause: "产子太少弱仔多",
-                remark: "备注"
+                cause: "",
+                remark: "",
             },
-            rules
+            rules,
         };
     },
     created() {
@@ -128,10 +172,10 @@ export default {
     },
     methods: {
         submitForm(formName) {
-            this.$refs[formName].validate(valid => {
+            this.$refs[formName].validate((valid) => {
                 if (valid) {
                     reqAddDieWeedOut(this.formData)
-                        .then(res => {
+                        .then((res) => {
                             // 死淘管理列表
                             this.getDieWeedOutList();
                             // this.$message.success("成功！");
@@ -139,10 +183,19 @@ export default {
                                 this.$message.error(res.errMsg);
                             } else {
                                 this.$message.success("成功");
+                                this.formData = {
+                                    sheepId: "",
+                                    cullingTime: this.$moment().format(
+                                        "YYYY-MM-DD HH:mm:ss"
+                                    ),
+                                    opeUser: null,
+                                    cause: "",
+                                    remark: "",
+                                };
+                                this.isShow = false;
                             }
-                            // this.isShow = false
                         })
-                        .catch(err => {
+                        .catch((err) => {
                             console.log(err);
                             this.$message.error("失败！");
                         });
@@ -156,13 +209,13 @@ export default {
             reqDieWeedOutList({
                 searchStr: this.search,
                 pageSize,
-                pageNum: this.pageNum
+                pageNum: this.pageNum,
             })
-                .then(res => {
+                .then((res) => {
                     this.tableData = res.content;
                     this.totalPages = res.totalPages;
                 })
-                .catch(err => {
+                .catch((err) => {
                     console.log(err);
                 });
         },
@@ -175,8 +228,8 @@ export default {
             this.pageNum = p;
             // 死淘管理列表
             this.getDieWeedOutList();
-        }
-    }
+        },
+    },
 };
 </script>
 

src/views/production/earTag.vue

@@ -1,13 +1,23 @@
 <template>
-    <div class="EarTag">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">耳标管理</h2>
+    <div class="earTag">
+        <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="getEarTagList">查找</el-button>
+                    <el-button type="primary" @click="getEarTagList"
+                        >查找</el-button
+                    >
                 </el-col>
                 <el-col :span="4">
                     <el-button type="primary" @click="add">新增</el-button>
@@ -22,25 +32,47 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号"></el-table-column>
-                    <el-table-column prop="earTag" label="耳标编码"></el-table-column>
-                    <el-table-column prop="sheepId" label="羊只编码"></el-table-column>
+                    <el-table-column
+                        prop="earTag"
+                        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['sheepType']" :key="item.value">
-                                <span v-if="item.value == scope.row['sheepType']">{{ item.label }}</span>
+                            <div
+                                v-for="item in $store.state['sheepType']"
+                                :key="item.value"
+                            >
+                                <span
+                                    v-if="item.value == scope.row['sheepType']"
+                                    >{{ item.label }}</span
+                                >
                             </div>
                         </template>
                     </el-table-column>
                     <el-table-column label="上标时间">
                         <template v-slot="scope">
-                            <span>{{ scope.row['bindTime'].substr(0,10) }}</span>
+                            <span>{{
+                                scope.row["bindTime"].substr(0, 10)
+                            }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="position" label="上标地点"></el-table-column>
+                    <el-table-column
+                        prop="position"
+                        label="上标地点"
+                    ></el-table-column>
                     <el-table-column label="上标人员">
                         <template v-slot="scope">
-                            <div v-for="item in $store.state['workerList']" :key="item.value">
-                                <span v-if="item.id == scope.row['opeUser']">{{ `${item.name}(${item.position})` }}</span>
+                            <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>
@@ -62,7 +94,12 @@
         <el-dialog title="新增" :visible.sync="isShow" width="40%">
             <el-row type="flex">
                 <el-col :span="20">
-                    <el-form ref="addEarTag" :model="formData" :rules="rules" label-width="140px">
+                    <el-form
+                        ref="addEarTag"
+                        :model="formData"
+                        :rules="rules"
+                        label-width="140px"
+                    >
                         <el-form-item label="耳标编码">
                             <el-input v-model="formData.earTag"></el-input>
                         </el-form-item>
@@ -81,7 +118,11 @@
                             <el-input v-model="formData.position"></el-input>
                         </el-form-item>
                         <el-form-item label="上标人员">
-                            <el-select v-model="formData.opeUser" filterable placeholder="请选择">
+                            <el-select
+                                v-model="formData.opeUser"
+                                filterable
+                                placeholder="请选择"
+                            >
                                 <el-option
                                     v-for="item in $store.state['workerList']"
                                     :key="item.id"
@@ -91,8 +132,12 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item>
-                            <el-button @click="isShow=false">取 消</el-button>
-                            <el-button type="primary" @click="submitForm('addEarTag')">保 存</el-button>
+                            <el-button @click="isShow = false">取 消</el-button>
+                            <el-button
+                                type="primary"
+                                @click="submitForm('addEarTag')"
+                                >保 存</el-button
+                            >
                         </el-form-item>
                     </el-form>
                 </el-col>
@@ -102,16 +147,13 @@
 </template>
 
 <script>
-import {
-    reqEarTagList,
-    reqAddEarTag
-} from "@/api/production.js";
+import { reqEarTagList, reqAddEarTag } from "@/api/production.js";
 
 const pageSize = 10;
 const rules = {};
 
 export default {
-    name: "EarTag",
+    name: "earTag",
     data() {
         return {
             search: "",
@@ -120,13 +162,13 @@ export default {
             totalPages: 0,
             isShow: false,
             formData: {
-                earTag: "das5d45ad515g",
-                sheepId: "35",
-                bindTime: this.$moment().format('YYYY-MM-DD HH:mm:ss'),
-                position: "后备一舍",
-                opeUser: null
+                earTag: "",
+                sheepId: "",
+                bindTime: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
+                position: "",
+                opeUser: null,
             },
-            rules
+            rules,
         };
     },
     created() {
@@ -135,10 +177,10 @@ export default {
     },
     methods: {
         submitForm(formName) {
-            this.$refs[formName].validate(valid => {
+            this.$refs[formName].validate((valid) => {
                 if (valid) {
                     reqAddEarTag(this.formData)
-                        .then(res => {
+                        .then((res) => {
                             // 耳标管理列表
                             this.getEarTagList();
                             // this.$message.success("成功！");
@@ -146,10 +188,19 @@ export default {
                                 this.$message.error(res.errMsg);
                             } else {
                                 this.$message.success("成功");
+                                this.formData = {
+                                    earTag: "",
+                                    sheepId: "",
+                                    bindTime: this.$moment().format(
+                                        "YYYY-MM-DD HH:mm:ss"
+                                    ),
+                                    position: "",
+                                    opeUser: null,
+                                };
+                                this.isShow = false;
                             }
-                            // this.isShow = false
                         })
-                        .catch(err => {
+                        .catch((err) => {
                             console.log(err);
                             this.$message.error("失败！");
                         });
@@ -163,13 +214,13 @@ export default {
             reqEarTagList({
                 searchStr: this.search,
                 pageSize,
-                pageNum: this.pageNum
+                pageNum: this.pageNum,
             })
-                .then(res => {
+                .then((res) => {
                     this.tableData = res.content;
                     this.totalPages = res.totalPages;
                 })
-                .catch(err => {
+                .catch((err) => {
                     console.log(err);
                 });
         },
@@ -182,8 +233,8 @@ export default {
             this.pageNum = p;
             // 耳标管理列表
             this.getEarTagList();
-        }
-    }
+        },
+    },
 };
 </script>
 

src/views/production/examiningReport.vue

@@ -1,13 +1,23 @@
 <template>
     <div class="ExaminingReport">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">检测报告</h2>
+        <h2
+            style="
+                margin-bottom: 20px;
+                padding-bottom: 7px;
+                border-bottom: 2px solid #ddd;
+            "
+        >
+            检测报告
+        </h2>
         <header 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="getExaminingReportList">查找</el-button>
+                    <el-button type="primary" @click="getExaminingReportList"
+                        >查找</el-button
+                    >
                 </el-col>
                 <el-col :span="4">
                     <el-button type="primary" @click="add">新增</el-button>
@@ -21,38 +31,74 @@
                     tooltip-effect="dark"
                     style="width: 100%"
                 >
-                    <el-table-column prop="id" label="序号" width="100"></el-table-column>
-                    <el-table-column prop="targetCode" label="羊只编码(批次)"></el-table-column>
+                    <el-table-column
+                        prop="id"
+                        label="序号"
+                        width="100"
+                    ></el-table-column>
+                    <el-table-column
+                        prop="targetCode"
+                        label="羊只编码(批次)"
+                    ></el-table-column>
                     <el-table-column label="检测对象">
                         <template v-slot="scope">
-                            <div v-for="item in $store.state['examiningSheepType']" :key="item.value">
-                                <span v-if="item.value == scope.row['targetType']">{{ item.label }}</span>
+                            <div
+                                v-for="item in $store.state[
+                                    'examiningSheepType'
+                                ]"
+                                :key="item.value"
+                            >
+                                <span
+                                    v-if="item.value == scope.row['targetType']"
+                                    >{{ item.label }}</span
+                                >
                             </div>
                         </template>
                     </el-table-column>
                     <el-table-column label="抗体检测时间">
                         <template v-slot="scope">
-                            <span>{{ scope.row['testTime'].substr(0,10) }}</span>
+                            <span>{{
+                                scope.row["testTime"].substr(0, 10)
+                            }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="number" label="抽样个数"></el-table-column>
-                    <el-table-column prop="testFor" label="抗体检测项目"></el-table-column>
+                    <el-table-column
+                        prop="number"
+                        label="抽样个数"
+                    ></el-table-column>
+                    <el-table-column
+                        prop="testFor"
+                        label="抗体检测项目"
+                    ></el-table-column>
                     <el-table-column label="结果">
                         <template v-slot="scope">
-                            <div v-for="item in $store.state['examiningReportType']" :key="item.value">
-                                <span v-if="item.value == scope.row['result']">{{ item.label }}</span>
+                            <div
+                                v-for="item in $store.state[
+                                    'examiningReportType'
+                                ]"
+                                :key="item.value"
+                            >
+                                <span
+                                    v-if="item.value == scope.row['result']"
+                                    >{{ 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
+                                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>
-                
+
                 <el-row type="flex" justify="end">
                     <el-col :span="8" class="pagination">
                         <el-pagination
@@ -69,17 +115,25 @@
         <el-dialog title="新增" :visible.sync="isShow" width="40%">
             <el-row type="flex">
                 <el-col :span="20">
-                    <el-form ref="addExaminingReport" :model="formData" :rules="rules" label-width="140px">
+                    <el-form
+                        ref="addExaminingReport"
+                        :model="formData"
+                        :rules="rules"
+                        label-width="140px"
+                    >
                         <el-form-item label="羊只编码(批次)">
                             <el-input v-model="formData.targetCode"></el-input>
                         </el-form-item>
                         <el-form-item label="测试对象">
                             <el-radio-group v-model="formData.targetType">
                                 <el-radio
-                                    v-for="item in $store.state['examiningSheepType']"
+                                    v-for="item in $store.state[
+                                        'examiningSheepType'
+                                    ]"
                                     :key="item.value"
                                     :label="item.value"
-                                >{{ item.label }}</el-radio>
+                                    >{{ item.label }}</el-radio
+                                >
                             </el-radio-group>
                         </el-form-item>
                         <el-form-item label="检测时间">
@@ -91,22 +145,33 @@
                             ></el-date-picker>
                         </el-form-item>
                         <el-form-item label="抽样数">
-                            <el-input v-model.number="formData.number"></el-input>
+                            <el-input
+                                v-model.number="formData.number"
+                            ></el-input>
                         </el-form-item>
                         <el-form-item label="抗体检测项目">
-                            <el-input v-model.number="formData.testFor"></el-input>
+                            <el-input
+                                v-model.number="formData.testFor"
+                            ></el-input>
                         </el-form-item>
                         <el-form-item label="结果">
                             <el-radio-group v-model="formData.result">
                                 <el-radio
-                                    v-for="item in $store.state['examiningReportType']"
+                                    v-for="item in $store.state[
+                                        'examiningReportType'
+                                    ]"
                                     :key="item.value"
                                     :label="item.value"
-                                >{{ item.label }}</el-radio>
+                                    >{{ item.label }}</el-radio
+                                >
                             </el-radio-group>
                         </el-form-item>
                         <el-form-item label="检测人">
-                            <el-select v-model="formData.opeUser" filterable placeholder="请选择">
+                            <el-select
+                                v-model="formData.opeUser"
+                                filterable
+                                placeholder="请选择"
+                            >
                                 <el-option
                                     v-for="item in $store.state['workerList']"
                                     :key="item.id"
@@ -116,8 +181,12 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item>
-                            <el-button @click="isShow=false">取 消</el-button>
-                            <el-button type="primary" @click="submitForm('addExaminingReport')">保 存</el-button>
+                            <el-button @click="isShow = false">取 消</el-button>
+                            <el-button
+                                type="primary"
+                                @click="submitForm('addExaminingReport')"
+                                >保 存</el-button
+                            >
                         </el-form-item>
                     </el-form>
                 </el-col>
@@ -129,7 +198,7 @@
 <script>
 import {
     reqExaminingReportList,
-    reqAddExaminingReport
+    reqAddExaminingReport,
 } from "@/api/production.js";
 
 const pageSize = 10;
@@ -145,15 +214,15 @@ export default {
             totalPages: 0,
             isShow: false,
             formData: {
-                targetCode: "das5d45ad515g",
-                targetType: this.$store.state['examiningSheepType'][0].value,
-                testTime: this.$moment().format('YYYY-MM-DD HH:mm:ss'),
-                number: 15,
-                testFor: "抗体检测项目",
-                result: this.$store.state['examiningReportType'][0].value,
-                opeUser: null
+                targetCode: "",
+                targetType: null,
+                testTime: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
+                number: null,
+                testFor: "",
+                result: null,
+                opeUser: null,
             },
-            rules
+            rules,
         };
     },
     created() {
@@ -162,10 +231,10 @@ export default {
     },
     methods: {
         submitForm(formName) {
-            this.$refs[formName].validate(valid => {
+            this.$refs[formName].validate((valid) => {
                 if (valid) {
                     reqAddExaminingReport(this.formData)
-                        .then(res => {
+                        .then((res) => {
                             // 检测报告列表
                             this.getExaminingReportList();
                             // this.$message.success("成功！");
@@ -173,10 +242,21 @@ export default {
                                 this.$message.error(res.errMsg);
                             } else {
                                 this.$message.success("成功");
+                                this.formData = {
+                                    targetCode: "",
+                                    targetType: null,
+                                    testTime: this.$moment().format(
+                                        "YYYY-MM-DD HH:mm:ss"
+                                    ),
+                                    number: null,
+                                    testFor: "",
+                                    result: null,
+                                    opeUser: null,
+                                };
+                                this.isShow = false;
                             }
-                            // this.isShow = false
                         })
-                        .catch(err => {
+                        .catch((err) => {
                             console.log(err);
                             this.$message.error("失败！");
                         });
@@ -190,13 +270,13 @@ export default {
             reqExaminingReportList({
                 searchStr: this.search,
                 pageSize,
-                pageNum: this.pageNum
+                pageNum: this.pageNum,
             })
-                .then(res => {
+                .then((res) => {
                     this.tableData = res.content;
                     this.totalPages = res.totalPages;
                 })
-                .catch(err => {
+                .catch((err) => {
                     console.log(err);
                 });
         },
@@ -209,8 +289,8 @@ export default {
             this.pageNum = p;
             // 检测报告列表
             this.getExaminingReportList();
-        }
-    }
+        },
+    },
 };
 </script>
 

src/views/production/shiftField.vue

@@ -1,13 +1,23 @@
 <template>
     <div class="ShiftField">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">调拨转舍</h2>
+        <h2
+            style="
+                margin-bottom: 20px;
+                padding-bottom: 7px;
+                border-bottom: 2px solid #ddd;
+            "
+        >
+            调拨转舍
+        </h2>
         <header 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-button type="primary" @click="getShiftFieldList"
+                        >查找</el-button
+                    >
                 </el-col>
                 <el-col :span="4">
                     <el-button type="primary" @click="add">新增</el-button>
@@ -16,27 +26,51 @@
         </header>
         <section>
             <article class="table">
-                <el-table :data="tableData" tooltip-effect="dark" style="width: 100%">
+                <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['created'].substr(0,10) }}</span>
+                            <span>{{
+                                scope.row["created"].substr(0, 10)
+                            }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="batchNo" label="转舍批次"></el-table-column>
-                    <el-table-column prop="fromBuilding" label="转出位置"></el-table-column>
-                    <el-table-column prop="toBuilding" label="转入位置"></el-table-column>
-                    <el-table-column prop="number" label="数量"></el-table-column>
+                    <el-table-column
+                        prop="batchNo"
+                        label="转舍批次"
+                    ></el-table-column>
+                    <el-table-column
+                        prop="fromBuilding"
+                        label="转出位置"
+                    ></el-table-column>
+                    <el-table-column
+                        prop="toBuilding"
+                        label="转入位置"
+                    ></el-table-column>
+                    <el-table-column
+                        prop="number"
+                        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
+                                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="remark" label="备注"></el-table-column>
+                    <el-table-column
+                        prop="remark"
+                        label="备注"
+                    ></el-table-column>
                 </el-table>
 
                 <el-row type="flex" justify="end">
@@ -70,7 +104,11 @@
                             ></el-date-picker>
                         </el-form-item>
                         <el-form-item label="转舍批次">
-                            <el-select v-model="formData.batchNo" filterable placeholder="请选择">
+                            <el-select
+                                v-model="formData.batchNo"
+                                filterable
+                                placeholder="请选择"
+                            >
                                 <el-option
                                     v-for="item in $store.state['batchList']"
                                     :key="item.batchNo"
@@ -80,7 +118,11 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="转出位置">
-                            <el-select v-model="formData.fromBuilding" filterable placeholder="请选择">
+                            <el-select
+                                v-model="formData.fromBuilding"
+                                filterable
+                                placeholder="请选择"
+                            >
                                 <el-option
                                     v-for="item in $store.state['areaList']"
                                     :key="item.id"
@@ -90,7 +132,11 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="转入位置">
-                            <el-select v-model="formData.toBuilding" filterable placeholder="请选择">
+                            <el-select
+                                v-model="formData.toBuilding"
+                                filterable
+                                placeholder="请选择"
+                            >
                                 <el-option
                                     v-for="item in $store.state['areaList']"
                                     :key="item.id"
@@ -100,7 +146,11 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="执行人">
-                            <el-select v-model="formData.opeUser" filterable placeholder="请选择">
+                            <el-select
+                                v-model="formData.opeUser"
+                                filterable
+                                placeholder="请选择"
+                            >
                                 <el-option
                                     v-for="item in $store.state['workerList']"
                                     :key="item.id"
@@ -110,11 +160,19 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="备注">
-                            <el-input type="textarea" autosize v-model="formData.remark"></el-input>
+                            <el-input
+                                type="textarea"
+                                autosize
+                                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-button @click="isShow = false">取 消</el-button>
+                            <el-button
+                                type="primary"
+                                @click="submitForm('addShiftField')"
+                                >保 存</el-button
+                            >
                         </el-form-item>
                     </el-form>
                 </el-col>
@@ -141,12 +199,12 @@ export default {
             formData: {
                 created: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
                 batchNo: "",
-                fromBuilding: "种猪舍",
-                toBuilding: "育肥舍",
+                fromBuilding: "",
+                toBuilding: "",
                 opeUser: null,
-                remark: "备注"
+                remark: "",
             },
-            rules
+            rules,
         };
     },
     created() {
@@ -155,10 +213,10 @@ export default {
     },
     methods: {
         submitForm(formName) {
-            this.$refs[formName].validate(valid => {
+            this.$refs[formName].validate((valid) => {
                 if (valid) {
                     reqAddShiftField(this.formData)
-                        .then(res => {
+                        .then((res) => {
                             // 调拨转舍列表
                             this.getShiftFieldList();
                             // this.$message.success("成功！");
@@ -166,10 +224,20 @@ export default {
                                 this.$message.error(res.errMsg);
                             } else {
                                 this.$message.success("成功");
+                                this.formData = {
+                                    created: this.$moment().format(
+                                        "YYYY-MM-DD HH:mm:ss"
+                                    ),
+                                    batchNo: "",
+                                    fromBuilding: "",
+                                    toBuilding: "",
+                                    opeUser: null,
+                                    remark: "",
+                                };
+                                this.isShow = false;
                             }
-                            // this.isShow = false
                         })
-                        .catch(err => {
+                        .catch((err) => {
                             console.log(err);
                             this.$message.error("失败！");
                         });
@@ -183,13 +251,13 @@ export default {
             reqShiftFieldList({
                 searchStr: this.search,
                 pageSize,
-                pageNum: this.pageNum
+                pageNum: this.pageNum,
             })
-                .then(res => {
+                .then((res) => {
                     this.tableData = res.content;
                     this.totalPages = res.totalPages;
                 })
-                .catch(err => {
+                .catch((err) => {
                     console.log(err);
                 });
         },
@@ -202,8 +270,8 @@ export default {
             this.pageNum = p;
             // 调拨转舍列表
             this.getShiftFieldList();
-        }
-    }
+        },
+    },
 };
 </script>
 

src/views/sell/sellLog.vue

@@ -1,13 +1,23 @@
 <template>
     <div class="SellLog">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">销售记录</h2>
+        <h2
+            style="
+                margin-bottom: 20px;
+                padding-bottom: 7px;
+                border-bottom: 2px solid #ddd;
+            "
+        >
+            销售记录
+        </h2>
         <header 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="getSellLogList">查找</el-button>
+                    <el-button type="primary" @click="getSellLogList"
+                        >查找</el-button
+                    >
                 </el-col>
                 <el-col :span="4">
                     <el-button type="primary" @click="add">新增</el-button>
@@ -21,26 +31,58 @@
                     tooltip-effect="dark"
                     style="width: 100%"
                 >
-                    <el-table-column prop="id" label="序号" width="100"></el-table-column>
-                    <el-table-column prop="saleNo" label="销售单号"></el-table-column>
+                    <el-table-column
+                        prop="id"
+                        label="序号"
+                        width="100"
+                    ></el-table-column>
+                    <el-table-column
+                        prop="saleNo"
+                        label="销售单号"
+                    ></el-table-column>
                     <el-table-column label="销售时间">
                         <template v-slot="scope">
-                            <span>{{ scope.row['saleTime'].substr(0,10) }}</span>
+                            <span>{{
+                                scope.row["saleTime"].substr(0, 10)
+                            }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="saleBatch" 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="price" label="销售价格(元)"></el-table-column>
+                    <el-table-column
+                        prop="saleBatch"
+                        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="price"
+                        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
+                                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="buyer" label="购买人"></el-table-column>
-                    <el-table-column prop="remark" label="备注"></el-table-column>
+                    <el-table-column
+                        prop="buyer"
+                        label="购买人"
+                    ></el-table-column>
+                    <el-table-column
+                        prop="remark"
+                        label="备注"
+                    ></el-table-column>
                 </el-table>
 
                 <el-row type="flex" justify="end">
@@ -59,7 +101,12 @@
         <el-dialog title="新增/编辑" :visible.sync="isShow" width="40%">
             <el-row type="flex">
                 <el-col :span="20">
-                    <el-form ref="addSellLog" :model="formData" :rules="rules" label-width="140px">
+                    <el-form
+                        ref="addSellLog"
+                        :model="formData"
+                        :rules="rules"
+                        label-width="140px"
+                    >
                         <el-form-item label="销售单号">
                             <el-input v-model="formData.saleNo"></el-input>
                         </el-form-item>
@@ -75,7 +122,9 @@
                             <el-input v-model="formData.saleBatch"></el-input>
                         </el-form-item>
                         <el-form-item label="销售数量">
-                            <el-input v-model.number="formData.number"></el-input>
+                            <el-input
+                                v-model.number="formData.number"
+                            ></el-input>
                         </el-form-item>
                         <el-form-item label="销售重量(kg)">
                             <el-input v-model="formData.weight"></el-input>
@@ -84,7 +133,11 @@
                             <el-input v-model="formData.price"></el-input>
                         </el-form-item>
                         <el-form-item label="经办人">
-                            <el-select v-model="formData.opeUser" filterable placeholder="请选择">
+                            <el-select
+                                v-model="formData.opeUser"
+                                filterable
+                                placeholder="请选择"
+                            >
                                 <el-option
                                     v-for="item in $store.state['workerList']"
                                     :key="item.id"
@@ -100,11 +153,19 @@
                             <el-input v-model="formData.sum"></el-input>
                         </el-form-item>
                         <el-form-item label="备注">
-                            <el-input type="textarea" autosize v-model="formData.remark"></el-input>
+                            <el-input
+                                type="textarea"
+                                autosize
+                                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('addSellLog')">保 存</el-button>
+                            <el-button @click="isShow = false">取 消</el-button>
+                            <el-button
+                                type="primary"
+                                @click="submitForm('addSellLog')"
+                                >保 存</el-button
+                            >
                         </el-form-item>
                     </el-form>
                 </el-col>
@@ -114,10 +175,7 @@
 </template>
 
 <script>
-import {
-    reqSellLogList,
-    reqAddSellLog
-} from "@/api/sell.js";
+import { reqSellLogList, reqAddSellLog } from "@/api/sell.js";
 
 const pageSize = 10;
 const rules = {};
@@ -125,7 +183,7 @@ const rules = {};
 export default {
     name: "SellLog",
     data() {
-        let _this = this
+        let _this = this;
         return {
             search: "",
             pageNum: 1,
@@ -133,18 +191,18 @@ export default {
             totalPages: 0,
             isShow: false,
             formData: {
-                saleNo: "20200814001",
-                saleTime: this.$moment().format('YYYY-MM-DD HH:mm:ss'),
-                saleBatch: "12380",
-                number: 4,
-                weight: 204.8,
-                price: 65,
+                saleNo: "",
+                saleTime: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
+                saleBatch: "",
+                number: null,
+                weight: null,
+                price: null,
                 opeUser: null,
-                buyer: "乔一飞",
-                sum: 0.00,
-                remark: "备注"
+                buyer: "",
+                sum: null,
+                remark: "",
             },
-            rules
+            rules,
         };
     },
     created() {
@@ -152,38 +210,51 @@ export default {
         this.getSellLogList();
     },
     watch: {
-        'formData.weight'(v, ov) {
-            if(Number(v).toString() == 'NaN') {
-                this.$message.error('请输入数字')
-                return
+        "formData.weight"(v, ov) {
+            if (Number(v).toString() == "NaN") {
+                this.$message.error("请输入数字");
+                return;
             }
-            this.formData.sum = (v * this.formData.price).toFixed(2)
+            this.formData.sum = (v * this.formData.price).toFixed(2);
         },
-        'formData.price'(v, ov) {
-            if(Number(v).toString() == 'NaN') {
-                this.$message.error('请输入数字')
-                return
+        "formData.price"(v, ov) {
+            if (Number(v).toString() == "NaN") {
+                this.$message.error("请输入数字");
+                return;
             }
-            this.formData.sum = (this.formData.weight * v).toFixed(2)
-        }
+            this.formData.sum = (this.formData.weight * v).toFixed(2);
+        },
     },
     methods: {
         submitForm(formName) {
-            this.$refs[formName].validate(valid => {
+            this.$refs[formName].validate((valid) => {
                 if (valid) {
                     reqAddSellLog(this.formData)
-                        .then(res => {
+                        .then((res) => {
                             // 调拨转舍列表
                             this.getSellLogList();
-                            // this.$message.success("成功！");
                             if (res.errCode) {
                                 this.$message.error(res.errMsg);
                             } else {
                                 this.$message.success("成功");
+                                this.formData = {
+                                    saleNo: "",
+                                    saleTime: this.$moment().format(
+                                        "YYYY-MM-DD HH:mm:ss"
+                                    ),
+                                    saleBatch: "",
+                                    number: null,
+                                    weight: null,
+                                    price: null,
+                                    opeUser: null,
+                                    buyer: "",
+                                    sum: null,
+                                    remark: "",
+                                };
+                                this.isShow = false;
                             }
-                            // this.isShow = false
                         })
-                        .catch(err => {
+                        .catch((err) => {
                             console.log(err);
                             this.$message.error("失败！");
                         });
@@ -197,13 +268,13 @@ export default {
             reqSellLogList({
                 searchStr: this.search,
                 pageSize,
-                pageNum: this.pageNum
+                pageNum: this.pageNum,
             })
-                .then(res => {
+                .then((res) => {
                     this.tableData = res.content;
                     this.totalPages = res.totalPages;
                 })
-                .catch(err => {
+                .catch((err) => {
                     console.log(err);
                 });
         },
@@ -216,8 +287,8 @@ export default {
             this.pageNum = p;
             // 调拨转舍列表
             this.getSellLogList();
-        }
-    }
+        },
+    },
 };
 </script>