朱兆平 / vue_cli · 提交

转到一个项目

作者 xudada
提交 4f10129c1f0330e4dae3ffa9a4604bfab2e49eef 1 个父辈 31ac8b97

回执颜色区分

内嵌 并排对比
正在显示 4 个修改的文件 包含 24 行增加 和 23 行删除
@@ -301,20 +301,20 @@ @@ -301,20 +301,20 @@
301 <el-col :span="5"> 301 <el-col :span="5">
302 <el-form-item label="运抵件数" prop="turnpiece"> 302 <el-form-item label="运抵件数" prop="turnpiece">
303 <div v-if="dialogStatus === 'update'"> 303 <div v-if="dialogStatus === 'update'">
304 - <el-input v-model="AruleForm.turnpiece"></el-input> 304 + <el-input type="number" v-model="AruleForm.turnpiece"></el-input>
305 </div> 305 </div>
306 <div v-else> 306 <div v-else>
307 - <el-input disabled="" v-model="AruleForm.turnpiece"></el-input> 307 + <el-input type="number" disabled="" v-model="AruleForm.turnpiece"></el-input>
308 </div> 308 </div>
309 </el-form-item> 309 </el-form-item>
310 </el-col> 310 </el-col>
311 <el-col :span="5"> 311 <el-col :span="5">
312 <el-form-item label="运抵重量" prop="turnweight"> 312 <el-form-item label="运抵重量" prop="turnweight">
313 <div v-if="dialogStatus === 'update'"> 313 <div v-if="dialogStatus === 'update'">
314 - <el-input v-model="AruleForm.turnweight"></el-input> 314 + <el-input type="number" v-model="AruleForm.turnweight"></el-input>
315 </div> 315 </div>
316 <div v-else> 316 <div v-else>
317 - <el-input disabled="" v-model="AruleForm.turnweight"></el-input> 317 + <el-input type="number" disabled="" v-model="AruleForm.turnweight"></el-input>
318 </div> 318 </div>
319 </el-form-item> 319 </el-form-item>
320 </el-col> 320 </el-col>
@@ -357,22 +357,22 @@ @@ -357,22 +357,22 @@
357 <el-row class="product"> 357 <el-row class="product">
358 <el-col :span="6"> 358 <el-col :span="6">
359 <el-form-item label="总件数" prop="awbinfo.pcs"> 359 <el-form-item label="总件数" prop="awbinfo.pcs">
360 - <el-input v-model="ruleForm.awbinfo.pcs" ></el-input> 360 + <el-input type="number" v-model="ruleForm.awbinfo.pcs" ></el-input>
361 </el-form-item> 361 </el-form-item>
362 </el-col> 362 </el-col>
363 <el-col :span="6"> 363 <el-col :span="6">
364 <el-form-item label="总重量" prop="awbinfo.weight"> 364 <el-form-item label="总重量" prop="awbinfo.weight">
365 - <el-input v-model="ruleForm.awbinfo.weight"></el-input> 365 + <el-input type="number" v-model="ruleForm.awbinfo.weight"></el-input>
366 </el-form-item> 366 </el-form-item>
367 </el-col> 367 </el-col>
368 <el-col :span="6"> 368 <el-col :span="6">
369 <el-form-item label="舱单件数" prop="piece"> 369 <el-form-item label="舱单件数" prop="piece">
370 - <el-input v-model="ruleForm.piece"></el-input> 370 + <el-input type="number" v-model="ruleForm.piece"></el-input>
371 </el-form-item> 371 </el-form-item>
372 </el-col> 372 </el-col>
373 <el-col :span="6"> 373 <el-col :span="6">
374 <el-form-item label="舱单重量" prop="weight"> 374 <el-form-item label="舱单重量" prop="weight">
375 - <el-input v-model="ruleForm.weight"></el-input> 375 + <el-input type="number" v-model="ruleForm.weight"></el-input>
376 </el-form-item> 376 </el-form-item>
377 </el-col> 377 </el-col>
378 </el-row> 378 </el-row>
@@ -953,7 +953,7 @@ @@ -953,7 +953,7 @@
953 :row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报' 953 :row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报'
954 :row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':''; 954 :row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':'';
955 }, 955 },
956 - //发送舱单报按钮判定事件 956 + //发送舱单报按钮,删除，修改判定事件
957 btSendStatusFormater:(status) => { 957 btSendStatusFormater:(status) => {
958 if(status=='23' || status=='24'||status=='25'){ 958 if(status=='23' || status=='24'||status=='25'){
959 return true; 959 return true;
@@ -987,6 +987,7 @@ @@ -987,6 +987,7 @@
987 this.FenStatus='ediAwbh'; 987 this.FenStatus='ediAwbh';
988 this.ruleForm=row; 988 this.ruleForm=row;
989 this.ruleForm.originstation=row.originstation+"-"+row.destinationstation; 989 this.ruleForm.originstation=row.originstation+"-"+row.destinationstation;
  990 + this.ruleForm.flightno=row.carrier+row.flightno;
990 this.FenQuery.awba=row.awba; 991 this.FenQuery.awba=row.awba;
991 this.FenQuery.flightno= row.flightno; 992 this.FenQuery.flightno= row.flightno;
992 this.FenQuery.flightdate=row.flightdate 993 this.FenQuery.flightdate=row.flightdate
@@ -1291,13 +1292,13 @@ @@ -1291,13 +1292,13 @@
1291 }, 1292 },
1292 //分拨申请 1293 //分拨申请
1293 Importallocation(index,row){ 1294 Importallocation(index,row){
1294 - this.$router.push({name:'进港分拨',params:{carrier:row.carrier,flightno:row.flightno.substr(2),awba:row.awba,flightdate:row.flightdate, 1295 + this.$router.push({name:'进港分拨',params:{carrier:row.carrier,flightno:row.flightno,awba:row.awba,flightdate:row.flightdate,
1295 turnpiece:row.awbinfo.pcs,turnweight:row.awbinfo.weight,customcode:row.customcode}}); 1296 turnpiece:row.awbinfo.pcs,turnweight:row.awbinfo.weight,customcode:row.customcode}});
1296 1297
1297 }, 1298 },
1298 //分拨运抵 1299 //分拨运抵
1299 Allocatearrive(index,row){ 1300 Allocatearrive(index,row){
1300 - this.$router.push({name:'分拨运抵',params:{carrier:row.carrier,flightno:row.flightno.substr(2),awba:row.awba,flightdate:row.flightdate, 1301 + this.$router.push({name:'分拨运抵',params:{carrier:row.carrier,flightno:row.flightno,awba:row.awba,flightdate:row.flightdate,
1301 turnpiece:row.awbinfo.pcs,turnweight:row.awbinfo.weight,customcode:row.customcode,goodsname:row.goodsname}}); 1302 turnpiece:row.awbinfo.pcs,turnweight:row.awbinfo.weight,customcode:row.customcode,goodsname:row.goodsname}});
1302 }, 1303 },
1303 back(){ 1304 back(){
@@ -236,22 +236,22 @@ @@ -236,22 +236,22 @@
236 <el-row class="product"> 236 <el-row class="product">
237 <el-col :span="6"> 237 <el-col :span="6">
238 <el-form-item label="舱单件数" prop="pcs"> 238 <el-form-item label="舱单件数" prop="pcs">
239 - <el-input v-model="ruleForm.pcs"></el-input> 239 + <el-input type="number" v-model="ruleForm.pcs"></el-input>
240 </el-form-item> 240 </el-form-item>
241 </el-col> 241 </el-col>
242 <el-col :span="6"> 242 <el-col :span="6">
243 <el-form-item label="舱单重量" prop="wei"> 243 <el-form-item label="舱单重量" prop="wei">
244 - <el-input v-model="ruleForm.wei"></el-input> 244 + <el-input type="number" v-model="ruleForm.wei"></el-input>
245 </el-form-item> 245 </el-form-item>
246 </el-col> 246 </el-col>
247 <el-col :span="6"> 247 <el-col :span="6">
248 <el-form-item label="理货件数" prop="piece"> 248 <el-form-item label="理货件数" prop="piece">
249 - <el-input v-model="ruleForm.piece"></el-input> 249 + <el-input type="number" v-model="ruleForm.piece"></el-input>
250 </el-form-item> 250 </el-form-item>
251 </el-col> 251 </el-col>
252 <el-col :span="6"> 252 <el-col :span="6">
253 <el-form-item label="理货重量" prop="weight"> 253 <el-form-item label="理货重量" prop="weight">
254 - <el-input v-model="ruleForm.weight"></el-input> 254 + <el-input type="number" v-model="ruleForm.weight"></el-input>
255 </el-form-item> 255 </el-form-item>
256 </el-col> 256 </el-col>
257 </el-row> 257 </el-row>
@@ -133,16 +133,16 @@ @@ -133,16 +133,16 @@
133 width="115" 133 width="115"
134 > 134 >
135 <template slot-scope="scope"> 135 <template slot-scope="scope">
136 - <span v-if="scope.row.stype=='MT1201'&&scope.row.awbh==''" style="background-color:#5BB75B;width: 100%;height:auto;display:block;"> 136 + <span v-if="scope.row.stype=='MT1201'&&scope.row.awbh==''" style="background-color:#67C23A;width: 100%;height:100%;display:block">
137 {{scope.row.awba}} 137 {{scope.row.awba}}
138 </span> 138 </span>
139 - <span v-else-if="scope.row.stype=='MT1201'&&scope.row.awbh!=''" style="background-color:#12B399;width: 100%;height:100%;display:block;"> 139 + <span v-else-if="scope.row.stype=='MT1201'&&scope.row.awbh!=''" style="background-color:#409eff;width: 100%;height:100%;display:block;">
140 {{scope.row.awba}} 140 {{scope.row.awba}}
141 </span> 141 </span>
142 - <span v-else-if="scope.row.stype=='MT5201'&&scope.row.awbh==''" style="background-color:#FA9403;width: 100%;height:100%;display:block;"> 142 + <span v-else-if="scope.row.stype=='MT5201'&&scope.row.awbh==''" style="background-color:#FF8C00;width: 100%;height:100%;display:block;">
143 {{scope.row.awba}} 143 {{scope.row.awba}}
144 </span> 144 </span>
145 - <span v-else-if="scope.row.stype=='MT5201'&&scope.row.awbh!=''" style="background-color:#C55124;width: 100%;height:100%;display:block;"> 145 + <span v-else-if="scope.row.stype=='MT5201'&&scope.row.awbh!=''" style="background-color:#e6a23c;width: 100%;height:100%;display:block;">
146 {{scope.row.awba}} 146 {{scope.row.awba}}
147 </span> 147 </span>
148 </template> 148 </template>
@@ -228,10 +228,10 @@ @@ -228,10 +228,10 @@
228 .sel{display: inline;} 228 .sel{display: inline;}
229 .mark{height:24px;} 229 .mark{height:24px;}
230 .bg{height:24px;text-align: center;line-height:24px;min-height: 24px} 230 .bg{height:24px;text-align: center;line-height:24px;min-height: 24px}
231 - .mainse{background: #5BB75B}  
232 - .fense{background-color: #12B399}  
233 - .tallse{background-color: #FA9403}  
234 - .tallfense{background-color: #C55124} 231 + .mainse{background: #67C23A}
  232 + .fense{background-color: #409eff}
  233 + .tallse{background-color: #FF8C00}
  234 + .tallfense{background-color: #e6a23c}
235 .cell{background: #5BB75B} 235 .cell{background: #5BB75B}
236 .cell2{background-color: #12B399} 236 .cell2{background-color: #12B399}
237 .el-input-group{ 237 .el-input-group{