From fb6f530bc0e0302d75f690752bf8ca4ac722400e Mon Sep 17 00:00:00 2001
From: "DESKTOP-00SUCB6\\Administrator" <qinshunyu07@sina.com>
Date: Mon, 26 Apr 2021 14:39:07 +0800
Subject: [PATCH] no message

---
 public/config.js                     |  4 +-
 src/views/get/addGet.vue             | 71 ++++++++++++++++++++--------
 src/views/get/get.vue                | 25 +++++-----
 src/views/send/send.vue              |  8 ++--
 src/views/systemManage/whiteList.vue | 12 +++--
 5 files changed, 76 insertions(+), 44 deletions(-)

diff --git a/public/config.js b/public/config.js
index b3b4a2a..5fdb086 100644
--- a/public/config.js
+++ b/public/config.js
@@ -5,8 +5,8 @@
 //         SHOW_URL: "http://www.fatoaniic.com/ftpfile/",
 //     }
     config = {
-        API_URL: 'http://121.36.65.171:9999',
-        // API_URL: 'http://172.119.50.59:8081',
+        // API_URL: 'http://121.36.65.171:9999',
+        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/views/get/addGet.vue b/src/views/get/addGet.vue
index 4a6965c..0e9bbb0 100644
--- a/src/views/get/addGet.vue
+++ b/src/views/get/addGet.vue
@@ -3,10 +3,10 @@
         <div>
             <el-form :inline="true"  class="demo-form-inline">
                 <el-form-item label="取码单编号:">
-                    123123123
+                    {{num}}
                 </el-form-item>
                 <el-form-item label="时间:">
-                    2021-05-01
+                    {{theGetTime}}
                 </el-form-item>
             </el-form>
             <span class="font-size-16 line-height-2em color-error" style="margin-right:20px;">发码总数：{{AllData.sendTotal}}</span>
@@ -23,9 +23,9 @@
                     >
                     <template slot-scope="scope">
                         <el-form-item
-                            :prop="'params.' + scope.$index + '.describe'"
-                            :rules="paramsForm.paramsRules.describe">
-                            <el-input v-model="scope.row.describe" size="small"></el-input>
+                            :prop="'params.' + scope.$index + '.summary'"
+                            :rules="paramsForm.paramsRules.summary">
+                            <el-input v-model="scope.row.summary" size="small"></el-input>
                         </el-form-item>
                     </template>
                 </el-table-column>
@@ -34,11 +34,10 @@
                     >
                     <template slot-scope="scope">
                         <el-form-item
-                            :prop="'params.' + scope.$index + '.company'"
-                            :rules="paramsForm.paramsRules.company">
-                            <el-select v-model="scope.row.company" placeholder="请选择印刷公司"  size="small">
-                                <el-option label="公司一" value="1"></el-option>
-                                <el-option label="公司二" value="2"></el-option>
+                            :prop="'params.' + scope.$index + '.whitelist_id'"
+                            :rules="paramsForm.paramsRules.whitelist_id">
+                            <el-select v-model="scope.row.whitelist_id" placeholder="请选择印刷公司"  size="small">
+                                <el-option v-for="(item,index) in whiteList" :key="index" :label="item.companyName" :value="item.id"></el-option>
                             </el-select>
                         </el-form-item>
                     </template>
@@ -48,9 +47,9 @@
                     >
                     <template slot-scope="scope">
                         <el-form-item
-                            :prop="'params.' + scope.$index + '.number'"
-                            :rules="paramsForm.paramsRules.number">
-                            <el-input v-model.number="scope.row.number" size="small"></el-input>
+                            :prop="'params.' + scope.$index + '.fetch_count'"
+                            :rules="paramsForm.paramsRules.fetch_count">
+                            <el-input v-model.number="scope.row.fetch_count" size="small"></el-input>
                         </el-form-item>
                     </template>
                 </el-table-column>
@@ -76,6 +75,7 @@
 import {
     addFetchList
 } from "@/api/get"
+import { getWhitelist } from "@/api/user"
 export default {
     name: "addGet",
     data() {
@@ -86,35 +86,64 @@ export default {
                 getTotal:'40000万',
                 otherTotal:'50000万',
             },
+            id:this.$route.query.id || "",
+            num:'FMD_'+new Date().getTime(),
+            theGetTime:new Date().toLocaleDateString() + ' ' + new Date().toTimeString().split(" ")[0],
             paramsForm:{
-                params: [
-                    {describe:'aaa',number:123,company:'公司1'}
-                ],  
+                params: [],  
                 paramsRules:{
-                    company:[
+                    whitelist_id:[
                         {required: true, message: '请选择公司', trigger: 'change'}
                     ],
-                    number:[
+                    fetch_count:[
                         {required: true,type:'number', message: '请输入取码数量', trigger: 'blur'}
                     ],
                 }
-            }
-                                //表格数据
+            },
+            whiteList:[]
         };
     },
     mounted() {
+        this.getCompanyList()
     },
     methods: {
+        getCompanyList(){
+            const params = {
+                pageNo: 1,
+                pageSize: 1000,
+            }
+            
+            getWhitelist(params).then(res => {
+                this.whiteList = res.data.list
+            })
+        },
         addRowData(){
-            this.paramsForm.params.push({describe:'',number:'',company:''})
+            this.paramsForm.params.push({summary:'',fetch_count:'',whitelist_id:''})
         },
         deleteData(index){
             this.paramsForm.params.splice(index,1)
         },
+        addFetch(){
+            const params = {
+                fetch_time:this.theGetTime,
+                fetch_id:this.num,
+                list:this.paramsForm.params
+            }
+            addFetchList(params).then(res => {
+                this.$message({
+                    message: res.msg,
+                    type: res.code == 200 ? 'success' : 'error'
+                });
+                this.$router.go(-1);
+            }).catch(err => {
+                console.log(err);
+            })
+        },
         //form提交检验
         submitForm(formName) {
             this.$refs[formName].validate((valid) => {
                 if (valid) {
+                    this.addFetch()
                 } else {
                     console.log('error submit!!');
                     return false;
diff --git a/src/views/get/get.vue b/src/views/get/get.vue
index f930a1b..871c225 100644
--- a/src/views/get/get.vue
+++ b/src/views/get/get.vue
@@ -6,6 +6,7 @@
                     <el-date-picker
                         v-model="formSearch.time"
                         size="mini"
+                        value-format="yyyy-MM-dd HH:mm:ss"
                         type="daterange"
                         range-separator="至"
                         start-placeholder="开始日期"
@@ -24,21 +25,21 @@
             </el-form>
         </div>
         <el-table :data="tableData" style="width: 100%" header-row-class-name="">
-            <el-table-column prop="phone" label="取码单号"></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="enIdText" label="取码数（万）"></el-table-column>
-            <el-table-column prop="enIdText" label="取码单状态"></el-table-column>
-            <el-table-column prop="enIdText" label="防伪码">
+            <el-table-column prop="fetchId" label="取码单号"></el-table-column>
+            <el-table-column prop="fetchTime" label="日期"></el-table-column>
+            <!-- <el-table-column prop="summary" label="摘要"></el-table-column> -->
+            <el-table-column prop="fetchCount" label="取码数"></el-table-column>
+            <el-table-column prop="status" label="取码单状态"></el-table-column>
+            <el-table-column prop="fileName" label="防伪码">
                 <template slot-scope="scope">
-                    <a :href="scope.row.file">{{scope.row.file}}</a>
+                    <a :href="scope.row.downloadUrl"><el-button type="text">{{scope.row.fileName}}</el-button></a>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" width="200">
+            <el-table-column label="操作" width="250">
                 <template slot-scope="scope">
-                    <el-button type="text" size="small" @click="addGetDialog(scope.row.id)"><i class="el-icon-edit"></i>编辑</el-button>
-                    <el-button type="text" size="small" @click="confirm(scope.row.id)"><i class="el-icon-edit"></i>生成防伪码印刷文件</el-button>
-                    <el-button type="text" size="small" @click="showDetail"><i class="el-icon-delete"></i>查看</el-button>
+                    <el-button type="text" size="small" @click="addGetDialog(scope.row.id)">编辑</el-button>
+                    <el-button type="text" size="small" @click="confirm(scope.row.id)">生成防伪码印刷文件</el-button>
+                    <el-button type="text" size="small" @click="showDetail">查看</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -122,7 +123,7 @@ export default {
         },
         //点击创建取码单
         addGetDialog(id){
-            this.$router.push({name:'addGet'})
+            this.$router.push({name:'addGet',query:{id:id}})
         },
         //每页条数变化
         handleSizeChange(val) {
diff --git a/src/views/send/send.vue b/src/views/send/send.vue
index 125747a..71dfe14 100644
--- a/src/views/send/send.vue
+++ b/src/views/send/send.vue
@@ -34,9 +34,9 @@
         <br><br>
         <el-table :data="tableData" style="width: 100%" header-row-class-name="">
             <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="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">
@@ -168,7 +168,7 @@ export default {
             }
             addSendList(params).then(res => {
                 this.$message({
-                    message: res.mes,
+                    message: res.msg,
                     type: res.code == 200 ? 'success' : 'error'
                 });
                 this.resetForm('sendForm')
diff --git a/src/views/systemManage/whiteList.vue b/src/views/systemManage/whiteList.vue
index 46b2f9a..6a1a88f 100644
--- a/src/views/systemManage/whiteList.vue
+++ b/src/views/systemManage/whiteList.vue
@@ -3,7 +3,7 @@
         <div>
             <el-form :inline="true" :model="formSearch" ref="ruleForm" class="demo-form-inline">
                 <el-form-item label="企业名称:">
-                    <el-input v-model="formSearch.account" size="mini" placeholder="请输入企业名称" clearable maxlength="50"></el-input>
+                    <el-input v-model="formSearch.company_name" size="mini" placeholder="请输入企业名称" clearable maxlength="50"></el-input>
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" size="mini" icon="el-icon-search" @click="search">查询</el-button>
@@ -126,6 +126,7 @@ export default {
             const params = {
                 pageNo: this.currentPage,
                 pageSize: this.pageSize,
+                company_name:this.formSearch.company_name || null
             }
             getWhitelist(params).then(res => {
                 this.tableData = res.data.list
@@ -142,8 +143,8 @@ export default {
         addWhiteListInfo() {
             addWhiteList(this.form).then(res => {
                 this.$message({
-                    message: res.message,
-                    type: res.status == 200 ? 'success' : 'error'
+                    message: res.msg,
+                    type: res.code == 200 ? 'success' : 'error'
                 });
                 this.resetForm('ruleForm')
                 this.dialogAddUserVisible = false
@@ -181,6 +182,7 @@ export default {
                 contact_name: row.contactName,
                 // insert_time: row.insertTime,
                 phone: row.phone,
+                wid:row.id
             },
             this.dialogAddUserVisible = true
         },
@@ -188,8 +190,8 @@ export default {
         updateUserData() {
             updateWhiteList(this.form).then(res => {
                 this.$message({
-                    message: res.message,
-                    type: res.status == 200 ? 'success' : 'error'
+                    message: res.msg,
+                    type: res.code == 200 ? 'success' : 'error'
                 });
                 this.dialogAddUserVisible = false
                 this.initData()