朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 468540192be5c1c83097c6556f4c59712f030f36 1 个父辈 f9a98e0f

界面优化

内嵌 并排对比
正在显示 1 个修改的文件 包含 45 行增加 和 27 行删除
... ... @@ -38,7 +38,7 @@
</div>
</el-col>
<div class="grid-content el-btn">
<el-button type="primary" @click="handleSerach">查询</el-button>
<el-button type="primary" @click="handleSerach" icon="el-icon-search">查&emsp;&emsp;询</el-button>
<el-button v-if="arriveQuery.flightno ===undefined && arriveData.length<1"
type="primary"
@click="handleAddArrive">新增运抵
... ... @@ -78,12 +78,12 @@
<!-- <span>{{scope.row.awbh}}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="运抵件数" width="70" align="center">
<el-table-column label="运抵件数" width="80" align="center">
<template slot-scope="scope">
<span>{{scope.row.piece}}</span>
</template>
</el-table-column>
<el-table-column label="运抵重量" width="70" align="center">
<el-table-column label="运抵重量" width="80" align="center">
<template slot-scope="scope">
<span>{{scope.row.weight}}</span>
</template>
... ... @@ -122,39 +122,55 @@
<span v-if="scope.row.status ==='25'">已发送修改报</span>
</template>
</el-table-column>
<el-table-column prop="receipt" label="回执信息" align="center">
<el-table-column prop="receipt" label="回执信息" align="center" width="380">
<template slot-scope="scope">
<span>{{scope.row.ext5}}</span>
<el-tooltip placement="top">
<div slot="content">{{scope.row.ext5}}</div>
<el-tag v-if="scope.row.status=='01' || scope.row.status=='11'" type="success">
{{scope.row.ext5}}
</el-tag>
<el-tag v-else-if="scope.row.status=='02' || scope.row.status=='03'" type="warning">
{{scope.row.ext5}}
</el-tag>
<el-tag v-else-if="scope.row.status=='12' || scope.row.status=='13'" type="danger">
{{scope.row.ext5}}
</el-tag>
<el-tag v-else>
{{scope.row.ext5}}
</el-tag>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="operation" fixed="right" label="操作" align="center" width="400">
<el-table-column prop="operation" fixed="right" label="操作" align="center" width="285">
<template slot-scope="scope">
<el-row type="flex" justify="space-between">
<!-- <el-button type="success" @click="handleEdit(scope.row)">编辑运单</el-button>-->
<el-button @click="handleSendDesc(scope.row)">收发明细</el-button>
<!-- <el-button type="success" @click="handleEdit(scope.row)">编辑</el-button>-->
<el-button type="primary" @click="handleSendAwb(scope.row)"
:disabled="scope.row.status ==='23'">发送出港运抵报
<el-button type="success" v-if="scope.row.awbh ===''"
@click="handleAddAwbh(scope.row)">新增分单
</el-button>
<p></p>
<el-button type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单
<el-button type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>
</el-row>
<el-row type="flex" justify="space-between">
<el-button type="primary" @click="handleSendAwb(scope.row)"
:disabled="scope.row.status ==='23'">运抵申报
</el-button>
<el-button type="warning" @click="handleAwbStatus(scope.row)"
:disabled="scope.row.status ==='22'">更改状态
</el-button>
<el-button type="primary" v-if="scope.row.awbh ===''"
@click="handleAddAwbh(scope.row)">新增分单
</el-button>
<el-button type="danger" @click="handleSendDelete(scope.row)"
:disabled="scope.row.status ==='24'">发删除报
:disabled="scope.row.status ==='24'">删除申报
</el-button>
</el-row>
</template>
</el-table-column>
</el-table>
<div class="btnFoot">
<el-row>
<el-button type="primary" v-if="arriveQuery.flightno !==undefined || arriveData.length>0"
<el-button icon="el-icon-document" type="success" v-if="arriveQuery.flightno !==undefined || arriveData.length>0"
@click="handelAddArriveInfo">新增出港运抵
</el-button>
<el-button type="primary" v-if="arriveQuery.flightno !== undefined || arriveData.length>0"
<el-button icon="el-icon-back" type="primary" v-if="arriveQuery.flightno !== undefined || arriveData.length>0"
@click="handelBackStep">返回
</el-button>
</el-row>
... ... @@ -492,20 +508,21 @@
contactName:[{required:true,message:'操作人不能为空',trigger:'blur'}],
contactTel:[
{ required: true, message: '手机号不能为空', trigger: 'blur' },
{ type: 'number', message: '手机号格式不正确', trigger: 'blur',
transform(value){
var phone = 11 && /^((13|14|15|16|17|18|19)[0-9]{1}\d{8})$/
if (!phone.test(value)){
return false;
}else {
return Number(value);
}
}}
// { type: 'number', message: '手机号格式不正确', trigger: 'blur',
// transform(value){
// var phone = 11 && /^((13|14|15|16|17|18|19)[0-9]{1}\d{8})$/
// if (!phone.test(value)){
// return false;
// }else {
// return Number(value);
// }
// }
// }
],
},
}
},
created() {
activated() {
if (this.$route.params.flightData !== undefined) {
// 给查询条件赋值
if (this.$route.params.flightData.awba !== undefined && this.$route.params.flightData.awba !== '') {
... ... @@ -522,6 +539,7 @@
if (username === 'admin') {
this.isAdmin = true
}
this.isAdmin = true
},
computed: {
awba: {
... ...