Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
241be316 1 parent 98269bd1

version:1.0.0

Inline Side-by-side
Showing 4 changed files with 24 additions and 8 deletions
...@@ -42,5 +42,5 @@ module.exports = { ...@@ -42,5 +42,5 @@ module.exports = {
42 /** 42 /**
43 * 版本号 43 * 版本号
44 */ 44 */
45 - version:'version：0.5.7.2' 45 + version:'version：1.0.0'
46 } 46 }
......
...@@ -55,7 +55,7 @@ service.interceptors.request.use(config => { ...@@ -55,7 +55,7 @@ service.interceptors.request.use(config => {
55 // 响应拦截器 55 // 响应拦截器
56 service.interceptors.response.use(res => { 56 service.interceptors.response.use(res => {
57 if(res.headers['token']){ 57 if(res.headers['token']){
58 - setToken(decodeURI(res.headers['token'])) 58 + setToken(decodeURIComponent(res.headers['token']))
59 } 59 }
60 // 未设置状态码则默认成功状态 60 // 未设置状态码则默认成功状态
61 const code = res.data.code || 200; 61 const code = res.data.code || 200;
......
...@@ -142,6 +142,7 @@ ...@@ -142,6 +142,7 @@
142 </el-col> 142 </el-col>
143 <el-col :span="6"> 143 <el-col :span="6">
144 <el-form-item label="重量区间"> 144 <el-form-item label="重量区间">
145 + <el-row>
145 <el-col :span="11" 146 <el-col :span="11"
146 ><el-input-number 147 ><el-input-number
147 class="formItem" 148 class="formItem"
...@@ -163,10 +164,12 @@ ...@@ -163,10 +164,12 @@
163 :precision="2" 164 :precision="2"
164 ></el-input-number 165 ></el-input-number
165 ></el-col> 166 ></el-col>
167 + </el-row>
166 </el-form-item> 168 </el-form-item>
167 </el-col> 169 </el-col>
168 <el-col :span="6"> 170 <el-col :span="6">
169 <el-form-item label="件数区间"> 171 <el-form-item label="件数区间">
172 + <el-row>
170 <el-col :span="11" 173 <el-col :span="11"
171 ><el-input-number 174 ><el-input-number
172 class="formItem" 175 class="formItem"
...@@ -186,6 +189,7 @@ ...@@ -186,6 +189,7 @@
186 :min="formData.minNumber" 189 :min="formData.minNumber"
187 ></el-input-number 190 ></el-input-number
188 ></el-col> 191 ></el-col>
192 + </el-row>
189 </el-form-item> 193 </el-form-item>
190 </el-col> 194 </el-col>
191 <!-- <el-col :span="6"> 195 <!-- <el-col :span="6">
...@@ -270,7 +274,7 @@ ...@@ -270,7 +274,7 @@
270 icon="el-icon-search" 274 icon="el-icon-search"
271 size="mini" 275 size="mini"
272 :loading="loading" 276 :loading="loading"
273 - @click="select" 277 + @click="select(0)"
274 >查询</el-button 278 >查询</el-button
275 > 279 >
276 <el-button 280 <el-button
...@@ -314,6 +318,7 @@ ...@@ -314,6 +318,7 @@
314 :loading="loading" 318 :loading="loading"
315 :limitSize="size" 319 :limitSize="size"
316 :limitStart="formData.limitStart" 320 :limitStart="formData.limitStart"
321 + :page="page"
317 :shiftKey="shiftKey" 322 :shiftKey="shiftKey"
318 height="350" 323 height="350"
319 @tableSelect="tableSelect" 324 @tableSelect="tableSelect"
...@@ -793,9 +798,10 @@ export default { ...@@ -793,9 +798,10 @@ export default {
793 }; 798 };
794 }, 799 },
795 created() { 800 created() {
796 - this.seleData() 801 + this.seleData();
797 this.select(); 802 this.select();
798 }, 803 },
804 +
799 mounted() { 805 mounted() {
800 window.addEventListener("keydown", (code) => { 806 window.addEventListener("keydown", (code) => {
801 if (code.keyCode === 16 && code.shiftKey) { 807 if (code.keyCode === 16 && code.shiftKey) {
...@@ -852,9 +858,13 @@ export default { ...@@ -852,9 +858,13 @@ export default {
852 .catch(() => {}); 858 .catch(() => {});
853 }, 859 },
854 //查询 860 //查询
855 - async select() { 861 + async select(val) {
856 this.loading = true; 862 this.loading = true;
857 this.dataInfo(); 863 this.dataInfo();
864 + if(val === 0){
865 + this.page = 1;
866 + this.formData.page = 1;
867 + }
858 findCargoAllocationData(this.formData) 868 findCargoAllocationData(this.formData)
859 .then((res) => { 869 .then((res) => {
860 this.loading = false; 870 this.loading = false;
......
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
213 icon="el-icon-search" 213 icon="el-icon-search"
214 size="small" 214 size="small"
215 :loading="tableLoading" 215 :loading="tableLoading"
216 - @click="select" 216 + @click="select(0)"
217 >查询</el-button 217 >查询</el-button
218 > 218 >
219 <el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(0)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading" 219 <el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(0)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading"
...@@ -239,6 +239,7 @@ ...@@ -239,6 +239,7 @@
239 :loading="tableLoading" 239 :loading="tableLoading"
240 :limitSize="limitSize" 240 :limitSize="limitSize"
241 :limitStart="limitStart" 241 :limitStart="limitStart"
242 + :page="page"
242 :shiftKey="shiftKey" 243 :shiftKey="shiftKey"
243 height="550" 244 height="550"
244 @tableSelect="tableSelect" 245 @tableSelect="tableSelect"
...@@ -709,7 +710,7 @@ export default { ...@@ -709,7 +710,7 @@ export default {
709 }; 710 };
710 }, 711 },
711 created() { 712 created() {
712 - //查询条件 713 + // 查询条件
713 findConditionData().then((res) => { 714 findConditionData().then((res) => {
714 if (res.code == 200) { 715 if (res.code == 200) {
715 this.findConditionData = res.data; 716 this.findConditionData = res.data;
...@@ -740,12 +741,17 @@ export default { ...@@ -740,12 +741,17 @@ export default {
740 this.$refs.cargoForm.resetFields(); 741 this.$refs.cargoForm.resetFields();
741 }, 742 },
742 //查询 743 //查询
743 - select() { 744 + select(val) {
744 this.tableData = []; 745 this.tableData = [];
745 this.allWeight = 0; 746 this.allWeight = 0;
746 this.allQty = 0; 747 this.allQty = 0;
747 this.tableLoading = true; 748 this.tableLoading = true;
748 this.dataInfo(); 749 this.dataInfo();
750 + if(val === 0){
751 + this.formData.limitStart = 1;
752 + this.limitStart = 1;
753 + this.page = 1;
754 + }
749 findCargoData(this.formData).then((res) => { 755 findCargoData(this.formData).then((res) => {
750 if (res.code == 200) { 756 if (res.code == 200) {
751 this.tableData = res.data.list; 757 this.tableData = res.data.list;
......