多个页面需求更改

src/store/publicType.js

@@ -1,31 +1,37 @@
-// 种羊来源 类型
-const seedSheedSource = [
-    { label: "本场出生", value: 1 },
-    { label: "它场转入", value: 2 }
+// 免疫状态
+const immuneStatus = [
+    { label: "未检疫", value: -1 },
+    { label: "检疫合格", value: 0 },
+    { label: "检疫不合格", value: 1 }
 ]
 
-// 种羊等级
-const seedSheedLevel = [
-    { label: "甲", value: 1 },
-    { label: "乙", value: 2 },
-    { label: "丙", value: 3 },
-    { label: "丁", value: 4 }
+// 出仓管理
+const outStoreStatus = [
+    { label: "分割加工", value: 0 },
+    { label: "出售", value: 1 }
 ]
 
-// 羊类型 
-const sheepType = [
-    { label: "商品羊", value: 4 },
-    { label: "种母羊", value: 2 },
-    { label: "种公羊", value: 1 }
+// 配送管理 配送状态
+const dispatchStatus = [
+    { label: "配送中", value: 0 },
+    { label: "配送完成", value: 1 }
 ]
 
-// 药品有效期单位
-const periodOfValidityUnit = [
-    { label: "天", value: 1 },
-    { label: "月", value: 2 },
-    { label: "年", value: 3 }
+// 销售渠道  销售方法
+const sellMethod = [
+    { label: "屠宰直销", value: 'TZ' },
+    { label: "胴体销售", value: 'DT' },
+    { label: "分割销售", value: 'FG' },
+    { label: "其他销售", value: 'QT'}
 ]
 
+// 出库管理-去向  出库去向
+const outStoreDirection = [
+    { label: "分割加工", value: 0 },
+    { label: "胴体销售", value: 1 }
+]
+
+
 // 羊产品类型
 const sheepProductType = [
     '带骨羊前腿(A)',
@@ -102,7 +108,7 @@ const sheepProductType = [
 ]
 
 export default {
-    sheepProductType
+    immuneStatus, outStoreStatus, dispatchStatus, sellMethod, outStoreDirection,sheepProductType
 }
 
 

src/views/Home/mencCofig.js

@@ -151,11 +151,6 @@ export const menuData = [
         disabled: false,
         childList: [
             {
-                optionName: '编码管理',
-                index: '4-1',
-                routerName: "sheepskinLog"
-            },
-            {
                 optionName: '配送管理',
                 index: '4-2',
                 routerName: "dispatching"

src/views/sellManagement/carcassSell.vue

@@ -23,12 +23,18 @@
                     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="carcassCode" label="胴体编码" width="100"></el-table-column>
                     <el-table-column prop="sellingTime" label="出售时间" width="180"></el-table-column>
-                    <el-table-column prop="batchNumber" 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>
+
                     <el-table-column prop="buyer" label="购买人(企业)"></el-table-column>
-                    <el-table-column prop="remarks" label="备注"></el-table-column>
+                    <el-table-column prop="seller" label="经办人"></el-table-column>
+                    <el-table-column prop="transportNo" 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>
@@ -56,6 +62,10 @@
             <el-row type="flex">
                 <el-col :span="20">
                     <el-form ref="addCarcass" :model="formData" :rules="rules" label-width="140px">
+                        <el-form-item label="销售单号">
+                            <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>
@@ -70,19 +80,27 @@
                         </el-form-item>
 
                         <el-form-item label="批次号">
-                            <el-input v-model="formData.batchNumber"></el-input>
+                            <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>
 
+                         <el-form-item label="销售金额(元)">
+                            <el-input v-model="formData.saleAmount"></el-input>
+                        </el-form-item>
+
                         <el-form-item label="购买人(企业)">
                             <el-input v-model="formData.buyer"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="备注">
-                            <el-input type="textarea" v-model="formData.remarks"></el-input>
+                        <el-form-item label="经办人">
+                            <el-input v-model="formData.seller"></el-input>
+                        </el-form-item>
+
+                        <el-form-item label="运输单号">
+                            <el-input v-model="formData.transportNo"></el-input>
                         </el-form-item>
 
                         <el-form-item>
@@ -117,12 +135,15 @@ export default {
             totalPages: 0,
             isShow: false,
             formData: {
+                salesNo: "JD5S6D4F444",
                 carcassCode: "1688",
                 sellingTime: this.$moment().format("YYYY-MM-DD"),
-                batchNumber: "2678",
+                slaughterBatch: "58715",
                 carcassWeight: "26",
+                saleAmount: "26789.5",
                 buyer: "张小刚",
-                remarks: "暂无备注"
+                seller: "李思涵",
+                transportNo: "DS74V5DDF5455"
             },
             isAdd: false,
             rules

src/views/sellManagement/directSell.vue

@@ -26,9 +26,11 @@
                     <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="buyer" label="购买人(企业)"></el-table-column>
+                    <el-table-column prop="seller" label="经办人"></el-table-column>
                     <el-table-column prop="weight" label="重量(kg)"></el-table-column>
-                    <el-table-column prop="remarks" label="备注"></el-table-column>
-                    <el-table-column prop="transactionNo" label="交易单号"></el-table-column>
+                    <el-table-column prop="saleAmount" label="销售金额"></el-table-column>
+                    <el-table-column prop="salesNo" label="销售单号"></el-table-column>
+                    <el-table-column prop="transportNo" 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>
@@ -73,16 +75,24 @@
                             <el-input v-model="formData.buyer"></el-input>
                         </el-form-item>
 
+                        <el-form-item label="经办人">
+                            <el-input v-model="formData.seller"></el-input>
+                        </el-form-item>
+
                         <el-form-item label="重量(kg)">
                             <el-input v-model="formData.weight"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="备注">
-                            <el-input type="textarea" v-model="formData.remarks"></el-input>
+                        <el-form-item label="销售金额(元)">
+                            <el-input v-model="formData.saleAmount"></el-input>
+                        </el-form-item>
+
+                        <el-form-item label="销售单号">
+                            <el-input v-model="formData.salesNo"></el-input>
                         </el-form-item>
 
                         <el-form-item label="交易单号">
-                            <el-input v-model="formData.transactionNo"></el-input>
+                            <el-input v-model="formData.transportNo"></el-input>
                         </el-form-item>
 
                         <el-form-item>
@@ -120,9 +130,12 @@ export default {
                 code: "1688",
                 saleTime: this.$moment().format("YYYY-MM-DD"),
                 buyer: "张小刚",
+                seller: "王凯军",
                 weight: "6",
                 remarks: "好吃的大羊排",
-                transactionNo: "AF652AC456"
+                saleAmount: "35241.5",
+                salesNo: "DS454GF54",
+                transportNo: "AF652AC456"
             },
             isAdd: false,
             rules

src/views/sellManagement/elseSell.vue

@@ -23,13 +23,15 @@
                     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="saleAmount" label="销售额(元)"></el-table-column>
+                    <el-table-column prop="transportNo" label="运输单号"></el-table-column>
                     <el-table-column prop="buyer" label="购买人(企业)"></el-table-column>
+                    <el-table-column prop="salesNo" label="销售单号"></el-table-column>
                     <el-table-column prop="seller" label="销售人(企业)"></el-table-column>
-                    <el-table-column prop="price" label="价格(元)"></el-table-column>
-                    <el-table-column prop="transportVehicle" 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>
@@ -65,6 +67,10 @@
                             <el-input v-model="formData.weight"></el-input>
                         </el-form-item>
 
+                        <el-form-item label="屠宰批次">
+                            <el-input v-model="formData.slaughterBatch"></el-input>
+                        </el-form-item>
+
                         <el-form-item label="销售时间">
                             <el-date-picker
                                 v-model="formData.salesTime"
@@ -74,6 +80,14 @@
                             ></el-date-picker>
                         </el-form-item>
 
+                        <el-form-item label="销售金额">
+                            <el-input v-model="formData.saleAmount"></el-input>
+                        </el-form-item>
+
+                        <el-form-item label="销售单号">
+                            <el-input v-model="formData.salesNo"></el-input>
+                        </el-form-item>
+
                         <el-form-item label="购买人(企业)">
                             <el-input v-model="formData.buyer"></el-input>
                         </el-form-item>
@@ -82,12 +96,8 @@
                             <el-input v-model="formData.seller"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="价格">
-                            <el-input v-model="formData.price"></el-input>
-                        </el-form-item>
-                        
-                        <el-form-item label="运输车辆">
-                            <el-input type="textarea" v-model="formData.transportVehicle"></el-input>
+                        <el-form-item label="运输单号">
+                            <el-input v-model="formData.transportNo"></el-input>
                         </el-form-item>
 
                         <el-form-item>
@@ -123,12 +133,14 @@ export default {
             isShow: false,
             formData: {
                 productName: "羊腿",
-                weight: "2678",
+                weight: "33",
+                slaughterBatch: "2678",
+                saleAmount: "15424",
                 salesTime: this.$moment().format("YYYY-MM-DD"),
+                salesNo: "KD4F654W454",
                 buyer: "张小刚",
                 seller: "王小五",
-                price: "198",
-                transportVehicle: "浙A45154"
+                transportNo: "浙A45154"
             },
             isAdd: false,
             rules

src/views/sellManagement/splitSell.vue

@@ -23,13 +23,14 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号" width="80"></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="weight" label="重量(kg)"></el-table-column>
+                    <el-table-column prop="salesNo" label="销售单号"></el-table-column>
+                    <el-table-column prop="productNames" label="产品内容"></el-table-column>
+                    <el-table-column prop="productQuantities" label="产品数量"></el-table-column>
+                    <el-table-column prop="salesTime" label="销售时间"></el-table-column>
+                    <el-table-column prop="totalAmount" 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="transportNo" 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>
@@ -56,25 +57,35 @@
         <el-dialog title="新增/编辑" :visible.sync="isShow" width="40%">
             <el-row type="flex">
                 <el-col :span="20">
-                    <el-form ref="addSplitSell" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="产品名称">
-                            <el-input v-model="formData.productName"></el-input>
+                    <el-form
+                        ref="addSplitSell"
+                        :model="formData"
+                        :rules="rules"
+                        label-width="140px"
+                    >
+                        <el-form-item label="销售单号">
+                            <el-input v-model="formData.salesNo"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="规格型号">
-                            <el-input v-model="formData.specificModel"></el-input>
+                        <el-form-item label="产品内容">
+                            <el-input v-model="formData.productNames"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="所属类别">
-                            <el-input v-model="formData.category"></el-input>
+                        <el-form-item label="产品数量">
+                            <el-input v-model="formData.productQuantities"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="价格">
-                            <el-input v-model="formData.price"></el-input>
+                        <el-form-item label="销售时间">
+                            <el-date-picker
+                                v-model="formData.salesTime"
+                                type="date"
+                                value-format="yyyy-MM-dd HH:mm:ss"
+                                placeholder="选择日期"
+                            ></el-date-picker>
                         </el-form-item>
 
-                        <el-form-item label="销售重量(kg)">
-                            <el-input v-model="formData.weight"></el-input>
+                        <el-form-item label="总金额">
+                            <el-input v-model="formData.totalAmount"></el-input>
                         </el-form-item>
 
                         <el-form-item label="购买人(企业)">
@@ -85,8 +96,10 @@
                             <el-input v-model="formData.seller"></el-input>
                         </el-form-item>
 
-                        
-                        
+                        <el-form-item label="运输单号">
+                            <el-input v-model="formData.transportNo"></el-input>
+                        </el-form-item>
+
                         <el-form-item>
                             <el-button @click="isShow=false">取 消</el-button>
                             <el-button type="primary" @click="submitForm('addSplitSell')">保 存</el-button>
@@ -119,13 +132,14 @@ export default {
             totalPages: 0,
             isShow: false,
             formData: {
-                productName: "羊腿",
-                specificModel: "AAAA",
-                category: "羊腿",
-                price: "198",
-                weight: "8",
+                salesNo: "XS-FG-202008150001",
+                productNames: "羊腿",
+                productQuantities: "55",
+                salesTime: this.$moment().format("YYYY-MM-DD"),
+                totalAmount: "19858",
                 buyer: "张小刚",
                 seller: "王小五",
+                transportNo: "GDF488D85D8",
             },
             isAdd: false,
             rules
@@ -167,7 +181,7 @@ export default {
                 }
             });
         },
-        // 出仓管理列表 
+        // 出仓管理列表
         getSplitSellList() {
             reqSplitSellList({
                 searchStr: this.search,
@@ -184,12 +198,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) {
             reqDelSplitSell(row.id)

src/views/slaughterManagment/outStore.vue

@@ -25,7 +25,16 @@
                     <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="currentStatus" label="目前状态"></el-table-column>
+                    <el-table-column prop="flowTo" label="去向">
+                        <template v-slot="scope">
+                            <div
+                                v-for="item in $store.state['outStoreDirection']"
+                                :key="item.value"
+                            >
+                                <span v-if="item.value == scope.row['flowTo']">{{ item.label }}</span>
+                            </div>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="deliveryWeight" label="出库重量" width="180"></el-table-column>
                     <el-table-column prop="operator" label="操作人员"></el-table-column>
                     <el-table-column prop="slaughterBatch" label="屠宰批次"></el-table-column>
@@ -60,7 +69,6 @@
                             <el-input v-model="formData.carcassCode"></el-input>
                         </el-form-item>
 
-
                         <el-form-item label="出库时间">
                             <el-date-picker
                                 v-model="formData.deliveryTime"
@@ -70,8 +78,14 @@
                             ></el-date-picker>
                         </el-form-item>
 
-                        <el-form-item label="目前状态">
-                            <el-input v-model="formData.currentStatus"></el-input>
+                        <el-form-item label="去向">
+                            <el-radio-group v-model="formData.flowTo">
+                                <el-radio
+                                    v-for="item in $store.state['outStoreDirection']"
+                                    :key="item.value"
+                                    :label="item.value"
+                                >{{ item.label }}</el-radio>
+                            </el-radio-group>
                         </el-form-item>
 
                         <el-form-item label="出库重量">
@@ -120,7 +134,7 @@ export default {
             formData: {
                 carcassCode: "1010",
                 deliveryTime: this.$moment().format("YYYY-MM-DD"),
-                currentStatus: "3",
+                flowTo: this.$store.state["outStoreDirection"][0].value,
                 deliveryWeight: "48",
                 operator: "王三喜",
                 slaughterBatch: "16546"
@@ -165,7 +179,7 @@ export default {
                 }
             });
         },
-        // 出仓管理列表 
+        // 出仓管理列表
         getOutStoreList() {
             reqOutStoreList({
                 searchStr: this.search,
@@ -182,12 +196,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) {
             reqDelOutStore(row.id)

src/views/slaughterManagment/reportQuarantine.vue

@@ -23,7 +23,6 @@
                     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="inspectionDate" label="送检日期" width="180"></el-table-column>
                     <el-table-column prop="inspectionPerson" label="送检人员"></el-table-column>
                     <el-table-column prop="status" label="状态"></el-table-column>
@@ -56,10 +55,6 @@
             <el-row type="flex">
                 <el-col :span="20">
                     <el-form ref="addReport" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="羊只编码">
-                            <el-input v-model="formData.sheepId"></el-input>
-                        </el-form-item>
-
                         <el-form-item label="送检日期">
                             <el-date-picker
                                 v-model="formData.inspectionDate"
@@ -117,7 +112,6 @@ export default {
             totalPages: 0,
             isShow: false,
             formData: {
-                sheepId: "1008",
                 inspectionDate: this.$moment().format("YYYY-MM-DD"),
                 inspectionPerson: "王炸",
                 status: "1",

src/views/slaughterManagment/segmentation.vue

@@ -23,12 +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="processingTime" label="加工时间" width="180"></el-table-column>
-                    <el-table-column prop="slaughterBatch" label="屠宰批次"></el-table-column>
-                    <el-table-column prop="weightBefore" label="加工前重量(kg)" width="180"></el-table-column>
-                    <el-table-column prop="confirmPeople" label="确认人"></el-table-column>
-                    <el-table-column prop="remarks" label="备注"></el-table-column>
+                    <el-table-column prop="splitBatch" label="分割批次"></el-table-column>
+                    <el-table-column prop="carcassCode" label="胴体编码"></el-table-column>
+                    <el-table-column prop="processingTime" label="加工时间"></el-table-column>
+                    <el-table-column prop="weight" label="重量(kg)"></el-table-column>
+                    <el-table-column prop="operator" 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>
@@ -60,6 +59,9 @@
                             <el-input v-model="formData.carcassCode"></el-input>
                         </el-form-item>
 
+                        <el-form-item label="分割批次">
+                            <el-input v-model="formData.splitBatch"></el-input>
+                        </el-form-item>
 
                         <el-form-item label="加工时间">
                             <el-date-picker
@@ -70,20 +72,12 @@
                             ></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.weightBefore"></el-input>
+                        <el-form-item label="重量(kg)">
+                            <el-input v-model="formData.weight"></el-input>
                         </el-form-item>
 
                         <el-form-item label="确认人">
-                            <el-input v-model="formData.confirmPeople"></el-input>
-                        </el-form-item>
-
-                        <el-form-item label="备注">
-                            <el-input type="textarea" v-model="formData.remarks"></el-input>
+                            <el-input v-model="formData.operator"></el-input>
                         </el-form-item>
 
                         <el-form-item>
@@ -119,11 +113,10 @@ export default {
             isShow: false,
             formData: {
                 carcassCode: "1010",
+                splitBatch: this.$moment().format("YYYYMMDD"),
                 processingTime: this.$moment().format("YYYY-MM-DD"),
-                slaughterBatch: "3244",
-                weightBefore: "48",
-                confirmPeople: "王三喜",
-                remarks: "暂无备注"
+                weight: "28",
+                operator: "王三喜"
             },
             isAdd: false,
             rules

src/views/slaughterManagment/slaughterWeight.vue

@@ -29,6 +29,16 @@
                     <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="operator" label="操作人员"></el-table-column>
+                    <el-table-column prop="flowTo" label="去向">
+                        <template v-slot="scope">
+                            <div
+                                v-for="item in $store.state['outStoreDirection']"
+                                :key="item.value"
+                            >
+                                <span v-if="item.value == scope.row['flowTo']">{{ item.label }}</span>
+                            </div>
+                        </template>
+                    </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>
@@ -82,6 +92,16 @@
                             ></el-date-picker>
                         </el-form-item>
 
+                        <el-form-item label="去向">
+                            <el-radio-group v-model="formData.flowTo">
+                                <el-radio
+                                    v-for="item in $store.state['outStoreDirection']"
+                                    :key="item.value"
+                                    :label="item.value"
+                                >{{ item.label }}</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+
                         <el-form-item label="胴体重量">
                             <el-input v-model="formData.carcassWeight"></el-input>
                         </el-form-item>
@@ -126,6 +146,7 @@ export default {
                 slaughterBatch: "15206",
                 slaughterTime: this.$moment().format("YYYY-MM-DD"),
                 weighingTime: this.$moment().format("YYYY-MM-DD"),
+                flowTo: this.$store.state['outStoreDirection'][0].value,
                 carcassWeight: "48",
                 operator: "李小红"
             },
@@ -169,7 +190,7 @@ export default {
                 }
             });
         },
-        // 宰后称重列表 
+        // 宰后称重列表
         getWeighSList() {
             reqWeighSList({
                 searchStr: this.search,
@@ -186,12 +207,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) {
             reqDelWeighS(row.id)

src/views/storeTransportation/dispatching.vue

@@ -23,13 +23,21 @@
                     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="salesNo" label="ID编码"></el-table-column>
                     <el-table-column prop="deliveryCustomer" label="配送客户/单位"></el-table-column>
                     <el-table-column prop="deliveryAddress" label="配送地址"></el-table-column>
-                    <el-table-column prop="productName" label="产品名称"></el-table-column>
+                    <el-table-column prop="transportNo" label="运输单号"></el-table-column>
                     <el-table-column prop="weight" label="重量"></el-table-column>
                     <el-table-column prop="distributor" label="配送员"></el-table-column>
-                    <el-table-column prop="status" label="状态"></el-table-column>
+                    <el-table-column prop="transportVehicles" label="车牌号"></el-table-column>
+                    <el-table-column prop="tel" label="手机号"></el-table-column>
+                    <el-table-column label="状态">
+                        <template v-slot="scope">
+                            <div v-for="item in $store.state['dispatchStatus']" :key="item.value">
+                                <span v-if="item.value == scope.row['status']">{{ item.label }}</span>
+                            </div>
+                        </template>
+                    </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>
@@ -57,8 +65,8 @@
             <el-row type="flex">
                 <el-col :span="20">
                     <el-form ref="addDispatch" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="ID编码">
-                            <el-input v-model="formData.code"></el-input>
+                        <el-form-item label="销售单号">
+                            <el-input v-model="formData.salesNo"></el-input>
                         </el-form-item>
 
                         <el-form-item label="配送客户/单位">
@@ -69,8 +77,8 @@
                             <el-input v-model="formData.deliveryAddress"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="产品名称">
-                            <el-input v-model="formData.productName"></el-input>
+                        <el-form-item label="运输单号">
+                            <el-input v-model="formData.transportNo"></el-input>
                         </el-form-item>
 
                         <el-form-item label="重量(kg)">
@@ -81,8 +89,12 @@
                             <el-input v-model="formData.distributor"></el-input>
                         </el-form-item>
 
-                        <el-form-item label="状态">
-                            <el-input v-model.number="formData.status"></el-input>
+                        <el-form-item label="车牌号">
+                            <el-input v-model="formData.transportVehicles"></el-input>
+                        </el-form-item>
+
+                        <el-form-item label="手机号">
+                            <el-input v-model="formData.tel"></el-input>
                         </el-form-item>
 
                         <el-form-item>
@@ -117,13 +129,14 @@ export default {
             totalPages: 0,
             isShow: false,
             formData: {
-                code: "1010",
+                salesNo: "DHG54G8415",
                 deliveryCustomer: "xx食品有限公司",
                 deliveryAddress: "深圳新思路",
-                productName: "羊菲力",
-                weight: 20,
-                distributor: "1010",
-                status: 1
+                transportNo: 'J4544T4D4F54',
+                weight: 2096,
+                distributor: '李宜珊',
+                transportVehicles: '浙A 1J8022',
+                tel: '13856798458'
             },
             isAdd: false,
             rules

src/views/template/Af.vue

@@ -7,304 +7,63 @@
                 <span v-if="!node.isLeaf">({{ data.children.length }})</span>
             </template>
         </el-cascader>
+
+        <el-table :data="tableData" tooltip-effect="dark" style="width: 100%">
+            <el-table-column label="种母羊等级">
+                <template v-slot="scope">
+                    <div v-for="item in $store.state['seedSheedLevel']" :key="item.value">
+                        <span v-if="item.value == scope.row['femaleLevel']">{{ item.label }}</span>
+                    </div>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <el-form ref="addMating" :model="formData" :rules="rules" label-width="140px">
+            <el-form-item label="种母羊等级">
+                <el-select v-model="formData.femaleLevel" placeholder="请选择">
+                    <el-option
+                        v-for="item in $store.state['seedSheedLevel']"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="密度">
+                <el-radio-group v-model="formData.density">
+                    <el-radio
+                        v-for="item in $store.state['seedDensity']"
+                        :key="item.value"
+                        :label="item.value"
+                    >{{ item.label }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+
+            <el-form-item label="配种时间">
+                <el-date-picker
+                    v-model="formData.opeTime"
+                    type="date"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    placeholder="选择日期"
+                ></el-date-picker>
+            </el-form-item>
+        </el-form>
     </div>
 </template>
 
 <script>
-
 export default {
     name: "Af",
     data() {
         return {
-            value: ["zhinan", "shejiyuanze"],
-            options: [
-                {
-                    value: "zhinan",
-                    label: "指南",
-                    children: [
-                        {
-                            value: "shejiyuanze",
-                            label: "设计原则",
-                            children: [
-                                {
-                                    value: "yizhi",
-                                    label: "一致"
-                                },
-                                {
-                                    value: "fankui",
-                                    label: "反馈"
-                                },
-                                {
-                                    value: "xiaolv",
-                                    label: "效率"
-                                },
-                                {
-                                    value: "kekong",
-                                    label: "可控"
-                                }
-                            ]
-                        },
-                        {
-                            value: "daohang",
-                            label: "导航",
-                            children: [
-                                {
-                                    value: "cexiangdaohang",
-                                    label: "侧向导航"
-                                },
-                                {
-                                    value: "dingbudaohang",
-                                    label: "顶部导航"
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    value: "zujian",
-                    label: "组件",
-                    children: [
-                        {
-                            value: "basic",
-                            label: "Basic",
-                            children: [
-                                {
-                                    value: "layout",
-                                    label: "Layout 布局"
-                                },
-                                {
-                                    value: "color",
-                                    label: "Color 色彩"
-                                },
-                                {
-                                    value: "typography",
-                                    label: "Typography 字体"
-                                },
-                                {
-                                    value: "icon",
-                                    label: "Icon 图标"
-                                },
-                                {
-                                    value: "button",
-                                    label: "Button 按钮"
-                                }
-                            ]
-                        },
-                        {
-                            value: "form",
-                            label: "Form",
-                            children: [
-                                {
-                                    value: "radio",
-                                    label: "Radio 单选框"
-                                },
-                                {
-                                    value: "checkbox",
-                                    label: "Checkbox 多选框"
-                                },
-                                {
-                                    value: "input",
-                                    label: "Input 输入框"
-                                },
-                                {
-                                    value: "input-number",
-                                    label: "InputNumber 计数器"
-                                },
-                                {
-                                    value: "select",
-                                    label: "Select 选择器"
-                                },
-                                {
-                                    value: "cascader",
-                                    label: "Cascader 级联选择器"
-                                },
-                                {
-                                    value: "switch",
-                                    label: "Switch 开关"
-                                },
-                                {
-                                    value: "slider",
-                                    label: "Slider 滑块"
-                                },
-                                {
-                                    value: "time-picker",
-                                    label: "TimePicker 时间选择器"
-                                },
-                                {
-                                    value: "date-picker",
-                                    label: "DatePicker 日期选择器"
-                                },
-                                {
-                                    value: "datetime-picker",
-                                    label: "DateTimePicker 日期时间选择器"
-                                },
-                                {
-                                    value: "upload",
-                                    label: "Upload 上传"
-                                },
-                                {
-                                    value: "rate",
-                                    label: "Rate 评分"
-                                },
-                                {
-                                    value: "form",
-                                    label: "Form 表单"
-                                }
-                            ]
-                        },
-                        {
-                            value: "data",
-                            label: "Data",
-                            children: [
-                                {
-                                    value: "table",
-                                    label: "Table 表格"
-                                },
-                                {
-                                    value: "tag",
-                                    label: "Tag 标签"
-                                },
-                                {
-                                    value: "progress",
-                                    label: "Progress 进度条"
-                                },
-                                {
-                                    value: "tree",
-                                    label: "Tree 树形控件"
-                                },
-                                {
-                                    value: "pagination",
-                                    label: "Pagination 分页"
-                                },
-                                {
-                                    value: "badge",
-                                    label: "Badge 标记"
-                                }
-                            ]
-                        },
-                        {
-                            value: "notice",
-                            label: "Notice",
-                            children: [
-                                {
-                                    value: "alert",
-                                    label: "Alert 警告"
-                                },
-                                {
-                                    value: "loading",
-                                    label: "Loading 加载"
-                                },
-                                {
-                                    value: "message",
-                                    label: "Message 消息提示"
-                                },
-                                {
-                                    value: "message-box",
-                                    label: "MessageBox 弹框"
-                                },
-                                {
-                                    value: "notification",
-                                    label: "Notification 通知"
-                                }
-                            ]
-                        },
-                        {
-                            value: "navigation",
-                            label: "Navigation",
-                            children: [
-                                {
-                                    value: "menu",
-                                    label: "NavMenu 导航菜单"
-                                },
-                                {
-                                    value: "tabs",
-                                    label: "Tabs 标签页"
-                                },
-                                {
-                                    value: "breadcrumb",
-                                    label: "Breadcrumb 面包屑"
-                                },
-                                {
-                                    value: "dropdown",
-                                    label: "Dropdown 下拉菜单"
-                                },
-                                {
-                                    value: "steps",
-                                    label: "Steps 步骤条"
-                                }
-                            ]
-                        },
-                        {
-                            value: "others",
-                            label: "Others",
-                            children: [
-                                {
-                                    value: "dialog",
-                                    label: "Dialog 对话框"
-                                },
-                                {
-                                    value: "tooltip",
-                                    label: "Tooltip 文字提示"
-                                },
-                                {
-                                    value: "popover",
-                                    label: "Popover 弹出框"
-                                },
-                                {
-                                    value: "card",
-                                    label: "Card 卡片"
-                                },
-                                {
-                                    value: "carousel",
-                                    label: "Carousel 走马灯"
-                                },
-                                {
-                                    value: "collapse",
-                                    label: "Collapse 折叠面板"
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    value: "ziyuan",
-                    label: "资源",
-                    children: [
-                        {
-                            value: "axure",
-                            label: "Axure Components"
-                        },
-                        {
-                            value: "sketch",
-                            label: "Sketch Templates"
-                        },
-                        {
-                            value: "jiaohu",
-                            label: "组件交互文档"
-                        }
-                    ]
-                }
-            ]
+            sellingTime: this.$moment().format("YYYY-MM-DD"),
+            aa: this.$store.state['dispatchStatus'][0].value,
         };
     },
     created() {},
     methods: {
-
-        get() {
-            this.fetch({
-                api: "core/memberInfo/list",
-                method: "GET",
-                data: {},
-                success: res => {
-                    console.log(res);
-                },
-                fail: err => {
-                    console.log(err);
-                    if (err.errMsg) this.$message.error(err.errMsg);
-                    else this.$message.error("服务器发生异常");
-                }
-            });
-        }
+        
     }
 };
 </script>