朱兆平 / vue_cli · 提交

转到一个项目

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

界面优化

内嵌 并排对比
正在显示 1 个修改的文件 包含 45 行增加 和 27 行删除
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 </div> 38 </div>
39 </el-col> 39 </el-col>
40 <div class="grid-content el-btn"> 40 <div class="grid-content el-btn">
41 - <el-button type="primary" @click="handleSerach">查询</el-button> 41 + <el-button type="primary" @click="handleSerach" icon="el-icon-search">查&emsp;&emsp;询</el-button>
42 <el-button v-if="arriveQuery.flightno ===undefined && arriveData.length<1" 42 <el-button v-if="arriveQuery.flightno ===undefined && arriveData.length<1"
43 type="primary" 43 type="primary"
44 @click="handleAddArrive">新增运抵 44 @click="handleAddArrive">新增运抵
@@ -78,12 +78,12 @@ @@ -78,12 +78,12 @@
78 <!-- <span>{{scope.row.awbh}}</span>--> 78 <!-- <span>{{scope.row.awbh}}</span>-->
79 <!-- </template>--> 79 <!-- </template>-->
80 <!-- </el-table-column>--> 80 <!-- </el-table-column>-->
81 - <el-table-column label="运抵件数" width="70" align="center"> 81 + <el-table-column label="运抵件数" width="80" align="center">
82 <template slot-scope="scope"> 82 <template slot-scope="scope">
83 <span>{{scope.row.piece}}</span> 83 <span>{{scope.row.piece}}</span>
84 </template> 84 </template>
85 </el-table-column> 85 </el-table-column>
86 - <el-table-column label="运抵重量" width="70" align="center"> 86 + <el-table-column label="运抵重量" width="80" align="center">
87 <template slot-scope="scope"> 87 <template slot-scope="scope">
88 <span>{{scope.row.weight}}</span> 88 <span>{{scope.row.weight}}</span>
89 </template> 89 </template>
@@ -122,39 +122,55 @@ @@ -122,39 +122,55 @@
122 <span v-if="scope.row.status ==='25'">已发送修改报</span> 122 <span v-if="scope.row.status ==='25'">已发送修改报</span>
123 </template> 123 </template>
124 </el-table-column> 124 </el-table-column>
125 - <el-table-column prop="receipt" label="回执信息" align="center"> 125 + <el-table-column prop="receipt" label="回执信息" align="center" width="380">
126 <template slot-scope="scope"> 126 <template slot-scope="scope">
127 - <span>{{scope.row.ext5}}</span> 127 + <el-tooltip placement="top">
  128 + <div slot="content">{{scope.row.ext5}}</div>
  129 + <el-tag v-if="scope.row.status=='01' || scope.row.status=='11'" type="success">
  130 + {{scope.row.ext5}}
  131 + </el-tag>
  132 + <el-tag v-else-if="scope.row.status=='02' || scope.row.status=='03'" type="warning">
  133 + {{scope.row.ext5}}
  134 + </el-tag>
  135 + <el-tag v-else-if="scope.row.status=='12' || scope.row.status=='13'" type="danger">
  136 + {{scope.row.ext5}}
  137 + </el-tag>
  138 + <el-tag v-else>
  139 + {{scope.row.ext5}}
  140 + </el-tag>
  141 + </el-tooltip>
128 </template> 142 </template>
129 </el-table-column> 143 </el-table-column>
130 - <el-table-column prop="operation" fixed="right" label="操作" align="center" width="400"> 144 + <el-table-column prop="operation" fixed="right" label="操作" align="center" width="285">
131 <template slot-scope="scope"> 145 <template slot-scope="scope">
  146 + <el-row type="flex" justify="space-between">
  147 +<!-- <el-button type="success" @click="handleEdit(scope.row)">编辑运单</el-button>-->
132 <el-button @click="handleSendDesc(scope.row)">收发明细</el-button> 148 <el-button @click="handleSendDesc(scope.row)">收发明细</el-button>
133 -<!-- <el-button type="success" @click="handleEdit(scope.row)">编辑</el-button>-->  
134 - <el-button type="primary" @click="handleSendAwb(scope.row)"  
135 - :disabled="scope.row.status ==='23'">发送出港运抵报 149 + <el-button type="success" v-if="scope.row.awbh ===''"
  150 + @click="handleAddAwbh(scope.row)">新增分单
136 </el-button> 151 </el-button>
137 - <p></p>  
138 - <el-button type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单 152 + <el-button type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>
  153 + </el-row>
  154 + <el-row type="flex" justify="space-between">
  155 + <el-button type="primary" @click="handleSendAwb(scope.row)"
  156 + :disabled="scope.row.status ==='23'">运抵申报
139 </el-button> 157 </el-button>
140 <el-button type="warning" @click="handleAwbStatus(scope.row)" 158 <el-button type="warning" @click="handleAwbStatus(scope.row)"
141 :disabled="scope.row.status ==='22'">更改状态 159 :disabled="scope.row.status ==='22'">更改状态
142 </el-button> 160 </el-button>
143 - <el-button type="primary" v-if="scope.row.awbh ===''"  
144 - @click="handleAddAwbh(scope.row)">新增分单  
145 - </el-button>  
146 <el-button type="danger" @click="handleSendDelete(scope.row)" 161 <el-button type="danger" @click="handleSendDelete(scope.row)"
147 - :disabled="scope.row.status ==='24'">发删除报 162 + :disabled="scope.row.status ==='24'">删除申报
148 </el-button> 163 </el-button>
  164 + </el-row>
149 </template> 165 </template>
150 </el-table-column> 166 </el-table-column>
151 </el-table> 167 </el-table>
152 <div class="btnFoot"> 168 <div class="btnFoot">
153 <el-row> 169 <el-row>
154 - <el-button type="primary" v-if="arriveQuery.flightno !==undefined || arriveData.length>0" 170 + <el-button icon="el-icon-document" type="success" v-if="arriveQuery.flightno !==undefined || arriveData.length>0"
155 @click="handelAddArriveInfo">新增出港运抵 171 @click="handelAddArriveInfo">新增出港运抵
156 </el-button> 172 </el-button>
157 - <el-button type="primary" v-if="arriveQuery.flightno !== undefined || arriveData.length>0" 173 + <el-button icon="el-icon-back" type="primary" v-if="arriveQuery.flightno !== undefined || arriveData.length>0"
158 @click="handelBackStep">返回 174 @click="handelBackStep">返回
159 </el-button> 175 </el-button>
160 </el-row> 176 </el-row>
@@ -492,20 +508,21 @@ @@ -492,20 +508,21 @@
492 contactName:[{required:true,message:'操作人不能为空',trigger:'blur'}], 508 contactName:[{required:true,message:'操作人不能为空',trigger:'blur'}],
493 contactTel:[ 509 contactTel:[
494 { required: true, message: '手机号不能为空', trigger: 'blur' }, 510 { required: true, message: '手机号不能为空', trigger: 'blur' },
495 - { type: 'number', message: '手机号格式不正确', trigger: 'blur',  
496 - transform(value){  
497 - var phone = 11 && /^((13|14|15|16|17|18|19)[0-9]{1}\d{8})$/  
498 - if (!phone.test(value)){  
499 - return false;  
500 - }else {  
501 - return Number(value);  
502 - }  
503 - }} 511 + // { type: 'number', message: '手机号格式不正确', trigger: 'blur',
  512 + // transform(value){
  513 + // var phone = 11 && /^((13|14|15|16|17|18|19)[0-9]{1}\d{8})$/
  514 + // if (!phone.test(value)){
  515 + // return false;
  516 + // }else {
  517 + // return Number(value);
  518 + // }
  519 + // }
  520 + // }
504 ], 521 ],
505 }, 522 },
506 } 523 }
507 }, 524 },
508 - created() { 525 + activated() {
509 if (this.$route.params.flightData !== undefined) { 526 if (this.$route.params.flightData !== undefined) {
510 // 给查询条件赋值 527 // 给查询条件赋值
511 if (this.$route.params.flightData.awba !== undefined && this.$route.params.flightData.awba !== '') { 528 if (this.$route.params.flightData.awba !== undefined && this.$route.params.flightData.awba !== '') {
@@ -522,6 +539,7 @@ @@ -522,6 +539,7 @@
522 if (username === 'admin') { 539 if (username === 'admin') {
523 this.isAdmin = true 540 this.isAdmin = true
524 } 541 }
  542 + this.isAdmin = true
525 }, 543 },
526 computed: { 544 computed: {
527 awba: { 545 awba: {