.

src/api/slaughterManagment.js

@@ -105,4 +105,6 @@ export const reqCreateBatch = (data) => ajax("post", "/farm-huyang/split-batch//
 
 
 /* 屠宰批次  SlaughterBatch*/
-export const reqSlaughterBatchList = (data) => ajax("post", "/farm-huyang/product-traceability/list", data)
+export const reqSlaughterBatchList = (data) => ajax("post", "/farm-huyang/slaughter-batch/list", data)
+
+export const reqCreateBatchList = (data) => ajax("post", "/farm-huyang/slaughter-batch/list", data)

src/views/Home/Home.vue

@@ -2,7 +2,7 @@
     <div class="home">
         <header class="header">
             <div class="left">
-                湖羊屠宰系统 
+                产品管理系统
                 <el-button
                     @click="onMenuCollapse"
                     circle
@@ -12,7 +12,7 @@
             </div>
             <div class="right">
                 <span class="warp">
-                    <el-dropdown  @command="onLogOut">
+                    <el-dropdown @command="onLogOut">
                         <span class="el-dropdown-link">
                             账号管理
                             <i class="el-icon-arrow-down el-icon--right"></i>
@@ -90,7 +90,6 @@
                         <router-view />
                     </div>
                 </div>
-
             </div>
         </section>
     </div>
@@ -105,7 +104,7 @@ export default {
             // 菜单配置
             menuData,
             menuCollapse: false, //是否水平折叠收起菜单
-            defaultUnfoldedMenu: [menuData[0].index], // 默认展开第一项
+            defaultUnfoldedMenu: [menuData[0].index] // 默认展开第一项
         };
     },
     created() {
@@ -113,8 +112,50 @@ export default {
             localStorage.getItem("defaultUnfoldedMenu")
         ];
         this.menuCollapse = JSON.parse(localStorage.getItem("menuCollapse"));
+        /* 筛选菜单 */
+        var target = this.$route.query.target
+        if(target) {
+            localStorage.setItem("target", target)
+        } else {
+            target = localStorage.getItem('target')
+        }
+        this.filterMenu(target);
+    },
+    watch: {
+        "$route.query.target"(v) {
+            if(v){
+                localStorage.setItem("target", v)
+                this.filterMenu(v);
+            }
+        }
     },
     methods: {
+        /* 筛选菜单  */
+        /*  http://localhost:8080/#/home?target=定点屠宰智能管控   */
+        /*  http://localhost:8080/#/home?target=产品制作智能监控    */
+        /*  http://localhost:8080/#/home?target=鲜肉储运智能管控   */
+        filterMenu(target) {
+            console.log(target)
+            let path;
+            switch (target) {
+                case "定点屠宰智能管控":
+                    var func = item => item.index == 1 || item.index == 2;
+                    path = "firmBuy";
+                    break;
+                case "产品制作智能监控":
+                    var func = item => item.index == 3;
+                    path = "productInfo";
+                    break;
+                case "鲜肉储运智能管控":
+                    var func = item => item.index == 4;
+                    path = "dispatching";
+                    break;
+            }
+            this.menuData = menuData.filter(func);
+            if (path && path != this.$route.name) {
+                this.$router.push({name: path});
+            }
+        },
         // 收取菜单按钮
         onMenuCollapse() {
             this.menuCollapse = !this.menuCollapse;
@@ -131,7 +172,6 @@ export default {
         handleClose(key, keyPath) {},
         // 点击菜单项
         onClickMenu(item) {
-            let _this = this;
             // 如果要跳转的路由和当前路由一致就 return
             if (this.$router.history.current.name == item.routerName) return;
             this.$router.push({
@@ -139,7 +179,7 @@ export default {
             });
         },
         onLogOut() {
-            this.$router.redirect('login')
+            this.$router.replace("login");
         }
     }
 };
@@ -153,7 +193,7 @@ export default {
     background-color: #eee;
     display: flex;
     flex-direction: column;
-    >.header {
+    > .header {
         background-color: #4b545e;
         height: 40px;
         padding: 10px 20px;
@@ -196,7 +236,7 @@ export default {
                 margin-right: 5px;
                 height: 100%;
                 overflow: auto;
-                
+
                 .warp {
                     margin: 15px;
                 }

src/views/Home/mencCofig.js

@@ -24,6 +24,11 @@ export const menuData = [
                 routerName: "inButcherHurdle"
             },
             {
+                optionName: '屠宰批次',
+                index: '1-11',
+                routerName: "slaughterBatch"
+            },
+            {
                 optionName: '上报检疫',
                 index: '1-3',
                 routerName: "reportQuarantine"
@@ -65,11 +70,6 @@ export const menuData = [
                 routerName: "splitBatch"
             },
             {
-                optionName: '屠宰批次',
-                index: '1-11',
-                routerName: "slaughterBatch"
-            },
-            {
                 optionName: '成本核算',
                 index: '1-12',
                 routerName: "costAccounting"

src/views/Login/Login.vue

@@ -58,11 +58,15 @@ export default {
     methods: {
         /* 登录按钮 */
         onSignIn() {
-            console.log(this.form);
+            const loading = this.$loading({
+                lock: true,
+                text: "登录中...",
+                spinner: "el-icon-loading",
+                background: "rgba(0, 0, 0, 0.7)"
+            });
             reqLogin(this.form)
                 .then(res => {
-                    console.log(res);
-                    console.log(res)
+                    loading.close();
                     localStorage.setItem("token", res.token);
                     this.doOrganizationChoose();
                 })
@@ -84,7 +88,6 @@ export default {
                     this.isShowDialog = true;
                     this.orgList = res;
                 } else {
-                    console.log("6666")
                     this.setOrganizationId(res[0].id);
                 }
             }).catch(err => {
@@ -101,7 +104,15 @@ export default {
             reqOrganizationId({orgId: id}).then(res => {
                 this.isShowDialog = false;
                     //导航到 正式页面
-                    this.$router.replace("/home/firmBuy");
+                    console.log(999999)
+                    this.$router.push({
+                        path: "/home",
+                        query: {
+                            // target: "定点屠宰智能管控"
+                            target: "产品制作智能监控"
+                            // target: "鲜肉储运智能管控"
+                        }
+                    });
             }).catch(err => {
                 if (err.errMsg) this.$message.error(err.errMsg);
                     else this.$message.error("服务器发生异常");

src/views/productManagement/goatBloodLog.vue

@@ -55,7 +55,12 @@
         <el-dialog title="新增/编辑" :visible.sync="isShow" width="40%">
             <el-row type="flex">
                 <el-col :span="20">
-                    <el-form ref="addGoatBloodLog" :model="formData" :rules="rules" label-width="140px">
+                    <el-form
+                        ref="addGoatBloodLog"
+                        :model="formData"
+                        :rules="rules"
+                        label-width="140px"
+                    >
                         <el-form-item label="羊ID">
                             <el-input v-model="formData.sheepId"></el-input>
                         </el-form-item>
@@ -115,7 +120,7 @@ export default {
                 bleedingTime: this.$moment().format("YYYY-MM-DD"),
                 slaughterBatch: "1210",
                 weight: 16,
-                shelfLife: '365',
+                shelfLife: "365",
                 storageLocation: "冷藏仓"
             },
             isAdd: false,
@@ -135,7 +140,12 @@ export default {
                             .then(res => {
                                 // 羊血登记列表
                                 this.getGoatBloodLogList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -158,7 +168,7 @@ export default {
                 }
             });
         },
-        // 羊血登记列表 
+        // 羊血登记列表
         getGoatBloodLogList() {
             reqGoatBloodLogList({
                 searchStr: this.search,
@@ -175,12 +185,12 @@ export default {
         },
         add() {
             this.isShow = true;
-            this.isAdd = true
+            this.isAdd = true;
         },
         edit(row) {
             this.formData = row;
             this.isShow = true;
-            this.isAdd = false
+            this.isAdd = false;
         },
         del(row) {
             reqDelGoatBloodLog(row.id)

src/views/productManagement/goatHasletLog.vue

@@ -135,7 +135,12 @@ export default {
                             .then(res => {
                                 // 羊杂登记列表
                                 this.getGoatHasletLogList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -146,7 +151,12 @@ export default {
                             .then(res => {
                                 // 羊杂登记列表
                                 this.getGoatHasletLogList();
-                                this.$message.success("编辑成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
+                                // this.$message.success("编辑成功！");
                             })
                             .catch(err => {
                                 console.log(err);

src/views/productManagement/productInfo.vue

@@ -125,7 +125,12 @@ export default {
                             .then(res => {
                                 // 产品档案列表
                                 this.getProductInfoList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -136,7 +141,12 @@ export default {
                             .then(res => {
                                 // 产品档案列表
                                 this.getProductInfoList();
-                                this.$message.success("编辑成功！");
+                                // this.$message.success("编辑成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);

src/views/productManagement/sheepskinLog.vue

@@ -25,7 +25,7 @@
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
                     <el-table-column prop="sheepId" label="羊ID"></el-table-column>
                     <el-table-column prop="strippingTime" label="剥离时间"></el-table-column>
-                    <el-table-column prop="batchNo" label="批次号"></el-table-column>
+                    <el-table-column prop="slaughterBatch" label="批次号"></el-table-column>
                     <el-table-column prop="weight" label="重量(kg)"></el-table-column>
                     <el-table-column prop="location" label="位置"></el-table-column>
                     <el-table-column label="操作" width="150">
@@ -54,7 +54,12 @@
         <el-dialog title="新增/编辑" :visible.sync="isShow" width="40%">
             <el-row type="flex">
                 <el-col :span="20">
-                    <el-form ref="addSheepskinLog" :model="formData" :rules="rules" label-width="140px">
+                    <el-form
+                        ref="addSheepskinLog"
+                        :model="formData"
+                        :rules="rules"
+                        label-width="140px"
+                    >
                         <el-form-item label="ID编码">
                             <el-input v-model="formData.sheepId"></el-input>
                         </el-form-item>
@@ -67,7 +72,7 @@
                             ></el-date-picker>
                         </el-form-item>
                         <el-form-item label="批次号">
-                            <el-input v-model="formData.batchNo"></el-input>
+                            <el-input v-model="formData.slaughterBatch"></el-input>
                         </el-form-item>
                         <el-form-item label="重量(kg)">
                             <el-input v-model.number="formData.weight"></el-input>
@@ -109,7 +114,7 @@ export default {
             formData: {
                 sheepId: "1010",
                 strippingTime: this.$moment().format("YYYY-MM-DD"),
-                batchNo: "1210",
+                slaughterBatch: "1210",
                 weight: 168,
                 location: "冷藏仓"
             },
@@ -130,7 +135,12 @@ export default {
                             .then(res => {
                                 // 羊皮登记列表
                                 this.getSheepskinLogList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -153,7 +163,7 @@ export default {
                 }
             });
         },
-        // 羊皮登记列表 
+        // 羊皮登记列表
         getSheepskinLogList() {
             reqSheepskinLogList({
                 searchStr: this.search,
@@ -170,12 +180,12 @@ export default {
         },
         add() {
             this.isShow = true;
-            this.isAdd = true
+            this.isAdd = true;
         },
         edit(row) {
             this.formData = row;
             this.isShow = true;
-            this.isAdd = false
+            this.isAdd = false;
         },
         del(row) {
             reqDelSheepskinLog(row.id)

src/views/productManagement/splitLog.vue

@@ -130,7 +130,12 @@ export default {
                             .then(res => {
                                 // 分割登记列表
                                 this.getSplitLogList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -141,7 +146,12 @@ export default {
                             .then(res => {
                                 // 分割登记列表
                                 this.getSplitLogList();
-                                this.$message.success("编辑成功！");
+                                // this.$message.success("编辑成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);

src/views/sellManagement/carcassSell.vue

@@ -25,9 +25,7 @@
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
                     <el-table-column prop="salesNo" label="销售单号"></el-table-column>
 
-                    <el-table-column prop="carcassCode" label="胴体编码"></el-table-column>
                     <el-table-column prop="sellingTime" label="出售时间"></el-table-column>
-                    <el-table-column prop="slaughterBatch" label="批次号"></el-table-column>
                     <el-table-column prop="carcassWeight" label="胴体重量(kg)"></el-table-column>
 
                     <el-table-column prop="saleAmount" label="销售金额(元)"></el-table-column>
@@ -66,10 +64,6 @@
                             <el-input v-model="formData.salesNo"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="胴体编码">
-                            <el-input v-model="formData.carcassCode"></el-input>
-                        </el-form-item>
-
                         <el-form-item label="出售时间">
                             <el-date-picker
                                 v-model="formData.sellingTime"
@@ -79,10 +73,6 @@
                             ></el-date-picker>
                         </el-form-item>
 
-                        <el-form-item label="批次号">
-                            <el-input v-model="formData.slaughterBatch"></el-input>
-                        </el-form-item>
-
                         <el-form-item label="胴体重量(kg)">
                             <el-input v-model="formData.carcassWeight"></el-input>
                         </el-form-item>
@@ -136,9 +126,7 @@ export default {
             isShow: false,
             formData: {
                 salesNo: "JD5S6D4F444",
-                carcassCode: "1688",
                 sellingTime: this.$moment().format("YYYY-MM-DD"),
-                slaughterBatch: "58715",
                 carcassWeight: "26",
                 saleAmount: "26789.5",
                 buyer: "张小刚",
@@ -162,7 +150,12 @@ export default {
                             .then(res => {
                                 // 胴体销售列表
                                 this.getCarcassList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -173,7 +166,12 @@ export default {
                             .then(res => {
                                 // 胴体销售列表
                                 this.getCarcassList();
-                                this.$message.success("编辑成功！");
+                                // this.$message.success("编辑成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);

src/views/sellManagement/client.vue

@@ -130,7 +130,12 @@ export default {
                             .then(res => {
                                 // 客户管理列表
                                 this.getClientList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -141,7 +146,12 @@ export default {
                             .then(res => {
                                 // 客户管理列表
                                 this.getClientList();
-                                this.$message.success("编辑成功！");
+                                // this.$message.success("编辑成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);

src/views/sellManagement/directSell.vue

@@ -23,7 +23,6 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
-                    <el-table-column prop="code" label="ID编码"></el-table-column>
                     <el-table-column prop="saleTime" label="出售时间"></el-table-column>
                     <el-table-column prop="buyer" label="购买人(企业)"></el-table-column>
                     <el-table-column prop="seller" label="经办人"></el-table-column>
@@ -58,10 +57,6 @@
             <el-row type="flex">
                 <el-col :span="20">
                     <el-form ref="addDirectSell" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="ID编码">
-                            <el-input v-model="formData.code"></el-input>
-                        </el-form-item>
-
                         <el-form-item label="出售时间">
                             <el-date-picker
                                 v-model="formData.saleTime"
@@ -127,7 +122,6 @@ export default {
             totalPages: 0,
             isShow: false,
             formData: {
-                code: "1688",
                 saleTime: this.$moment().format("YYYY-MM-DD"),
                 buyer: "张小刚",
                 seller: "王凯军",
@@ -154,7 +148,12 @@ export default {
                             .then(res => {
                                 // 屠宰直销列表
                                 this.getDirectSellList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -165,7 +164,12 @@ export default {
                             .then(res => {
                                 // 屠宰直销列表
                                 this.getDirectSellList();
-                                this.$message.success("编辑成功！");
+                                // this.$message.success("编辑成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);

src/views/sellManagement/elseSell.vue

@@ -159,7 +159,12 @@ export default {
                             .then(res => {
                                 // 其他销售列表
                                 this.getElseSellList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -170,7 +175,12 @@ export default {
                             .then(res => {
                                 // 其他销售列表
                                 this.getElseSellList();
-                                this.$message.success("编辑成功！");
+                                // this.$message.success("编辑成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);

src/views/sellManagement/price.vue

@@ -130,7 +130,12 @@ export default {
                             .then(res => {
                                 // 价格管理列表
                                 this.getPriceList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -141,7 +146,12 @@ export default {
                             .then(res => {
                                 // 价格管理列表
                                 this.getPriceList();
-                                this.$message.success("编辑成功！");
+                                // this.$message.success("编辑成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);

src/views/sellManagement/splitSell.vue

@@ -158,7 +158,12 @@ export default {
                             .then(res => {
                                 // 分割销售列表
                                 this.getSplitSellList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -169,7 +174,12 @@ export default {
                             .then(res => {
                                 // 分割销售列表
                                 this.getSplitSellList();
-                                this.$message.success("编辑成功！");
+                                // this.$message.success("编辑成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);

src/views/slaughterManagment/drainageAcid.vue

@@ -168,7 +168,12 @@ export default {
                             .then(res => {
                                 // 排酸损耗列表
                                 this.getDrainageAcidList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -179,7 +184,12 @@ export default {
                             .then(res => {
                                 // 排酸损耗列表
                                 this.getDrainageAcidList();
-                                this.$message.success("编辑成功！");
+                                // this.$message.success("编辑成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);

src/views/slaughterManagment/firmBuy.vue

@@ -139,7 +139,12 @@ export default {
                             .then(res => {
                                 // 企业采购列表
                                 this.getfirmBuyList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -150,7 +155,12 @@ export default {
                             .then(res => {
                                 // 企业采购列表
                                 this.getfirmBuyList();
-                                this.$message.success("编辑成功！");
+                                // this.$message.success("编辑成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);

src/views/slaughterManagment/inButcherHurdle.vue

@@ -129,7 +129,12 @@ export default {
                             .then(res => {
                                 // 入待宰栏列表
                                 this.getWaitList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -140,7 +145,12 @@ export default {
                             .then(res => {
                                 // 入待宰栏列表
                                 this.getWaitList();
-                                this.$message.success("编辑成功！");
+                                // this.$message.success("编辑成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);

src/views/slaughterManagment/inStore.vue

@@ -153,7 +153,12 @@ export default {
                             .then(res => {
                                 // 入库管理列表
                                 this.getInStoreList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -164,7 +169,12 @@ export default {
                             .then(res => {
                                 // 入库管理列表
                                 this.getInStoreList();
-                                this.$message.success("编辑成功！");
+                                // this.$message.success("编辑成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);

src/views/slaughterManagment/outStore.vue

@@ -156,7 +156,12 @@ export default {
                             .then(res => {
                                 // 出仓管理列表
                                 this.getOutStoreList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -167,7 +172,12 @@ export default {
                             .then(res => {
                                 // 出仓管理列表
                                 this.getOutStoreList();
-                                this.$message.success("编辑成功！");
+                                // this.$message.success("编辑成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);

src/views/slaughterManagment/packinghouse.vue

@@ -135,7 +135,12 @@ export default {
                             .then(res => {
                                 // 入宰登记列表
                                 this.getWaitList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -146,7 +151,12 @@ export default {
                             .then(res => {
                                 // 入宰登记列表
                                 this.getWaitList();
-                                this.$message.success("编辑成功！");
+                                // this.$message.success("编辑成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);

src/views/slaughterManagment/regisSlaughter.vue

@@ -141,7 +141,12 @@ export default {
                             .then(res => {
                                 // 入宰登记列表
                                 this.getRegisList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -152,7 +157,12 @@ export default {
                             .then(res => {
                                 // 入宰登记列表
                                 this.getRegisList();
-                                this.$message.success("编辑成功！");
+                                // this.$message.success("编辑成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);

src/views/slaughterManagment/reportQuarantine.vue

@@ -135,7 +135,12 @@ export default {
                             .then(res => {
                                 // 上报检疫列表
                                 this.getReportList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -146,7 +151,12 @@ export default {
                             .then(res => {
                                 // 上报检疫列表
                                 this.getReportList();
-                                this.$message.success("编辑成功！");
+                                // this.$message.success("编辑成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);

src/views/slaughterManagment/segmentation.vue

@@ -135,7 +135,12 @@ export default {
                             .then(res => {
                                 // 分割加工列表
                                 this.getSegmentationList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -146,7 +151,12 @@ export default {
                             .then(res => {
                                 // 分割加工列表
                                 this.getSegmentationList();
-                                this.$message.success("编辑成功！");
+                                // this.$message.success("编辑成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);

src/views/slaughterManagment/slaughterBatch.vue

@@ -19,14 +19,24 @@
                     tooltip-effect="dark"
                     style="width: 30%"
                     border
+                    @selection-change="handleSelectionChange"
+                    :row-key="getRowKeys"
                 >
+                    <el-table-column type="selection" width="55"></el-table-column>
                     <el-table-column prop="id" label="序号" width="80" align="center"></el-table-column>
                     <el-table-column prop="sheepId" label="羊只编号" align="center"></el-table-column>
                     <el-table-column prop="weight" label="体重" align="center"></el-table-column>
                 </el-table>
 
-                <el-row type="flex" justify="end">
-                    <el-col :span="19" class="pagination">
+                <el-row type="flex" style="margin-top: 20px">
+                    <el-col :span="4">
+                        <el-button @click="toggleSelection()">取消选择</el-button>
+                        <el-button type="primary" plain @click="create">
+                            生成批次
+                            <i class="el-icon-arrow-right el-icon--right"></i>
+                        </el-button>
+                    </el-col>
+                    <el-col :span="8">
                         <el-pagination
                             @current-change="pageChange"
                             background
@@ -41,7 +51,7 @@
 </template>
 
 <script>
-import { reqSlaughterBatchList } from "@/api/slaughterManagment.js";
+import { reqSlaughterBatchList, reqCreateBatchList } from "@/api/slaughterManagment.js";
 
 const pageSize = 10;
 const rules = {};
@@ -55,6 +65,10 @@ export default {
             tableData: [],
             totalPages: 0,
             isShow: false,
+            multipleSelection: [],
+            getRowKeys(row) {
+                return row.id;
+            },
             rules
         };
     },
@@ -78,6 +92,29 @@ export default {
                     console.log(err);
                 });
         },
+        handleSelectionChange(val) {
+            this.multipleSelection = val;
+        },
+        // 选项选择
+        toggleSelection(rows) {
+            if (rows) {
+                rows.forEach(row => {
+                    this.$refs.multipleTableCreateBatch.toggleRowSelection(row);
+                });
+            } else {
+                this.$refs.multipleTableCreateBatch.clearSelection();
+            }
+        },
+        create() {
+            let ids = this.multipleSelection.map(item => item.id).toString
+            reqCreateBatchList({ids}).then(res => {
+                if(res.errCode) {
+                    this.$message.error(res.errMsg)
+                } else {
+                    this.$message.success("成功")
+                }
+            })
+        },
         pageChange(p) {
             console.log(p);
             this.page = p;

src/views/slaughterManagment/slaughterWeight.vue

@@ -167,7 +167,12 @@ export default {
                             .then(res => {
                                 // 宰后称重列表
                                 this.getWeighSList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -178,7 +183,12 @@ export default {
                             .then(res => {
                                 // 宰后称重列表
                                 this.getWeighSList();
-                                this.$message.success("编辑成功！");
+                                // this.$message.success("编辑成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);

src/views/slaughterManagment/splitBatch.vue

@@ -150,7 +150,12 @@ export default {
                             .then(res => {
                                 // 分割批次列表
                                 this.getSplitBatchList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -161,7 +166,12 @@ export default {
                             .then(res => {
                                 // 分割批次列表
                                 this.getSplitBatchList();
-                                this.$message.success("编辑成功！");
+                                // this.$message.success("编辑成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);

src/views/storeTransportation/dispatching.vue

@@ -155,7 +155,12 @@ export default {
                             .then(res => {
                                 // 配送管理列表
                                 this.getDispatchList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -166,7 +171,12 @@ export default {
                             .then(res => {
                                 // 配送管理列表
                                 this.getDispatchList();
-                                this.$message.success("编辑成功！");
+                                // this.$message.success("编辑成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);

src/views/storeTransportation/shopStore.vue

@@ -130,7 +130,12 @@ export default {
                             .then(res => {
                                 // 门店管理列表
                                 this.getShopStoreList();
-                                this.$message.success("添加成功！");
+                                // this.$message.success("添加成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);
@@ -141,7 +146,12 @@ export default {
                             .then(res => {
                                 // 门店管理列表
                                 this.getShopStoreList();
-                                this.$message.success("编辑成功！");
+                                // this.$message.success("编辑成功！");
+                                if (res.errCode) {
+                                    this.$message.error(res.errMsg);
+                                } else {
+                                    this.$message.success("成功");
+                                }
                             })
                             .catch(err => {
                                 console.log(err);