diff --git a/public/config.js b/public/config.js
index 6544ea9..b3b4a2a 100644
--- a/public/config.js
+++ b/public/config.js
@@ -6,7 +6,7 @@
 //     }
     config = {
         API_URL: 'http://121.36.65.171:9999',
-        // API_URL: 'http://172.119.50.18:8081',
+        // API_URL: 'http://172.119.50.59:8081',
         
         UPLOAD_URL: "http://61.135.192.42:8082/attachment/uploadOne",
         DOWNLOAD_URL: "http://61.135.192.42:8082/api-ftp/ftp/download?filename=",
diff --git a/src/api/cancel.js b/src/api/cancel.js
new file mode 100644
index 0000000..09baf48
--- /dev/null
+++ b/src/api/cancel.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request';
+//获取防伪码作废用户列表
+export function getDiscardList(params) {
+    return request({
+        url: '/discard/list',
+        method: 'post',
+        data:params
+    });
+}
\ No newline at end of file
diff --git a/src/api/get.js b/src/api/get.js
new file mode 100644
index 0000000..2036a24
--- /dev/null
+++ b/src/api/get.js
@@ -0,0 +1,17 @@
+import request from '@/utils/request';
+//获取取码用户列表
+export function getFetchList(params) {
+    return request({
+        url: '/fetch/list',
+        method: 'post',
+        data:params
+    });
+}
+//取码
+export function addFetchList(params) {
+    return request({
+        url: '/fetch/add',
+        method: 'post',
+        data:params
+    });
+}
\ No newline at end of file
diff --git a/src/api/send.js b/src/api/send.js
new file mode 100644
index 0000000..10903d6
--- /dev/null
+++ b/src/api/send.js
@@ -0,0 +1,17 @@
+import request from '@/utils/request';
+//获取发码用户列表
+export function getSendList(params) {
+    return request({
+        url: '/send/list',
+        method: 'post',
+        data:params
+    });
+}
+//发码
+export function addSendList(params) {
+    return request({
+        url: '/send/add',
+        method: 'post',
+        data:params
+    });
+}
\ No newline at end of file
diff --git a/src/api/user.js b/src/api/user.js
index 13fe584..ae52c3a 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -15,6 +15,7 @@ export function resetPass(params) {
         data:params
     });
 }
+
 //获取白名单用户列表
 export function getWhitelist(params) {
     return request({
@@ -23,94 +24,27 @@ export function getWhitelist(params) {
         data:params
     });
 }
-
-
-
-
-
-
-
-
-
-//根据id获取用户详情
-export function getUserDetail(id) {
-    return request({
-        url: '/user/get/'+id,
-        method: 'get'
-    });
-}
-//添加用户
-export function addUser(params) {
-    return request({
-        url: '/user/add',
-        method: 'post',
-        data:params
-    });
-}
-//删除用户
-export function deleteUser(params) {
+//添加白名单用户列表
+export function addWhiteList(params) {
     return request({
-        url: '/user/delete',
+        url: '/whitelist/add',
         method: 'post',
         data:params
     });
 }
-//更新用户信息
-export function updateUserInfo(params) {
+//删除白名单用户列表
+export function deleteWhiteList(params) {
     return request({
-        url: '/user/edit',
+        url: '/whitelist/delete',
         method: 'post',
         data:params
     });
 }
-//添加用户时校验用户是否存在
-export function existsUserName(params) {
+//编辑白名单用户列表
+export function updateWhiteList(params) {
     return request({
-        url: '/user/checkUserInfo',
+        url: '/whitelist/update',
         method: 'post',
         data:params
     });
-}
-
-
-
-
-
-//用户启用停用状态
-export function editUserStatus(params) {
-    return request({
-        url: '/api-login/user/status',
-        method: 'get',
-        params
-    });
-}
-//获取角色类型
-export function getRoleType(params) {
-    return request({
-        url: '/api-login/user/types',
-        method: 'get',
-        params
-    });
-}
-
-
-
-
-
-
-//获取当前用户类别与角色
-export function getAddRole(params) {
-    return request({
-        url: '/api-login/user/getAddRole',
-        method: 'get',
-        params
-    });
-}
-//更改个人中心信息
-export function editPersonalCenter(params) {
-    return request({
-        url: '/api-login/user/personalCenter',
-        method: 'put',
-        data:params
-    });
-}
+}
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index 7b2a067..606059c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -25,7 +25,7 @@ service.interceptors.request.use((config) => {
     }
     if (config.method == 'post' || config.method == 'put') {
         //----------------End---------------------------------
-        config.data = qs.stringify(config.data)
+        // config.data = qs.stringify(config.data)
             // qs.stringify(config.params, { indices: false })
     } else if (config.method == 'get') {
         config.paramsSerializer = params => {
@@ -79,7 +79,7 @@ service.interceptors.response.use(
             } else {
                 //接口失败统一报错
                 Message({
-                    message: res.message,
+                    message: res.msg,
                     type: 'error',
                     duration: 5 * 1000
                 })
diff --git a/src/views/get/addGet.vue b/src/views/get/addGet.vue
index 4bdd20a..4a6965c 100644
--- a/src/views/get/addGet.vue
+++ b/src/views/get/addGet.vue
@@ -74,8 +74,8 @@
 </template>
 <script>
 import {
-    getUserList
-} from "@/api/user"
+    addFetchList
+} from "@/api/get"
 export default {
     name: "addGet",
     data() {
@@ -103,23 +103,8 @@ export default {
         };
     },
     mounted() {
-        this.initData()
     },
     methods: {
-        //获取用户列表
-        initData() {
-            const params = {
-                pageNum: this.currentPage,
-                pageSize: this.pageSize,
-                search:{
-                },
-                sort:''
-            }
-            getUserList(params).then(res => {
-                this.tableData = res.data.list
-                this.total = res.data.count
-            })
-        },
         addRowData(){
             this.paramsForm.params.push({describe:'',number:'',company:''})
         },
diff --git a/src/views/get/get.vue b/src/views/get/get.vue
index be9f50b..f930a1b 100644
--- a/src/views/get/get.vue
+++ b/src/views/get/get.vue
@@ -57,8 +57,8 @@
 </template>
 <script>
 import {
-    getUserList, getUserDetail
-} from "@/api/user"
+    getFetchList
+} from "@/api/get"
 export default {
     name: "getGet",
     data() {
@@ -88,31 +88,31 @@ export default {
         //获取用户列表
         initData() {
             const params = {
-                pageNum: this.currentPage,
+                pageNo: this.currentPage,
                 pageSize: this.pageSize,
-                search:{
-                },
-                sort:''
+                discardId: this.formSearch.number|| null,
+                startTime:this.formSearch.time[0] || null,
+                endTime:this.formSearch.time[1] || null
             }
-            getUserList(params).then(res => {
+            getFetchList(params).then(res => {
                 this.tableData = res.data.list
                 this.total = res.data.count
             })
         },
         confirm(){
-            this.$confirm('此操作将废弃本防伪码, 是否继续?', '提示', {
+            this.$confirm('此操作将生成防伪码印刷文件, 是否继续?', '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning'
             }).then(() => {
                 this.$message({
                     type: 'success',
-                    message: '废弃成功!'
+                    message: '操作成功!'
                 });
             }).catch(() => {
                 this.$message({
                     type: 'info',
-                    message: '已取消废弃'
+                    message: '已取消操作'
                 });          
             });
         },
diff --git a/src/views/send/cancel.vue b/src/views/send/cancel.vue
index 5b543ae..31f6e5d 100644
--- a/src/views/send/cancel.vue
+++ b/src/views/send/cancel.vue
@@ -48,8 +48,8 @@
 </template>
 <script>
 import {
-    getUserList, getUserDetail
-} from "@/api/user"
+    getDiscardList
+} from "@/api/cancel"
 export default {
     name: "sendCancel",
     data() {
@@ -79,11 +79,11 @@ export default {
             const params = {
                 pageNum: this.currentPage,
                 pageSize: this.pageSize,
-                search:{
-                },
-                sort:''
+                discardId: this.formSearch.number|| null,
+                startTime:this.formSearch.time[0] || null,
+                endTime:this.formSearch.time[1] || null
             }
-            getUserList(params).then(res => {
+            getDiscardList(params).then(res => {
                 this.tableData = res.data.list
                 this.total = res.data.count
             })
diff --git a/src/views/send/send.vue b/src/views/send/send.vue
index 072172c..ace65a1 100644
--- a/src/views/send/send.vue
+++ b/src/views/send/send.vue
@@ -32,11 +32,11 @@
         <span class="font-size-16 line-height-2em color-error" style="margin-right:20px;">发码剩余：{{AllData.otherTotal}}</span>
         <br><br>
         <el-table :data="tableData" style="width: 100%" header-row-class-name="">
-            <el-table-column prop="account" label="发码日期"></el-table-column>
-            <el-table-column prop="name" label="发码数（万）"></el-table-column>
-            <el-table-column prop="phone" label="发码剩余（万）"></el-table-column>
-            <el-table-column prop="enIdText" label="取码数（万）"></el-table-column>
-            <el-table-column prop="enIdText" label="发码状态"></el-table-column>
+            <el-table-column prop="sendTime" label="发码日期"></el-table-column>
+            <el-table-column prop="sendCount" label="发码数（万）"></el-table-column>
+            <el-table-column prop="sendRemainder" label="发码剩余（万）"></el-table-column>
+            <el-table-column prop="receivedCount" label="取码数（万）"></el-table-column>
+            <el-table-column prop="status" label="发码状态"></el-table-column>
             <el-table-column label="操作" width="200">
                 <template slot-scope="scope">
                     <el-button type="text" size="small" @click="showDetail(scope.row.id)"><i class="el-icon-edit"></i>查看</el-button>
@@ -94,10 +94,9 @@
 </template>
 <script>
 import {
-    getUserList, getUserDetail,
-    addUser, 
-    updateUserInfo
-} from "@/api/user"
+    getSendList,
+    addSendList
+} from "@/api/send"
 export default {
     name: "sendSend",
     data() {
@@ -146,15 +145,13 @@ export default {
         //获取用户列表
         initData() {
             const params = {
-                pageNum: this.currentPage,
+                pageNo: this.currentPage,
                 pageSize: this.pageSize,
-                search:{
-                    time:'',
-                    status:''
-                },
-                sort:''
+                // fetchStatus :this.formSearch.status || 0,
+                // startTime:this.formSearch.time[0] || null,
+                // endTime:this.formSearch.time[1] || null
             }
-            getUserList(params).then(res => {
+            getSendList(params).then(res => {
                 this.tableData = res.data.list
                 this.total = res.data.count
             })
@@ -163,14 +160,17 @@ export default {
         addUserDialog() {
             this.dialogSendVisible = true
         },
-        //添加用户信息
+        //添加发码信息
         addUserInfo() {
-            addUser(params).then(res => {
+            const params = {
+                send_count:this.sendForm.number
+            }
+            addSendList(params).then(res => {
                 this.$message({
-                    message: res.message,
-                    type: res.status == 200 ? 'success' : 'error'
+                    message: res.mes,
+                    type: res.code == 200 ? 'success' : 'error'
                 });
-                this.resetForm('ruleForm')
+                this.resetForm('sendForm')
                 this.dialogSendVisible = false
                 this.initData()
             })
@@ -178,34 +178,11 @@ export default {
         //获取用户详细信息
         showDetail(id) {
             this.dialogSendVisible = true
-            getUserDetail(id).then(res => {
-                // this.form = {//添加修改的form
-                //     id: res.data.id,
-                //     account: res.data.account,
-                //     name: res.data.realName,
-                //     phone: res.data.phone,
-                //     typeId: res.data.typeId,
-                //     idNumber: res.data.idNumber,
-                //     email: res.data.email
-                // }
-                this.form = res.data
-            })
         },
         //查看取码详情
         showGetDetail(){
             this.$router.push({name:'getDetail'})
         },
-        //更新用户信息
-        updateUserData() {
-            updateUserInfo(this.form).then(res => {
-                this.$message({
-                    message: res.message,
-                    type: res.status == 200 ? 'success' : 'error'
-                });
-                this.dialogSendVisible = false
-                this.initData()
-            })
-        },
         //form提交检验
         submitForm(formName) {
             this.$refs[formName].validate((valid) => {
diff --git a/src/views/systemManage/whiteList.vue b/src/views/systemManage/whiteList.vue
index 3fdcf83..750c1d7 100644
--- a/src/views/systemManage/whiteList.vue
+++ b/src/views/systemManage/whiteList.vue
@@ -15,14 +15,14 @@
         </div>
         <el-table :data="tableData" style="width: 100%" header-row-class-name="">
             <el-table-column type="selection" width="55"></el-table-column>
-            <el-table-column prop="account" label="企业名称"></el-table-column>
-            <el-table-column prop="name" label="联系人"></el-table-column>
+            <el-table-column prop="companyName" label="企业名称"></el-table-column>
+            <el-table-column prop="contactName" label="联系人"></el-table-column>
             <el-table-column prop="phone" label="联系电话"></el-table-column>
-            <el-table-column prop="enIdText" label="操作时间"></el-table-column>
+            <el-table-column prop="insertTime" label="操作时间"></el-table-column>
             <el-table-column prop="enIdText" label="操作人"></el-table-column>
             <el-table-column label="操作" width="200">
                 <template slot-scope="scope">
-                    <el-button type="text" size="small" @click="editUser(scope.row.id)"><i class="el-icon-edit"></i>修改</el-button>
+                    <el-button type="text" size="small" @click="editUser(scope.row)"><i class="el-icon-edit"></i>修改</el-button>
                     <el-button type="text" size="small" @click="deleteUser(scope.row.id)"><i class="el-icon-delete"></i>移除</el-button>
                 </template>
             </el-table-column>
@@ -39,13 +39,12 @@
         </el-pagination>
         <el-dialog :title="isEdit == true ?'修改':'新增'" :visible.sync="dialogAddUserVisible" width="450px">
             <el-form :model="form" :rules="rules" ref="ruleForm">
-                <el-form-item label="企业名称：" :label-width="formLabelWidth" prop="account">
-                    <el-input type="text" v-if="!isEdit" v-model="form.account" auto-complete="new-password"
-                                placeholder="请输入企业名称（必填）"></el-input>
-                    <span v-else>{{ form.account }}</span>
+                <el-form-item label="企业名称：" :label-width="formLabelWidth" prop="company_name">
+                    <el-input type="text" v-if="!isEdit" v-model="form.company_name" auto-complete="new-password" placeholder="请输入企业名称（必填）"></el-input>
+                    <span v-else>{{ form.company_name}}</span>
                 </el-form-item>
-                    <el-form-item label="联系人：" :label-width="formLabelWidth" prop="name">
-                    <el-input v-model="form.name" autocomplete="off" placeholder="请输入姓名（必填）"></el-input>
+                <el-form-item label="联系人：" :label-width="formLabelWidth" prop="contact_name">
+                    <el-input v-model="form.contact_name" autocomplete="off" placeholder="请输入姓名（必填）"></el-input>
                 </el-form-item>
                 <el-form-item label="联系电话：" :label-width="formLabelWidth" prop="phone">
                     <el-input v-model.number="form.phone" autocomplete="off" minlength="11" maxlength="11"
@@ -61,29 +60,13 @@
 </template>
 <script>
 import {
-    getWhitelist, getUserDetail, editUserStatus,
-    addUser, deleteUser, resetPass,
-    updateUserInfo, existsUserName
+    getWhitelist, updateWhiteList,
+    addWhiteList, deleteWhiteList,
 } from "@/api/user"
-import {validatePhone, validateChinese} from "@/utils/validate"
+import {validatePhone} from "@/utils/validate"
 export default {
     name: "whiteList",
     data() {
-        const checkIsUserdUser = (rule, value, callback) => {
-            if (validateChinese(value)) {
-                return callback(new Error('用户名不可为中文'));
-            } else {
-                if (!this.isEdit) {
-                    existsUserName({account: this.form.account}).then(res => {
-                        callback()
-                    }).catch(err => {
-                        return callback(new Error(err.message));
-                    })
-                } else {
-                    callback()
-                }
-            }
-        };
         const checkPhone = (rule, value, callback) => {
             if (!value) {
                 return callback(new Error('手机号不能为空'));
@@ -99,7 +82,7 @@ export default {
         return {
             isEdit: false,                       //添加 or 修改标记
             formSearch: {//模糊搜索
-                account: ''
+                company_name: ''
             },
             currentPage: 1,                      //当前页
             pageSize: 10,                        //每页条数
@@ -108,22 +91,16 @@ export default {
             dialogResetPass: false,              //重置密码的Dialog
             formLabelWidth: '130px',             //form的lable的宽带
             form: {                              //添加修改的form
-                account: '',
-                name: '',
+                company_name: '',
+                contact_name: '',
                 phone: ''
             },
-            formPass: {                          //重置密码的form
-                id: '',
-                password: '',
-                version: '',
-                account: '',
-            },
             rules: {                            //添加修改的校验规则
-                account: [
+                company_name:[
                     {required: true, message: '请输入企业名称', trigger: 'blur'},
-                    {validator: checkIsUserdUser, trigger: 'blur'}
+                    // {validator: checkIsUserdUser, trigger: 'blur'}
                 ],
-                name: [
+                contact_name:[
                     {required: true, message: '请输入联系人姓名', trigger: 'blur'},
                     {min: 2, max: 5, message: '长度在 2 到 5 个字符', trigger: 'blur'}
                 ],
@@ -162,8 +139,9 @@ export default {
             this.dialogAddUserVisible = true
         },
         //添加用户信息
-        addUserInfo() {
-            addUser(params).then(res => {
+        addWhiteListInfo() {
+            this.form.insert_time = new Date().toLocaleString()
+            addWhiteList(this.form).then(res => {
                 this.$message({
                     message: res.message,
                     type: res.status == 200 ? 'success' : 'error'
@@ -180,7 +158,7 @@ export default {
                 cancelButtonText: '取消',
                 type: 'warning'
             }).then(() => {
-                deleteUser([id]).then(res => {
+                deleteWhiteList({wid:id}).then(res => {
                     this.$message({
                         message: '删除成功！',
                         type: 'success'
@@ -196,26 +174,20 @@ export default {
 
         },
         //获取用户详细信息
-        editUser(id) {
+        editUser(row) {
             this.isEdit = true
-            // this.form = {}
+            this.form = row
+            this.form = {
+                company_name: row.companyName,
+                contact_name: row.contactName,
+                // insert_time: row.insertTime,
+                phone: row.phone,
+            },
             this.dialogAddUserVisible = true
-            getUserDetail(id).then(res => {
-                // this.form = {//添加修改的form
-                //     id: res.data.id,
-                //     account: res.data.account,
-                //     name: res.data.realName,
-                //     phone: res.data.phone,
-                //     typeId: res.data.typeId,
-                //     idNumber: res.data.idNumber,
-                //     email: res.data.email
-                // }
-                this.form = res.data
-            })
         },
         //更新用户信息
         updateUserData() {
-            updateUserInfo(this.form).then(res => {
+            updateWhiteList(this.form).then(res => {
                 this.$message({
                     message: res.message,
                     type: res.status == 200 ? 'success' : 'error'
@@ -231,7 +203,7 @@ export default {
                     if (this.isEdit) {
                         this.updateUserData()
                     } else {
-                        this.addUserInfo()
+                        this.addWhiteListInfo()
                     }
 
                 } else {