朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 3aa72df1975cf1fac2636fc61083622110d4e86a 1 个父辈 0c386043

理货优化

内嵌 并排对比
正在显示 2 个修改的文件 包含 18 行增加 和 19 行删除
@@ -50,7 +50,6 @@ @@ -50,7 +50,6 @@
50 :remote-method="remoteMethodAirport" 50 :remote-method="remoteMethodAirport"
51 :loading="listLoading" 51 :loading="listLoading"
52 v-model="flight.destinationstation" 52 v-model="flight.destinationstation"
53 - @blur = "elblur"  
54 allow-create 53 allow-create
55 default-first-option 54 default-first-option
56 filterable 55 filterable
@@ -66,11 +65,11 @@ @@ -66,11 +65,11 @@
66 </el-option> 65 </el-option>
67 </el-select> 66 </el-select>
68 </el-col> 67 </el-col>
69 - <el-col :span="4" style="margin-left: 20px">  
70 - <el-input placeholder="可为空" v-model="awba">  
71 - <template slot="prepend">主单号</template>  
72 - </el-input>  
73 - </el-col> 68 +<!-- <el-col :span="4" style="margin-left: 20px">-->
  69 +<!-- <el-input placeholder="可为空" v-model="awba">-->
  70 +<!-- <template slot="prepend">主单号</template>-->
  71 +<!-- </el-input>-->
  72 +<!-- </el-col>-->
74 </el-row> 73 </el-row>
75 <el-row> 74 <el-row>
76 <el-col :span="4" :offset="10"> 75 <el-col :span="4" :offset="10">
@@ -219,10 +218,6 @@ @@ -219,10 +218,6 @@
219 } else { 218 } else {
220 this.airportCode = [] 219 this.airportCode = []
221 } 220 }
222 - },  
223 - elblur: e => {  
224 - // this.destinationstation = "CGO"  
225 - console.log(e)  
226 } 221 }
227 } 222 }
228 }; 223 };
@@ -152,7 +152,7 @@ @@ -152,7 +152,7 @@
152 </el-col> 152 </el-col>
153 <el-col :span="7.5"> 153 <el-col :span="7.5">
154 <el-form-item label="分单号" prop="awbh"> 154 <el-form-item label="分单号" prop="awbh">
155 - <el-input v-model="awbh" :disabled="dialogStatus === 'addAwbh'"></el-input> 155 + <el-input v-model="awbh" clearable :disabled="dialogStatus === 'update'"></el-input>
156 </el-form-item> 156 </el-form-item>
157 </el-col> 157 </el-col>
158 </el-row> 158 </el-row>
@@ -210,18 +210,18 @@ @@ -210,18 +210,18 @@
210 210
211 <el-row> 211 <el-row>
212 <el-col :span="7.5"> 212 <el-col :span="7.5">
213 - <el-form-item label="运单件数" prop="price"> 213 + <el-form-item label="运单件数" prop="awbprice">
214 <el-input v-model="tidyModel.awbprice"></el-input> 214 <el-input v-model="tidyModel.awbprice"></el-input>
215 </el-form-item> 215 </el-form-item>
216 </el-col> 216 </el-col>
217 <el-col :span="7.5"> 217 <el-col :span="7.5">
218 - <el-form-item label="运单重量" prop="weight"> 218 + <el-form-item label="运单重量" prop="awbweight">
219 <el-input v-model="tidyModel.awbweight"></el-input> 219 <el-input v-model="tidyModel.awbweight"></el-input>
220 </el-form-item> 220 </el-form-item>
221 </el-col> 221 </el-col>
222 <el-col :span="7.5"> 222 <el-col :span="7.5">
223 <el-col :span="7.5"> 223 <el-col :span="7.5">
224 - <el-form-item label="装载开始时间" prop="endtime"> 224 + <el-form-item label="装载开始时间" prop="starttime">
225 <el-date-picker v-model="tidyModel.starttime" value-format="yyyy-MM-dd HH:mm:ss" 225 <el-date-picker v-model="tidyModel.starttime" value-format="yyyy-MM-dd HH:mm:ss"
226 type="datetime" 226 type="datetime"
227 placeholder="请输入"></el-date-picker> 227 placeholder="请输入"></el-date-picker>
@@ -257,8 +257,10 @@ @@ -257,8 +257,10 @@
257 <el-col :span="7.5"> 257 <el-col :span="7.5">
258 <el-form-item label="海关关区" prop="customcode"> 258 <el-form-item label="海关关区" prop="customcode">
259 <el-select v-model="tidyModel.customcode" placeholder="请选择关区代码" 259 <el-select v-model="tidyModel.customcode" placeholder="请选择关区代码"
  260 + allow-create
  261 + default-first-option
260 filterable clearable remote :remote-method="remoteMethodCustomCode" :loading="customLoading" 262 filterable clearable remote :remote-method="remoteMethodCustomCode" :loading="customLoading"
261 - :disabled="dialogStatus === 'addAwbh'"> 263 + >
262 <el-option v-for="item in customCodeList" :key="item.customcode" :label="item.customcode" 264 <el-option v-for="item in customCodeList" :key="item.customcode" :label="item.customcode"
263 :value="item.customcode"> 265 :value="item.customcode">
264 <span style="float: left">{{ item.customcode }}</span> 266 <span style="float: left">{{ item.customcode }}</span>
@@ -363,10 +365,12 @@ @@ -363,10 +365,12 @@
363 callback() 365 callback()
364 } 366 }
365 const validatorAwbh = (rule, value, callback) => { 367 const validatorAwbh = (rule, value, callback) => {
366 - if (!validAlphabetsAndNum(value)) { 368 + if (value !=='' && value !== undefined && !validAlphabetsAndNum(value)) {
367 callback("只能输入字母和数字") 369 callback("只能输入字母和数字")
  370 + }else{
  371 + callback()
368 } 372 }
369 - callback() 373 +
370 } 374 }
371 const validatorAlphabets = (rule, value, callback) => { 375 const validatorAlphabets = (rule, value, callback) => {
372 if (!validAlphabets(value)) { 376 if (!validAlphabets(value)) {
@@ -411,7 +415,7 @@ @@ -411,7 +415,7 @@
411 }, 415 },
412 tidyRoles: { 416 tidyRoles: {
413 awba: [{required: true, trigger: 'blur', validator: validatorAwb}], 417 awba: [{required: true, trigger: 'blur', validator: validatorAwb}],
414 - awbh: [{required: true, trigger: 'blur', validator: validatorAwbh}], 418 + awbh: [{trigger: 'blur', validator: validatorAwbh}],
415 goodsname: [{required: true, trigger: 'blur', validator: validAlphabetsSpanceKey}], 419 goodsname: [{required: true, trigger: 'blur', validator: validAlphabetsSpanceKey}],
416 carrier: [{required: true, trigger: 'blur', validator: validatorAwbh}], 420 carrier: [{required: true, trigger: 'blur', validator: validatorAwbh}],
417 flightno: [{required: true, trigger: 'blur', validator: validatorAwbh}], 421 flightno: [{required: true, trigger: 'blur', validator: validatorAwbh}],
@@ -872,7 +876,7 @@ @@ -872,7 +876,7 @@
872 // 新增理货弹框 876 // 新增理货弹框
873 handleAddTidy() { 877 handleAddTidy() {
874 const query = { 878 const query = {
875 - 'rcfdep': 'MT5202' 879 + 'messageType': 'MT5202'
876 } 880 }
877 this.$router.push({name: '出港航班信息', params: {scopeRow: query}}) 881 this.$router.push({name: '出港航班信息', params: {scopeRow: query}})
878 }, 882 },