优化场站管理解决申请列表分页查询问题

shenhailong
src/views/nav1/role.vue
src/views/nav1/user.vue
src/views/nav3/Page6.vue
src/views/nav3/Page7.vue
src/views/road_verecord/verecord.vue
src/views/station_manage/Bayonet.vue
src/views/station_manage/Warehouse.vue
src/views/station_manage/Yard.vue
--- a/src/views/nav1/role.vue
查看文件 @a248716
+++ b/src/views/nav1/role.vue
查看文件 @a248716
@@ -41,7 +41,7 @@
 			</el-table-column>
 			<el-table-column prop="mqcode" label="海关通道编号" min-width="150" >
 			</el-table-column>
-			<el-table-column label="操作" min-width="260">
+			<el-table-column label="操作" min-width="360">
 				<template slot-scope="scope">
 					<el-button type="primary" size="small" @click="handleAdd(scope.$index, scope.row)">新增下级</el-button>
 					<el-button size="small" @click="setPerm(scope.$index, scope.row)">设置权限</el-button>
--- a/src/views/nav1/user.vue
查看文件 @a248716
+++ b/src/views/nav1/user.vue
查看文件 @a248716
@@ -20,30 +20,30 @@
 		<!--列表-->
 		<el-table :data="users" highlight-current-row border v-loading="listLoading" @selection-change="selsChange" style="width: 100%;">
-			<el-table-column type="selection" width="55">
+			<el-table-column type="selection" width="55px">
 			</el-table-column>
-			<el-table-column prop="loginName" label="账号" width="120" sortable>
+			<el-table-column prop="loginName" label="账号" width="120px" sortable>
 			</el-table-column>
-			<el-table-column prop="name" label="姓名" width="120" sortable>
+			<el-table-column prop="name" label="姓名" width="120px" sortable>
 			</el-table-column>
-			<el-table-column prop="mobile" label="电话" width="125">
+			<el-table-column prop="mobile" label="电话" width="125px">
 			</el-table-column>
-			<el-table-column prop="createDate" label="创建时间" width="170" sortable>
+			<el-table-column prop="createDate" label="创建时间" width="170px" sortable>
 			</el-table-column>
-			<el-table-column prop="updateDate" label="更新时间" width="170" sortable>
+			<el-table-column prop="updateDate" label="更新时间" width="170px" sortable>
 			</el-table-column>
-			<el-table-column prop="address" label="地址" min-width="180">
+			<el-table-column prop="address" label="地址" min-width="120px">
 			</el-table-column>
-			<el-table-column prop="email" label="Email" min-width="180">
+			<el-table-column prop="email" label="Email" min-width="120px">
 			</el-table-column>
-			<el-table-column prop="loginFlag" label="启用" width="100" :formatter="formatState" sortable>
+			<el-table-column prop="loginFlag" label="启用" width="100px" :formatter="formatState" sortable>
 			</el-table-column>
-			<el-table-column label="操作" width="250">
+			<el-table-column label="操作" width="350px">
 				<template slot-scope="scope">
 					<el-button size="small" @click="roleEdit(scope.$index, scope.row)" type="primary">角色配置</el-button>
 					<el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
 					<el-button size="small" @click="resetUserPass(scope.$index, scope.row)" type="warning">重置密码</el-button>
-					<el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button>
+					<el-button size="small" type="danger"  @click="handleDel(scope.$index, scope.row)">删除</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
@@ -335,9 +335,10 @@
 			 * @param row
 			 */
 			resetUserPass: function(index,row){
-				this.editForm = Object.assign({}, row);
-				this.editForm.password= 'zzairport@kako2020';
-				editPass(this.editForm).then(res=>{
+				let user = {};
+				user.id  = row.id;
+				user.password = 'zzairport@kako2020';
+				editPass(user).then(res=>{
 					let response=res.data;
 					if(response.code=='200'){
 						this.$notify({
--- a/src/views/nav3/Page6.vue
查看文件 @a248716
+++ b/src/views/nav3/Page6.vue
查看文件 @a248716
@@ -40,7 +40,7 @@
 					</el-col>
 					<el-col :span="2">
 						<el-form-item>
-							<el-button type="primary" @click="getList()" size="small">查询</el-button>
+							<el-button type="primary" @click="getList(1)" size="small">查询</el-button>
 						</el-form-item>
 					</el-col>
 				</el-row>
@@ -492,9 +492,13 @@
 				}
 			},
 			// 获取列表
-			getList() {
+			getList(val) {
+				let pageSize = this.pageSize;
+				if (val != undefined){
+					pageSize = val;
+				}
 				let para = {
-					pageSize: this.pageSize,
+					pageSize: pageSize,
 					limitSize: this.limitSize,
 					trailerFrameNo: this.filters.trailerFrameNo,
 					agentname: this.filters.agentname,
--- a/src/views/nav3/Page7.vue
查看文件 @a248716
+++ b/src/views/nav3/Page7.vue
查看文件 @a248716
@@ -76,7 +76,7 @@
                             </el-row>
                             <el-row>
                                 <el-form-item label="车牌号码：" prop="trailerFrameNo">
-                                    <el-input v-model="addForm.trailerFrameNo" placeholder="请输入车牌号" @change="trailerFrameNo(addForm.trailerFrameNo)" size="small" style="width: 180px"></el-input>
+                                    <el-input v-model.trim="addForm.trailerFrameNo" placeholder="请输入车牌号" @change="trailerFrameNo(addForm.trailerFrameNo)" size="small" style="width: 180px"></el-input>
                                 </el-form-item>
                             </el-row>
                             <el-row>
@@ -84,9 +84,10 @@
                                     <el-select v-model="addForm.cocode" placeholder="请选择" size="small" style="width: 180px">
                                         <el-option label="转关货" value="转关货"></el-option>
                                         <el-option label="换单货" value="换单货"></el-option>
-                                        <el-option label="普通货" selected value="普通货"></el-option>
+                                        <el-option label="普通货" value="普通货"></el-option>
                                         <el-option label="退库货" value="退库货"></el-option>
                                         <el-option label="查验货" value="查验货"></el-option>
+                                        <el-option label="快件货" value="快件货"></el-option>
                                     </el-select>
                                 </el-form-item>
                             </el-row>
@@ -408,7 +409,6 @@
             addsubmit(){
                 this.addForm.masterList = this.wayBillList();
                 this.addForm.remark = this.weightFloat.toString();
-                this.addForm.trailerFrameNo = this.addForm.trailerFrameNo.trim;
                 let para = Object.assign({}, this.addForm);
                 this.addloading = true;
                 save(para).then((res) => {
@@ -468,6 +468,7 @@
         },
         mounted() {
             this.getYardList();
+            this.addForm.cocode = '普通货物'
         },
         computed: {
         },
--- a/src/views/road_verecord/verecord.vue
查看文件 @a248716
+++ b/src/views/road_verecord/verecord.vue
查看文件 @a248716
@@ -7,7 +7,7 @@
                     <el-input v-model="filters.trailerFrameNo" placeholder="车牌号查询"></el-input>
                 </el-form-item>
                 <el-form-item>
-                    <el-button type="primary" v-on:click="getReCord()">查询</el-button>
+                    <el-button type="primary" v-on:click="getReCord(1)">查询</el-button>
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="companyAdd">新增</el-button>
@@ -365,9 +365,13 @@
         },
         methods: {
             //获取备案列表
-            getReCord() {
+            getReCord(val) {
+                let pageSize = this.pageSize;
+                if (val != undefined){
+                    pageSize = val;
+                }
                 let para = {
-                    pageSize: this.pageSize,
+                    pageSize: pageSize,
                     limitSize: this.limitSize,
                     trailerFrameNo: this.filters.trailerFrameNo,
                     userId: this.userid = JSON.parse(sessionStorage.getItem('user')).id
--- a/src/views/station_manage/Bayonet.vue
查看文件 @a248716
+++ b/src/views/station_manage/Bayonet.vue
查看文件 @a248716
@@ -35,12 +35,7 @@
                     <el-table-column label="场站名称" prop="yard.name" align="center" width="120"></el-table-column>
                     <el-table-column label="卡口名称" prop="name" align="center" width="200"></el-table-column>
                     <el-table-column label="通道编号" prop="channel" align="center" width="200"></el-table-column>
-                    <el-table-column label="卡口类型" prop="type" align="center" width="200">
-                        <template slot-scope="scope">
-                            <span v-if="scope.row.type ==='1'">进</span>
-                            <span v-if="scope.row.type ==='2'">出</span>
-                            <span v-if="scope.row.type ==='3'">进出共用</span>
-                        </template>
+                    <el-table-column label="卡口类型" prop="type" :formatter="kakoType" align="center" width="200">
                     </el-table-column>
                     <el-table-column label="备注信息" prop="remarks" align="center" width="200"></el-table-column>
                     <el-table-column label="操作" width="140px" align="center">
@@ -239,17 +234,13 @@
                  */
                 bayonetTypeList: [
                     {
-                        value: '1',
+                        value: 'I',
                         label: '进'
                     },
                     {
-                        value: '2',
+                        value: 'E',
                         label: '出'
                     },
-                    {
-                        value: '3',
-                        label: '进出共用'
-                    },
                 ],
                 /**
                  * 加载
@@ -493,8 +484,22 @@
                 }).catch(error => {
                     this.$message.error(error.toString());
                 });
+            },
+
+            // 卡口类型
+            kakoType(row, column){
+                console.log(row);
+                if (row.type == 'I'){
+                    return '进'
+                }else if (row.type == 'E'){
+                    return '出'
+                }
+
             }
         },
+        mounted() {
+            this.bayonet_getList();
+        }
     }
 </script>
--- a/src/views/station_manage/Warehouse.vue
查看文件 @a248716
+++ b/src/views/station_manage/Warehouse.vue
查看文件 @a248716
@@ -584,6 +584,9 @@
                 });
             },
         },
+        mounted() {
+            this.warehouse_getList();
+        }
     }
 </script>
--- a/src/views/station_manage/Yard.vue
查看文件 @a248716
+++ b/src/views/station_manage/Yard.vue
查看文件 @a248716
@@ -418,6 +418,9 @@
                 });
             },
         },
+        mounted() {
+            this.yard_getList();
+        }
     }
 </script>