切换导航条
此项目
正在载入...
登录
朱兆平
/
vue_cli
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
xudada
5 years ago
提交
a3a5d3903d7392fdb2afea4308e5b2c743a3c43e
1 个父辈
3877b92e
master
...
ExportOrder
analysis
flightplan2.0
kako_vue
master_dev
master_dev_markdown
master_dev_permission
master_ffmTemp
message_bus
nmms-import-dev
vehicle_dispatch
zhidan
申报状态更新
显示空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
43 行增加
和
17 行删除
src/views/nmms_import/AllocateSearch.vue
src/views/nmms_import/OrigFlightList.vue
src/views/nmms_import/OrigMaster.vue
src/views/nmms_import/TallyMster.vue
src/views/nmms_import/Waybill.vue
src/views/nmms_import/AllocateSearch.vue
查看文件 @
a3a5d39
...
...
@@ -131,7 +131,7 @@
<el-table-column
prop="status"
label="状态"
width="100">
width="100"
:formatter="formatStatus"
>
</el-table-column>
<el-table-column
prop="repick"
...
...
@@ -204,7 +204,7 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
:page-sizes="[10
0, 20
0, 300, 400]"
:page-sizes="[10
, 2
0, 300, 400]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total">
...
...
@@ -534,7 +534,8 @@
}, {
value: '08',
label: '舱单删除报转人工'
}],
}
],
options2: [
{
value: '',
...
...
@@ -545,7 +546,8 @@
}, {
value: 'MT3202',
label: '分拨运抵'
}],
}
],
options3: [
{
value: '4604',
...
...
@@ -561,7 +563,7 @@
multipleSelection: [],
labelPosition:'left',
currentPage:1,
pageSize:10,
pageSize:10
0
,
total:0,
dialogStatus:'',
IouterVisible: false,
...
...
@@ -694,6 +696,13 @@
}
},
methods:{
//状态适配
formatStatus:function (row,column) {
return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单'
:row.status=='11'?'放行':row.status=='12'?'拒装':row.status=='13'?'禁卸'
:row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报'
:row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':'';
},
//发送分拨申请报
importSend(index,row){
const map = {'mt6202':row}
...
...
src/views/nmms_import/OrigFlightList.vue
查看文件 @
a3a5d39
...
...
@@ -125,6 +125,7 @@
this.listLoading = true;
selectFlightLists(params).then(res=>{
let response=res.data.data;
console.log(response)
this.tableData=response.list;
this.total=response.total;
this.listLoading = false;
...
...
src/views/nmms_import/OrigMaster.vue
查看文件 @
a3a5d39
...
...
@@ -109,7 +109,7 @@
<el-table-column
prop="status"
label="状态"
width="100">
width="100"
:formatter="formatStatus"
>
</el-table-column>
<el-table-column
prop="customText"
...
...
@@ -401,12 +401,6 @@
</el-form-item>
</el-col>
<el-col :span="6">
<!--<el-form-item label="国家代码" prop="awbinfo.shprcountyr">
<el-select v-model="ruleForm.awbinfo.shprcountyr" placeholder="" style="display:inline">
<el-option v-for="item in shprcountyrs" :key="item" :label="item"
:value="item"></el-option>
</el-select>
</el-form-item>-->
<el-form-item label="国家代码" prop="awbinfo.shprcountyr">
<el-select v-model="ruleForm.awbinfo.shprcountyr"
filterable
...
...
@@ -713,7 +707,7 @@
splitcode: 'T',
uldType: undefined,
uldNo: undefined,
status:
undefined
,
status:
'22'
,
awbinfo: {
specopeid: undefined,
shprname: undefined,
...
...
@@ -826,12 +820,20 @@
}
},
methods: {
//状态识别
formatStatus: function(row,column){
return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单'
:row.status=='11'?'放行':row.status=='12'?'拒装':row.status=='13'?'禁卸'
:row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报'
:row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':'';
},
/*多选框功能*/
handleSelectionChange(val) {
this.multipleSelection = val;
},
/*编辑主单信息*/
handleEdit(index, row){
console.log(row)
this.outerVisible = true;
this.dialogStatus='update';
this.FenStatus='ediAwbh';
...
...
src/views/nmms_import/TallyMster.vue
查看文件 @
a3a5d39
...
...
@@ -90,7 +90,7 @@
<el-table-column
prop="status"
label="状态"
width="100">
width="100"
:formatter="formatStatus"
>
</el-table-column>
<el-table-column
prop="receipt"
...
...
@@ -490,7 +490,13 @@
}
},
methods: {
//获取关区代码
//状态适配
formatStatus:function (row,column) {
return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单'
:row.status=='11'?'放行':row.status=='12'?'拒装':row.status=='13'?'禁卸'
:row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报'
:row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':'';
},
//获取关区代码
remoteMethod2:function(query){
this.customcodes=[];
...
...
src/views/nmms_import/Waybill.vue
查看文件 @
a3a5d39
...
...
@@ -162,7 +162,7 @@
<el-table-column
prop="status"
label="状态"
width="90">
width="90"
:formatter="formatStatus"
>
</el-table-column>
<el-table-column
prop="repick"
...
...
@@ -249,13 +249,14 @@
tableData: [],
multipleSelection: [],
currentPage:1,
pageSize:10,
pageSize:10
0
,
total:0
}
},
methods:{
handleSelectionChange(val) {
this.multipleSelection = val;
console.log(val)
},
handleClick(row) {
console.log(row);
...
...
@@ -268,6 +269,13 @@
this.currentPage=val;
this.QueryData();
},
//状态适配
formatStatus:function (row,column) {
return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单'
:row.status=='11'?'放行':row.status=='12'?'拒装':row.status=='13'?'禁卸'
:row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报'
:row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':'';
},
//修改状态
handleStuts(){},
//条件查询方法
...
...
请
注册
或
登录
后发表评论