Browse Source

优化调整表格间隙

linan 4 years ago
parent
commit
fd2e0c3209

+ 3 - 3
src/api/storeTransportation.js

@@ -24,9 +24,9 @@ export const reqDelShopStore = (id) => ajax("post", "/farm-huyang/store-manageme
 /* 产品追溯  ProductQuery*/
 export const reqProductQueryList = (data) => ajax("post", "/farm-huyang/product-traceability/list", data)
 
-export const reqAddProductQuery = (data) => ajax("post", "/farm-huyang/product-traceability/add", data)
+// export const reqAddProductQuery = (data) => ajax("post", "/farm-huyang/product-traceability/add", data)
 
-export const reqUpdateProductQuery = (data) => ajax("post", "/farm-huyang/product-traceability/update", data)
+// export const reqUpdateProductQuery = (data) => ajax("post", "/farm-huyang/product-traceability/update", data)
 
-export const reqDelProductQuery = (id) => ajax("post", "/farm-huyang/product-traceability/delete", {id})
+// export const reqDelProductQuery = (id) => ajax("post", "/farm-huyang/product-traceability/delete", {id})
 

+ 3 - 3
src/views/productManagement/sheepskinLog.vue

@@ -23,10 +23,10 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
-                    <el-table-column prop="sheepId" label="羊ID" width="180"></el-table-column>
-                    <el-table-column prop="strippingTime" label="剥离时间" width="180"></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="weight" label="重量(kg)" width="180"></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">
                         <template slot-scope="scope">

+ 1 - 6
src/views/productManagement/splitLog.vue

@@ -28,7 +28,6 @@
                     <el-table-column prop="splitTime" label="分割时间"></el-table-column>
                     <el-table-column prop="weight" label="重量"></el-table-column>
                     <el-table-column prop="splitBatchNo" label="分割批次"></el-table-column>
-                    <el-table-column prop="salesNo" 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,9 +75,6 @@
                         <el-form-item label="分割批次">
                             <el-input v-model="formData.splitBatchNo"></el-input>
                         </el-form-item>
-                        <el-form-item label="销售单号">
-                            <el-input v-model.number="formData.salesNo"></el-input>
-                        </el-form-item>
                         <el-form-item>
                             <el-button @click="isShow=false">取 消</el-button>
                             <el-button type="primary" @click="submitForm('addSplitLog')">保 存</el-button>
@@ -115,8 +111,7 @@ export default {
                 productName: "带骨羊前腿",
                 splitTime: this.$moment().format("YYYY-MM-DD"),
                 weight: "35",
-                splitBatchNo: "1548",
-                salesNo: 'D15GAE56684'
+                splitBatchNo: "1548"
             },
             isAdd: false,
             rules

+ 3 - 3
src/views/sellManagement/carcassSell.vue

@@ -23,10 +23,10 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
-                    <el-table-column prop="salesNo" label="销售单号" width="100"></el-table-column>
+                    <el-table-column prop="salesNo" label="销售单号"></el-table-column>
 
-                    <el-table-column prop="carcassCode" label="胴体编码" width="100"></el-table-column>
-                    <el-table-column prop="sellingTime" label="出售时间" width="180"></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>
 

+ 2 - 2
src/views/sellManagement/client.vue

@@ -23,8 +23,8 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
-                    <el-table-column prop="company" label="公司(单位)" width="180"></el-table-column>
-                    <el-table-column prop="customerName" label="客户姓名" width="180"></el-table-column>
+                    <el-table-column prop="company" label="公司(单位)"></el-table-column>
+                    <el-table-column prop="customerName" label="客户姓名"></el-table-column>
                     <el-table-column prop="contactInformation" label="联系方式"></el-table-column>
                     <el-table-column prop="address" label="地址"></el-table-column>
                     <el-table-column prop="remarks" label="备注"></el-table-column>

+ 3 - 3
src/views/sellManagement/directSell.vue

@@ -23,8 +23,8 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
-                    <el-table-column prop="code" label="ID编码" width="180"></el-table-column>
-                    <el-table-column prop="saleTime" label="出售时间" width="180"></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>
                     <el-table-column prop="weight" label="重量(kg)"></el-table-column>
@@ -91,7 +91,7 @@
                             <el-input v-model="formData.salesNo"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="交易单号">
+                        <el-form-item label="运输单号">
                             <el-input v-model="formData.transportNo"></el-input>
                         </el-form-item>
 

+ 4 - 4
src/views/sellManagement/elseSell.vue

@@ -23,10 +23,10 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
-                    <el-table-column prop="slaughterBatch" label="屠宰批次" width="80"></el-table-column>
-                    <el-table-column prop="productName" label="产品名称" width="100"></el-table-column>
-                    <el-table-column prop="weight" label="重量(kg)" width="100"></el-table-column>
-                    <el-table-column prop="salesTime" label="销售时间" width="180"></el-table-column>
+                    <el-table-column prop="slaughterBatch" label="屠宰批次"></el-table-column>
+                    <el-table-column prop="productName" label="产品名称"></el-table-column>
+                    <el-table-column prop="weight" label="重量(kg)"></el-table-column>
+                    <el-table-column prop="salesTime" label="销售时间"></el-table-column>
                     <el-table-column prop="saleAmount" label="销售额(元)"></el-table-column>
                     <el-table-column prop="transportNo" label="运输单号"></el-table-column>
                     <el-table-column prop="buyer" label="购买人(企业)"></el-table-column>

+ 3 - 3
src/views/sellManagement/price.vue

@@ -23,11 +23,11 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
-                    <el-table-column prop="productName" label="产品名称" width="180"></el-table-column>
-                    <el-table-column prop="specificModel" label="规格型号" width="180"></el-table-column>
+                    <el-table-column prop="productName" label="产品名称"></el-table-column>
+                    <el-table-column prop="specificModel" label="规格型号"></el-table-column>
                     <el-table-column prop="category" label="所属类别"></el-table-column>
                     <el-table-column prop="price" label="价格(元)"></el-table-column>
-                    <el-table-column prop="operation" label="操作"></el-table-column>
+                    <!-- <el-table-column prop="operation" 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>

+ 5 - 5
src/views/slaughterManagment/drainageAcid.vue

@@ -23,12 +23,12 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
-                    <el-table-column prop="slaughterBatch" label="屠宰批次" width="180"></el-table-column>
-                    <el-table-column prop="productName" label="产品名称" width="180"></el-table-column>
+                    <el-table-column prop="slaughterBatch" label="屠宰批次"></el-table-column>
+                    <el-table-column prop="productName" label="产品名称"></el-table-column>
                     <el-table-column prop="acidTime" label="排酸时间"></el-table-column>
-                    <el-table-column prop="weightBefore" label="排酸前重量(kg)" width="180"></el-table-column>
-                    <el-table-column prop="weightAfter" label="排酸后重量(kg)" width="180"></el-table-column>
-                    <el-table-column prop="acidLoss" label="排酸损耗(kg)" width="180"></el-table-column>
+                    <el-table-column prop="weightBefore" label="排酸前重量(kg)"></el-table-column>
+                    <el-table-column prop="weightAfter" label="排酸后重量(kg)"></el-table-column>
+                    <el-table-column prop="acidLoss" label="排酸损耗(kg)"></el-table-column>
                     <el-table-column prop="responsiblePerson" label="负责人员"></el-table-column>
                     <el-table-column label="操作" width="150">
                         <template slot-scope="scope">

+ 2 - 2
src/views/slaughterManagment/firmBuy.vue

@@ -22,8 +22,8 @@
                     tooltip-effect="dark"
                     style="width: 100%"
                 >
-                    <el-table-column prop="sheepId" label="羊耳标号" width="180"></el-table-column>
-                    <el-table-column prop="acquisitionTime" label="收购时间" width="180"></el-table-column>
+                    <el-table-column prop="sheepId" label="羊耳标号"></el-table-column>
+                    <el-table-column prop="acquisitionTime" label="收购时间"></el-table-column>
                     <el-table-column prop="origin" label="来源牧场"></el-table-column>
                     <el-table-column prop="acquisitionWeight" label="收购重量(kg)"></el-table-column>
                     <el-table-column prop="acquisitionPerson" label="收购人员"></el-table-column>

+ 3 - 3
src/views/slaughterManagment/inButcherHurdle.vue

@@ -23,9 +23,9 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
-                    <el-table-column prop="sheepId" label="羊只编号" width="180"></el-table-column>
-                    <el-table-column prop="entryTime" label="入栏时间" width="180"></el-table-column>
-                    <el-table-column prop="currentPosition" label="目前位置" width="180"></el-table-column>
+                    <el-table-column prop="sheepId" label="羊只编号"></el-table-column>
+                    <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">

+ 4 - 4
src/views/slaughterManagment/inStore.vue

@@ -23,11 +23,11 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
-                    <el-table-column prop="carcassCode" label="胴体编码" width="180"></el-table-column>
-                    <el-table-column prop="storageTime" label="入库时间" width="180"></el-table-column>
+                    <el-table-column prop="carcassCode" label="胴体编码"></el-table-column>
+                    <el-table-column prop="storageTime" label="入库时间"></el-table-column>
                     <el-table-column prop="storageLocation" label="储存位置"></el-table-column>
-                    <el-table-column prop="slaughterTime" label="屠宰时间" width="180"></el-table-column>
-                    <el-table-column prop="storageWeight" label="入库重量" width="180"></el-table-column>
+                    <el-table-column prop="slaughterTime" label="屠宰时间"></el-table-column>
+                    <el-table-column prop="storageWeight" label="入库重量"></el-table-column>
                     <el-table-column prop="operator" label="操作人员"></el-table-column>
                     <el-table-column prop="slaughterBatch" label="屠宰批次"></el-table-column>
                     <el-table-column label="操作" width="150">

+ 3 - 3
src/views/slaughterManagment/outStore.vue

@@ -23,8 +23,8 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
-                    <el-table-column prop="carcassCode" label="胴体编码" width="180"></el-table-column>
-                    <el-table-column prop="deliveryTime" label="出库时间" width="180"></el-table-column>
+                    <el-table-column prop="carcassCode" label="胴体编码"></el-table-column>
+                    <el-table-column prop="deliveryTime" label="出库时间"></el-table-column>
                     <el-table-column prop="flowTo" label="去向">
                         <template v-slot="scope">
                             <div
@@ -35,7 +35,7 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="deliveryWeight" label="出库重量" width="180"></el-table-column>
+                    <el-table-column prop="deliveryWeight" label="出库重量"></el-table-column>
                     <el-table-column prop="operator" label="操作人员"></el-table-column>
                     <el-table-column prop="slaughterBatch" label="屠宰批次"></el-table-column>
                     <el-table-column label="操作" width="150">

+ 3 - 3
src/views/slaughterManagment/packinghouse.vue

@@ -23,9 +23,9 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
-                    <el-table-column prop="sheepId" label="羊只编号" width="180"></el-table-column>
-                    <el-table-column prop="entryTime" label="入栏时间" width="180"></el-table-column>
-                    <el-table-column prop="currentPosition" label="目前位置" width="180"></el-table-column>
+                    <el-table-column prop="sheepId" label="羊只编号"></el-table-column>
+                    <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">

+ 3 - 3
src/views/slaughterManagment/regisSlaughter.vue

@@ -23,10 +23,10 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
-                    <el-table-column prop="sheepId" label="羊只编号" width="180"></el-table-column>
-                    <el-table-column prop="registrationTime" label="登记时间" width="180"></el-table-column>
+                    <el-table-column prop="sheepId" label="羊只编号"></el-table-column>
+                    <el-table-column prop="registrationTime" label="登记时间"></el-table-column>
                     <el-table-column prop="slaughterBatch" label="屠宰批次"></el-table-column>
-                    <el-table-column prop="entryWeight" label="入栏重量" width="180"></el-table-column>
+                    <el-table-column prop="entryWeight" label="入栏重量"></el-table-column>
                     <el-table-column prop="operator" label="操作人员"></el-table-column>
                     <el-table-column prop="quarantineNo" label="检疫单编号"></el-table-column>
                     <el-table-column label="操作" width="150">

+ 1 - 1
src/views/slaughterManagment/reportQuarantine.vue

@@ -23,7 +23,7 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
-                    <el-table-column prop="inspectionDate" label="送检日期" width="180"></el-table-column>
+                    <el-table-column prop="inspectionDate" label="送检日期"></el-table-column>
                     <el-table-column prop="inspectionPerson" label="送检人员"></el-table-column>
                     <el-table-column prop="status" label="状态"></el-table-column>
                     <el-table-column prop="quarantineNo" label="检疫单编号"></el-table-column>

+ 4 - 4
src/views/slaughterManagment/slaughterWeight.vue

@@ -23,11 +23,11 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
-                    <el-table-column prop="carcassCode" label="胴体编码" width="180"></el-table-column>
+                    <el-table-column prop="carcassCode" label="胴体编码"></el-table-column>
                     <el-table-column prop="slaughterBatch" label="屠宰批次"></el-table-column>
-                    <el-table-column prop="slaughterTime" label="屠宰时间" width="180"></el-table-column>
-                    <el-table-column prop="weighingTime" label="称重时间" width="180"></el-table-column>
-                    <el-table-column prop="carcassWeight" label="胴体重量" width="180"></el-table-column>
+                    <el-table-column prop="slaughterTime" label="屠宰时间"></el-table-column>
+                    <el-table-column prop="weighingTime" label="称重时间"></el-table-column>
+                    <el-table-column prop="carcassWeight" label="胴体重量"></el-table-column>
                     <el-table-column prop="operator" label="操作人员"></el-table-column>
                     <el-table-column prop="flowTo" label="去向">
                         <template v-slot="scope">

+ 2 - 2
src/views/slaughterManagment/splitBatch.vue

@@ -26,8 +26,8 @@
                 >
                     <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
-                    <el-table-column prop="carcassCode" label="胴体编码" width="180"></el-table-column>
-                    <el-table-column prop="weight" label="重量(kg)" width="180"></el-table-column>
+                    <el-table-column prop="carcassCode" label="胴体编码"></el-table-column>
+                    <el-table-column prop="weight" label="重量(kg)"></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>

+ 62 - 62
src/views/storeTransportation/productQuery.vue

@@ -9,9 +9,9 @@
                 <el-col :span="4">
                     <el-button type="primary" @click="getProductQueryList">查找</el-button>
                 </el-col>
-                <el-col :span="4">
+                <!-- <el-col :span="4">
                     <el-button type="primary" @click="add">新增</el-button>
-                </el-col>
+                </el-col> -->
             </el-row>
         </header>
         <section>
@@ -31,14 +31,14 @@
                     <el-table-column prop="placeOrigin" 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">
+                    <!-- <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> -->
                 </el-table>
 
                 <el-row type="flex" justify="end">
@@ -54,7 +54,7 @@
             </article>
         </section>
 
-        <el-dialog title="新增/编辑" :visible.sync="isShow" width="40%">
+        <!-- <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">
@@ -117,16 +117,16 @@
                     </el-form>
                 </el-col>
             </el-row>
-        </el-dialog>
+        </el-dialog> -->
     </div>
 </template>
 
 <script>
 import {
     reqProductQueryList,
-    reqAddProductQuery,
-    reqUpdateProductQuery,
-    reqDelProductQuery
+    // reqAddProductQuery,
+    // reqUpdateProductQuery,
+    // reqDelProductQuery
 } from "@/api/storeTransportation.js";
 
 const pageSize = 10;
@@ -160,37 +160,37 @@ 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;
-                }
-            });
-        },
+        // 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 +206,28 @@ 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("删除失败!");
-                });
-        },
+        // 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;