.

src/components/uploadImg/uploadImg.vue

@@ -12,16 +12,13 @@
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
         >
-            <!-- 
-                drag
-            -->
             <img v-if="imgUrl" :src="imgUrl" class="avatar" />
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
         <el-dialog :visible.sync="dialogVisible" append-to-body>
             <img width="100%" :src="imgUrl" alt />
         </el-dialog>
-        <el-link type="primary" @click="dialogVisible=true">查看大图</el-link>
+        <el-link type="primary" @click="showBigImg">查看大图</el-link>
     </div>
 </template>
 
@@ -49,8 +46,6 @@ export default {
             } else {
                 return ''
             }
-            
-            // return this.value;
         }
     },
     beforeCreate() {
@@ -81,6 +76,13 @@ export default {
                 this.$message.error("上传图片大小不能超过 10MB!");
             }
             return isJPG && isLt2M;
+        },
+        showBigImg() {
+            if(!this.imgUrl) {
+                this.$message.warning('请上传图片！');
+                return
+            }
+            this.dialogVisible = true
         }
     }
 };

src/store/publicType.js

@@ -12,7 +12,7 @@ const seedSheedLevel = [
     { label: "丁", value: 4 }
 ]
 
-// 种羊状态
+// 种母羊状态
 const seedSheedStatus = [
     { label: "后备", value: 1 },
     { label: "采精", value: 2 },
@@ -24,6 +24,12 @@ const seedSheedStatus = [
     { label: "淘汰", value: 8 }
 ]
 
+// 种公羊状态
+const seedRamSheedStatus = [
+    { label: "后备", value: 1 },
+    { label: "配种", value: 4 }
+]
+
 // 商品羊状态
 const prductSheedStatus = [
     { label: "羔羊", value: 1 },
@@ -135,7 +141,7 @@ const deviceStatus = [
 
 
 export default {
-    seedSheedSource, seedSheedLevel, seedSheedStatus, prductSheedStatus, seedColor, seedDensity,
+    seedSheedSource, seedSheedLevel, seedSheedStatus, seedRamSheedStatus, prductSheedStatus, seedColor, seedDensity,
     fetationStatus, estrusStatus, vaccineStyle, sheepType, cureStatus, periodOfValidityUnit, 
     drugStatus, harmlessConfirmStatus, examiningSheepType, examiningReportType, deviceType,
     deviceStatus

src/views/antiepidemic/immuneLog.vue

@@ -108,7 +108,7 @@ export default {
         };
     },
     created() {
-        // 免疫程序列表
+        // 免疫记录列表
         this.getImmuneLogList();
     },
     methods: {
@@ -122,7 +122,7 @@ export default {
         S_change() {
             this.getImmuneLogList();
         },
-        // 免疫程序列表
+        // 免疫记录列表
         getImmuneLogList() {
             reqImmuneLogList({
                 searchStr: this.search,
@@ -142,7 +142,7 @@ export default {
         pageChange(p) {
             console.log(p);
             this.pageNum = p;
-            // 免疫程序列表
+            // 免疫记录列表
             this.getImmuneLogList();
         }
     }

src/views/antiepidemic/immunePlan.vue

@@ -12,7 +12,7 @@
                 <el-col :span="10">
                     <el-button type="primary" @click="add">新增</el-button>
                 </el-col>
-                <el-col :span="4">
+                <el-col :span="5">
                     <el-button-group>
                         <el-button
                             v-for="item in $store.state['sheepType']"

src/views/breed/collectSeedLog.vue

@@ -194,7 +194,7 @@ export default {
         };
     },
     created() {
-        // 入库管理列表
+        // 采精记录列表
         this.getSemenList();
     },
     methods: {
@@ -203,7 +203,7 @@ export default {
                 if (valid) {
                     reqAddOrUpdateSemen(this.formData)
                         .then(res => {
-                            // 入库管理列表
+                            // 采精记录列表
                             this.getSemenList();
                             this.$message.success("成功！");
                             // this.isShow = false
@@ -217,7 +217,7 @@ export default {
                 }
             });
         },
-        // 入库管理列表
+        // 采精记录列表
         getSemenList() {
             reqSemenList({
                 searchStr: this.search,
@@ -244,7 +244,7 @@ export default {
         del(row) {
             reqDelSemen(row.id)
                 .then(res => {
-                    // 入库管理列表
+                    // 采精记录列表
                     this.getSemenList();
                     if (res.code == "success") {
                         this.$message.success(res.msg);
@@ -261,7 +261,7 @@ export default {
         pageChange(p) {
             console.log(p);
             this.pageNum = p;
-            // 入库管理列表
+            // 采精记录列表
             this.getSemenList();
         }
     }

src/views/breed/matingLog.vue

@@ -173,7 +173,7 @@ export default {
         };
     },
     created() {
-        // 入库管理列表
+        // 配种记录列表
         this.getMatingList();
     },
     methods: {
@@ -182,7 +182,7 @@ export default {
                 if (valid) {
                     reqAddOrUpdateMating(this.formData)
                         .then(res => {
-                            // 入库管理列表
+                            // 配种记录列表
                             this.getMatingList();
                             this.$message.success("成功！");
                             // this.isShow = false
@@ -196,7 +196,7 @@ export default {
                 }
             });
         },
-        // 入库管理列表
+        // 配种记录列表
         getMatingList() {
             reqMatingList({
                 searchStr: this.search,
@@ -223,7 +223,7 @@ export default {
         del(row) {
             reqDelMating(row.id)
                 .then(res => {
-                    // 入库管理列表
+                    // 配种记录列表
                     this.getMatingList();
                     if (res.code == "success") {
                         this.$message.success(res.msg);
@@ -240,7 +240,7 @@ export default {
         pageChange(p) {
             console.log(p);
             this.pageNum = p;
-            // 入库管理列表
+            // 配种记录列表
             this.getMatingList();
         }
     }

src/views/breed/matingSuccLog.vue

@@ -169,7 +169,7 @@ export default {
         };
     },
     created() {
-        // 入库管理列表
+        // 查情记录列表
         this.getmatingSList();
     },
     methods: {
@@ -178,7 +178,7 @@ export default {
                 if (valid) {
                     reqAddOrUpdatematingS(this.formData)
                         .then(res => {
-                            // 入库管理列表
+                            // 查情记录列表
                             this.getmatingSList();
                             this.$message.success("成功！");
                             // this.isShow = false
@@ -192,7 +192,7 @@ export default {
                 }
             });
         },
-        // 入库管理列表
+        // 查情记录列表
         getmatingSList() {
             reqmatingSList({
                 searchStr: this.search,
@@ -219,7 +219,7 @@ export default {
         del(row) {
             reqDelmatingS(row.id)
                 .then(res => {
-                    // 入库管理列表
+                    // 查情记录列表
                     this.getmatingSList();
                     if (res.code == "success") {
                         this.$message.success(res.msg);
@@ -236,7 +236,7 @@ export default {
         pageChange(p) {
             console.log(p);
             this.pageNum = p;
-            // 入库管理列表
+            // 查情记录列表
             this.getmatingSList();
         }
     }

src/views/breed/parturitionLog.vue

@@ -163,7 +163,7 @@ export default {
         };
     },
     created() {
-        // 入库管理列表
+        // 分娩记录列表
         this.getParturitionList();
     },
     methods: {
@@ -172,7 +172,7 @@ export default {
                 if (valid) {
                     reqAddOrUpdateParturition(this.formData)
                         .then(res => {
-                            // 入库管理列表
+                            // 分娩记录列表
                             this.getParturitionList();
                             this.$message.success("成功！");
                             // this.isShow = false
@@ -186,7 +186,7 @@ export default {
                 }
             });
         },
-        // 入库管理列表
+        // 分娩记录列表
         getParturitionList() {
             reqParturitionList({
                 searchStr: this.search,
@@ -213,7 +213,7 @@ export default {
         del(row) {
             reqDelParturition(row.id)
                 .then(res => {
-                    // 入库管理列表
+                    // 分娩记录列表
                     this.getParturitionList();
                     if (res.code == "success") {
                         this.$message.success(res.msg);
@@ -230,7 +230,7 @@ export default {
         pageChange(p) {
             console.log(p);
             this.pageNum = p;
-            // 入库管理列表
+            // 分娩记录列表
             this.getParturitionList();
         }
     }

src/views/breed/pregnancyTestLog.vue

@@ -184,7 +184,7 @@ export default {
         };
     },
     created() {
-        // 入库管理列表
+        // 妊检记录列表
         this.getPregnancyTestList();
     },
     methods: {
@@ -193,7 +193,7 @@ export default {
                 if (valid) {
                     reqAddOrUpdatePregnancyTest(this.formData)
                         .then(res => {
-                            // 入库管理列表
+                            // 妊检记录列表
                             this.getPregnancyTestList();
                             this.$message.success("成功！");
                             // this.isShow = false
@@ -207,7 +207,7 @@ export default {
                 }
             });
         },
-        // 入库管理列表
+        // 妊检记录列表
         getPregnancyTestList() {
             reqPregnancyTestList({
                 searchStr: this.search,
@@ -234,7 +234,7 @@ export default {
         del(row) {
             reqDelPregnancyTest(row.id)
                 .then(res => {
-                    // 入库管理列表
+                    // 妊检记录列表
                     this.getPregnancyTestList();
                     if (res.code == "success") {
                         this.$message.success(res.msg);
@@ -251,7 +251,7 @@ export default {
         pageChange(p) {
             console.log(p);
             this.pageNum = p;
-            // 入库管理列表
+            // 妊检记录列表
             this.getPregnancyTestList();
         }
     }

src/views/breed/seedSheepFile.vue

@@ -10,7 +10,7 @@
                     <el-button type="primary" @click="getSeedSheepList">查找</el-button>
                 </el-col>
                 <el-col :span="10">
-                    <el-button type="primary" @click="add">新增档案</el-button>
+                    <el-button type="primary" @click="add">新增档案</el-button>暂时别删，要测试删除的话，先自己新增几条数据，别删已经存在的，这关乎到种羊档案
                 </el-col>
                 <el-col :span="4">
                     <el-button-group>
@@ -123,7 +123,7 @@
                             </el-select>
                         </el-form-item>
 
-                        <el-form-item label="当前状态">
+                        <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']"
@@ -133,6 +133,16 @@
                                 ></el-option>
                             </el-select>
                         </el-form-item>
+                        <el-form-item v-if="sheepType==1" label="当前状态">
+                            <el-select v-model="formData.status" filterable placeholder="请选择">
+                                <el-option
+                                    v-for="item in $store.state['seedRamSheedStatus']"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
 
                         <el-form-item label="成本价格(元)">
                             <el-input v-model="formData.cost"></el-input>

src/views/breed/shiftFieldLog.vue

@@ -193,7 +193,7 @@ export default {
         };
     },
     created() {
-        // 离场记录  列表
+        // 转舍记录  列表
         this.getShiftFieldList();
     },
     methods: {
@@ -202,7 +202,7 @@ export default {
                 if (valid) {
                     reqAddOrUpdateShiftField(this.formData)
                         .then(res => {
-                            // 离场记录 列表
+                            // 转舍记录 列表
                             this.getShiftFieldList();
                             this.$message.success("成功！");
                             // this.isShow = false
@@ -216,7 +216,7 @@ export default {
                 }
             });
         },
-        // 离场记录 列表
+        // 转舍记录 列表
         getShiftFieldList() {
             reqShiftFieldList({
                 searchStr: this.search,
@@ -243,7 +243,7 @@ export default {
         del(row) {
             reqDelShiftField(row.id)
                 .then(res => {
-                    // 离场记录 列表
+                    // 转舍记录 列表
                     this.getShiftFieldList();
                     if (res.code == "success") {
                         this.$message.success(res.msg);
@@ -260,7 +260,7 @@ export default {
         pageChange(p) {
             console.log(p);
             this.pageNum = p;
-            // 离场记录 列表
+            // 转舍记录 列表
             this.getShiftFieldList();
         }
     }

src/views/breed/weaningLog.vue

@@ -145,7 +145,7 @@ export default {
         };
     },
     created() {
-        // 入库管理列表
+        // 断奶信息列表
         this.getWeaningList();
     },
     methods: {
@@ -154,7 +154,7 @@ export default {
                 if (valid) {
                     reqAddOrUpdateWeaning(this.formData)
                         .then(res => {
-                            // 入库管理列表
+                            // 断奶信息列表
                             this.getWeaningList();
                             this.$message.success("成功！");
                             // this.isShow = false
@@ -168,7 +168,7 @@ export default {
                 }
             });
         },
-        // 入库管理列表
+        // 断奶信息列表
         getWeaningList() {
             reqWeaningList({
                 searchStr: this.search,
@@ -195,7 +195,7 @@ export default {
         del(row) {
             reqDelWeaning(row.id)
                 .then(res => {
-                    // 入库管理列表
+                    // 断奶信息列表
                     this.getWeaningList();
                     if (res.code == "success") {
                         this.$message.success(res.msg);
@@ -212,7 +212,7 @@ export default {
         pageChange(p) {
             console.log(p);
             this.pageNum = p;
-            // 入库管理列表
+            // 断奶信息列表
             this.getWeaningList();
         }
     }

src/views/cultivateSeed/gradeAssess.vue

@@ -17,8 +17,8 @@
                     <el-table-column prop="id" label="羊只编号"></el-table-column>
                     <el-table-column prop="gender" label="性别">
                         <template v-slot="scope">
-                            <span v-if="scope.row['source'] == 0">母</span>
-                            <span v-if="scope.row['source'] == 1">公</span>
+                            <span v-if="scope.row['gender'] == 0">母</span>
+                            <span v-if="scope.row['gender'] == 1">公</span>
                         </template>
                     </el-table-column>
                     <el-table-column prop="patternArea" label="花纹面积"></el-table-column>
@@ -91,7 +91,7 @@ export default {
         };
     },
     created() {
-        // 调拨转舍列表
+        // 等级评定列表
         this.getGradeAssessList();
     },
     watch: {
@@ -103,11 +103,12 @@ export default {
         }
     },
     methods: {
-        // 调拨转舍列表
+        // 等级评定列表
         getGradeAssessList() {
             reqGradeAssessList({
                 searchStr: this.search,
                 pageSize,
+                // gender: 1,
                 pageNum: this.pageNum
             })
                 .then(res => {
@@ -135,7 +136,7 @@ export default {
         pageChange(p) {
             console.log(p);
             this.pageNum = p;
-            // 调拨转舍列表
+            // 等级评定列表
             this.getGradeAssessList();
         }
     }

src/views/cultivateSeed/sub/clan.vue

@@ -2,7 +2,7 @@
     <div class="clan">
         <el-page-header @back="$router.go(-1)" style="margin-bottom: 15px;">
             <template v-slot:content>
-                <h4>系谱管理</h4>
+                <h3>系谱管理</h3>
             </template>
         </el-page-header>
         <!-- rowspan="2"    -->
@@ -21,7 +21,7 @@
                         </tr>
                         <tr>
                             <td class="title">性 别</td>
-                            <td>{{ self.gender==0?'母':'公' }}</td>
+                            <td>{{ self.gender==0?'母':self.gender==1?'公':'' }}</td>
                             <td class="title">出 生 日 期</td>
                             <td>{{ self.birthday.substr(0,10) }}</td>
                         </tr>
@@ -118,7 +118,8 @@
                     <td>{{ father.twelveWeight }}</td>
                     <td>{{ father.twFourWeight }}</td>
                     <td>{{ father.twelveHair }}</td>
-                    <td>{{ father.deliverRank }}</td>
+                    <!-- <td>{{ father.deliverRank }}</td> -->
+                    <td>{{ calc_seedSheedLevel(father.deliverRank) }}</td>
                 </tr>
                 <tr>
                     <td class="title">母</td>
@@ -130,7 +131,8 @@
                     <td>{{ mother.twelveWeight }}</td>
                     <td>{{ mother.twFourWeight }}</td>
                     <td>{{ mother.twelveHair }}</td>
-                    <td>{{ mother.deliverRank }}</td>
+                    <!-- <td>{{ mother.deliverRank }}</td> -->
+                    <td>{{ calc_seedSheedLevel(mother.deliverRank) }}</td>
                 </tr>
                 <tr>
                     <td class="title">父父</td>
@@ -142,7 +144,8 @@
                     <td>{{ fatherFather.twelveWeight }}</td>
                     <td>{{ fatherFather.twFourWeight }}</td>
                     <td>{{ fatherFather.twelveHair }}</td>
-                    <td>{{ fatherFather.deliverRank }}</td>
+                    <!-- <td>{{ fatherFather.deliverRank }}</td> -->
+                    <td>{{ calc_seedSheedLevel(fatherFather.deliverRank) }}</td>
                 </tr>
                 <tr>
                     <td class="title">父母</td>
@@ -154,7 +157,8 @@
                     <td>{{ fatherMother.twelveWeight }}</td>
                     <td>{{ fatherMother.twFourWeight }}</td>
                     <td>{{ fatherMother.twelveHair }}</td>
-                    <td>{{ fatherMother.deliverRank }}</td>
+                    <!-- <td>{{ fatherMother.deliverRank }}</td> -->
+                    <td>{{ calc_seedSheedLevel(fatherMother.deliverRank) }}</td>
                 </tr>
                 <tr>
                     <td class="title">母父</td>
@@ -166,7 +170,8 @@
                     <td>{{ motherFather.twelveWeight }}</td>
                     <td>{{ motherFather.twFourWeight }}</td>
                     <td>{{ motherFather.twelveHair }}</td>
-                    <td>{{ motherFather.deliverRank }}</td>
+                    <!-- <td>{{ motherFather.deliverRank }}</td> -->
+                    <td>{{ calc_seedSheedLevel(motherFather.deliverRank) }}</td>
                 </tr>
                 <tr>
                     <td class="title">母母</td>
@@ -178,7 +183,8 @@
                     <td>{{ motherMother.twelveWeight }}</td>
                     <td>{{ motherMother.twFourWeight }}</td>
                     <td>{{ motherMother.twelveHair }}</td>
-                    <td>{{ motherMother.deliverRank }}</td>
+                    <!-- <td>{{ motherMother.deliverRank }}</td> -->
+                    <td>{{ calc_seedSheedLevel(motherMother.deliverRank) }}</td>
                 </tr>
             </table>
         </section>
@@ -200,7 +206,14 @@ export default {
             fatherMother: {},
             mother: {},
             motherFather: {},
-            motherMother: {}
+            motherMother: {},
+            aa: this.$store.state["seedSheedLevel"],
+            calc_seedSheedLevel(id) {
+                let obj = this.$store.state["seedSheedLevel"].find(item => {
+                    return item.value == id;
+                });
+                if (obj) return obj.label;
+            }
         };
     },
     created() {

src/views/cultivateSeed/sub/virtualMating.vue

@@ -1,73 +1,36 @@
 <template>
     <!-- 静态  虚拟配种  virtualMating-->
     <div class="virtualMating">
-        <el-page-header @back="$router.go(-1)" style="margin-bottom: 15px;">
+        <el-page-header @back="$router.go(-1)" style="margin-bottom: 55px;">
             <template v-slot:content>
-                <h4>虚拟配种</h4>
+                <h3>虚拟配种</h3>
             </template>
         </el-page-header>
 
-        <header id="header">
-            <el-row type="flex">
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1区" value="11"></el-option>
-                        <el-option label="2区" value="22"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1舍" value="13"></el-option>
-                        <el-option label="2舍" value="24"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="可用" value="15"></el-option>
-                        <el-option label="可用" value="26"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary">查找</el-button>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary">新增</el-button>
-                </el-col>
-            </el-row>
-        </header>
         <section>
             <article class="table">
                 <el-table
-                    ref="multipleTable"
                     :data="tableData"
-                    tooltip-effect="dark"
-                    style="width: 100%"
-                    @selection-change="handleSelectionChange"
+                    :span-method="objectSpanMethod"
+                    border
+                    style="width: 100%; margin-top: 20px"
                 >
-                    <el-table-column type="selection" width="55"></el-table-column>
-                    <el-table-column prop="a" label="屠宰批次"></el-table-column>
-                    <el-table-column prop="b" label="产品名称"></el-table-column>
-                    <el-table-column prop="c" label="排酸时间"></el-table-column>
-                    <el-table-column prop="d" label="排酸前重量"></el-table-column>
-                    <el-table-column prop="e" label="排酸后重量"></el-table-column>
-                    <el-table-column prop="f" label="排酸损耗"></el-table-column>
-                    <el-table-column prop="g" label="负责人员"></el-table-column>
-                    <!-- <el-table-column label="操作" width="150">
-                        <template slot-scope="scope">
-                            <el-button @click="edit(scope.row)" type="text" size="small">编辑</el-button>
-                            <el-popconfirm title="是否删除此设备的信息？" @onConfirm="del(scope.row)">
-                                <el-button slot="reference" type="text" size="small">删除</el-button>
-                            </el-popconfirm>
+                    <el-table-column label="母羊编号" width="300" align="center">
+                        <template #default="scope">
+                            <h2 style="color: #333">{{ scope.row.id }}</h2>
                         </template>
-                    </el-table-column> -->
+                    </el-table-column>
+                    <el-table-column label="母羊编号" width="300" align="center">
+                        <template #default="scope">
+                            <h2 style="color: #333">{{ scope.row.name }}</h2>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="amount1" label="公羊编号"></el-table-column>
+                    <el-table-column prop="amount2" label="公羊级别"></el-table-column>
+                    <el-table-column prop="amount3" label="特性一"></el-table-column>
                 </el-table>
-                <div style="margin-top: 20px">
-                    <el-button @click="toggleSelection([tableData[1], tableData[2]])">切换第二、第三行的选中状态</el-button>
-                    <el-button @click="toggleSelection()">取消选择</el-button>
-                    <el-button @click="inStore">入待宰栏</el-button>
-                </div>
 
-                <el-row type="flex" justify="end">
+                <el-row type="flex" justify="end" style="margin-top: 30px;">
                     <el-col :span="8" class="pagination">
                         <el-pagination
                             @current-change="pageChange"
@@ -83,57 +46,114 @@
 </template>
 
 <script>
-
-const pageSize = 10
+const pageSize = 10;
 const tableData = [
-                {
-                    a: "15463",
-                    b: "胴体",
-                    c: "2020-07-14",
-                    d: "49kg",
-                    e: "48kg",
-                    f: "1.6%",
-                    g: "张小刚",
-                },
-                {
-                    a: "15463",
-                    b: "带骨羊前腿",
-                    c: "2020-07-14",
-                    d: "49kg",
-                    e: "48kg",
-                    f: "1.6%",
-                    g: "张小刚",
-                },
-                {
-                    a: "15463",
-                    b: "羔羊肉卷",
-                    c: "2020-07-14",
-                    d: "49kg",
-                    e: "48kg",
-                    f: "1.6%",
-                    g: "张小刚",
-                },
-                {
-                    a: "15463",
-                    b: "胴体",
-                    c: "2020-07-14",
-                    d: "49kg",
-                    e: "48kg",
-                    f: "1.6%",
-                    g: "张小刚",
-                },
-                {
-                    a: "15463",
-                    b: "羔羊肉卷",
-                    c: "2020-07-14",
-                    d: "49kg",
-                    e: "48kg",
-                    f: "1.6%",
-                    g: "张小刚",
-                },
-                
-                
-            ]
+    {
+        id: "12987121",
+        name: "王小虎",
+        amount1: "234",
+        amount2: "3.2",
+        amount3: 10
+    },
+    {
+        id: "12987122",
+        name: "王小虎",
+        amount1: "234",
+        amount2: "3.2",
+        amount3: 10
+    },
+    {
+        id: "12987123",
+        name: "王小虎",
+        amount1: "165",
+        amount2: "4.43",
+        amount3: 12
+    },
+    {
+        id: "12987124",
+        name: "王小虎",
+        amount1: "324",
+        amount2: "1.9",
+        amount3: 9
+    },
+    {
+        id: "12987125",
+        name: "王小虎",
+        amount1: "621",
+        amount2: "2.2",
+        amount3: 17
+    },
+    {
+        id: "12987126",
+        name: "王小虎",
+        amount1: "539",
+        amount2: "4.1",
+        amount3: 15
+    },
+    {
+        id: "12987127",
+        name: "王小虎",
+        amount1: "539",
+        amount2: "4.1",
+        amount3: 15
+    },
+    {
+        id: "12987128",
+        name: "王小虎",
+        amount1: "539",
+        amount2: "4.1",
+        amount3: 15
+    },
+    {
+        id: "12987129",
+        name: "王小虎",
+        amount1: "539",
+        amount2: "4.1",
+        amount3: 15
+    },
+    {
+        id: "12987130",
+        name: "王小虎",
+        amount1: "539",
+        amount2: "4.1",
+        amount3: 15
+    },
+    {
+        id: "12987131",
+        name: "王小虎",
+        amount1: "539",
+        amount2: "4.1",
+        amount3: 15
+    },
+    {
+        id: "12987132",
+        name: "王小虎",
+        amount1: "539",
+        amount2: "4.1",
+        amount3: 15
+    },
+    {
+        id: "12987133",
+        name: "王小虎",
+        amount1: "539",
+        amount2: "4.1",
+        amount3: 15
+    },
+    {
+        id: "12987134",
+        name: "王小虎",
+        amount1: "539",
+        amount2: "4.1",
+        amount3: 15
+    },
+    {
+        id: "12987135",
+        name: "王小虎",
+        amount1: "539",
+        amount2: "4.1",
+        amount3: 15
+    },
+];
 
 export default {
     data() {
@@ -146,22 +166,31 @@ export default {
     },
     created() {},
     methods: {
-        toggleSelection(rows) {
-            if (rows) {
-                rows.forEach(row => {
-                    this.$refs.multipleTable.toggleRowSelection(row);
-                });
-            } else {
-                this.$refs.multipleTable.clearSelection();
+        arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+            if (rowIndex % 12 === 0) {
+                if (columnIndex === 0) {
+                    return [1, 12];
+                } else if (columnIndex === 1) {
+                    return [0, 1];
+                }
             }
         },
-        // 入待宰栏
-        inStore() {},
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
+
+        objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+            if (columnIndex === 0 || columnIndex === 1) {
+                if (rowIndex % 12 === 0) {
+                    return {
+                        rowspan: 12,
+                        colspan: 1
+                    };
+                } else {
+                    return {
+                        rowspan: 0,
+                        colspan: 2
+                    };
+                }
+            }
         },
-        edit(row) {},
-        del(row) {},
         pageChange(p) {
             console.log(p);
         }
@@ -170,12 +199,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-#header {
-    margin-bottom: 15px;
-}
-.table {
-    .pagination {
-        margin-top: 20px;
-    }
-}
 </style>

src/views/harmless/intelligentHint.vue

@@ -64,7 +64,7 @@ export default {
         this.getHarmlessList()
     },
     methods: {
-        // 无害化确认列表
+        // 智能提醒列表
         getHarmlessList() {
             reqHarmlessList({
                 searchStr: '',

src/views/material/materialInStore.vue

@@ -170,7 +170,7 @@ export default {
         };
     },
     created() {
-        // 基础信息列表
+        // 物料入库列表
         this.getMInStoreList();
     },
     computed: {},
@@ -180,7 +180,7 @@ export default {
                 if (valid) {
                     reqAddMInStore(this.formData)
                         .then(res => {
-                            // 基础信息列表
+                            // 物料入库列表
                             this.getMInStoreList();
                             // 获取基础药品列表 给后面下拉选择器使用
                             this.$store.dispatch("getDrugBasicsList");
@@ -196,7 +196,7 @@ export default {
                 }
             });
         },
-        // 基础信息列表
+        // 物料入库列表
         getMInStoreList() {
             reqMInStoreList({
                 searchStr: this.search,
@@ -223,7 +223,7 @@ export default {
         del(row) {
             reqDelMInStore(row.id)
                 .then(res => {
-                    // 基础信息列表
+                    // 物料入库列表
                     this.getMInStoreList();
                     if (res.code == "success") {
                         this.$message.success(res.msg);
@@ -240,7 +240,7 @@ export default {
         pageChange(p) {
             console.log(p);
             this.pageNum = p;
-            // 基础信息列表
+            // 物料入库列表
             this.getMInStoreList();
         },
         CPeriodOfValidityUnit(v) {

src/views/material/materialOutStore.vue

@@ -142,7 +142,7 @@ export default {
         };
     },
     created() {
-        // 基础信息列表
+        // 物料出库列表
         this.getMOutStoreList();
     },
     computed: {},
@@ -152,7 +152,7 @@ export default {
                 if (valid) {
                     reqAddMOutStore(this.formData)
                         .then(res => {
-                            // 基础信息列表
+                            // 物料出库列表
                             this.getMOutStoreList();
                             this.$message.success("成功！");
                             // this.isShow = false
@@ -166,7 +166,7 @@ export default {
                 }
             });
         },
-        // 基础信息列表
+        // 物料出库列表
         getMOutStoreList() {
             reqMOutStoreList({
                 searchStr: this.search,
@@ -189,7 +189,7 @@ export default {
         pageChange(p) {
             console.log(p);
             this.pageNum = p;
-            // 基础信息列表
+            // 物料出库列表
             this.getMOutStoreList();
         },
         CPeriodOfValidityUnit(v) {

src/views/production/batch.vue

@@ -192,7 +192,7 @@ export default {
     created() {
         // 批次列表
         this.getBatchList();
-        // 获取种羊档案列表
+        // 获取批次管理列表
         this.getSeedSheepList();
     },
     methods: {
@@ -205,7 +205,7 @@ export default {
                             this.$store.dispatch("getBatchList");
                             // 批次列表
                             this.getBatchList();
-                            // 获取种羊档案列表
+                            // 获取批次管理列表
                             this.getSeedSheepList();
                             this.$message.success("成功11！");
                             // 清空选项
@@ -236,7 +236,7 @@ export default {
                     console.log(err);
                 });
         },
-        // 获取种羊档案列表
+        // 获取批次管理列表
         getSeedSheepList() {
             reqSeedEweSheepList({
                 searchStr: this.search_2,
@@ -289,7 +289,7 @@ export default {
         pageChange_2(p) {
             console.log(p);
             this.pageNum_2 = p;
-            // 获取种羊档案列表
+            // 获取批次管理列表
             this.getSeedSheepList();
         }
     }

src/views/production/carefulFeed.vue

@@ -1,177 +0,0 @@
-<template>
-    <div class="carefulFeed">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">精细饲喂</h2>
-
-        <header id="header">
-            
-            <el-row type="flex">
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1区" value="11"></el-option>
-                        <el-option label="2区" value="22"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1舍" value="13"></el-option>
-                        <el-option label="2舍" value="24"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="可用" value="15"></el-option>
-                        <el-option label="可用" value="26"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary">查找</el-button>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary">新增</el-button>
-                </el-col>
-            </el-row>
-        </header>
-        <section>
-            <article class="table">
-                <el-table
-                    ref="multipleTable"
-                    :data="tableData"
-                    tooltip-effect="dark"
-                    style="width: 100%"
-                    @selection-change="handleSelectionChange"
-                >
-                    <el-table-column type="selection" width="55"></el-table-column>
-                    <el-table-column prop="a" label="屠宰批次"></el-table-column>
-                    <el-table-column prop="b" label="产品名称"></el-table-column>
-                    <el-table-column prop="c" label="排酸时间"></el-table-column>
-                    <el-table-column prop="d" label="排酸前重量"></el-table-column>
-                    <el-table-column prop="e" label="排酸后重量"></el-table-column>
-                    <el-table-column prop="f" label="排酸损耗"></el-table-column>
-                    <el-table-column prop="g" label="负责人员"></el-table-column>
-                    <!-- <el-table-column label="操作" width="150">
-                        <template slot-scope="scope">
-                            <el-button @click="edit(scope.row)" type="text" size="small">编辑</el-button>
-                            <el-popconfirm title="是否删除此设备的信息？" @onConfirm="del(scope.row)">
-                                <el-button slot="reference" type="text" size="small">删除</el-button>
-                            </el-popconfirm>
-                        </template>
-                    </el-table-column> -->
-                </el-table>
-                <div style="margin-top: 20px">
-                    <el-button @click="toggleSelection([tableData[1], tableData[2]])">切换第二、第三行的选中状态</el-button>
-                    <el-button @click="toggleSelection()">取消选择</el-button>
-                    <el-button @click="inStore">入待宰栏</el-button>
-                </div>
-
-                <el-row type="flex" justify="end">
-                    <el-col :span="8" class="pagination">
-                        <el-pagination
-                            @current-change="pageChange"
-                            background
-                            layout="prev, pager, next"
-                            :page-count="10"
-                        ></el-pagination>
-                    </el-col>
-                </el-row>
-            </article>
-        </section>
-    </div>
-</template>
-
-<script>
-
-const pageSize = 10
-const tableData = [
-                {
-                    a: "15463",
-                    b: "胴体",
-                    c: "2020-07-14",
-                    d: "49kg",
-                    e: "48kg",
-                    f: "1.6%",
-                    g: "张小刚",
-                },
-                {
-                    a: "15463",
-                    b: "带骨羊前腿",
-                    c: "2020-07-14",
-                    d: "49kg",
-                    e: "48kg",
-                    f: "1.6%",
-                    g: "张小刚",
-                },
-                {
-                    a: "15463",
-                    b: "羔羊肉卷",
-                    c: "2020-07-14",
-                    d: "49kg",
-                    e: "48kg",
-                    f: "1.6%",
-                    g: "张小刚",
-                },
-                {
-                    a: "15463",
-                    b: "胴体",
-                    c: "2020-07-14",
-                    d: "49kg",
-                    e: "48kg",
-                    f: "1.6%",
-                    g: "张小刚",
-                },
-                {
-                    a: "15463",
-                    b: "羔羊肉卷",
-                    c: "2020-07-14",
-                    d: "49kg",
-                    e: "48kg",
-                    f: "1.6%",
-                    g: "张小刚",
-                },
-                
-                
-            ]
-
-export default {
-    data() {
-        return {
-            value: "",
-            multipleSelection: [],
-            page: 1,
-            tableData
-        };
-    },
-    created() {},
-    methods: {
-        toggleSelection(rows) {
-            if (rows) {
-                rows.forEach(row => {
-                    this.$refs.multipleTable.toggleRowSelection(row);
-                });
-            } else {
-                this.$refs.multipleTable.clearSelection();
-            }
-        },
-        // 入待宰栏
-        inStore() {},
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
-        edit(row) {},
-        del(row) {},
-        pageChange(p) {
-            console.log(p);
-        }
-    }
-};
-</script>
-
-<style lang="scss" scoped>
-#header {
-    margin-bottom: 15px;
-}
-.table {
-    .pagination {
-        margin-top: 20px;
-    }
-}
-</style>

src/views/production/earTag.vue

@@ -130,7 +130,7 @@ export default {
         };
     },
     created() {
-        // 死淘管理列表
+        // 耳标管理列表
         this.getEarTagList();
     },
     methods: {
@@ -139,7 +139,7 @@ export default {
                 if (valid) {
                     reqAddEarTag(this.formData)
                         .then(res => {
-                            // 死淘管理列表
+                            // 耳标管理列表
                             this.getEarTagList();
                             this.$message.success("成功！");
                             // this.isShow = false
@@ -153,7 +153,7 @@ export default {
                 }
             });
         },
-        // 死淘管理列表
+        // 耳标管理列表
         getEarTagList() {
             reqEarTagList({
                 searchStr: this.search,
@@ -176,7 +176,7 @@ export default {
         pageChange(p) {
             console.log(p);
             this.pageNum = p;
-            // 死淘管理列表
+            // 耳标管理列表
             this.getEarTagList();
         }
     }