Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Fedex
/
imac-vue
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
Elements-SY
2023-08-16 15:03:52 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
8def66ea47c326fb1164576786f8fcf80fd0fc55
8def66ea
1 parent
6d5ea540
新增【CY23-PI03-014-01 数据字典(航线设置)】& ET86编辑修改etc
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
115 additions
and
22 deletions
src/api/preMdeConfig.js
src/api/system/dictionary.js
src/assets/languages/tableHeaders.js
src/views/allocationConfig/cargoAllocation/index.vue
src/views/allocationConfig/cargoAllocation/info.vue
src/views/allocationConfig/et86/edit/index.vue
src/views/allocationConfig/et86/formConfig.js
src/views/allocationConfig/et86/index.vue
src/views/basicInformation/caExportPreQualification/index.vue
src/views/basicInformation/queryCargo/info.vue
src/views/preMdeConfig/preMdeSelect/index.vue
src/views/systemConfig/dictionaryConfig/index.vue
src/api/preMdeConfig.js
View file @
8def66e
...
...
@@ -83,7 +83,7 @@ export function searchUrsaDestination(data) {
* @param waybillNo 运单号
* @param ursa ursa
* @param typeName 申报类别
* @param siteName
站点
* @param siteName
始发站
* @param regionArray 区域 list
* @param areaArray 地区 list
* @param serviceTypeArray 服务代码 list
...
...
src/api/system/dictionary.js
View file @
8def66e
...
...
@@ -204,3 +204,15 @@ export function checkFlightRoute(data) {
data
:
data
})
}
//更新航线
/**
* @param id *
*/
export
function
updateRoute
(
id
)
{
return
request
({
url
:
`/dictionary/updateRoute/
${
id
}
`
,
method
:
"post"
,
data
:
{},
});
}
...
...
src/assets/languages/tableHeaders.js
View file @
8def66e
...
...
@@ -69,7 +69,7 @@ let tableHeaders = {
status
:
1
},
{
columnChineseName
:
"
站点
"
,
columnChineseName
:
"
始发站
"
,
columnName
:
"siteName"
,
columnWidth
:
"80"
,
ext1
:
"sorTable"
,
...
...
@@ -671,7 +671,7 @@ let tableHeaders = {
status
:
1
},
{
columnChineseName
:
"
站点
"
,
columnChineseName
:
"
始发站
"
,
columnName
:
"siteName"
,
columnWidth
:
"80"
,
ext1
:
"sorTable"
,
...
...
@@ -1764,7 +1764,7 @@ let tableHeaders = {
status
:
1
},
{
columnChineseName
:
"
站点
"
,
columnChineseName
:
"
始发站
"
,
columnName
:
"siteName"
,
columnWidth
:
""
,
ext1
:
""
,
...
...
@@ -1955,7 +1955,7 @@ let tableHeaders = {
status
:
1
},
{
columnChineseName
:
"
站点
"
,
columnChineseName
:
"
始发站
"
,
columnName
:
"siteName"
,
columnWidth
:
""
,
ext1
:
""
,
...
...
src/views/allocationConfig/cargoAllocation/index.vue
View file @
8def66e
...
...
@@ -112,7 +112,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="
站点
">
<el-form-item label="
始发站
">
<el-input class="formItem" type="textarea" placeholder="PVG;PEK" v-model="siteName" :rows="1" clearable>
</el-input>
</el-form-item>
...
...
src/views/allocationConfig/cargoAllocation/info.vue
View file @
8def66e
...
...
@@ -73,7 +73,7 @@ export default {
{ name: "口岸代码", value: "portName", width: "" },
{ name: "运单号", value: "waybillNo", width: "" },
{ name: "货物状态", value: "statusName", width: "" },
{ name: "
站点
", value: "siteName", width: "" },
{ name: "
始发站
", value: "siteName", width: "" },
{ name: "申报类型", value: "typeName", width: "" },
{ name: "URSA", value: "ursa", width: "" },
{ name: "实际重量", value: "actualWeight", width: "" },
...
...
src/views/allocationConfig/et86/edit/index.vue
View file @
8def66e
...
...
@@ -467,8 +467,12 @@ export default {
list.map((item) => {
routeList.push(item);
});
let isEtesRoute = list.filter(item=>item.isEtesRoute == "Y"); // 过滤普通航线
if(isEtesRoute.length == 0){
this.msgError("该航班下的航线均为普通航线");
}
this.tableData[this.currentIndex].fltRoute = "";
this.tableData[this.currentIndex].routeList =
routeList
;
this.tableData[this.currentIndex].routeList =
isEtesRoute
;
} else {
this.msgError("暂无航线");
this.tableData[this.currentIndex].routeList = [];
...
...
src/views/allocationConfig/et86/formConfig.js
View file @
8def66e
...
...
@@ -33,8 +33,8 @@ export const formConfig = [
label
:
"无效"
,
},
],
label
:
""
,
value
:
""
,
label
:
"
有效
"
,
value
:
"
1
"
,
},
},
];
...
...
src/views/allocationConfig/et86/index.vue
View file @
8def66e
...
...
@@ -44,7 +44,9 @@ export default {
data() {
return {
formConfig: formConfig, // 表单配置项
queryForm: {}, // 表单参数
queryForm: { // 表单参数
status: "有效"
},
pageConfig: {
// 分页配置项
isPagination: true,
...
...
@@ -152,10 +154,7 @@ export default {
})
.then(() => {
console.log("删除:", item);
this.$message({
type: "success",
message: "删除成功!",
});
this.msgSuccess("删除成功!")
})
.catch(() => {});
},
...
...
src/views/basicInformation/caExportPreQualification/index.vue
View file @
8def66e
...
...
@@ -23,7 +23,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="
站点
">
<el-form-item label="
始发站
">
<el-input type="textarea" v-model="siteName" class="formItem" placeholder="PVG;PEK" clearable :rows="1">
</el-input>
</el-form-item>
...
...
@@ -106,7 +106,7 @@ export default {
fltNo: null,
//运单号
waybillNo: "",
//
站点
//
始发站
siteName: "",
//ursa
ursa: "",
...
...
src/views/basicInformation/queryCargo/info.vue
View file @
8def66e
...
...
@@ -72,7 +72,7 @@ export default {
{ name: "口岸代码", value: "portName", width: "" },
{ name: "运单号", value: "waybillNo", width: "" },
{ name: "货物状态", value: "statusName", width: "" },
{ name: "
站点
", value: "siteName", width: "" },
{ name: "
始发站
", value: "siteName", width: "" },
{ name: "申报类型", value: "typeName", width: "" },
{ name: "URSA", value: "ursa", width: "" },
{ name: "实际重量", value: "actualWeight", width: "" },
...
...
src/views/preMdeConfig/preMdeSelect/index.vue
View file @
8def66e
...
...
@@ -56,7 +56,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="
站点
">
<el-form-item label="
始发站
">
<el-input type="textarea" v-model="formData.siteName" class="formItem" placeholder="PVG;PEK"
:rows="4" clearable>
</el-input>
...
...
src/views/systemConfig/dictionaryConfig/index.vue
View file @
8def66e
...
...
@@ -3,7 +3,7 @@
<el-card style="margin-bottom:10px">
<!-- cardHeader -->
<div slot="header" class="clearfix">
<span style="font-size:16px;font-weight:700">{{ (tableName == '航线' ? '航线' : tableName == 'Site' ? '
站点
' :
<span style="font-size:16px;font-weight:700">{{ (tableName == '航线' ? '航线' : tableName == 'Site' ? '
始发站
' :
tableName ==
'虚拟航班' ? '虚拟航班' : tableName.replace(/( |^)[a-z]/g, L => L.toUpperCase())) + "表"
}}</span>
...
...
@@ -88,7 +88,7 @@
</template>
</Tables>
<!-- 航线表 -->
<Tables v-
else-
if="tableName === '航线'" ductName="dictionary" :selection="true" :selectFixed="false"
<Tables v-if="tableName === '航线'" ductName="dictionary" :selection="true" :selectFixed="false"
:order='true' :height="tableHeight" :data="tableData" :headerData="routeTable" :page="selectDict.page"
:pageSizes="[20]" :totalCount="total" :loading="loading" @currentChange="currentChange"
layout="total,prev, pager, next, jumper, ->" @tableSelect="tableSelection"
...
...
@@ -100,6 +100,11 @@
}}<i class="el-icon-link"></i> </el-link>
</template>
<template slot="optionColumn">
<el-table-column label="是否为ET86航线" align="center">
<template slot-scope="scope">
<el-checkbox v-model="scope.row.isEtesRoute" @change="checkboxIsEtesRoute(scope)"></el-checkbox>
</template>
</el-table-column>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button size="mini" type="text" style="color:#ff4949" icon="el-icon-delete"
...
...
@@ -166,7 +171,7 @@
<script>
import Dialog from './dialog.vue'
import { getDictNameList, getDictionaryList, getServiceCodeList, delServiceCodeCihild, delDict, flightType, delFlight, queryRoute, delRoute, checkFlightRoute } from '@/api/system/dictionary.js'
import { getDictNameList, getDictionaryList, getServiceCodeList, delServiceCodeCihild, delDict, flightType, delFlight, queryRoute, delRoute, checkFlightRoute
, updateRoute
} from '@/api/system/dictionary.js'
export default {
name: 'DictionaryConfig',
...
...
@@ -217,6 +222,16 @@ export default {
mounted() {
// this.tableHeight = window.innerHeight - this.$refs.dictForm.$el.offsetHeight - 270
},
filters: {
// 是否为ET86航线
isEtesRoute(val) {
if(val == "N"){
return "否"
}else{
return "是"
}
},
},
watch: {
tableName(val, oldVal) {
this.tableName = val
...
...
@@ -228,6 +243,25 @@ export default {
},
},
methods: {
/*
【更新航线】
更新路由成功后不用去调查询接口,
因为即便不去刷新页面调查询接口,
当前checkBox都是当前操作的状态;
所以调不调查询接口没有意义,反而消耗后台服务;
*/
async updateRouteSubmit(params){
await updateRoute(params).then(res=>{
if(res.code == 200){
this.msgSuccess(res.msg)
}else{
this.msgError(res.msg);
}
}).catch(err => {
console.log(err)
this.msgWarning(err)
})
},
//字典名称
dictNameSelect() {
getDictNameList().then(res => {
...
...
@@ -281,6 +315,13 @@ export default {
}
queryRoute(obj).then(res => {
if (res.code === 200) {
res.data.list.map(item=>{
if(item.isEtesRoute == "N"){
item.isEtesRoute = false;
}else{
item.isEtesRoute = true;
}
})
this.tableData = res.data.list
this.total = res.data.total
} else {
...
...
@@ -325,7 +366,15 @@ export default {
} else if (this.tableName === '虚拟航班') {
this.flightDel([val.id])
} else if (this.tableName === '航线') {
/*
如果该航线是普通航线直接删,如果是ET86航线,那么要查询该航线有没有设置维度,
如果没有直接删,如果已经设置了维度是否考虑将该航线下的维度删掉再进行操作;
*/
if(!val.isEtesRoute){ // 普通航线
this.routeDel({ data: [val], id: [val.id] })
}else{ // ET86航线
}
} else {
this.dicDel([val.id])
}
...
...
@@ -488,6 +537,35 @@ export default {
serviceCodeTableSelectAll(val) {
this.nowSelect = val
},
// 确认消息提示
confirmHandle($index, row){
this.$confirm(row.msg, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
center: true,
})
.then(() => {
this.updateRouteSubmit(row.id);
})
.catch(() => {
this.tableData[$index].isEtesRoute = !this.tableData[$index].isEtesRoute;
});
},
// checkBox是否设置ET86航线
checkboxIsEtesRoute({ $index, row }){
if(!row.isEtesRoute){
/*
将ET86设置成普通航线要查询校验该航线有没有设置维度,
如果该航线设置了ET86维度是否考虑将该航线下的维度删掉再进行操作;
*/
row.msg = "是否将该航线设置为非ET86航线?";
this.confirmHandle($index, row)
}else{
row.msg = "是否将该航线设置为ET86航线?";
this.confirmHandle($index, row)
}
}
}
}
</script>
...
...
Please
register
or
login
to post a comment