朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 4b6a28c16bf20797548790e9042c73680ddd2926 1 个父辈 a0655ddd

转关运抵界面优化

内嵌 并排对比
正在显示 1 个修改的文件 包含 14 行增加 和 16 行删除
@@ -165,7 +165,6 @@ @@ -165,7 +165,6 @@
165 border 165 border
166 highlight-current-row 166 highlight-current-row
167 @selection-change="trnSelectionChange" 167 @selection-change="trnSelectionChange"
168 - height="550px"  
169 tooltip-effect="dark" 168 tooltip-effect="dark"
170 style="border-radius: 10px 10px 0px 0px;line-height: 25px" 169 style="border-radius: 10px 10px 0px 0px;line-height: 25px"
171 :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" 170 :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
@@ -250,7 +249,7 @@ @@ -250,7 +249,7 @@
250 <span>{{ scope.row.unloadcode }}</span> 249 <span>{{ scope.row.unloadcode }}</span>
251 </template> 250 </template>
252 </el-table-column> 251 </el-table-column>
253 - <el-table-column label="时间" width="140"> 252 + <el-table-column label="时间" width="180">
254 <template slot-scope="scope"> 253 <template slot-scope="scope">
255 <span>{{ scope.row.creattime }}</span> 254 <span>{{ scope.row.creattime }}</span>
256 </template> 255 </template>
@@ -271,9 +270,13 @@ @@ -271,9 +270,13 @@
271 </el-table-column> 270 </el-table-column>
272 <el-table-column label="回执内容" width="220"> 271 <el-table-column label="回执内容" width="220">
273 <template slot-scope="scope"> 272 <template slot-scope="scope">
274 - <span :style="{'color':scope.row.customResponseStatus=='0'?'rgb(103,194,58)'  
275 - :scope.row.customResponseStatus=='1'?'rgb(245,110,110)':scope.row.customResponseStatus=='S'?'rgb(103,194,58)'  
276 - :scope.row.customResponseStatus=='F'?'rgb(245,110,110)':'rgb(60,62,66)'}">{{ scope.row.customResponseText }}</span> 273 + <span :style="{'color':scope.row.customResponseStatus=='0'?'rgb(103,194,58)'
  274 + :scope.row.customResponseStatus=='1'?'rgb(245,110,110)':scope.row.customResponseStatus=='S'?'rgb(103,194,58)'
  275 + :scope.row.customResponseStatus=='F'?'rgb(245,110,110)':'rgb(60,62,66)'}">{{ scope.row.customResponseText }}</span>
  276 + <br/>
  277 + <el-button type="text" @click="check(scope.row)">
  278 + 查看回执
  279 + </el-button>
277 </template> 280 </template>
278 </el-table-column> 281 </el-table-column>
279 <el-table-column label="操作" align="center" width="410" fixed="right"> 282 <el-table-column label="操作" align="center" width="410" fixed="right">
@@ -286,9 +289,6 @@ @@ -286,9 +289,6 @@
286 <el-button type="danger" :disabled="scope.row.customResponseText && scope.row.customResponseText !== undefined && scope.row.customResponseText.length>0" @click="delTrn(scope.row)"> 289 <el-button type="danger" :disabled="scope.row.customResponseText && scope.row.customResponseText !== undefined && scope.row.customResponseText.length>0" @click="delTrn(scope.row)">
287 删除 290 删除
288 </el-button> 291 </el-button>
289 - <el-button type="primary" @click="check(scope.row)">  
290 - 回执明细  
291 - </el-button>  
292 <el-button type="info" @click="statusTrn(scope.row)"> 292 <el-button type="info" @click="statusTrn(scope.row)">
293 修改状态 293 修改状态
294 </el-button> 294 </el-button>
@@ -323,7 +323,7 @@ @@ -323,7 +323,7 @@
323 <el-divider></el-divider> 323 <el-divider></el-divider>
324 <el-row> 324 <el-row>
325 <el-col :span="24"> 325 <el-col :span="24">
326 - <div class="grid-content content">信息表单 [id: {{form.autoid}}]</div> 326 + <div class="grid-content content">信息表单 [id: {{form.autoid}}]-[申报用户:{{form.username}}]</div>
327 </el-col> 327 </el-col>
328 </el-row> 328 </el-row>
329 <el-row> 329 <el-row>
@@ -548,8 +548,9 @@ @@ -548,8 +548,9 @@
548 import {selectTrans,delTrans,batchSend,ediTrans,send,addTrans} from "../../api/trn"; 548 import {selectTrans,delTrans,batchSend,ediTrans,send,addTrans} from "../../api/trn";
549 import DetailedLog from '@/components/detailedDialog' 549 import DetailedLog from '@/components/detailedDialog'
550 import uti from '@/utils' 550 import uti from '@/utils'
551 - import loginuserInfo from "@/api/base"; 551 + import loginedUserInfo from "@/api/user";
552 import unloadingCode from "@/common/customs/trans_arrive_unloadingCode"; 552 import unloadingCode from "@/common/customs/trans_arrive_unloadingCode";
  553 + import {mapActions, mapGetters} from 'vuex'
553 554
554 555
555 export default { 556 export default {
@@ -674,12 +675,10 @@ @@ -674,12 +675,10 @@
674 mounted() { 675 mounted() {
675 //获取列表 676 //获取列表
676 this.trnList(); 677 this.trnList();
677 - var user = loginuserInfo;  
678 - if (user) {  
679 - this.form.username = user.username || '';  
680 - } 678 +
681 }, 679 },
682 computed:{ 680 computed:{
  681 + ...mapGetters(['getUserInfoStore','getUserMenuStore']),
683 //海关关区 682 //海关关区
684 customscode: { 683 customscode: {
685 get: function () { 684 get: function () {
@@ -716,7 +715,7 @@ @@ -716,7 +715,7 @@
716 } 715 }
717 }, 716 },
718 username: function () { 717 username: function () {
719 - var user = loginuserInfo; 718 + var user = this.getUserInfoStore;
720 if (user) { 719 if (user) {
721 return user.username || ''; 720 return user.username || '';
722 } 721 }
@@ -741,7 +740,6 @@ @@ -741,7 +740,6 @@
741 this.dialogDetailedLogVisible = true 740 this.dialogDetailedLogVisible = true
742 this.autoid = row.autoid 741 this.autoid = row.autoid
743 this.$refs.detailedlog.check(row.autoid) 742 this.$refs.detailedlog.check(row.autoid)
744 - console.log('======'+this.detailedList)  
745 }, 743 },
746 updateVisible(val) { 744 updateVisible(val) {
747 this.dialogDetailedLogVisible = val 745 this.dialogDetailedLogVisible = val