jinhui.wang

bug修正

...@@ -161,16 +161,16 @@ ...@@ -161,16 +161,16 @@
161 size="small" @click="xlse(1)" :disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{ 161 size="small" @click="xlse(1)" :disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{
162 downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果" 162 downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
163 }}</el-button> 163 }}</el-button>
164 - <el-button type="primary" size="small" :disabled="selectTable.length == 0" v-hasPermi="['base:cargo:release']" 164 + <el-button type="primary" size="small" icon="el-icon-s-flag" :disabled="selectTable.length == 0"
165 - @click="release">释放舱位</el-button> 165 + v-hasPermi="['base:cargo:release']" @click="release">释放舱位</el-button>
166 - <el-button type="primary" size="small" :disabled="selectTable.length == 0" @click="transfer" 166 + <el-button type="primary" size="small" icon="el-icon-sort" :disabled="selectTable.length == 0" @click="transfer"
167 v-hasPermi="['log:cargo:flightTransfer']">航班迁转</el-button> 167 v-hasPermi="['log:cargo:flightTransfer']">航班迁转</el-button>
168 - <el-button type="primary" size="small" :disabled="cargoPlaneTime == null || cargoPlaneTime.length <= 0" 168 + <!-- <el-button type="primary" size="small" :disabled="cargoPlaneTime == null || cargoPlaneTime.length <= 0"
169 @click="historyFlie"> 169 @click="historyFlie">
170 <el-tooltip class="item" effect="dark" content="请先选择配置航班日期" placement="top"> 170 <el-tooltip class="item" effect="dark" content="请先选择配置航班日期" placement="top">
171 <span class="el-icon-warning-outline">生成归档数据</span> 171 <span class="el-icon-warning-outline">生成归档数据</span>
172 </el-tooltip> 172 </el-tooltip>
173 - </el-button> 173 + </el-button> -->
174 <span class="ml20" style="color: #ffba00">全部导出上限80000条数据</span> 174 <span class="ml20" style="color: #ffba00">全部导出上限80000条数据</span>
175 <el-progress v-if="progress != 0" class="progress" :stroke-width="12" :show-text="true" :percentage="progress" 175 <el-progress v-if="progress != 0" class="progress" :stroke-width="12" :show-text="true" :percentage="progress"
176 :status="progress == 100 ? 'success' : 'warning'"></el-progress> 176 :status="progress == 100 ? 'success' : 'warning'"></el-progress>
......
...@@ -169,7 +169,7 @@ export default { ...@@ -169,7 +169,7 @@ export default {
169 select(val) { 169 select(val) {
170 this.tableLoading = true 170 this.tableLoading = true
171 let obj = JSON.parse(JSON.stringify(this.datainfo(this.formData))) 171 let obj = JSON.parse(JSON.stringify(this.datainfo(this.formData)))
172 - if (this.accsDate.length > 0) { 172 + if (this.accsDate != null && this.accsDate.length > 0) {
173 obj.fltDateStart = this.accsDate[0] 173 obj.fltDateStart = this.accsDate[0]
174 obj.fltDateEnd = this.accsDate[1] 174 obj.fltDateEnd = this.accsDate[1]
175 } 175 }
......