jinhui.wang

代码更新,文本修正

......@@ -27,9 +27,12 @@ export function findFltById(data) {
})
}
//删除航班
/**
* @param data id List *
*/
export function delFlight(data) {
return request({
url: '/FlightPreserveController/delFlight/'+ data,
url: '/FlightPreserveController/delFlight/' + data,
method: 'post'
})
}
......@@ -53,7 +56,7 @@ export function findFltCommonConf(data) {
})
}
export function updateStatusBatch(data){
export function updateStatusBatch(data) {
return request({
url: '/FlightPreserveController/updateStatusBatch',
method: 'post',
......@@ -62,7 +65,7 @@ export function updateStatusBatch(data){
}
//自动推送开关
export function updateAutoPushBatch(data){
export function updateAutoPushBatch(data) {
return request({
url: '/FlightPreserveController/updateAutoPushBatch',
method: 'post',
......
......@@ -10,7 +10,8 @@ let ductLabels = {
"cargoAllocationDataStatus": {
"已推送": "已推送",
"不推送": "不推送",
"已配": "已配",
"已配": " ",
"待推送": "待推送",
"手动配舱": ' ',
"已释放": ' ',
"原航班配舱": ' ',
......
......@@ -64,7 +64,7 @@
</el-button>
</el-form>
<Tables ref="flightInfoTable" ductName="FlightInformation" :data="findAllFltDatList" :headerData="tableHeader"
:infoData="tableHeader" :selection="true" :totalCount="total" :loading="loading"
:infoData="tableHeader" :order="true" :selection="true" :totalCount="total" :loading="loading"
:limitSize="queryParams.limitSize" :page="queryParams.pageNum" :shiftKey="shiftKey" :infoShow="false"
:height="tableHeight" :pageSizes="[20, 30, 40, 50, 100]" @tableSelect="tableSelect"
@tableSelectAll="tableSelectAll" @currentChange="currentChange" @sortChange="sortChange" @sizeChange="sizeChange">
......@@ -137,13 +137,13 @@
</el-col>
<el-col :span="12">
<el-form-item label="原始重量(KG)" prop="originalWeight">
<el-input-number @change="LowHighAvailable" placeholder="请输入原始重量(KG)" style="width: 93%"
<el-input-number @change="LowHighAvailable" :precision="0" placeholder="请输入原始重量(KG)" style="width: 93%"
v-model="form.originalWeight"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="额外增重百分比" prop="extraWeightPercent">
<el-input-number @change="LowHighAvailable" placeholder="请输入额外增重百分比" style="width: 93%"
<el-input-number @change="LowHighAvailable" :precision="0" placeholder="请输入额外增重百分比" style="width: 93%"
v-model="form.extraWeightPercent"></el-input-number>
</el-form-item>
</el-col>
......@@ -952,6 +952,8 @@ export default {
// formdata.highLowPriceFlg = formdata.highLowPriceFlg ? 1 : 0;
//是否预审
// formdata.isNeedRequired = formdata.isNeedRequired ? 1 : 0;
//总重量更新
// formdata.totalWeight = this.Weightall()
//处理数据
saveOrUpdate(formdata).then((response) => {
if (response.code === 200) {
......
......@@ -165,7 +165,7 @@
<el-table-column type="index" label="序号" align="center">
</el-table-column>
<el-table-column v-for="(item, index) in releaseHeader" header-align="center" :align="item.align"
:prop="item.value" :label="item.name" :key="index" :show-overflow-tooltip="true">
:prop="item.value" :label="item.name" :width="item.width" :key="index" :show-overflow-tooltip="true">
</el-table-column>
</el-table>
<div slot="footer">
......@@ -633,7 +633,7 @@ export default {
{
name: "提示信息",
value: "msg",
width: "500",
width: "550",
align: "center",
},
{
......@@ -649,12 +649,6 @@ export default {
align: "center",
},
{
name: "推送状态",
value: "cargoAllocationDataStatus",
width: "",
align: "center",
},
{
name: "释放状态",
value: "releasing",
width: "",
......@@ -671,7 +665,19 @@ export default {
value: "statusName",
width: "",
align: "center",
}
},
{
name: "ACCS原航班号",
value: "fltNoAccs",
width: "",
align: "center",
},
{
name: "ACCS原航班日期",
value: "fltDateAccs",
width: "",
align: "center",
},
],
findConditionData: {}, //货物查询条件
tableData: [], //表格数据
......@@ -818,6 +824,7 @@ export default {
val === item.id ? item.msg = item.msg + '已释放仓位。' : ''
})
res.data['pushFalse'].map(val => {
console.log(item)
val === item.id ? item.msg = item.msg + '该货物配舱结果已回推ACCS,不能释放。' : ''
})
})
......@@ -984,7 +991,6 @@ export default {
}
}
},
formatter() { }
},
computed: {
fltNo: {
......