朱兆平 / vue_cli · 提交

转到一个项目

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

回执颜色区分

内嵌 并排对比
正在显示 4 个修改的文件 包含 24 行增加 和 23 行删除
... ... @@ -301,20 +301,20 @@
<el-col :span="5">
<el-form-item label="运抵件数" prop="turnpiece">
<div v-if="dialogStatus === 'update'">
<el-input v-model="AruleForm.turnpiece"></el-input>
<el-input type="number" v-model="AruleForm.turnpiece"></el-input>
</div>
<div v-else>
<el-input disabled="" v-model="AruleForm.turnpiece"></el-input>
<el-input type="number" disabled="" v-model="AruleForm.turnpiece"></el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="运抵重量" prop="turnweight">
<div v-if="dialogStatus === 'update'">
<el-input v-model="AruleForm.turnweight"></el-input>
<el-input type="number" v-model="AruleForm.turnweight"></el-input>
</div>
<div v-else>
<el-input disabled="" v-model="AruleForm.turnweight"></el-input>
<el-input type="number" disabled="" v-model="AruleForm.turnweight"></el-input>
</div>
</el-form-item>
</el-col>
... ...
... ... @@ -357,22 +357,22 @@
<el-row class="product">
<el-col :span="6">
<el-form-item label="总件数" prop="awbinfo.pcs">
<el-input v-model="ruleForm.awbinfo.pcs" ></el-input>
<el-input type="number" v-model="ruleForm.awbinfo.pcs" ></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="总重量" prop="awbinfo.weight">
<el-input v-model="ruleForm.awbinfo.weight"></el-input>
<el-input type="number" v-model="ruleForm.awbinfo.weight"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="舱单件数" prop="piece">
<el-input v-model="ruleForm.piece"></el-input>
<el-input type="number" v-model="ruleForm.piece"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="舱单重量" prop="weight">
<el-input v-model="ruleForm.weight"></el-input>
<el-input type="number" v-model="ruleForm.weight"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -953,7 +953,7 @@
:row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报'
:row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':'';
},
//发送舱单报按钮判定事件
//发送舱单报按钮,删除，修改判定事件
btSendStatusFormater:(status) => {
if(status=='23' || status=='24'||status=='25'){
return true;
... ... @@ -987,6 +987,7 @@
this.FenStatus='ediAwbh';
this.ruleForm=row;
this.ruleForm.originstation=row.originstation+"-"+row.destinationstation;
this.ruleForm.flightno=row.carrier+row.flightno;
this.FenQuery.awba=row.awba;
this.FenQuery.flightno= row.flightno;
this.FenQuery.flightdate=row.flightdate
... ... @@ -1291,13 +1292,13 @@
},
//分拨申请
Importallocation(index,row){
this.$router.push({name:'进港分拨',params:{carrier:row.carrier,flightno:row.flightno.substr(2),awba:row.awba,flightdate:row.flightdate,
this.$router.push({name:'进港分拨',params:{carrier:row.carrier,flightno:row.flightno,awba:row.awba,flightdate:row.flightdate,
turnpiece:row.awbinfo.pcs,turnweight:row.awbinfo.weight,customcode:row.customcode}});
},
//分拨运抵
Allocatearrive(index,row){
this.$router.push({name:'分拨运抵',params:{carrier:row.carrier,flightno:row.flightno.substr(2),awba:row.awba,flightdate:row.flightdate,
this.$router.push({name:'分拨运抵',params:{carrier:row.carrier,flightno:row.flightno,awba:row.awba,flightdate:row.flightdate,
turnpiece:row.awbinfo.pcs,turnweight:row.awbinfo.weight,customcode:row.customcode,goodsname:row.goodsname}});
},
back(){
... ...
... ... @@ -236,22 +236,22 @@
<el-row class="product">
<el-col :span="6">
<el-form-item label="舱单件数" prop="pcs">
<el-input v-model="ruleForm.pcs"></el-input>
<el-input type="number" v-model="ruleForm.pcs"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="舱单重量" prop="wei">
<el-input v-model="ruleForm.wei"></el-input>
<el-input type="number" v-model="ruleForm.wei"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="理货件数" prop="piece">
<el-input v-model="ruleForm.piece"></el-input>
<el-input type="number" v-model="ruleForm.piece"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="理货重量" prop="weight">
<el-input v-model="ruleForm.weight"></el-input>
<el-input type="number" v-model="ruleForm.weight"></el-input>
</el-form-item>
</el-col>
</el-row>
... ...
... ... @@ -133,16 +133,16 @@
width="115"
>
<template slot-scope="scope">
<span v-if="scope.row.stype=='MT1201'&&scope.row.awbh==''" style="background-color:#5BB75B;width: 100%;height:auto;display:block;">
<span v-if="scope.row.stype=='MT1201'&&scope.row.awbh==''" style="background-color:#67C23A;width: 100%;height:100%;display:block">
{{scope.row.awba}}
</span>
<span v-else-if="scope.row.stype=='MT1201'&&scope.row.awbh!=''" style="background-color:#12B399;width: 100%;height:100%;display:block;">
<span v-else-if="scope.row.stype=='MT1201'&&scope.row.awbh!=''" style="background-color:#409eff;width: 100%;height:100%;display:block;">
{{scope.row.awba}}
</span>
<span v-else-if="scope.row.stype=='MT5201'&&scope.row.awbh==''" style="background-color:#FA9403;width: 100%;height:100%;display:block;">
<span v-else-if="scope.row.stype=='MT5201'&&scope.row.awbh==''" style="background-color:#FF8C00;width: 100%;height:100%;display:block;">
{{scope.row.awba}}
</span>
<span v-else-if="scope.row.stype=='MT5201'&&scope.row.awbh!=''" style="background-color:#C55124;width: 100%;height:100%;display:block;">
<span v-else-if="scope.row.stype=='MT5201'&&scope.row.awbh!=''" style="background-color:#e6a23c;width: 100%;height:100%;display:block;">
{{scope.row.awba}}
</span>
</template>
... ... @@ -228,10 +228,10 @@
.sel{display: inline;}
.mark{height:24px;}
.bg{height:24px;text-align: center;line-height:24px;min-height: 24px}
.mainse{background: #5BB75B}
.fense{background-color: #12B399}
.tallse{background-color: #FA9403}
.tallfense{background-color: #C55124}
.mainse{background: #67C23A}
.fense{background-color: #409eff}
.tallse{background-color: #FF8C00}
.tallfense{background-color: #e6a23c}
.cell{background: #5BB75B}
.cell2{background-color: #12B399}
.el-input-group{
... ...