朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 879aed52a0f3024249d0395d38bf2c72a4e800c3 1 个父辈 029fd37b

新增区分进出港数据功能

内嵌 并排对比
正在显示 12 个修改的文件 包含 44 行增加 和 16 行删除
@@ -191,7 +191,7 @@ @@ -191,7 +191,7 @@
191 dischargecompleteddatetime:undefined, 191 dischargecompleteddatetime:undefined,
192 arrivaldatetime:undefined, 192 arrivaldatetime:undefined,
193 meno:undefined, 193 meno:undefined,
194 - accessFlag:'0', 194 + accessFlag: '0',
195 createBy:loginUserInfo.username, 195 createBy:loginUserInfo.username,
196 updateBy:loginUserInfo.username, 196 updateBy:loginUserInfo.username,
197 }, 197 },
@@ -21,6 +21,16 @@ @@ -21,6 +21,16 @@
21 </el-select> 21 </el-select>
22 </el-form-item> 22 </el-form-item>
23 </el-col> 23 </el-col>
  24 +<!-- <el-col :span="8">-->
  25 +<!-- <el-form-item label="国籍" prop="country" label-width="120px">-->
  26 +<!-- <Nationality v-on:tellFarther="fromCountry"></Nationality>-->
  27 +<!-- </el-form-item>-->
  28 +<!-- </el-col>-->
  29 +<!-- <el-col :span="8">-->
  30 +<!-- <el-form-item label="证件" prop="certType" label-width="120px">-->
  31 +<!-- <Document v-on:tellFa="fromDocument"></Document>-->
  32 +<!-- </el-form-item>-->
  33 +<!-- </el-col>-->
24 <el-col :span="24"> 34 <el-col :span="24">
25 <el-form-item label="备注" prop="reamrk" label-width="120px"> 35 <el-form-item label="备注" prop="reamrk" label-width="120px">
26 <el-input v-model="configure.reamrk"></el-input> 36 <el-input v-model="configure.reamrk"></el-input>
@@ -69,18 +79,25 @@ @@ -69,18 +79,25 @@
69 </style> 79 </style>
70 <script> 80 <script>
71 import { addSchedule} from "../../api/transport"; 81 import { addSchedule} from "../../api/transport";
72 - import loginUserInfo from '../../api/base'  
73 - 82 + import loginUserInfo from '../../api/base';
  83 + import Nationality from './Nationality'
  84 + import Document from './Document'
74 85
75 export default { 86 export default {
  87 + components: { Nationality, Document },
  88 +
76 data(){ 89 data(){
77 return{ 90 return{
  91 + //国籍数据
  92 + // countryOptions:[],
78 configure:{ 93 configure:{
79 username:loginUserInfo.username, 94 username:loginUserInfo.username,
80 flightNo:undefined, 95 flightNo:undefined,
81 - ietype:undefined, 96 + ietype:'0',
82 reamrk:undefined, 97 reamrk:undefined,
83 - accessFlag:'1', 98 + // accessFlag:'1',
  99 + country:'',
  100 + certType:'',
84 createBy:loginUserInfo.username, 101 createBy:loginUserInfo.username,
85 updateBy:loginUserInfo.username, 102 updateBy:loginUserInfo.username,
86 }, 103 },
@@ -104,6 +121,16 @@ @@ -104,6 +121,16 @@
104 } 121 }
105 }, 122 },
106 methods:{ 123 methods:{
  124 + //从子组件获取国籍数据
  125 + fromCountry:function(val){
  126 + console.log("来自子组件的值:"+val)
  127 + this.configure.country = val;
  128 + },
  129 + //从子组件获取证件数据
  130 + fromDocument:function(val){
  131 + console.log("来自子组件的值:"+val)
  132 + this.configure.certType = val;
  133 + },
107 //新增进港确报申报（保存按钮） 134 //新增进港确报申报（保存按钮）
108 submitForm(formName) { 135 submitForm(formName) {
109 let _this = this; 136 let _this = this;
@@ -172,7 +172,7 @@ @@ -172,7 +172,7 @@
172 arrivaldatetime:undefined, 172 arrivaldatetime:undefined,
173 stayid:undefined, 173 stayid:undefined,
174 meno:undefined, 174 meno:undefined,
175 - accessFlag:'0', 175 + accessFlag: '0',
176 createBy:loginUserInfo.username, 176 createBy:loginUserInfo.username,
177 updateBy:loginUserInfo.username, 177 updateBy:loginUserInfo.username,
178 }, 178 },
@@ -156,7 +156,7 @@ @@ -156,7 +156,7 @@
156 departuredatetime:undefined, 156 departuredatetime:undefined,
157 customDistrictNo:undefined, 157 customDistrictNo:undefined,
158 meno:undefined, 158 meno:undefined,
159 - accessFlag:'1', 159 + accessFlag: '1',
160 createBy:loginUserInfo.username, 160 createBy:loginUserInfo.username,
161 updateBy:loginUserInfo.username, 161 updateBy:loginUserInfo.username,
162 }, 162 },
@@ -170,7 +170,7 @@ @@ -170,7 +170,7 @@
170 stayid:undefined, 170 stayid:undefined,
171 departuredatetime:undefined, 171 departuredatetime:undefined,
172 meno:undefined, 172 meno:undefined,
173 - accessFlag:'1', 173 + accessFlag: '1',
174 createBy:loginUserInfo.username, 174 createBy:loginUserInfo.username,
175 updateBy:loginUserInfo.username, 175 updateBy:loginUserInfo.username,
176 }, 176 },
@@ -78,9 +78,9 @@ @@ -78,9 +78,9 @@
78 outConfigure:{ 78 outConfigure:{
79 username:loginUserInfo.username, 79 username:loginUserInfo.username,
80 flightNo:undefined, 80 flightNo:undefined,
81 - ietype:undefined, 81 + ietype:'1',
82 reamrk:undefined, 82 reamrk:undefined,
83 - accessFlag:'2', 83 + // accessFlag:'2',
84 createBy:loginUserInfo.username, 84 createBy:loginUserInfo.username,
85 updateBy:loginUserInfo.username, 85 updateBy:loginUserInfo.username,
86 }, 86 },
@@ -286,7 +286,7 @@ @@ -286,7 +286,7 @@
286 submitForm() { 286 submitForm() {
287 let params = { 287 let params = {
288 pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryArrival.flightNo, 288 pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryArrival.flightNo,
289 - flightDate: this.queryArrival.flightDate 289 + flightDate: this.queryArrival.flightDate,accessFlag:'0'
290 }; 290 };
291 this.tableloading = true; 291 this.tableloading = true;
292 selectPrediction(params).then(res => { 292 selectPrediction(params).then(res => {
@@ -174,7 +174,7 @@ @@ -174,7 +174,7 @@
174 //获取进港航班配置查询列表 174 //获取进港航班配置查询列表
175 submitForm() { 175 submitForm() {
176 let params = { 176 let params = {
177 - pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryConfigure.flightNo, 177 + pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryConfigure.flightNo,ietype:'0'
178 }; 178 };
179 this.tableloading = true; 179 this.tableloading = true;
180 selectSchedule(params).then(res => { 180 selectSchedule(params).then(res => {
@@ -221,7 +221,7 @@ @@ -221,7 +221,7 @@
221 submitForm() { 221 submitForm() {
222 let params = { 222 let params = {
223 pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryConfirmatory.flightNo, 223 pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryConfirmatory.flightNo,
224 - flightDate: this.queryConfirmatory.flightDate 224 + flightDate: this.queryConfirmatory.flightDate,accessFlag:'0'
225 }; 225 };
226 this.tableloading = true; 226 this.tableloading = true;
227 selectConfirm(params).then(res => { 227 selectConfirm(params).then(res => {
@@ -229,7 +229,8 @@ @@ -229,7 +229,8 @@
229 submitForm() { 229 submitForm() {
230 let params = { 230 let params = {
231 pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryDeclare.flightNo, 231 pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryDeclare.flightNo,
232 - flightDate: this.queryDeclare.flightDate 232 + flightDate: this.queryDeclare.flightDate,accessFlag:'1'
  233 +
233 }; 234 };
234 this.tableloading = true; 235 this.tableloading = true;
235 selectConfirm(params).then(res => { 236 selectConfirm(params).then(res => {
@@ -253,7 +253,7 @@ @@ -253,7 +253,7 @@
253 submitForm() { 253 submitForm() {
254 let params = { 254 let params = {
255 pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryDeparture.flightNo, 255 pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryDeparture.flightNo,
256 - flightDate: this.queryDeparture.flightDate 256 + flightDate: this.queryDeparture.flightDate,accessFlag:'1'
257 }; 257 };
258 this.tableloading = true; 258 this.tableloading = true;
259 selectPrediction(params).then(res => { 259 selectPrediction(params).then(res => {
@@ -174,7 +174,7 @@ @@ -174,7 +174,7 @@
174 //获取出港航班配置查询列表 174 //获取出港航班配置查询列表
175 submitForm() { 175 submitForm() {
176 let params = { 176 let params = {
177 - pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryFlightConfigure.flightNo, 177 + pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryFlightConfigure.flightNo,ietype:'1'
178 }; 178 };
179 this.tableloading = true; 179 this.tableloading = true;
180 selectSchedule(params).then(res => { 180 selectSchedule(params).then(res => {