zuixin

src/api/slaughterManagment.js

@@ -12,7 +12,7 @@ export const reqUpdateFirmBuy = (data) => ajax("post", "/farm-huyang/enterprise-
 export const reqDelFirmBuy = (id) => ajax("post", "/farm-huyang/enterprise-procurement/delete", {id})
 
 
-/* 入待宰栏 */ 
+/* 入待宰栏 */
 export const reqWaitList = (data) => ajax("post", "/farm-huyang/wait-slaughter/list", data)
 
 export const reqAddWait = (data) => ajax("post", "/farm-huyang/wait-slaughter/add", data)
@@ -41,7 +41,6 @@ export const reqUpdateRegis = (data) => ajax("post", "/farm-huyang/registration-
 
 export const reqDelRegis = (id) => ajax("post", "/farm-huyang/registration-slaughter/delete", {id})
 
-
 /* 宰后称重  WeighS = Weight slaughter */
 export const reqWeighSList = (data) => ajax("post", "/farm-huyang/weigh-slaughter/list", data)
 

src/store/index.js

@@ -18,7 +18,7 @@ export default new Vuex.Store({
 	},
 	mutations: {
 		setState(state, [key, val]) {
-			state[key] = val
+			state[key] = val.reverse();
 		},
 	},
 	actions: {

src/views/Home/Home.vue

@@ -54,7 +54,7 @@
                         text-color="#fff"
                         active-text-color="#ffd04b"
                     >
-                        <div v-for="(item, index1) in menu " :key="index1">
+                        <div v-for="(item, index1) in menuData " :key="index1">
                             <el-submenu
                                 v-if="item.children && item.children.length > 0"
                                 :index="`${index1}`"
@@ -97,14 +97,14 @@
 </template>
 
 <script>
-// import { menuData } from "./mencCofig.js";
+import { menuData } from "./mencCofig.js";
 import { mapState } from 'vuex';
 
 export default {
     data() {
         return {
             // 菜单配置
-            menuData: [],
+            menuData: menuData,
             menuCollapse: false, //是否水平折叠收起菜单
             defaultUnfoldedMenu: '', // 默认展开第一项
             mainTitle: ''
@@ -177,7 +177,7 @@ export default {
         }
     },
     mounted() {
-        this.init();
+        // this.init();
     }
 };
 </script>

src/views/Login/Login.vue

@@ -19,20 +19,20 @@
                     </el-form-item>
                 </el-form>
             </article>
-            <el-dialog title="请选择一个组织" :visible.sync="isShowDialog" append-to-body>
-                <el-select v-model="orgSelected">
-                    <el-option
-                        v-for="item in orgList"
-                        :key="item.id"
-                        :value="item.id"
-                        :label="item.orgName"
-                    ></el-option>
-                </el-select>
-                <div slot="footer">
-                    <el-button @click="isShowDialog=false">取 消</el-button>
-                    <el-button type="primary" @click="handleSet">设置</el-button>
-                </div>
-            </el-dialog>
+<!--            <el-dialog title="请选择一个组织" :visible.sync="isShowDialog" append-to-body>-->
+<!--                <el-select v-model="orgSelected">-->
+<!--                    <el-option-->
+<!--                        v-for="item in orgList"-->
+<!--                        :key="item.id"-->
+<!--                        :value="item.id"-->
+<!--                        :label="item.orgName"-->
+<!--                    ></el-option>-->
+<!--                </el-select>-->
+<!--                <div slot="footer">-->
+<!--                    <el-button @click="isShowDialog=false">取 消</el-button>-->
+<!--                    <el-button type="primary" @click="handleSet">设置</el-button>-->
+<!--                </div>-->
+<!--            </el-dialog>-->
         </div>
     </div>
 </template>
@@ -64,28 +64,31 @@ export default {
                 spinner: "el-icon-loading",
                 background: "rgba(0, 0, 0, 0.7)"
             });
-            // reqLogin(this.form)
-            //     .then(res => {
-            //         loading.close();
-            //         localStorage.setItem("token", res.token);
-            //         this.$router.replace ("/home/dashboard");
-            //         // this.doOrganizationChoose();
-            //     })
-            //     .catch(err => {
-            //         console.log("登录失败", err);
-            //     });
-            this.$axios.post(`http://121.37.169.186:8081/my/login?accountName=${this.form.userName}&password=${this.form.userPwd}`)
-                    .then(res => {
-                        loading.close();
-                        if(res.data.code === 10000) {
-                            localStorage.setItem("token", res.data.token);
-
-                            localStorage.setItem('accountName', res.data.accountName);
-                            this.$router.replace ("/home/dashboard");
-                        } else {
-                            this.$message.error(res.data.message);
-                        }
-                    })
+            reqLogin(this.form)
+                .then(res => {
+                    loading.close();
+                    localStorage.setItem("token", res.token);
+                    this.$router.replace ("/home/dashboard");
+                    this.doOrganizationChoose();
+                })
+                .catch(err => {
+                    console.log("登录失败", err);
+                });
+            // this.$axios.post(`http://121.37.169.186:8081/my/login?accountName=${this.form.userName}&password=${this.form.userPwd}`)
+            //         .then(res => {
+            //             loading.close();
+            //             if(res.data.code === 10000) {
+            //                 localStorage.setItem("token", res.data.token);
+            //
+            //                 localStorage.setItem('accountName', res.data.accountName);
+            //                 console.log(111);
+            //                 this.$router.replace ("/home/dashboard");
+            //             } else if(res.data.code === 1003){
+            //                 this.$message.error('该账户未激活,请联系管理员激活');
+            //             } else {
+            //                 this.$message.error(res.data.message);
+            //             }
+            //         })
         },
         handleSet: function() {
             if (!this.orgSelected) {
@@ -116,7 +119,7 @@ export default {
             this.loading = true;
             reqOrganizationId({orgId: id}).then(res => {
                 this.isShowDialog = false;
-                this.$router.replace ("/home/dashboard");
+                // this.$router.replace ("/home/dashboard");
                     //导航到 正式页面
                     // console.log(999999)
                     // this.$router.push({

src/views/productManagement/splitLog.vue

@@ -170,11 +170,12 @@ export default {
                         reqUpdateSplitLog(this.formData)
                             .then(res => {
                                 // 分割登记列表
-                                this.getSplitLogList();
                                 // this.$message.success("编辑成功！");
                                 if (res.errCode) {
                                     this.$message.error(res.errMsg);
                                 } else {
+                                    // this.getSplitLogList();
+                                    this.getSplitLogList();
                                     this.$message.success("成功");
                                     this.formData = {}
                                     this.isShow = false
@@ -194,8 +195,10 @@ export default {
             this.$refs[formName].validate(valid => {
                 if (valid) {
                     reqWeight(this.formData_1).then(res => {
+                        this.getSplitLogList();
                         if (res.errCode) {
                             this.$message.error(res.errMsg);
+
                         } else {
                             this.$message.success("成功");
                             this.formData_1 = {}
@@ -227,7 +230,7 @@ export default {
             this.isAdd = true;
         },
         weigh(row) {
-            console.log(row);
+            // console.log(row);
             this.formData_1.productUniqueNo = row.productUniqueNo;
             this.isShowWeigh = true;
         },
@@ -272,4 +275,4 @@ export default {
         margin-top: 20px;
     }
 }
-</style>
+</style>

src/views/slaughterManagment/inButcherHurdle.vue

@@ -36,17 +36,21 @@
                         </template>
                     </el-table-column>
                 </el-table>
-
-                <el-row type="flex" justify="end">
-                    <el-col :span="8" class="pagination">
-                        <el-pagination
-                            @current-change="pageChange"
-                            background
-                            layout="prev, pager, next"
-                            :page-count="Number(totalPages)"
-                        ></el-pagination>
-                    </el-col>
-                </el-row>
+                <table-footer
+                        :totals="totalPages"
+                        :size="size"
+                        @sizeChange="sizeChange"
+                        @pageChange="pageChange"></table-footer>
+<!--                <el-row type="flex" justify="end">-->
+<!--                    <el-col :span="8" class="pagination">-->
+<!--                        <el-pagination-->
+<!--                            @current-change="pageChange"-->
+<!--                            background-->
+<!--                            layout="prev, pager, next"-->
+<!--                            :page-count="Number(totalPages)"-->
+<!--                        ></el-pagination>-->
+<!--                    </el-col>-->
+<!--                </el-row>-->
             </article>
         </section>
 
@@ -54,8 +58,13 @@
             <el-row type="flex">
                 <el-col :span="20">
                     <el-form ref="addWait" :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-input v-model="formData.sheepId"></el-input>
+                            <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="入栏时间">
@@ -91,18 +100,22 @@ import {
     reqWaitList,
     reqAddWait,
     reqUpdateWait,
-    reqDelWait
+    reqDelWait,
+    reqFirmBuyList
 } from "@/api/slaughterManagment.js";
+import TableFooter  from "../../components/TableFooter";
 
-const pageSize = 10;
 const rules = {};
 
 export default {
     name: "inButcherHurdle",
+    components: {
+        TableFooter
+    },
     data() {
         return {
             search: "",
-            page: 1,
+            pageNum: 1,
             tableData: [],
             totalPages: 0,
             isShow: false,
@@ -113,6 +126,9 @@ export default {
                 currentPosition: ""
             },
             isAdd: false,
+            size: 10,
+            sheepList: [],
+            showType: false,
             rules
         };
     },
@@ -130,15 +146,16 @@ export default {
                                 // 入待宰栏列表
                                 this.getWaitList();
                                 if (res.errCode) {
-                                    this.$message.error(res.errMsg);
+                                    // this.$message.error(res.errMsg);
                                 } else {
-                                    this.$message.success("成功");
-                                    this.formData.currentPosition = '';
-                                    this.formData.entryTime = '';
-                                    this.formData.operation = '';
-                                    this.formData.sheepId = '';
-                                    this.isShow = false
+
                                 }
+                              this.$message.success("成功");
+                              this.formData.currentPosition = '';
+                              this.formData.entryTime = '';
+                              this.formData.operation = '';
+                              this.formData.sheepId = '';
+                              this.isShow = false
                             })
                             .catch(err => {
                                 console.log(err);
@@ -175,12 +192,12 @@ export default {
         getWaitList() {
             reqWaitList({
                 searchStr: this.search,
-                pageSize,
-                pageNum: this.page
+                pageSize: this.size,
+                pageNum: this.pageNum,
             })
                 .then(res => {
                     this.tableData = res.content;
-                    console.log(res.totalPages);
+                    // console.log(res.totalPages);
                     this.totalPages = res.totalPages;
                 })
                 .catch(err => {
@@ -190,6 +207,19 @@ export default {
         add() {
             this.isShow = true;
             this.isAdd = true;
+            this.sheepList = [];
+            reqFirmBuyList({
+                searchStr: '',
+                pageNum: 1,
+                pageSize: 200
+            })
+            .then(res => {
+                res.content.forEach(item => {
+                    if(item.locationStatus === 0) {
+                        this.sheepList.push(item);
+                    }
+                });
+            })
         },
         edit(row, bool) {
             this.formData.currentPosition = row.currentPosition;
@@ -219,10 +249,14 @@ export default {
                     this.$message.error("删除失败！");
                 });
         },
-        pageChange(p) {
-            // console.log(p);
-            this.page = p;
-            // 入待宰栏列表
+        // 修改size
+        sizeChange(val) {
+            this.size = val;
+            this.getWaitList();
+        },
+        // 修改页数
+        pageChange(val) {
+            this.pageNum= val;
             this.getWaitList();
         },
         // 取消

src/views/slaughterManagment/regisSlaughter.vue

@@ -56,8 +56,13 @@
             <el-row type="flex">
                 <el-col :span="20">
                     <el-form ref="addRegis" :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-input v-model="formData.sheepId"></el-input>
+                            <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="入栏时间">
@@ -70,8 +75,13 @@
                         </el-form-item>
 
                         <el-form-item label="屠宰批次">
-                            <el-input v-model="formData.slaughterBatch"></el-input>
+                            <el-input v-model="formData.slaughterBatch" disabled></el-input>
                         </el-form-item>
+<!--                        <el-form-item label="屠宰批次">-->
+<!--                            <el-select v-model="formData.slaughterBatch" placeholder="请选择屠宰批次" :disabled="showType">-->
+<!--                                <el-option v-for="item in listBatch" :key="item" :label="item" :value="item"></el-option>-->
+<!--                            </el-select>-->
+<!--                        </el-form-item>-->
 
                         <el-form-item label="入栏重量">
                             <el-input v-model="formData.entryWeight"></el-input>
@@ -82,7 +92,7 @@
                         </el-form-item>
 
                         <el-form-item label="检疫单编号">
-                            <el-input v-model="formData.quarantineNo"></el-input>
+                            <el-input v-model="formData.quarantineNo" disabled></el-input>
                         </el-form-item>
 
                         <el-form-item>
@@ -98,10 +108,14 @@
 
 <script>
 import {
+    reqWaitList,
     reqRegisList,
     reqAddRegis,
     reqUpdateRegis,
-    reqDelRegis
+    reqDelRegis,
+    reqSlaughterBatchIdList,
+    reqSlaughterBatchList,
+    reqReportList
 } from "@/api/slaughterManagment.js";
 
 const pageSize = 10;
@@ -125,6 +139,9 @@ export default {
                 quarantineNo: ""
             },
             isAdd: false,
+            sheepList: [],
+            showType: false,
+            listBatch: [],
             rules
         };
     },
@@ -142,7 +159,7 @@ export default {
                                 // 入宰登记列表
                                 this.getRegisList();
                                 if (res.errCode) {
-                                    this.$message.error(res.errMsg);
+                                    // this.$message.error(res.errMsg);
                                 } else {
                                     this.$message.success("成功");
                                     this.formData.sheepId = '';
@@ -151,8 +168,9 @@ export default {
                                     this.formData.entryWeight = '';
                                     this.formData.operator = '';
                                     this.formData.quarantineNo = '';
-                                    this.isShow = false
+
                                 }
+                              this.isShow = false
                             })
                             .catch(err => {
                                 console.log(err);
@@ -164,18 +182,18 @@ export default {
                                 // 入宰登记列表
                                 this.getRegisList();
                                 if (res.errCode) {
-                                    this.$message.error(res.errMsg);
+                                    // this.$message.error(res.errMsg);
                                 } else {
                                     this.$message.success("成功");
-                                    this.formData.sheepId = '';
-                                    this.formData.registrationTime = '';
-                                    this.formData.slaughterBatch = '';
-                                    this.formData.entryWeight = '';
-                                    this.formData.operator = '';
-                                    this.formData.quarantineNo = '';
-                                    this.formData.id = '';
-                                    this.isShow = false
                                 }
+                              this.isShow = false;
+                              this.formData.sheepId = '';
+                              this.formData.registrationTime = '';
+                              this.formData.slaughterBatch = '';
+                              this.formData.entryWeight = '';
+                              this.formData.operator = '';
+                              this.formData.quarantineNo = '';
+                              this.formData.id = '';
                             })
                             .catch(err => {
                                 console.log(err);
@@ -205,6 +223,9 @@ export default {
         add() {
             this.isShow = true;
             this.isAdd = true;
+            this.showType = false;
+            this.getWaitList();
+            this.getListBatch();
         },
         edit(row, bool) {
             this.formData.sheepId = row.sheepId;
@@ -214,6 +235,7 @@ export default {
             this.formData.operator = row.operator;
             this.formData.quarantineNo = row.quarantineNo;
             if(bool) {
+                this.showType = bool;
                 this.formData.id = row.id;
             }
             this.isShow = true;
@@ -256,7 +278,46 @@ export default {
                 operator: "",
                 quarantineNo: ""
             };
-        }
+        },
+        // 入待宰栏列表
+        getWaitList() {
+            reqWaitList({
+                searchStr: '',
+                pageSize: 200,
+                pageNum: 1
+            })
+                    .then(res => {
+                        this.sheepList = res.content;
+                    })
+                    .catch(err => {
+                        console.log(err);
+                    });
+        },
+        // 屠宰批次
+        getListBatch() {
+            reqSlaughterBatchIdList({})
+            .then(res => {
+                this.listBatch = res.reverse();
+            })
+        },
+      // 选中编码 得到 屠宰批次
+      hanldChange(val) {
+        reqSlaughterBatchList({
+          searchStr: val,
+          pageNum: 1,
+          pageSize: 20
+        })
+        .then(res => {
+          this.formData.slaughterBatch = res.content[0].slaughterBatchNo;
+          reqReportList({
+            searchStr: this.formData.slaughterBatch,
+            pageNum: 1,
+            pageSize: 20
+          }).then(res => {
+            this.formData.quarantineNo = res.content[0].quarantineNo;
+          })
+        })
+      }
     }
 };
 </script>

src/views/slaughterManagment/slaughterBatch.vue

@@ -9,54 +9,61 @@
                 <el-col :span="4">
                     <el-button type="primary" @click="getSlaughterBatchList">查找</el-button>
                 </el-col>
+                <el-col :span="4">
+                    <el-button type="primary" @click="isShow=true">新增</el-button>
+                </el-col>
             </el-row>
         </header>
         <section>
             <article class="table">
                 <el-table
+                    :data="batchList"
+                    tooltip-effect="dark"
+                    height="700"
+                    border>
+                    <el-table-column prop="id" label="序号" width="80" align="center"></el-table-column>
+                    <el-table-column prop="slaughterBatchNo" label="屠宰批次" align="center"></el-table-column>
+                    <el-table-column prop="sheepId" label="羊只编码" align="center"></el-table-column>
+                    <el-table-column prop="weight" label="重量" align="center"></el-table-column>
+                </el-table>
+            </article>
+        </section>
+        <el-dialog
+                title="新增屠宰批次"
+                :visible.sync="isShow"
+                width="50%">
+            <el-table
                     ref="SlaughterBatch"
                     :data="tableData"
                     tooltip-effect="dark"
-                    style="width: 30%"
                     border
                     @selection-change="handleSelectionChange"
                     :row-key="getRowKeys"
-                >
-                    <el-table-column type="selection" width="55"></el-table-column>
-                    <el-table-column prop="id" label="序号" width="80" align="center"></el-table-column>
-                    <el-table-column prop="sheepId" label="羊只编号" align="center"></el-table-column>
-                    <el-table-column prop="weight" label="体重" align="center"></el-table-column>
-                </el-table>
-
-                <el-row type="flex" style="margin-top: 20px">
-                    <el-col :span="4">
-                        <el-button @click="toggleSelection()">取消选择</el-button>
-                        <el-button type="primary" plain @click="create">
-                            生成批次
-                            <i class="el-icon-arrow-right el-icon--right"></i>
-                        </el-button>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-pagination
-                            @current-change="pageChange"
-                            background
-                            layout="prev, pager, next"
-                            :page-count="Number(totalPages)"
-                        ></el-pagination>
-                    </el-col>
-                </el-row>
-            </article>
-        </section>
+            >
+                <el-table-column type="selection" width="55"></el-table-column>
+                <el-table-column prop="id" label="序号" width="80" align="center"></el-table-column>
+                <el-table-column prop="sheepId" label="羊只编号" align="center"></el-table-column>
+                <el-table-column prop="weight" label="体重" align="center"></el-table-column>
+            </el-table>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="toggleSelection()">取消选择</el-button>
+                    <el-button type="primary" plain @click="create">
+                        生成批次
+                        <i class="el-icon-arrow-right el-icon--right"></i>
+                    </el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
 
 <script>
 import {
     reqSlaughterBatchList,
-    reqSCreateBatch
+    reqSCreateBatch,
+    getSlaughterBatchList
 } from "@/api/slaughterManagment.js";
 
-const pageSize = 10;
+const pageSize = 200;
 const rules = {};
 
 export default {
@@ -72,6 +79,7 @@ export default {
             getRowKeys(row) {
                 return row.id;
             },
+            batchList: [],
             rules
         };
     },
@@ -88,12 +96,21 @@ export default {
                 pageNum: this.page
             })
                 .then(res => {
-                    this.tableData = res.content;
+                    this.tableData = [];
+                    this.batchList = [];
+                    res.content.forEach(item => {
+                      if(item.status === 0) {
+                          this.tableData.push(item);
+                      }  else {
+                          this.batchList.push(item);
+                      }
+                    });
                     this.totalPages = res.totalPages;
                 })
                 .catch(err => {
                     console.log(err);
                 });
+            this.isShow = false;
         },
         handleSelectionChange(val) {
             this.multipleSelection = val;
@@ -116,16 +133,18 @@ export default {
                     this.$store.dispatch("getSlaughterBatchIdList");
                     this.$message.error(res.errMsg);
                 } else {
+                    this.toggleSelection();
                     this.$message.success("成功");
-                    this.toggleSelection()
                 }
+                this.isShow = false;
+                this.getSlaughterBatchList();
             });
         },
         pageChange(p) {
             this.page = p;
             // 屠宰批次列表
             this.getSlaughterBatchList();
-        }
+        },
     }
 };
 </script>
@@ -139,4 +158,4 @@ export default {
         margin-top: 20px;
     }
 }
-</style>
+</style>

src/views/systemAdmin/menuAdmin.vue

@@ -19,7 +19,7 @@
                 default-expand-all>
           <el-table-column prop="menuName" label="菜单名称"></el-table-column>
           <el-table-column prop="url" label="菜单路由"></el-table-column>
-          <el-table-column prop="remark" label="备注"></el-table-column>
+<!--          <el-table-column prop="remark" label="备注"></el-table-column>-->
           <el-table-column
                   label="操作"
                   fixed="right">
@@ -48,9 +48,9 @@
         <el-form-item label="菜单名字" :label-width="formLabelWidth" prop="name">
           <el-input v-model="form.name" autocomplete="off"></el-input>
         </el-form-item>
-        <el-form-item label="备注" :label-width="formLabelWidth" prop="name">
-          <el-input v-model="form.remark" autocomplete="off"></el-input>
-        </el-form-item>
+<!--        <el-form-item label="备注" :label-width="formLabelWidth" prop="name">-->
+<!--          <el-input v-model="form.remark" autocomplete="off"></el-input>-->
+<!--        </el-form-item>-->
         <el-form-item label="菜单路由" :label-width="formLabelWidth">
           <el-input v-model="form.url" autocomplete="off"></el-input>
         </el-form-item>

src/views/systemAdmin/userAdmin.vue

@@ -45,7 +45,7 @@
           <el-table-column prop="accountName" label="登录名"></el-table-column>
           <el-table-column label="性别">
             <template slot-scope="scope">
-              <span v-if="scope.row.male === 0">男</span>
+              <span v-if="scope.row.male == 1">男</span>
               <span v-else>女</span>
             </template>
           </el-table-column>
@@ -98,19 +98,19 @@
       <div>
         <el-form ref="form" :model="form" label-width="80px">
           <el-form-item label="用户姓名">
-            <el-input v-model="form.userName"></el-input>
+            <el-input v-model="form.userName" placeholder="默认手机号为登录名，如没有填写手机号则是用户姓名为登录名"></el-input>
           </el-form-item>
           <el-form-item label="性别">
-            <el-radio-group v-model="form.males">
-              <el-radio :label="0">女</el-radio>
-              <el-radio :label="1">男</el-radio>
+            <el-radio-group v-model="form.male">
+              <el-radio :label="man">女</el-radio>
+              <el-radio :label="woman">男</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="出生日期">
             <el-date-picker type="date" placeholder="选择日期" v-model="form.birthday" value-format="yyyy-MM-dd" style="width: 100%;"></el-date-picker>
           </el-form-item>
           <el-form-item label="手机号">
-            <el-input v-model="form.mobile"></el-input>
+            <el-input v-model="form.mobile" placeholder="默认手机号为登录名，如没有填写手机号则是用户姓名为登录名"></el-input>
           </el-form-item>
           <el-form-item label="住址">
             <el-input v-model="form.address"></el-input>
@@ -152,14 +152,15 @@
           userName: '',
           remark: '',
           mobile: '',
-          males: '',
-          male: '',
+          male: 0,
           job: '',
           birthday: '',
           address: '',
           id: ''
         },
         selectList: '',
+        man: '1',
+        woman: '0'
       };
     },
     created() {
@@ -198,7 +199,17 @@
       },
       // 用户编辑
       edit(data) {
-        this.form = data;
+        this.form =  {
+          userName: data.userName,
+          remark: data.remark,
+          mobile: data.mobile,
+          male: data.male,
+          job: data.job,
+          birthday: data.birthday,
+          address: data.address,
+          id: data.id
+        };
+        this.form.userId = data.userId;
         this.showType = true;
         this.dialogVisible = true;
       },
@@ -215,7 +226,7 @@
       // 保存
       onSubmit() {
         if(this.showType) {
-          this.$axios.post(`http://121.37.169.186:8081/user/edit?id=${this.form.id}&userName=${this.form.userName}&male=${this.form.males}&birthday=${this.form.birthday}&mobile=${this.form.mobile}&address=${this.form.address}&job=${this.form.job}&remark=${this.form.remark}`)
+          this.$axios.post(`http://121.37.169.186:8081/user/edit?id=${this.form.id}&userName=${this.form.userName}&male=${this.form.male}&birthday=${this.form.birthday}&mobile=${this.form.mobile}&address=${this.form.address}&job=${this.form.job}&remark=${this.form.remark}&userId=${this.form.userId}`)
             .then(res => {
               if(res.data.code === 10000) {
                 this.init();
@@ -224,7 +235,7 @@
               this.reset();
             })
         } else {
-          this.$axios.post(`http://121.37.169.186:8081/user/add?userName=${this.form.userName}&male=${this.form.males}&birthday=${this.form.birthday}&mobile=${this.form.mobile}&address=${this.form.address}&job=${this.form.job}&remark=${this.form.remark}`)
+          this.$axios.post(`http://121.37.169.186:8081/user/add?userName=${this.form.userName}&male=${this.form.male}&birthday=${this.form.birthday}&mobile=${this.form.mobile}&address=${this.form.address}&job=${this.form.job}&remark=${this.form.remark}`)
             .then(res => {
               if(res.data.code === 10000) {
                 this.init();
@@ -237,7 +248,16 @@
       },
       // 重置
       reset() {
-        this.form = {};
+        this.form = {
+          userName: '',
+          remark: '',
+          mobile: '',
+          male: '',
+          job: '',
+          birthday: '',
+          address: '',
+          id: ''
+        };
         this.pageNum = 1;
         this.keyword = '';
       },