e преди 4 години
родител
ревизия
f46324f549

+ 26 - 7
src/views/productManagement/goatBloodLog.vue

@@ -61,10 +61,10 @@
                         :rules="rules"
                         label-width="140px"
                     >
-                        <el-form-item label="羊ID">
+                        <el-form-item label="羊ID" prop="sheepId">
                             <el-input v-model="formData.sheepId"></el-input>
                         </el-form-item>
-                        <el-form-item label="剥离时间">
+                        <el-form-item label="放血时间" prop="bleedingTime">
                             <el-date-picker
                                 v-model="formData.bleedingTime"
                                 type="date"
@@ -72,16 +72,16 @@
                                 placeholder="选择日期"
                             ></el-date-picker>
                         </el-form-item>
-                        <el-form-item label="屠宰批次">
+                        <el-form-item label="屠宰批次" prop="slaughterBatch">
                             <el-input v-model="formData.slaughterBatch"></el-input>
                         </el-form-item>
-                        <el-form-item label="重量(kg)">
+                        <el-form-item label="重量(kg)" prop="weight">
                             <el-input v-model.number="formData.weight"></el-input>
                         </el-form-item>
-                        <el-form-item label="保质期">
+                        <el-form-item label="保质期" prop="shelfLife">
                             <el-input v-model="formData.shelfLife"></el-input>
                         </el-form-item>
-                        <el-form-item label="存放位置">
+                        <el-form-item label="存放位置" prop="storageLocation">
                             <el-input v-model.number="formData.storageLocation"></el-input>
                         </el-form-item>
                         <el-form-item>
@@ -124,7 +124,26 @@ export default {
                 storageLocation: ""
             },
             isAdd: false,
-            rules
+            rules: {
+                sheepId: [
+                    { required: true, message: '请输入ID编码', trigger: 'blur' },
+                ],
+                bleedingTime: [
+                    { required: true, message: '请输入放血时间', trigger: 'blur' },
+                ],
+                slaughterBatch: [
+                    { required: true, message: '请输入批次号', trigger: 'blur' },
+                ],
+                weight: [
+                    { required: true, message: '请输入重量(kg)', trigger: 'blur' },
+                ],
+                shelfLife: [
+                    { required: true, message: '请输入保质期', trigger: 'blur' },
+                ],
+                storageLocation: [
+                    { required: true, message: '请输入位置', trigger: 'blur' },
+                ],
+            }
         };
     },
     created() {

+ 26 - 7
src/views/productManagement/goatHasletLog.vue

@@ -56,10 +56,10 @@
             <el-row type="flex">
                 <el-col :span="20">
                     <el-form ref="addGoatHasletLog" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="羊ID">
+                        <el-form-item label="羊ID" prop="sheepId">
                             <el-input v-model="formData.sheepId"></el-input>
                         </el-form-item>
-                        <el-form-item label="宰杀时间">
+                        <el-form-item label="宰杀时间" prop="slaughterTime">
                             <el-date-picker
                                 v-model="formData.slaughterTime"
                                 type="date"
@@ -67,16 +67,16 @@
                                 placeholder="选择日期"
                             ></el-date-picker>
                         </el-form-item>
-                        <el-form-item label="屠宰批次">
+                        <el-form-item label="屠宰批次" prop="slaughterBatch">
                             <el-input v-model="formData.slaughterBatch"></el-input>
                         </el-form-item>
-                        <el-form-item label="重量(kg)">
+                        <el-form-item label="重量(kg)" prop="weight">
                             <el-input v-model.number="formData.weight"></el-input>
                         </el-form-item>
-                        <el-form-item label="保质期">
+                        <el-form-item label="保质期" prop="shelfLife">
                             <el-input v-model="formData.shelfLife"></el-input>
                         </el-form-item>
-                        <el-form-item label="存放位置">
+                        <el-form-item label="存放位置" prop="storageLocation">
                             <el-input v-model.number="formData.storageLocation"></el-input>
                         </el-form-item>
                         <el-form-item>
@@ -119,7 +119,26 @@ export default {
                 storageLocation: ""
             },
             isAdd: false,
-            rules
+            rules: {
+                sheepId: [
+                    { required: true, message: '请输入ID编码', trigger: 'blur' },
+                ],
+                slaughterTime: [
+                    { required: true, message: '请输入屠宰时间', trigger: 'blur' },
+                ],
+                slaughterBatch: [
+                    { required: true, message: '请输入批次号', trigger: 'blur' },
+                ],
+                weight: [
+                    { required: true, message: '请输入重量(kg)', trigger: 'blur' },
+                ],
+                shelfLife: [
+                    { required: true, message: '请输入保质期', trigger: 'blur' },
+                ],
+                storageLocation: [
+                    { required: true, message: '请输入位置', trigger: 'blur' },
+                ],
+            }
         };
     },
     created() {

+ 22 - 6
src/views/productManagement/productInfo.vue

@@ -55,19 +55,19 @@
             <el-row type="flex">
                 <el-col :span="20">
                     <el-form ref="addProductInfo" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="ID编码">
+                        <el-form-item label="ID编码" prop="code">
                             <el-input v-model="formData.code"></el-input>
                         </el-form-item>
-                        <el-form-item label="产品名称">
+                        <el-form-item label="产品名称" prop="productName">
                             <el-input v-model="formData.productName"></el-input>
                         </el-form-item>
-                        <el-form-item label="规格型号">
+                        <el-form-item label="规格型号" prop="specificModel">
                             <el-input v-model="formData.specificModel"></el-input>
                         </el-form-item>
-                        <el-form-item label="产品价格">
+                        <el-form-item label="产品价格" prop="productPrice">
                             <el-input v-model.number="formData.productPrice"></el-input>
                         </el-form-item>
-                        <el-form-item label="保质期(天)">
+                        <el-form-item label="保质期(天)" prop="shelfLife">
                             <el-input v-model="formData.shelfLife"></el-input>
                         </el-form-item>
                         <el-form-item>
@@ -109,7 +109,23 @@ export default {
                 shelfLife: ''
             },
             isAdd: false,
-            rules
+            rules: {
+                code: [
+                    { required: true, message: '请输入ID编码', trigger: 'blur' },
+                ],
+                productName: [
+                    { required: true, message: '请输入产品名称', trigger: 'blur' },
+                ],
+                specificModel: [
+                    { required: true, message: '请输入规格型号', trigger: 'blur' },
+                ],
+                productPrice: [
+                    { required: true, message: '请输入产品价格', trigger: 'blur' },
+                ],
+                shelfLife: [
+                    { required: true, message: '请输入保质期', trigger: 'blur' },
+                ],
+            }
         };
     },
     created() {

+ 22 - 6
src/views/productManagement/sheepskinLog.vue

@@ -60,10 +60,10 @@
                         :rules="rules"
                         label-width="140px"
                     >
-                        <el-form-item label="ID编码">
+                        <el-form-item label="ID编码" prop="sheepId">
                             <el-input v-model="formData.sheepId"></el-input>
                         </el-form-item>
-                        <el-form-item label="剥离时间">
+                        <el-form-item label="剥离时间" prop="strippingTime">
                             <el-date-picker
                                 v-model="formData.strippingTime"
                                 type="date"
@@ -71,13 +71,13 @@
                                 placeholder="选择日期"
                             ></el-date-picker>
                         </el-form-item>
-                        <el-form-item label="批次号">
+                        <el-form-item label="批次号" prop="slaughterBatch">
                             <el-input v-model="formData.slaughterBatch"></el-input>
                         </el-form-item>
-                        <el-form-item label="重量(kg)">
+                        <el-form-item label="重量(kg)" prop="weight">
                             <el-input v-model.number="formData.weight"></el-input>
                         </el-form-item>
-                        <el-form-item label="位置">
+                        <el-form-item label="位置" prop="location">
                             <el-input v-model.number="formData.location"></el-input>
                         </el-form-item>
                         <el-form-item>
@@ -119,7 +119,23 @@ export default {
                 location: ""
             },
             isAdd: false,
-            rules
+            rules: {
+                sheepId: [
+                    { required: true, message: '请输入ID编码', trigger: 'blur' },
+                ],
+                strippingTime: [
+                    { required: true, message: '请输入剥离时间', trigger: 'blur' },
+                ],
+                slaughterBatch: [
+                    { required: true, message: '请输入批次号', trigger: 'blur' },
+                ],
+                weight: [
+                    { required: true, message: '请输入重量(kg)', trigger: 'blur' },
+                ],
+                location: [
+                    { required: true, message: '请输入位置', trigger: 'blur' },
+                ],
+            }
         };
     },
     created() {

+ 18 - 5
src/views/sellManagement/client.vue

@@ -55,19 +55,19 @@
             <el-row type="flex">
                 <el-col :span="20">
                     <el-form ref="addClient" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="公司(单位)">
+                        <el-form-item label="公司(单位)" prop="company">
                             <el-input v-model="formData.company"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="客户姓名">
+                        <el-form-item label="客户姓名" prop="customerName">
                             <el-input v-model="formData.customerName"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="联系方式">
+                        <el-form-item label="联系方式" prop="contactInformation">
                             <el-input v-model="formData.contactInformation"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="地址">
+                        <el-form-item label="地址" prop="address">
                             <el-input v-model="formData.address"></el-input>
                         </el-form-item>
 
@@ -114,7 +114,20 @@ export default {
                 remarks: ""
             },
             isAdd: false,
-            rules
+            rules: {
+                company: [
+                    { required: true, message: '请输入公司(单位)', trigger: 'blur' },
+                ],
+                customerName: [
+                    { required: true, message: '请输入客户姓名', trigger: 'blur' },
+                ],
+                contactInformation: [
+                    { required: true, message: '请输入联系方式', trigger: 'blur' },
+                ],
+                address: [
+                    { required: true, message: '请输入地址', trigger: 'blur' },
+                ],
+            }
         };
     },
     created() {

+ 18 - 5
src/views/sellManagement/price.vue

@@ -55,19 +55,19 @@
             <el-row type="flex">
                 <el-col :span="20">
                     <el-form ref="addPrice" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="产品名称">
+                        <el-form-item label="产品名称" prop="productName">
                             <el-input v-model="formData.productName"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="规格型号">
+                        <el-form-item label="规格型号" prop="specificModel">
                             <el-input v-model="formData.specificModel"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="所属类别">
+                        <el-form-item label="所属类别" prop="category">
                             <el-input v-model="formData.category"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="价格(元)">
+                        <el-form-item label="价格(元)" prop="price">
                             <el-input v-model="formData.price"></el-input>
                         </el-form-item>
 
@@ -114,7 +114,20 @@ export default {
                 operation: 1
             },
             isAdd: false,
-            rules
+            rules: {
+                productName: [
+                    { required: true, message: '请输入产品名称', trigger: 'blur' },
+                ],
+                specificModel: [
+                    { required: true, message: '请输入规格型号', trigger: 'blur' },
+                ],
+                category: [
+                    { required: true, message: '请输入所属类别', trigger: 'blur' },
+                ],
+                price: [
+                    { required: true, message: '请输入价格', trigger: 'blur' },
+                ],
+            }
         };
     },
     created() {

+ 27 - 8
src/views/slaughterManagment/firmBuy.vue

@@ -55,15 +55,15 @@
             <el-row type="flex">
                 <el-col :span="20">
                     <el-form ref="addFirmBuy" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="羊耳标号">
-                            <el-input v-model="formData.sheepId"></el-input>
+                        <el-form-item label="羊耳标号" prop="sheepId">
+                            <el-input v-model="formData.sheepId" maxlength="8"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="来源牧场">
+                        <el-form-item label="来源牧场" prop="origin">
                             <el-input v-model="formData.origin"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="收购日期">
+                        <el-form-item label="收购日期" prop="acquisitionTime">
                             <el-date-picker
                                 v-model="formData.acquisitionTime"
                                 type="date"
@@ -72,15 +72,15 @@
                             ></el-date-picker>
                         </el-form-item>
 
-                        <el-form-item label="收购人">
+                        <el-form-item label="收购人" prop="acquisitionPerson">
                             <el-input v-model="formData.acquisitionPerson"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="羊只重量(kg)">
+                        <el-form-item label="羊只重量(kg)" prop="acquisitionWeight">
                             <el-input v-model="formData.acquisitionWeight"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="车牌号">
+                        <el-form-item label="车牌号" prop="transportVehicles">
                             <el-input v-model="formData.transportVehicles"></el-input>
                         </el-form-item>
 
@@ -123,7 +123,26 @@ export default {
                 acquisitionWeight: "",
                 transportVehicles: ""
             },
-            rules
+            rules: {
+                sheepId: [
+                    { required: true, message: '请输入羊只编号', trigger: 'blur' },
+                ],
+                origin: [
+                    { required: true, message: '请输入来源牧场', trigger: 'blur' },
+                ],
+                acquisitionTime: [
+                    { required: true, message: '请选择收购日期', trigger: 'blur' },
+                ],
+                acquisitionPerson: [
+                    { required: true, message: '请输入收购人', trigger: 'blur' },
+                ],
+                acquisitionWeight: [
+                    { required: true, message: '请输入羊只重量', trigger: 'blur' },
+                ],
+                transportVehicles: [
+                    { required: true, message: '请输入车牌号', trigger: 'blur' },
+                ]
+            }
         };
     },
     created() {

+ 18 - 5
src/views/slaughterManagment/inButcherHurdle.vue

@@ -61,13 +61,13 @@
 <!--                        <el-form-item label="羊只编码">-->
 <!--                            <el-input v-model="formData.sheepId"></el-input>-->
 <!--                        </el-form-item>-->
-                        <el-form-item label="羊只编码">
+                        <el-form-item label="羊只编码" prop="sheepId">
                             <el-select v-model="formData.sheepId" placeholder="请选择羊只编码" :disabled="showType">
                                 <el-option v-for="item in sheepList" :key="item.id" :label="item.sheepId" :value="item.sheepId"></el-option>
                             </el-select>
                         </el-form-item>
 
-                        <el-form-item label="入栏时间">
+                        <el-form-item label="入栏时间" prop="entryTime">
                             <el-date-picker
                                 v-model="formData.entryTime"
                                 type="date"
@@ -76,11 +76,11 @@
                             ></el-date-picker>
                         </el-form-item>
 
-                        <el-form-item label="送检人员">
+                        <el-form-item label="送检人员" prop="operator">
                             <el-input v-model="formData.operator"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="目前位置">
+                        <el-form-item label="目前位置" prop="currentPosition">
                             <el-input v-model="formData.currentPosition"></el-input>
                         </el-form-item>
 
@@ -129,7 +129,20 @@ export default {
             size: 10,
             sheepList: [],
             showType: false,
-            rules
+          rules: {
+            sheepId: [
+              { required: true, message: '请选择羊只编号', trigger: 'change' },
+            ],
+            entryTime: [
+              { required: true, message: '请选择入栏日期', trigger: 'blur' },
+            ],
+            operator: [
+              { required: true, message: '请输入送检人员', trigger: 'blur' },
+            ],
+            currentPosition: [
+              { required: true, message: '请输入目前位置', trigger: 'blur' },
+            ],
+          }
         };
     },
     created() {

+ 30 - 8
src/views/slaughterManagment/inStore.vue

@@ -57,12 +57,12 @@
             <el-row type="flex">
                 <el-col :span="20">
                     <el-form ref="addInStore" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="胴体编码">
+                        <el-form-item label="胴体编码" prop="carcassCode">
                             <el-input v-model="formData.carcassCode"></el-input>
                         </el-form-item>
 
 
-                        <el-form-item label="入库时间">
+                        <el-form-item label="入库时间" prop="storageTime">
                             <el-date-picker
                                 v-model="formData.storageTime"
                                 type="date"
@@ -71,11 +71,11 @@
                             ></el-date-picker>
                         </el-form-item>
 
-                        <el-form-item label="储存位置">
+                        <el-form-item label="储存位置" prop="storageLocation">
                             <el-input v-model="formData.storageLocation"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="屠宰时间">
+                        <el-form-item label="屠宰时间" prop="slaughterTime">
                             <el-date-picker
                                 v-model="formData.slaughterTime"
                                 type="date"
@@ -84,15 +84,15 @@
                             ></el-date-picker>
                         </el-form-item>
 
-                        <el-form-item label="入库重量">
+                        <el-form-item label="入库重量" prop="storageWeight">
                             <el-input v-model="formData.storageWeight"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="操作人员">
+                        <el-form-item label="操作人员" prop="operator">
                             <el-input v-model="formData.operator"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="屠宰批次">
+                        <el-form-item label="屠宰批次" prop="slaughterBatch">
                             <el-input v-model="formData.slaughterBatch"></el-input>
                         </el-form-item>
 
@@ -137,7 +137,29 @@ export default {
                 slaughterBatch: ""
             },
             isAdd: false,
-            rules
+            rules: {
+                carcassCode: [
+                    { required: true, message: '请输入胴体编号', trigger: 'blur' },
+                ],
+                slaughterBatch: [
+                    { required: true, message: '请输入屠宰批次', trigger: 'blur' },
+                ],
+                slaughterTime: [
+                    { required: true, message: '请选择屠宰时间', trigger: 'blur' },
+                ],
+                storageTime: [
+                    { required: true, message: '请选择入库时间', trigger: 'blur' },
+                ],
+                storageLocation: [
+                    { required: true, message: '请输入储存位置', trigger: 'blur' },
+                ],
+                storageWeight: [
+                    { required: true, message: '请输入入库重量', trigger: 'blur' },
+                ],
+                operator: [
+                    { required: true, message: '请输入操作人员', trigger: 'blur' },
+                ],
+            }
         };
     },
     created() {

+ 26 - 7
src/views/slaughterManagment/outStore.vue

@@ -65,11 +65,11 @@
             <el-row type="flex">
                 <el-col :span="20">
                     <el-form ref="addOutStore" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="胴体编码">
+                        <el-form-item label="胴体编码" prop="carcassCode">
                             <el-input v-model="formData.carcassCode"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="出库时间">
+                        <el-form-item label="出库时间" prop="deliveryTime">
                             <el-date-picker
                                 v-model="formData.deliveryTime"
                                 type="date"
@@ -78,7 +78,7 @@
                             ></el-date-picker>
                         </el-form-item>
 
-                        <el-form-item label="去向">
+                        <el-form-item label="去向" prop="flowTo">
                             <el-radio-group v-model="formData.flowTo">
                                 <el-radio
                                     v-for="item in $store.state['outStoreDirection']"
@@ -88,15 +88,15 @@
                             </el-radio-group>
                         </el-form-item>
 
-                        <el-form-item label="出库重量">
+                        <el-form-item label="出库重量" prop="deliveryWeight">
                             <el-input v-model="formData.deliveryWeight"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="操作人员">
+                        <el-form-item label="操作人员" prop="operator">
                             <el-input v-model="formData.operator"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="屠宰批次">
+                        <el-form-item label="屠宰批次" prop="slaughterBatch">
                             <el-input v-model="formData.slaughterBatch"></el-input>
                         </el-form-item>
 
@@ -140,7 +140,26 @@ export default {
                 slaughterBatch: ""
             },
             isAdd: false,
-            rules
+            rules: {
+                carcassCode: [
+                    { required: true, message: '请输入胴体编号', trigger: 'blur' },
+                ],
+                slaughterBatch: [
+                    { required: true, message: '请输入屠宰批次', trigger: 'blur' },
+                ],
+                deliveryTime: [
+                    { required: true, message: '请选择出库时间', trigger: 'blur' },
+                ],
+                flowTo: [
+                    { required: true, message: '请选择去向', trigger: 'blur' },
+                ],
+                deliveryWeight: [
+                    { required: true, message: '请输入出库重量', trigger: 'blur' },
+                ],
+                operator: [
+                    { required: true, message: '请输入操作人员', trigger: 'blur' },
+                ],
+            }
         };
     },
     created() {

+ 18 - 5
src/views/slaughterManagment/regisSlaughter.vue

@@ -59,13 +59,13 @@
 <!--                        <el-form-item label="羊只编码">-->
 <!--                            <el-input v-model="formData.sheepId"></el-input>-->
 <!--                        </el-form-item>-->
-                        <el-form-item label="羊只编码">
+                        <el-form-item label="羊只编码" prop="sheepId">
                             <el-select v-model="formData.sheepId" placeholder="请选择羊只编码" @change="hanldChange" :disabled="showType">
                                 <el-option v-for="item in sheepList" :key="item.id" :label="item.sheepId" :value="item.sheepId"></el-option>
                             </el-select>
                         </el-form-item>
 
-                        <el-form-item label="入栏时间">
+                        <el-form-item label="入栏时间" prop="registrationTime">
                             <el-date-picker
                                 v-model="formData.registrationTime"
                                 type="date"
@@ -83,11 +83,11 @@
 <!--                            </el-select>-->
 <!--                        </el-form-item>-->
 
-                        <el-form-item label="入栏重量">
+                        <el-form-item label="入栏重量" prop="entryWeight">
                             <el-input v-model="formData.entryWeight"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="操作人员">
+                        <el-form-item label="操作人员" prop="operator">
                             <el-input v-model="formData.operator"></el-input>
                         </el-form-item>
 
@@ -142,7 +142,20 @@ export default {
             sheepList: [],
             showType: false,
             listBatch: [],
-            rules
+          rules: {
+            sheepId: [
+              { required: true, message: '请选择羊只编号', trigger: 'change' },
+            ],
+            registrationTime: [
+              { required: true, message: '请选择入栏时间', trigger: 'blur' },
+            ],
+            entryWeight: [
+              { required: true, message: '请输入入栏重量', trigger: 'blur' },
+            ],
+            operator: [
+              { required: true, message: '请输入操作人员', trigger: 'blur' },
+            ],
+          }
         };
     },
     created() {

+ 25 - 6
src/views/slaughterManagment/reportQuarantine.vue

@@ -59,7 +59,7 @@
             <el-row type="flex">
                 <el-col :span="20">
                     <el-form ref="addReport" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="送检日期">
+                        <el-form-item label="送检日期" prop="inspectionDate">
                             <el-date-picker
                                 v-model="formData.inspectionDate"
                                 type="date"
@@ -68,22 +68,22 @@
                             ></el-date-picker>
                         </el-form-item>
 
-                        <el-form-item label="送检人员">
+                        <el-form-item label="送检人员" prop="inspectionPerson">
                             <el-input v-model="formData.inspectionPerson"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="状态">
+                        <el-form-item label="状态" prop="status">
                             <el-radio-group v-model="formData.status">
                                 <el-radio :label="0">未通过</el-radio>
                                 <el-radio :label="1">通过</el-radio>
                             </el-radio-group>
                         </el-form-item>
 
-                        <el-form-item label="检疫单编号">
+                        <el-form-item label="检疫单编号" prop="quarantineNo">
                             <el-input v-model="formData.quarantineNo"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="屠宰批次">
+                        <el-form-item label="屠宰批次" prop="slaughterBatch">
                             <el-select v-model="formData.slaughterBatch" filterable placeholder="请选择">
                                 <el-option
                                     v-for="item in $store.state['slaughterBatchIdList']"
@@ -115,6 +115,7 @@ import {
 
 const pageSize = 10;
 const rules = {};
+import {mapActions} from 'vuex';
 
 export default {
     name: "reportQuarantine",
@@ -133,14 +134,32 @@ export default {
                 slaughterBatch: null
             },
             isAdd: false,
-            rules
+            rules: {
+                inspectionDate: [
+                    { required: true, message: '请选择送检日期', trigger: 'blur' },
+                ],
+                inspectionPerson: [
+                    { required: true, message: '请输入送检人员', trigger: 'blur' },
+                ],
+                status: [
+                    { required: true, message: '请选择状态', trigger: 'blur' },
+                ],
+                quarantineNo: [
+                    { required: true, message: '请输入检疫单编号', trigger: 'blur' },
+                ],
+                slaughterBatch: [
+                    { required: true, message: '请选择屠宰批次', trigger: 'change' },
+                ]
+            }
         };
     },
     created() {
         // 上报检疫列表
         this.getReportList();
+        this.getSlaughterBatchIdList();
     },
     methods: {
+        ...mapActions(['getSlaughterBatchIdList']),
         submitForm(formName) {
             this.$refs[formName].validate(valid => {
                 if (valid) {

+ 22 - 6
src/views/slaughterManagment/segmentation.vue

@@ -55,15 +55,15 @@
             <el-row type="flex">
                 <el-col :span="20">
                     <el-form ref="addSegmentation" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="胴体编码">
+                        <el-form-item label="胴体编码" prop="carcassCode">
                             <el-input v-model="formData.carcassCode"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="分割批次">
+                        <el-form-item label="分割批次" prop="splitBatch">
                             <el-input v-model="formData.splitBatch"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="加工时间">
+                        <el-form-item label="加工时间" prop="processingTime">
                             <el-date-picker
                                 v-model="formData.processingTime"
                                 type="date"
@@ -72,11 +72,11 @@
                             ></el-date-picker>
                         </el-form-item>
 
-                        <el-form-item label="重量(kg)">
+                        <el-form-item label="重量(kg)" prop="weight">
                             <el-input v-model="formData.weight"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="确认人">
+                        <el-form-item label="确认人" prop="operator">
                             <el-input v-model="formData.operator"></el-input>
                         </el-form-item>
 
@@ -119,7 +119,23 @@ export default {
                 operator: ""
             },
             isAdd: false,
-            rules
+            rules: {
+                carcassCode: [
+                    { required: true, message: '请输入胴体编号', trigger: 'blur' },
+                ],
+                splitBatch: [
+                    { required: true, message: '请输入分割批次', trigger: 'blur' },
+                ],
+                processingTime: [
+                    { required: true, message: '请选择加工时间', trigger: 'blur' },
+                ],
+                weight: [
+                    { required: true, message: '请输入重量', trigger: 'blur' },
+                ],
+                operator: [
+                    { required: true, message: '请输入操作人员', trigger: 'blur' },
+                ],
+            }
         };
     },
     created() {

+ 51 - 29
src/views/slaughterManagment/slaughterWeight.vue

@@ -66,15 +66,15 @@
             <el-row type="flex">
                 <el-col :span="20">
                     <el-form ref="addWeighS" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="胴体编码">
+                        <el-form-item label="胴体编码" prop="carcassCode">
                             <el-input v-model="formData.carcassCode"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="屠宰批次">
+                        <el-form-item label="屠宰批次" prop="slaughterBatch">
                             <el-input v-model="formData.slaughterBatch"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="屠宰时间">
+                        <el-form-item label="屠宰时间" prop="slaughterTime">
                             <el-date-picker
                                 v-model="formData.slaughterTime"
                                 type="date"
@@ -83,7 +83,7 @@
                             ></el-date-picker>
                         </el-form-item>
 
-                        <el-form-item label="称重时间">
+                        <el-form-item label="称重时间" prop="weighingTime">
                             <el-date-picker
                                 v-model="formData.weighingTime"
                                 type="date"
@@ -92,7 +92,7 @@
                             ></el-date-picker>
                         </el-form-item>
 
-                        <el-form-item label="去向">
+                        <el-form-item label="去向" prop="flowTo">
                             <el-radio-group v-model="formData.flowTo">
                                 <el-radio
                                     v-for="item in $store.state['outStoreDirection']"
@@ -102,11 +102,11 @@
                             </el-radio-group>
                         </el-form-item>
 
-                        <el-form-item label="胴体重量">
+                        <el-form-item label="胴体重量" prop="carcassWeight">
                             <el-input v-model="formData.carcassWeight"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="操作人员">
+                        <el-form-item label="操作人员" prop="operator">
                             <el-input v-model="formData.operator"></el-input>
                         </el-form-item>
 
@@ -151,7 +151,29 @@ export default {
                 operator: ""
             },
             isAdd: false,
-            rules
+            rules: {
+                carcassCode: [
+                    { required: true, message: '请输入胴体编号', trigger: 'blur' },
+                ],
+                slaughterBatch: [
+                    { required: true, message: '请输入屠宰批次', trigger: 'blur' },
+                ],
+                slaughterTime: [
+                    { required: true, message: '请选择屠宰时间', trigger: 'blur' },
+                ],
+                weighingTime: [
+                    { required: true, message: '请选择称重时间', trigger: 'blur' },
+                ],
+                flowTo: [
+                    { required: true, message: '请选择去向', trigger: 'blur' },
+                ],
+                carcassWeight: [
+                    { required: true, message: '请输入胴体重量', trigger: 'blur' },
+                ],
+                operator: [
+                    { required: true, message: '请输入操作人员', trigger: 'blur' },
+                ],
+            }
         };
     },
     created() {
@@ -169,18 +191,18 @@ export default {
                                 this.getWeighSList();
                                 // this.$message.success("添加成功!");
                                 if (res.errCode) {
-                                    this.$message.error(res.errMsg);
+                                    // this.$message.error(res.errMsg);
                                 } else {
-                                    this.$message.success("成功");
-                                    this.formData.carcassCode = '';
-                                    this.formData.slaughterBatch = '';
-                                    this.formData.slaughterTime = '';
-                                    this.formData.weighingTime = '';
-                                    this.formData.flowTo = '';
-                                    this.formData.carcassWeight = '';
-                                    this.formData.operator = '';
-                                    this.isShow = false
                                 }
+                                this.$message.success("成功");
+                                this.formData.carcassCode = '';
+                                this.formData.slaughterBatch = '';
+                                this.formData.slaughterTime = '';
+                                this.formData.weighingTime = '';
+                                this.formData.flowTo = '';
+                                this.formData.carcassWeight = '';
+                                this.formData.operator = '';
+                                this.isShow = false
                             })
                             .catch(err => {
                                 console.log(err);
@@ -193,19 +215,19 @@ export default {
                                 this.getWeighSList();
                                 // this.$message.success("编辑成功!");
                                 if (res.errCode) {
-                                    this.$message.error(res.errMsg);
+                                    // this.$message.error(res.errMsg);
                                 } else {
-                                    this.$message.success("成功");
-                                    this.formData.carcassCode = '';
-                                    this.formData.slaughterBatch = '';
-                                    this.formData.slaughterTime = '';
-                                    this.formData.weighingTime = '';
-                                    this.formData.flowTo = '';
-                                    this.formData.carcassWeight = '';
-                                    this.formData.operator = '';
-                                    this.formData.id = '';
-                                    this.isShow = false
                                 }
+                                this.$message.success("成功");
+                                this.formData.carcassCode = '';
+                                this.formData.slaughterBatch = '';
+                                this.formData.slaughterTime = '';
+                                this.formData.weighingTime = '';
+                                this.formData.flowTo = '';
+                                this.formData.carcassWeight = '';
+                                this.formData.operator = '';
+                                this.formData.id = '';
+                                this.isShow = false
                             })
                             .catch(err => {
                                 console.log(err);

+ 34 - 9
src/views/storeTransportation/dispatching.vue

@@ -65,35 +65,35 @@
             <el-row type="flex">
                 <el-col :span="20">
                     <el-form ref="addDispatch" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="商品编码">
+                        <el-form-item label="商品编码" prop="salesNo">
                             <el-input v-model="formData.salesNo"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="配送客户/单位">
+                        <el-form-item label="配送客户/单位" prop="deliveryCustomer">
                             <el-input v-model="formData.deliveryCustomer"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="配送地址">
+                        <el-form-item label="配送地址" prop="deliveryAddress">
                             <el-input v-model="formData.deliveryAddress"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="运输单号">
+                        <el-form-item label="运输单号" prop="transportNo">
                             <el-input v-model="formData.transportNo"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="重量(kg)">
+                        <el-form-item label="重量(kg)" prop="weight">
                             <el-input v-model.number="formData.weight"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="配送员">
+                        <el-form-item label="配送员" prop="distributor">
                             <el-input v-model="formData.distributor"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="车牌号">
+                        <el-form-item label="车牌号" prop="transportVehicles">
                             <el-input v-model="formData.transportVehicles"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="手机号">
+                        <el-form-item label="手机号" prop="tel">
                             <el-input v-model="formData.tel"></el-input>
                         </el-form-item>
 
@@ -147,7 +147,32 @@ export default {
                 status: 0
             },
             isAdd: false,
-            rules
+            rules: {
+                salesNo: [
+                    { required: true, message: '请输入商品编码', trigger: 'blur' },
+                ],
+                deliveryCustomer: [
+                    { required: true, message: '请输入配送客户/单位', trigger: 'blur' },
+                ],
+                deliveryAddress: [
+                    { required: true, message: '请输入配送地址', trigger: 'blur' },
+                ],
+                transportNo: [
+                    { required: true, message: '请输入运输单号', trigger: 'blur' },
+                ],
+                weight: [
+                    { required: true, message: '请输入重量', trigger: 'blur' },
+                ],
+                distributor: [
+                    { required: true, message: '请输入配送员', trigger: 'blur' },
+                ],
+                transportVehicles: [
+                    { required: true, message: '请输入车牌号', trigger: 'blur' },
+                ],
+                tel: [
+                    { required: true, message: '请输入手机号', trigger: 'blur' },
+                ],
+            }
         };
     },
     created() {

+ 6 - 1
src/views/storeTransportation/productQuery.vue

@@ -21,7 +21,12 @@
                 >
                     <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  label="产品名称">
+                        <template slot-scope="scope">
+                            <span v-if="scope.row.productCode.indexOf('99930') != -1">羊前腿</span>
+                            <span v-else-if="scope.row.productCode.indexOf('10108') != -1">羊排</span>
+                        </template>
+                    </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>