1730532197@qq.com

lwj

...@@ -83,28 +83,34 @@ ...@@ -83,28 +83,34 @@
83 <el-table-column label="总重量(KG)" align="center" prop="totalWeight" width="130" /> 83 <el-table-column label="总重量(KG)" align="center" prop="totalWeight" width="130" />
84 <el-table-column label="原始重量(KG)" align="center" prop="originalWeight" width="130" /> 84 <el-table-column label="原始重量(KG)" align="center" prop="originalWeight" width="130" />
85 <el-table-column label="总体积(cm³)" align="center" prop="totalVolume" width="130" /> 85 <el-table-column label="总体积(cm³)" align="center" prop="totalVolume" width="130" />
86 - <el-table-column label="是否限制一票一件" align="center" prop="ticketToPiece" width="150" :formatter="ticketToPieceFormat" /> 86 + <el-table-column label="是否限制一票一件" align="center" prop="ticketToPiece" width="150"
87 - <el-table-column label="是否需要预审" align="center" prop="needRequired" width="150" :formatter="needRequiredFormat" /> 87 + :formatter="ticketToPieceFormat" />
88 + <el-table-column label="是否需要预审" align="center" prop="needRequired" width="150" :formatter="needRequiredFormat" />
88 <el-table-column label="额外增重百分比" align="center" prop="extraWeightPercent" width="150" /> 89 <el-table-column label="额外增重百分比" align="center" prop="extraWeightPercent" width="150" />
89 <el-table-column label="高价百分比" align="center" prop="highPriceWeightPercent" width="150" /> 90 <el-table-column label="高价百分比" align="center" prop="highPriceWeightPercent" width="150" />
90 <el-table-column label="低价百分比" align="center" prop="lowPriceWeightPercent" width="150" /> 91 <el-table-column label="低价百分比" align="center" prop="lowPriceWeightPercent" width="150" />
91 - <el-table-column label="是否开启高地价" align="center" prop="highLowPriceFlg" width="150":formatter="highLowPriceFlgFormat"/> 92 + <el-table-column label="是否开启高地价" align="center" prop="highLowPriceFlg" width="150"
93 + :formatter="highLowPriceFlgFormat" />
92 <el-table-column label="已配重量(KG)" align="center" prop="alloctedWeight" width="150" /> 94 <el-table-column label="已配重量(KG)" align="center" prop="alloctedWeight" width="150" />
93 <el-table-column label="已配体积(cm³)" align="center" prop="alloctedVolume" width="150" /> 95 <el-table-column label="已配体积(cm³)" align="center" prop="alloctedVolume" width="150" />
94 <el-table-column label="航班优先级" align="center" prop="priorityName" width="150" /> 96 <el-table-column label="航班优先级" align="center" prop="priorityName" width="150" />
95 <el-table-column label="配舱优先级" align="center" prop="priorityRuleName" width="150" /> 97 <el-table-column label="配舱优先级" align="center" prop="priorityRuleName" width="150" />
96 <el-table-column label="创建人" align="center" prop="createUserName" width="120" /> 98 <el-table-column label="创建人" align="center" prop="createUserName" width="120" />
97 - <el-table-column label="创建时间" align="center" prop="createTime" width="155"> 99 + <el-table-column label="创建时间" align="center" prop="createTime" width="155" />
100 +
101 + <!-- <el-table-column label="创建时间" align="center" prop="createTime" width="155">
98 <template slot-scope="scope"> 102 <template slot-scope="scope">
99 <span>{{ renderTime(scope.row.createTime) }}</span> 103 <span>{{ renderTime(scope.row.createTime) }}</span>
100 </template> 104 </template>
101 - </el-table-column> 105 + </el-table-column> -->
102 - <el-table-column label="最后修改人" align="center" prop="lastModifyUserName" width="120" /> 106 + <el-table-column label="最后修改人" align="center" prop="lastModifyUserName" width="155" />
103 - <el-table-column label="最后修改时间" align="center" prop="lastModifyTime" width="155"> 107 + <!-- <el-table-column label="最后修改时间" align="center" prop="lastModifyTime" width="155">
104 <template slot-scope="scope"> 108 <template slot-scope="scope">
105 <span>{{ renderTime(scope.row.lastModifyTime) }}</span> 109 <span>{{ renderTime(scope.row.lastModifyTime) }}</span>
106 </template> 110 </template>
107 - </el-table-column> 111 + </el-table-column> -->
112 + <el-table-column label="最后修改时间" align="center" prop="lastModifyTime" width="120" />
113 +
108 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="130" fixed="right"> 114 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="130" fixed="right">
109 <template slot-scope="scope"> 115 <template slot-scope="scope">
110 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button> 116 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
...@@ -165,7 +171,7 @@ ...@@ -165,7 +171,7 @@
165 </el-col> 171 </el-col>
166 <el-col :span="12"> 172 <el-col :span="12">
167 <el-form-item label="航班类型" prop="startDate"> 173 <el-form-item label="航班类型" prop="startDate">
168 - <!-- <el-select v-model="form.value1" placeholder="请选择航班类型"> 174 + <!-- <el-select v-model="form.value1" placeholder="请选择航班类型">
169 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> 175 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
170 </el-option> 176 </el-option>
171 </el-select> --> 177 </el-select> -->
...@@ -175,7 +181,7 @@ ...@@ -175,7 +181,7 @@
175 181
176 <el-col :span="12"> 182 <el-col :span="12">
177 <el-form-item label="航班状态" prop="startDate"> 183 <el-form-item label="航班状态" prop="startDate">
178 - <!-- <el-select v-model="form.value2" placeholder="请选择航班状态"> 184 + <!-- <el-select v-model="form.value2" placeholder="请选择航班状态">
179 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> 185 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
180 </el-option> 186 </el-option>
181 </el-select> --> 187 </el-select> -->
...@@ -230,7 +236,7 @@ ...@@ -230,7 +236,7 @@
230 236
231 <el-col :span="12"> 237 <el-col :span="12">
232 <el-form-item label="航班优先级" prop="startDate"> 238 <el-form-item label="航班优先级" prop="startDate">
233 - <!-- <el-select v-model="form.value5" placeholder="请选择航班优先级"> 239 + <!-- <el-select v-model="form.value5" placeholder="请选择航班优先级">
234 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> 240 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
235 </el-option> 241 </el-option>
236 </el-select> --> 242 </el-select> -->
......