转关运抵界面优化

朱兆平
src/views/transit/transit.vue
--- a/src/views/transit/transit.vue
查看文件 @4b6a28c
+++ b/src/views/transit/transit.vue
查看文件 @4b6a28c
@@ -165,7 +165,6 @@
                     border
                     highlight-current-row
                     @selection-change="trnSelectionChange"
-                    height="550px"
                     tooltip-effect="dark"
                     style="border-radius: 10px 10px 0px 0px;line-height: 25px"
                     :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
@@ -250,7 +249,7 @@
                         <span>{{ scope.row.unloadcode }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="时间" width="140">
+                <el-table-column label="时间" width="180">
                     <template slot-scope="scope">
                         <span>{{ scope.row.creattime }}</span>
                     </template>
@@ -274,6 +273,10 @@
                             <span :style="{'color':scope.row.customResponseStatus=='0'?'rgb(103,194,58)'
                                                     :scope.row.customResponseStatus=='1'?'rgb(245,110,110)':scope.row.customResponseStatus=='S'?'rgb(103,194,58)'
                                                     :scope.row.customResponseStatus=='F'?'rgb(245,110,110)':'rgb(60,62,66)'}">{{ scope.row.customResponseText }}</span>
+                        <br/>
+                        <el-button type="text"   @click="check(scope.row)">
+                                查看回执
+                        </el-button>
                     </template>
                 </el-table-column>
                 <el-table-column label="操作" align="center" width="410" fixed="right">
@@ -286,9 +289,6 @@
                             <el-button type="danger"  :disabled="scope.row.customResponseText && scope.row.customResponseText !== undefined && scope.row.customResponseText.length>0" @click="delTrn(scope.row)">
                                 删除
                             </el-button>
-                            <el-button type="primary"   @click="check(scope.row)">
-                                回执明细
-                            </el-button>
                             <el-button type="info" @click="statusTrn(scope.row)">
                                 修改状态
                             </el-button>
@@ -323,7 +323,7 @@
                     <el-divider></el-divider>
                     <el-row>
                         <el-col :span="24">
-                            <div class="grid-content content">信息表单 [id: {{form.autoid}}]</div>
+                            <div class="grid-content content">信息表单 [id: {{form.autoid}}]-[申报用户:{{form.username}}]</div>
                         </el-col>
                     </el-row>
                     <el-row>
@@ -548,8 +548,9 @@
     import {selectTrans,delTrans,batchSend,ediTrans,send,addTrans} from "../../api/trn";
     import DetailedLog from '@/components/detailedDialog'
     import  uti from '@/utils'
-    import loginuserInfo from "@/api/base";
+    import loginedUserInfo from "@/api/user";
     import unloadingCode from "@/common/customs/trans_arrive_unloadingCode";
+    import {mapActions, mapGetters} from 'vuex'
     export default {
@@ -674,12 +675,10 @@
         mounted() {
             //获取列表
             this.trnList();
-            var user = loginuserInfo;
-            if (user) {
-                this.form.username = user.username || '';
-            }
+
         },
         computed:{
+            ...mapGetters(['getUserInfoStore','getUserMenuStore']),
             //海关关区
             customscode: {
                 get: function () {
@@ -716,7 +715,7 @@
                 }
             },
             username: function () {
-                var user = loginuserInfo;
+                var user = this.getUserInfoStore;
                 if (user) {
                     return  user.username || '';
                 }
@@ -741,7 +740,6 @@
                 this.dialogDetailedLogVisible = true
                 this.autoid = row.autoid
                 this.$refs.detailedlog.check(row.autoid)
-                console.log('======'+this.detailedList)
             },
             updateVisible(val) {
                 this.dialogDetailedLogVisible = val