linan 4 vuotta sitten
vanhempi
commit
1c00d2be73

+ 1 - 0
package.json

@@ -10,6 +10,7 @@
   "dependencies": {
     "cnpm": "^6.1.1",
     "core-js": "^3.3.2",
+    "default-passive-events": "^2.0.0",
     "echarts": "^4.8.0",
     "element-ui": "^2.13.2",
     "moment": "^2.27.0",

+ 4 - 0
src/api/slaughterManagment.js

@@ -102,3 +102,7 @@ export const reqUpdateSplitBatch = (data) => ajax("post", "/farm-huyang/split-ba
 export const reqDelSplitBatch = (id) => ajax("post", "/farm-huyang/split-batch/delete", {id})
 
 export const reqCreateBatch = (data) => ajax("post", "/farm-huyang/split-batch//create-batch", data)
+
+
+/* 屠宰批次  SlaughterBatch*/
+export const reqSlaughterBatchList = (data) => ajax("post", "/farm-huyang/product-traceability/list", data)

+ 1 - 0
src/main.js

@@ -8,6 +8,7 @@ import store from './store'
 import vueModuleLoader from 'vue-module-loader'
 import localModule from './module'
 import './assets/css/reset.scss'
+import 'default-passive-events'  // ( https://www.jianshu.com/p/23850d4cade8 )
 import echarts from "echarts";
 import moment from 'moment'
 import VueAMap from 'vue-amap'

+ 6 - 0
src/router/routes.js

@@ -12,6 +12,7 @@ import outStore from '@/views/slaughterManagment/outStore.vue'
 import drainageAcid from '@/views/slaughterManagment/drainageAcid.vue'
 import segmentation from '@/views/slaughterManagment/segmentation.vue'
 import splitBatch from '@/views/slaughterManagment/splitBatch.vue'
+import slaughterBatch from '@/views/slaughterManagment/slaughterBatch.vue'
 import costAccounting from '@/views/slaughterManagment/costAccounting.vue'
 /* 销售管理 */
 import client from '@/views/sellManagement/client.vue'
@@ -100,6 +101,11 @@ export default [
 				component: splitBatch
 			},
 			{
+				path: 'slaughterBatch',
+				name: 'slaughterBatch',
+				component: slaughterBatch
+			},
+			{
 				path: 'costAccounting',
 				name: 'costAccounting',
 				component: costAccounting

+ 6 - 1
src/views/Home/mencCofig.js

@@ -65,8 +65,13 @@ export const menuData = [
                 routerName: "splitBatch"
             },
             {
-                optionName: '成本核算',
+                optionName: '屠宰批次',
                 index: '1-11',
+                routerName: "slaughterBatch"
+            },
+            {
+                optionName: '成本核算',
+                index: '1-12',
                 routerName: "costAccounting"
             }
         ]

+ 0 - 10
src/views/productManagement/productInfo.vue

@@ -25,10 +25,8 @@
                     <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="productName" label="产品名称"></el-table-column>
-                    <el-table-column prop="batchNo" label="所属批次"></el-table-column>
                     <el-table-column prop="specificModel" label="规格型号"></el-table-column>
                     <el-table-column prop="productPrice" label="产品价格"></el-table-column>
-                    <el-table-column prop="storageLocation" label="存放地点"></el-table-column>
                     <el-table-column prop="shelfLife" label="保质期(天)"></el-table-column>
                     <el-table-column label="操作" width="150">
                         <template slot-scope="scope">
@@ -63,18 +61,12 @@
                         <el-form-item label="产品名称">
                             <el-input v-model="formData.productName"></el-input>
                         </el-form-item>
-                        <el-form-item label="所属批次">
-                            <el-input v-model="formData.batchNo"></el-input>
-                        </el-form-item>
                         <el-form-item label="规格型号">
                             <el-input v-model="formData.specificModel"></el-input>
                         </el-form-item>
                         <el-form-item label="产品价格">
                             <el-input v-model.number="formData.productPrice"></el-input>
                         </el-form-item>
-                        <el-form-item label="存放地点">
-                            <el-input v-model="formData.storageLocation"></el-input>
-                        </el-form-item>
                         <el-form-item label="保质期(天)">
                             <el-input v-model="formData.shelfLife"></el-input>
                         </el-form-item>
@@ -112,10 +104,8 @@ export default {
             formData: {
                 code: "1010",
                 productName: "带骨羊前腿",
-                batchNo: "1010",
                 specificModel: "AAA",
                 productPrice: 168,
-                storageLocation: "冷藏仓",
                 shelfLife: '360'
             },
             isAdd: false,

+ 1 - 7
src/views/slaughterManagment/inButcherHurdle.vue

@@ -27,7 +27,6 @@
                     <el-table-column prop="entryTime" label="入栏时间"></el-table-column>
                     <el-table-column prop="currentPosition" label="目前位置"></el-table-column>
                     <el-table-column prop="operator" label="操作人员"></el-table-column>
-                    <el-table-column prop="batchNo" 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>
@@ -76,10 +75,6 @@
                             <el-input v-model="formData.currentPosition"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="批次号">
-                            <el-input v-model="formData.batchNo"></el-input>
-                        </el-form-item>
-
                         <el-form-item>
                             <el-button @click="isShow=false">取 消</el-button>
                             <el-button type="primary" @click="submitForm('addWait')">保 存</el-button>
@@ -115,8 +110,7 @@ export default {
                 sheepId: "1008",
                 entryTime: this.$moment().format("YYYY-MM-DD"),
                 operator: "王炸",
-                currentPosition: "待宰栏一舍01",
-                batchNo: '1396'
+                currentPosition: "待宰栏一舍01"
             },
             isAdd: false,
             rules

+ 100 - 0
src/views/slaughterManagment/slaughterBatch.vue

@@ -0,0 +1,100 @@
+<template>
+    <div class="SlaughterBatch">
+        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">屠宰批次</h2>
+        <header id="header">
+            <el-row type="flex" :gutter="20">
+                <el-col :span="4">
+                    <el-input v-model="search" placeholder="请选择"></el-input>
+                </el-col>
+                <el-col :span="4">
+                    <el-button type="primary" @click="getSlaughterBatchList">查找</el-button>
+                </el-col>
+            </el-row>
+        </header>
+        <section>
+            <article class="table">
+                <el-table
+                    ref="multipleTable"
+                    :data="tableData"
+                    tooltip-effect="dark"
+                    style="width: 30%"
+                    border
+                >
+                    <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-pagination
+                            @current-change="pageChange"
+                            background
+                            layout="prev, pager, next"
+                            :page-count="Number(totalPages)"
+                        ></el-pagination>
+                    </el-col>
+                </el-row>
+            </article>
+        </section>
+    </div>
+</template>
+
+<script>
+import { reqSlaughterBatchList } from "@/api/slaughterManagment.js";
+
+const pageSize = 10;
+const rules = {};
+
+export default {
+    name: "SlaughterBatch",
+    data() {
+        return {
+            search: "",
+            page: 1,
+            tableData: [],
+            totalPages: 0,
+            isShow: false,
+            rules
+        };
+    },
+    created() {
+        // 屠宰批次列表
+        this.getSlaughterBatchList();
+    },
+    methods: {
+        // 屠宰批次列表
+        getSlaughterBatchList() {
+            reqSlaughterBatchList({
+                searchStr: this.search,
+                pageSize,
+                pageNum: this.page
+            })
+                .then(res => {
+                    this.tableData = res.content;
+                    this.totalPages = res.totalPages;
+                })
+                .catch(err => {
+                    console.log(err);
+                });
+        },
+        pageChange(p) {
+            console.log(p);
+            this.page = p;
+            // 屠宰批次列表
+            this.getSlaughterBatchList();
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+#header {
+    margin-bottom: 15px;
+}
+.table {
+    .pagination {
+        margin-top: 20px;
+    }
+}
+</style>

+ 13 - 147
src/views/storeTransportation/productQuery.vue

@@ -9,9 +9,6 @@
                 <el-col :span="4">
                     <el-button type="primary" @click="getProductQueryList">查找</el-button>
                 </el-col>
-                <!-- <el-col :span="4">
-                    <el-button type="primary" @click="add">新增</el-button>
-                </el-col> -->
             </el-row>
         </header>
         <section>
@@ -25,20 +22,18 @@
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
                     <el-table-column prop="productCode" label="产品编码"></el-table-column>
                     <el-table-column prop="productName" label="产品名称"></el-table-column>
-                    <el-table-column prop="saleTime" label="出售时间"></el-table-column>
-                    <el-table-column prop="partitionTime" label="分割时间"></el-table-column>
-                    <el-table-column prop="cuttingTime" label="宰割时间"></el-table-column>
-                    <el-table-column prop="placeOrigin" label="来源地"></el-table-column>
+                    <el-table-column prop="saleNo" label="销售单号"></el-table-column>
+                    <el-table-column prop="buyer" label="购买人"></el-table-column>
+                    <el-table-column prop="splitTime" label="分割时间"></el-table-column>
+                    <el-table-column prop="saleNo" label="分割时间"></el-table-column>
+                    <el-table-column prop="acidTime" label="排酸时间"></el-table-column>
+                    <el-table-column prop="slaughterTime" label="屠宰时间"></el-table-column>
                     <el-table-column prop="quarantineTime" label="检疫时间"></el-table-column>
-                    <el-table-column prop="quarantineForm" 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-column prop="quarantineResult" label="检疫结果"></el-table-column>
+                    <el-table-column prop="acquisitionTime" label="收购时间"></el-table-column>
+                    <el-table-column prop="placeOrigin" label="来源牧场"></el-table-column>
+                    <el-table-column prop="sheepId" label="羊只编码"></el-table-column>
+                    <el-table-column prop="sheepWeight" label="羊只重量"></el-table-column>
                 </el-table>
 
                 <el-row type="flex" justify="end">
@@ -54,79 +49,13 @@
             </article>
         </section>
 
-        <!-- <el-dialog title="新增/编辑" :visible.sync="isShow" width="40%">
-            <el-row type="flex">
-                <el-col :span="20">
-                    <el-form ref="addProductQuery" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="产品编码">
-                            <el-input v-model="formData.productCode"></el-input>
-                        </el-form-item>
-
-                        <el-form-item label="产品名称">
-                            <el-input v-model="formData.productName"></el-input>
-                        </el-form-item>
-
-                        <el-form-item label="出售时间">
-                            <el-date-picker
-                                v-model="formData.saleTime"
-                                type="date"
-                                value-format="yyyy-MM-dd"
-                                placeholder="选择日期"
-                            ></el-date-picker>
-                        </el-form-item>
-
-                         <el-form-item label="分割时间">
-                            <el-date-picker
-                                v-model="formData.partitionTime"
-                                type="date"
-                                value-format="yyyy-MM-dd"
-                                placeholder="选择日期"
-                            ></el-date-picker>
-                        </el-form-item>
-
-                         <el-form-item label="宰割时间">
-                            <el-date-picker
-                                v-model="formData.cuttingTime"
-                                type="date"
-                                value-format="yyyy-MM-dd"
-                                placeholder="选择日期"
-                            ></el-date-picker>
-                        </el-form-item>
-
-                        <el-form-item label="来源地">
-                            <el-input v-model="formData.placeOrigin"></el-input>
-                        </el-form-item>
-
-                         <el-form-item label="检疫时间">
-                            <el-date-picker
-                                v-model="formData.quarantineTime"
-                                type="date"
-                                value-format="yyyy-MM-dd"
-                                placeholder="选择日期"
-                            ></el-date-picker>
-                        </el-form-item>
-
-                        <el-form-item label="检疫单">
-                            <el-input v-model="formData.quarantineForm"></el-input>
-                        </el-form-item>
-
-                        <el-form-item>
-                            <el-button @click="isShow=false">取 消</el-button>
-                            <el-button type="primary" @click="submitForm('addProductQuery')">保 存</el-button>
-                        </el-form-item>
-                    </el-form>
-                </el-col>
-            </el-row>
-        </el-dialog> -->
+        
     </div>
 </template>
 
 <script>
 import {
     reqProductQueryList,
-    // reqAddProductQuery,
-    // reqUpdateProductQuery,
-    // reqDelProductQuery
 } from "@/api/storeTransportation.js";
 
 const pageSize = 10;
@@ -141,17 +70,6 @@ export default {
             tableData: [],
             totalPages: 0,
             isShow: false,
-            formData: {
-                productCode: "156546",
-                productName: "产品名称",
-                saleTime: this.$moment().format("YYYY-MM-DD"),
-                partitionTime: this.$moment().format("YYYY-MM-DD"),
-                cuttingTime: this.$moment().format("YYYY-MM-DD"),
-                placeOrigin: "哈斯牧场",
-                quarantineTime: this.$moment().format("YYYY-MM-DD"),
-                quarantineForm: "检疫单"
-            },
-            isAdd: false,
             rules
         };
     },
@@ -160,37 +78,7 @@ export default {
         this.getProductQueryList();
     },
     methods: {
-        // submitForm(formName) {
-        //     this.$refs[formName].validate(valid => {
-        //         if (valid) {
-        //             if (this.isAdd) {
-        //                 reqAddProductQuery(this.formData)
-        //                     .then(res => {
-        //                         // 出仓管理列表
-        //                         this.getProductQueryList();
-        //                         this.$message.success("添加成功!");
-        //                     })
-        //                     .catch(err => {
-        //                         console.log(err);
-        //                         this.$message.error("添加失败!");
-        //                     });
-        //             } else {
-        //                 reqUpdateProductQuery(this.formData)
-        //                     .then(res => {
-        //                         // 出仓管理列表
-        //                         this.getProductQueryList();
-        //                         this.$message.success("编辑成功!");
-        //                     })
-        //                     .catch(err => {
-        //                         console.log(err);
-        //                         this.$message.error("编辑失败!");
-        //                     });
-        //             }
-        //         } else {
-        //             return false;
-        //         }
-        //     });
-        // },
+        //
         // 出仓管理列表
         getProductQueryList() {
             reqProductQueryList({
@@ -206,28 +94,6 @@ export default {
                     console.log(err);
                 });
         },
-        // add() {
-        //     this.isShow = true;
-        //     this.isAdd = true;
-        // },
-        // edit(row) {
-        //     this.formData = row;
-        //     this.isShow = true;
-        //     this.isAdd = false;
-        // },
-        // del(row) {
-        //     reqDelProductQuery(row.id)
-        //         .then(res => {
-        //             console.log(res);
-        //             // 出仓管理列表
-        //             this.getProductQueryList();
-        //             this.$message.success("删除成功!");
-        //         })
-        //         .catch(err => {
-        //             console.log(err);
-        //             this.$message.error("删除失败!");
-        //         });
-        // },
         pageChange(p) {
             console.log(p);
             this.page = p;