朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 cff76975016c6f6f762bfefe9d8c016f40c2bd14 1 个父辈 2b2651d6 master ... ExportOrder flightplan2.0 master_dev master_dev_markdown master_dev_permission master_ffmTemp zhidan

快邮舱单申报 主分单报文发送追加

内嵌 并排对比
正在显示 2 个修改的文件 包含 229 行增加 和 55 行删除
import axios from 'axios'
import http from "../http";
let baseUrl = 'express-system/express'
let awbaUrl = 'express-system/expressAwba'
let awbhUrl = 'express-system/expressAwbh'
let bulidMsg = 'express-system/bulidMsg'
/**
* 主单请求
* @param params
* @returns {Promise<AxiosResponse<T>>}
*/
export const getExpressList = params => { return axios.get(`${awbaUrl}/list`, { params: params });};
export const getExpressList = params => { return axios.get(`${baseUrl}/list`, { params: params }); };
export const awbaAdd = params => { return http.post(`${awbaUrl}/awbaAdd`,params)};
export const awbaAdd = params => { return http.post(`${baseUrl}/awbaAdd`,params)};
export const awbaEdit = params => { return http.put(`${awbaUrl}/awbaEdit`,params)};
export const awbaEdit = params => { return http.put(`${baseUrl}/awbaEdit`,params)};
export const selectAwba = params => { return http.get(`${awbaUrl}/selectAwba`,{ params: params });};
export const awbhAdd = params => { return http.post(`${baseUrl}/awbhAdd`,params)};
/**
* 分单请求
*/
export const awbhAdd = params => { return http.post(`${awbhUrl}/awbhAdd`,params)};
export const awbhEdit = params => { return http.put(`${awbhUrl}/awbhEdit`,params)};
export const selectAwbh = params => { return axios.get(`${awbhUrl}/selectAwbh`, { params: params }); };
/**
* 生成报文
*/
export const awbaAddBulid = params => { return http.post(`${bulidMsg}/awbaAddBulid`,params)};
export const awbhAddBulid = params => { return http.post(`${bulidMsg}/awbhAddBulid`,params)};
export const awbhEdit = params => { return http.put(`${baseUrl}/awbhEdit`,params)};
... ...
... ... @@ -37,31 +37,41 @@
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55">
</el-table-column>
<el-table-column prop="billno" label="主单号" width="180">
<el-table-column prop="billno" label="主单号" width="170px">
</el-table-column>
<el-table-column prop="assbillno" label="分单号" width="180">
<el-table-column prop="assbillno" label="分单号" width="110px">
</el-table-column>
<el-table-column prop="flightNo" label="航班号" width="180">
<el-table-column prop="flightNo" label="航班号" width="75px">
</el-table-column>
<el-table-column prop="flightDate" label="航班日期" width="180">
<el-table-column prop="flightDate" label="航班日期" width="110px">
</el-table-column>
<el-table-column prop="maingname" label="分单主商品名称" width="180">
<!-- <el-table-column prop="maingname" label="分单主商品名称" width="180px">-->
<!-- </el-table-column>-->
<el-table-column prop="ieflag" :formatter="ieflagType" label="进出口标识" width="100px">
</el-table-column>
<el-table-column prop="ieflag" label="进出口标识" width="100px">
<el-table-column prop="grosswt" label="毛重" width="100px">
</el-table-column>
<el-table-column prop="grosswt" label="毛重">
</el-table-column>
<el-table-column prop="packno" label="件数">
<el-table-column prop="packno" label="件数" width="100px">
</el-table-column>
<el-table-column prop="billnum" label="分运单总数" width="100px">
</el-table-column>
<el-table-column prop="iedate" label="进出口日期" width="100px">
</el-table-column>
<el-table-column label="操作" min-width="300px">
<template slot-scope="scope">
<el-button type="primary" size="small" v-if="scope.row.ext1 == 'awba'" @click="expressAwbhAdd(scope.$index, scope.row)">新增分单</el-button>
<el-button type="primary" size="small" v-if="scope.row.ext1 == 'awba'" @click="expressEditAwbaAdd(scope.$index, scope.row)">编辑主单</el-button>
<el-button type="primary" size="small" v-else @click="expressEditAwbhAdd(scope.$index, scope.row)">编辑分单</el-button>
<el-table-column prop="" label="回执状态" width="100px">
</el-table-column>
<el-table-column prop="" label="回执内容" width="180px">
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="330px">
<template slot-scope="scope" >
<el-button type="primary" size="mini" v-if="scope.row.ext1 == 'awba'" @click="expressAwbhAdd(scope.$index, scope.row)">新增分单</el-button>
<el-button type="primary" size="mini" v-if="scope.row.ext1 == 'awba'" @click="expressEditAwbaAdd(scope.$index, scope.row)">编辑主单</el-button>
<el-button type="primary" size="mini" v-else @click="expressEditAwbhAdd(scope.$index, scope.row)">编辑分单</el-button>
<el-button type="primary" size="mini" v-if="scope.row.ext1 == 'awba'" @click="expressBulidAbwa(scope.$index, scope.row)">发送主单报文</el-button>
<el-button type="primary" size="mini" v-else @click="expressBulidAbwh(scope.$index, scope.row)">发送分单报</el-button>
<br>
<br>
<el-button type="primary" size="mini" v-if="scope.row.ext1 == 'awba'" @click="expressEditBulidAbwa(scope.$index, scope.row)">发送修改主单表头报文</el-button>
<el-button type="primary" size="mini" v-else @click="expressEditBulidAbwh(scope.$index, scope.row)">发送追加表体分单报</el-button>
</template>
</el-table-column>
</el-table>
... ... @@ -84,7 +94,8 @@
<el-row>
<el-col :span="8">
<el-form-item label="主单号" :label-width="expressAddlWidth" prop="billno">
<el-input style="width: 80%" v-model="expressAwbaAddModel.billno" autocomplete="off"></el-input>
<el-input style="width: 80%" v-if="dialogCommon == 'add'" v-model="expressAwbaAddModel.billno" autocomplete="off"></el-input>
<el-input style="width: 80%" v-else disabled v-model="expressAwbaAddModel.billno" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
... ... @@ -241,7 +252,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="分单号" :label-width="expressAddlWidth" prop="assbillno">
<el-input style="width: 80%" v-model="expressAwbhAddModel.assbillno" autocomplete="off"></el-input>
<el-input style="width: 80%" v-model="expressAwbhAddModel.assbillno" autocomplete="off"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
... ... @@ -275,14 +286,15 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="expressAwbhAddVisible = false">取消</el-button>
<el-button type="primary" @click="dialogCommon=='add'?expressAwbhAddSubmit():expressAwbhEditSubmit()">提交</el-button>
<el-button type="primary" @click="dialogCommon=='add'?expressAwbhAddSubmit():expressAwbhEditSubmit()">提交</el-button>
</div>
</el-dialog>
</section>
</template>
<script>
import {getExpressList, awbaAdd, awbaEdit, awbhAdd, awbhEdit} from '../../api/express/express'
import {getExpressList, awbaAdd, awbaEdit, selectAwba, awbhAdd,
awbhEdit, selectAwbh, awbaAddBulid, awbhAddBulid} from '../../api/express/express'
import loginUserInfo from "../../api/base";
export default {
name: "express",
... ... @@ -466,6 +478,13 @@
this.listLoading = false;
});
},
ieflagType: function(row, column){
if (row.ieflag == 'I'){
return "进口";
}else if(row.ieflag == 'E'){
return "出口";
}
},
/**
* 多选单选
* @param val
... ... @@ -501,27 +520,43 @@
this.$refs.expressAwbaAddModel.validate((valid) => {
if (valid) {
this.$confirm('确认提交吗？', '提示', {}).then(() => {
//NProgress.start();
let para = {
billno: this.expressAwbaAddModel.billno
}
this.listLoading = true;
this.expressAwbaAddModel.userName = loginUserInfo.username;
this.expressAwbaAddModel.userid = loginUserInfo.userId;
let para = Object.assign({}, this.expressAwbaAddModel);
awbaAdd(para).then((res) => {
// 查询主单是否重复
selectAwba(para).then((res) => {
if (res.data.code == 200){
this.$message({
message: '提交成功',
type: 'success'
});
this.$refs.expressAwbaAddModel.resetFields();
this.expressAwbaAddVisible = false;
this.getList();
//NProgress.start();
this.listLoading = true;
this.expressAwbaAddModel.userName = loginUserInfo.username;
this.expressAwbaAddModel.userid = loginUserInfo.userId;
let para = Object.assign({}, this.expressAwbaAddModel);
awbaAdd(para).then((res) => {
if (res.data.code == 200){
this.$message({
message: '提交成功',
type: 'success'
});
this.$refs.expressAwbaAddModel.resetFields();
this.expressAwbaAddVisible = false;
this.getList();
}else {
this.$message({
message: '提交失败',
type: 'error'
});
}
}).catch(error => alert(error));
}else {
this.$message({
message: '提交失败',
message: '此单号已存在,请勿重复添加',
type: 'error'
});
}
}).catch(error => alert(error));
}).catch((error) => {
this.listLoading = false;
});
}).catch(() =>{
});
... ... @@ -593,27 +628,43 @@
this.$refs.expressAwbhAddModel.validate((valid) => {
if (valid) {
this.$confirm('确认提交吗？', '提示', {}).then(() => {
//NProgress.start();
this.listLoading = true;
this.expressAwbhAddModel.userName = loginUserInfo.username;
this.expressAwbhAddModel.userid = loginUserInfo.userId;
let para = Object.assign({}, this.expressAwbhAddModel);
awbhAdd(para).then((res) => {
if (res.data.code == 200){
this.$message({
message: '提交成功',
type: 'success'
});
this.$refs.expressAwbhAddModel.resetFields();
this.expressAwbhAddVisible = false;
this.getList();
let para = {
billno: this.expressAwbhAddModel.billno,
assbillno: this.expressAwbhAddModel.assbillno
}
selectAwbh(para).then((res) => {
if(res.data.code == 200){
//NProgress.start();
this.listLoading = true;
this.expressAwbhAddModel.userName = loginUserInfo.username;
this.expressAwbhAddModel.userid = loginUserInfo.userId;
let para = Object.assign({}, this.expressAwbhAddModel);
awbhAdd(para).then((res) => {
if (res.data.code == 200){
this.$message({
message: '提交成功',
type: 'success'
});
this.$refs.expressAwbhAddModel.resetFields();
this.expressAwbhAddVisible = false;
this.getList();
}else {
this.$message({
message: '提交失败',
type: 'error'
});
}
}).catch(error => alert(error));
}else {
this.$message({
message: '提交失败',
type: 'error'
message: "同一主单下分单号不可以重复",
type: "error"
});
}
}).catch(error => alert(error));
}).catch((error) => {
this.listLoading = false;
});
}).catch(() =>{
});
... ... @@ -663,8 +714,110 @@
}
});
},
/**
* 发送主单报文
*/
expressBulidAbwa(index, row){
this.$confirm('发送主单报该下面所有分单会一起发送确定吗？', '提示', {}).then(() => {
row.optype = "ADD";
awbaAddBulid(row).then((res) => {
if (res.data.code == 200){
this.$message({
message: '发送成功',
type: 'success'
});
this.listLoading = true;
this.getList();
}else {
this.$message({
message: '发送失败',
type: 'error'
});
}
}).catch(error => alert(error));
}).catch((error) => {
this.listLoading = false;
});
},
/**
* 追加主单报文
*/
expressEditBulidAbwa(index, row){
this.$confirm('发送修改主单报表头该下面所有分单会一起发送确定吗？', '提示', {}).then(() => {
row.optype = "APD";
awbaAddBulid(row).then((res) => {
if (res.data.code == 200){
this.$message({
message: '发送成功',
type: 'success'
});
this.listLoading = true;
this.getList();
}else {
this.$message({
message: '发送失败',
type: 'error'
});
}
}).catch(error => alert(error));
}).catch((error) => {
this.listLoading = false;
});
},
/**
* 发送分单报文
*/
expressBulidAbwh(index, row){
this.$confirm('发送分单报文会和主单一起发送？', '提示', {}).then(() => {
row.ext2 = "ADD";
awbhAddBulid(row).then((res) => {
if (res.data.code == 200){
this.$message({
message: '发送成功',
type: 'success'
});
this.listLoading = true;
this.getList();
}else {
this.$message({
message: '发送失败',
type: 'error'
});
}
}).catch(error => alert(error));
}).catch((error) => {
this.listLoading = false;
});
},
/**
* 追加分单报文
*/
expressEditBulidAbwh(index, row){
this.$confirm('追加分单报文会和主单一起发送？', '提示', {}).then(() => {
row.ext2 = "APD";
awbhAddBulid(row).then((res) => {
if (res.data.code == 200){
this.$message({
message: '发送成功',
type: 'success'
});
this.listLoading = true;
this.getList();
}else {
this.$message({
message: '发送失败',
type: 'error'
});
}
}).catch(error => alert(error));
}).catch((error) => {
this.listLoading = false;
});
},
},
mounted() {
this.getList();
... ...