朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 31a9d418df355841f298937613d30e718ef940d9 1 个父辈 47d0bdab

进港原始舱单界面功能完善

内嵌 并排对比
正在显示 1 个修改的文件 包含 53 行增加 和 17 行删除
@@ -32,21 +32,21 @@ @@ -32,21 +32,21 @@
32 <div class="grid-content"> 32 <div class="grid-content">
33 <el-col :span="9" class="pub"> 33 <el-col :span="9" class="pub">
34 <div class="grid-content"> 34 <div class="grid-content">
35 - <el-input v-model="defaultQuery.awba" placeholder="请输入主单号" style="width: 250px"> 35 + <el-input v-model="defaultQuery.awba" placeholder="请输入主单号" style="width: 250px" clearable>
36 <template slot="prepend">主单号</template> 36 <template slot="prepend">主单号</template>
37 </el-input> 37 </el-input>
38 </div> 38 </div>
39 </el-col> 39 </el-col>
40 - <el-col :span="2" class="pub"> 40 + <el-col :span="3" class="pub">
41 <div class="grid-content"> 41 <div class="grid-content">
42 - <el-button type="primary" size="mini" v-on:click="getList">查询</el-button> 42 + <el-button type="primary" size="mini" v-on:click="getList" icon="el-icon-search">查&emsp;询</el-button>
43 </div> 43 </div>
44 </el-col> 44 </el-col>
45 - <el-col :span="4" class="pub"> 45 + <el-col :span="3" class="pub">
46 <div class="grid-content"> 46 <div class="grid-content">
47 <el-dropdown @command="handleCommand"> 47 <el-dropdown @command="handleCommand">
48 <el-button size="mini" type="success"> 48 <el-button size="mini" type="success">
49 - 导出文件<i class="el-icon-arrow-down el-icon--right"></i> 49 + 导出文件
50 </el-button> 50 </el-button>
51 <el-dropdown-menu slot="dropdown"> 51 <el-dropdown-menu slot="dropdown">
52 <el-dropdown-item command="PDF">导出PDF</el-dropdown-item> 52 <el-dropdown-item command="PDF">导出PDF</el-dropdown-item>
@@ -55,6 +55,13 @@ @@ -55,6 +55,13 @@
55 </el-dropdown> 55 </el-dropdown>
56 </div> 56 </div>
57 </el-col> 57 </el-col>
  58 + <el-col :span="3">
  59 + <div class="grid-content">
  60 + <el-button type="warning" @click="toggleRowExpansion">
  61 + 全部{{ isExpansion ? "折叠" : "展开" }}
  62 + </el-button>
  63 + </div>
  64 + </el-col>
58 </div> 65 </div>
59 </el-col> 66 </el-col>
60 </div> 67 </div>
@@ -71,7 +78,7 @@ @@ -71,7 +78,7 @@
71 class="table" 78 class="table"
72 id="pdfDom" 79 id="pdfDom"
73 v-loading="tableloading" 80 v-loading="tableloading"
74 - ref="multipleTable" 81 + ref="dataTreeList"
75 :data="tableData" 82 :data="tableData"
76 tooltip-effect="dark" 83 tooltip-effect="dark"
77 style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px" 84 style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
@@ -87,11 +94,11 @@ @@ -87,11 +94,11 @@
87 </el-table-column> 94 </el-table-column>
88 <el-table-column 95 <el-table-column
89 label="运单号" 96 label="运单号"
90 - width="185"  
91 - > 97 + width="185">
92 <template slot-scope="scope"> 98 <template slot-scope="scope">
93 <span v-if="scope.row.awbh==''||scope.row.awbh==null"> 99 <span v-if="scope.row.awbh==''||scope.row.awbh==null">
94 - {{scope.row.awba}} 100 + {{scope.row.awba}}<i style="margin-left: 2px" class="el-icon-menu" :style="{'color':scope.row.splitcodes=='P'?'rgb(255,77,81)'
  101 + :scope.row.splitcodes=='M'?'rgb(255,77,81)':scope.row.splitcodes=='D'?'rgb(255,77,81)':'rgb(255,255,255)'}"></i>
95 </span> 102 </span>
96 <span v-else> 103 <span v-else>
97 {{scope.row.awbh}} 104 {{scope.row.awbh}}
@@ -101,26 +108,39 @@ @@ -101,26 +108,39 @@
101 <el-table-column 108 <el-table-column
102 prop="awbinfo.pcs" 109 prop="awbinfo.pcs"
103 label="总件数" 110 label="总件数"
104 - width="70"  
105 - show-overflow-tooltip> 111 + width="70">
  112 +
106 </el-table-column> 113 </el-table-column>
107 <el-table-column 114 <el-table-column
108 prop="awbinfo.weight" 115 prop="awbinfo.weight"
109 label="总重量" 116 label="总重量"
110 - width="70"  
111 - show-overflow-tooltip> 117 + width="70">
112 </el-table-column> 118 </el-table-column>
113 <el-table-column 119 <el-table-column
114 prop="piece" 120 prop="piece"
115 label="舱单件数" 121 label="舱单件数"
116 - width="80"  
117 - show-overflow-tooltip> 122 + width="80">
  123 + <template slot-scope="scope">
  124 + <span v-if="scope.row.piece != scope.row.awbinfo.pcs" style="color: #ff4d51;font-weight: bold">
  125 + {{scope.row.piece}}
  126 + </span>
  127 + <span v-else>
  128 + {{scope.row.piece}}
  129 + </span>
  130 + </template>
118 </el-table-column> 131 </el-table-column>
119 <el-table-column 132 <el-table-column
120 prop="weight" 133 prop="weight"
121 label="舱单重量" 134 label="舱单重量"
122 - width="80"  
123 - show-overflow-tooltip> 135 + width="100">
  136 + <template slot-scope="scope" style="text-align: center">
  137 + <span v-if="scope.row.weight != scope.row.awbinfo.weight" style="color: #ff4d51;font-weight: bold">
  138 + {{scope.row.weight}}
  139 + </span>
  140 + <span v-else>
  141 + {{scope.row.weight}}
  142 + </span>
  143 + </template>
124 </el-table-column> 144 </el-table-column>
125 <el-table-column 145 <el-table-column
126 prop="goodsname" 146 prop="goodsname"
@@ -136,6 +156,9 @@ @@ -136,6 +156,9 @@
136 label="回执内容" 156 label="回执内容"
137 width="260"> 157 width="260">
138 <template slot-scope="scope"> 158 <template slot-scope="scope">
  159 +<!-- <span v-if="scope.row.ext5 && scope.row.ext5.indexOf('异常')" style="color: #F56C6C">-->
  160 +<!-- {{scope.row.ext5}}-->
  161 +<!-- </span>-->
139 <span v-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A"> 162 <span v-if="scope.row.status=='01' || scope.row.status=='11'" style="color: #67C23A">
140 {{scope.row.ext5}} 163 {{scope.row.ext5}}
141 </span> 164 </span>
@@ -859,6 +882,7 @@ @@ -859,6 +882,7 @@
859 data() { 882 data() {
860 /*初始数据*/ 883 /*初始数据*/
861 return { 884 return {
  885 + isExpansion:true,
862 defaultQuery:{ 886 defaultQuery:{
863 flightno: undefined, 887 flightno: undefined,
864 flightdate: undefined, 888 flightdate: undefined,
@@ -1029,6 +1053,18 @@ @@ -1029,6 +1053,18 @@
1029 } 1053 }
1030 }, 1054 },
1031 methods: { 1055 methods: {
  1056 + toggleRowExpansion() {
  1057 + this.isExpansion = !this.isExpansion;
  1058 + this.toggleRowExpansionAll(this.tableData, this.isExpansion);
  1059 + },
  1060 + toggleRowExpansionAll(data, isExpansion) {
  1061 + data.forEach((item) => {
  1062 + this.$refs.dataTreeList.toggleRowExpansion(item, isExpansion);
  1063 + if (item.children !== undefined && item.children !== null) {
  1064 + this.toggleRowExpansionAll(item.children, isExpansion);
  1065 + }
  1066 + });
  1067 + },
1032 //导出PDF,EXCEL文件 1068 //导出PDF,EXCEL文件
1033 handleCommand(command) { 1069 handleCommand(command) {
1034 if(command=='EXCEL'){ 1070 if(command=='EXCEL'){