Merge branch 'master' of http://git.xdadan.com/tanex/emis-frontend
This commit is contained in:
liuyp
commit
4c7b6ec0da
@ -69,3 +69,14 @@ export function delEmisTmsScanRecord(id) {
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
|
||||
// 删除TMS扫描记录-支持备注
|
||||
export function deleteSignedAndRemark(id,remark) {
|
||||
return request({
|
||||
url: '/emis/emisTmsScanRecord/deleteSignedAndRemark/' + id,
|
||||
method: 'delete',
|
||||
params: {'remark':remark}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<Form ref="searchForm" :model="model" :label-width="labelWidth" :size="size" :inline="true" >
|
||||
<div :id="formId">
|
||||
<slot></slot>
|
||||
<FormItem>
|
||||
<FormItem v-if="isShowSearchBtn">
|
||||
<Button type="primary" icon="el-icon-search" @click="handleQuery">查询</Button>
|
||||
<Button icon="el-icon-refresh" @click="handleReset">重置</Button>
|
||||
<Button v-show="collapsiable" type="text" @click="shiftCollapsiable">
|
||||
@ -38,6 +38,10 @@ export default {
|
||||
model: {
|
||||
type: Object,
|
||||
default: () => {}
|
||||
},
|
||||
isShowSearchBtn:{
|
||||
type: Boolean,
|
||||
default: true,
|
||||
}
|
||||
},
|
||||
data() {
|
||||
|
||||
@ -5,16 +5,10 @@
|
||||
<!-- label-width="100px" -->
|
||||
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
|
||||
<!-- :span="6" -->
|
||||
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
|
||||
<el-col :span="6">
|
||||
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="" prop="billCode">
|
||||
<div slot="label">
|
||||
<el-radio-group class="query-label" v-model="queryOrderType">
|
||||
<el-radio :key="1" label="1">运单号</el-radio>
|
||||
<!-- <el-radio :key="0" label="0">订单号</el-radio> -->
|
||||
</el-radio-group>
|
||||
</div>
|
||||
<el-form-item label="按运单号查询" prop="billCode">
|
||||
<XdTextareaInput
|
||||
v-model="queryParams.billCode"
|
||||
:placeholder="$t('多个流水号逗号或换行隔开')"
|
||||
@ -25,63 +19,34 @@
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
<el-col :span="18">
|
||||
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
</SearchForm>
|
||||
|
||||
<el-collapse v-model="activeNames">
|
||||
<el-collapse-item title="" name="1">
|
||||
<template slot="title">
|
||||
<div style="display:inline-flex">
|
||||
<div class="form-group-title"><span class="title">{{ $t('跟踪信息') }}</span></div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<div>
|
||||
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
|
||||
<el-col :span="24">
|
||||
1232131
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
|
||||
</el-collapse>
|
||||
|
||||
|
||||
|
||||
<el-table v-loading="loading" :data="emisWaybillList" @selection-change="handleSelectionChange">
|
||||
|
||||
<el-table-column label="入库单编号" align="center" prop="receiptNo" min-width="100" />
|
||||
|
||||
</el-table>
|
||||
|
||||
<el-table v-loading="loading" :data="emisWaybillList" @selection-change="handleSelectionChange">
|
||||
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
|
||||
<el-table-column :label="$t('快件当前最新状态')" align="center" prop="lastTraceInfo" min-width="350" :show-overflow-tooltip="true" />
|
||||
|
||||
<el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.emis_payment_status" :value="scope.row.paymentStatus"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" width="100" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('发件人')" align="center" prop="pickupMethod" width="180" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.sendName }}--{{ scope.row.receiveName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('快件类型')" align="center" prop="pickupMethod" width="180" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.sendSiteName }}--{{ scope.row.dispatchUnderlingSiteName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('预计送达时间')" align="center" prop="estimateDate" min-width="100" >
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.estimateDate, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('发货日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('收件员')" align="center" prop="takePieceEmployeeName" min-width="100" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.pickupMethod==2">{{scope.row.takePieceEmployeeName}}</span>
|
||||
<span v-else></span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column :label="$t('订单号')" align="center" prop="orderSn" width="100" :show-overflow-tooltip="true"/> -->
|
||||
|
||||
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="120" :show-overflow-tooltip="true" />
|
||||
<el-table-column :label="$t('合同号')" align="center" prop="custOrderId" width="100" :show-overflow-tooltip="true"/>
|
||||
|
||||
|
||||
</el-table>
|
||||
|
||||
|
||||
</XdPageContainer>
|
||||
|
||||
@ -1,240 +0,0 @@
|
||||
<template>
|
||||
<div >
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="运单号" prop="billCode">
|
||||
<el-input v-model="form.billCode" placeholder="请输入运单号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="转件单号" prop="transferBillCode">
|
||||
<el-input v-model="form.transferBillCode" placeholder="请输入转件单号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="转件日期" prop="transferDate">
|
||||
<el-date-picker clearable
|
||||
v-model="form.transferDate"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择转件日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="转件公司" prop="transferExpress">
|
||||
<el-input v-model="form.transferExpress" placeholder="请输入转件公司" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="联系人" prop="linkMan">
|
||||
<el-input v-model="form.linkMan" placeholder="请输入联系人" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="联系电话" prop="linkPhone">
|
||||
<el-input v-model="form.linkPhone" placeholder="请输入联系电话" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="转件费" prop="transferFee">
|
||||
<el-input v-model="form.transferFee" placeholder="请输入转件费" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="转件重量" prop="transferWeight">
|
||||
<el-input v-model="form.transferWeight" placeholder="请输入转件重量" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="转件体积" prop="transferVolume">
|
||||
<el-input v-model="form.transferVolume" placeholder="请输入转件体积" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="转件原因" prop="transferResean">
|
||||
<el-input v-model="form.transferResean" placeholder="请输入转件原因" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="转件城市" prop="transferCity">
|
||||
<el-input v-model="form.transferCity" placeholder="请输入转件城市" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="数据来源" prop="dataFrom">
|
||||
<el-input v-model="form.dataFrom" placeholder="请输入数据来源" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="删除标志（0代表存在" prop="delFlag">
|
||||
<el-input v-model="form.delFlag" placeholder="请输入删除标志（0代表存在" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<!--
|
||||
<el-form-item label="上级字典">
|
||||
<treeselect
|
||||
ref="tree"
|
||||
v-model="form.parentId"
|
||||
:options="emisWaybillTransferOptions"
|
||||
:normalizer="normalizer"
|
||||
:default-expand-level="1"
|
||||
:show-count="true"
|
||||
placeholder="选择上级"
|
||||
/>
|
||||
</el-form-item>
|
||||
-->
|
||||
</el-row>
|
||||
</el-form>
|
||||
<div style="text-align: center;margin-bottom: 10px;">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listEmisWaybillTransfer, getEmisWaybillTransfer, delEmisWaybillTransfer, addEmisWaybillTransfer, updateEmisWaybillTransfer } from "@/api/emis/emisWaybillTransfer";
|
||||
|
||||
export default {
|
||||
name: "emisWaybillTransferForm",
|
||||
props:{
|
||||
id:{
|
||||
type:Number
|
||||
}
|
||||
},
|
||||
components: { },
|
||||
dicts: [
|
||||
],
|
||||
data() {
|
||||
return {
|
||||
emisWaybillTransferOptions: [],
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
id: [
|
||||
{ required: true, message: "id不能为空", trigger: "blur" }
|
||||
],
|
||||
delFlag: [
|
||||
{ required: true, message: "删除标志（0代表存在不能为空", trigger: "blur" }
|
||||
],
|
||||
}
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
"id": {
|
||||
handler (newValue, oldValue) {
|
||||
this.id = newValue;
|
||||
this.initData();
|
||||
},
|
||||
deep: true
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.initData();
|
||||
},
|
||||
|
||||
methods: {
|
||||
initData() {
|
||||
|
||||
if(this.id !=null) {
|
||||
this.loading = true;
|
||||
getEmisWaybillTransfer(this.id).then(response => {
|
||||
this.form = response.data;
|
||||
this.loading = false;
|
||||
});
|
||||
}else{
|
||||
this.reset();
|
||||
}
|
||||
// this.getTreeselect();
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.reset();
|
||||
this.$emit("on-cancel");
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
id: null,
|
||||
billCode: null,
|
||||
transferBillCode: null,
|
||||
transferDate: null,
|
||||
transferExpress: null,
|
||||
linkMan: null,
|
||||
linkPhone: null,
|
||||
transferFee: null,
|
||||
transferWeight: null,
|
||||
transferVolume: null,
|
||||
transferResean: null,
|
||||
transferCity: null,
|
||||
dataFrom: null,
|
||||
delFlag: null,
|
||||
createBy: null,
|
||||
createTime: null,
|
||||
updateBy: null,
|
||||
updateTime: null,
|
||||
remark: null,
|
||||
createSite: null,
|
||||
updateSite: null
|
||||
};
|
||||
this.resetForm("form");
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
if (this.form.id != null) {
|
||||
updateEmisWaybillTransfer(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.$emit("on-changed");
|
||||
});
|
||||
} else {
|
||||
addEmisWaybillTransfer(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.$emit("on-changed");
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
// /** 转换菜单数据结构 */
|
||||
// normalizer(node) {
|
||||
// if (node.children && !node.children.length) {
|
||||
// delete node.children;
|
||||
// }
|
||||
// return {
|
||||
// id: node.id,
|
||||
// label: node.idName,
|
||||
// children: node.children
|
||||
// };
|
||||
// },
|
||||
// /** 查询菜单下拉树结构 */
|
||||
// getTreeselect() {
|
||||
// const queryParams = {}
|
||||
// listEmisWaybillTransfer(queryParams).then(response => {
|
||||
// this.emisWaybillTransferOptions = [];
|
||||
// const rootItem = { idId: 0, emisWaybillTransferName: '-', children: [] };
|
||||
// rootItem.children = this.handleTree(response.data, "id");
|
||||
// this.emisWaybillTransferOptions.push(rootItem);
|
||||
|
||||
// if(this.parentId != undefined) {
|
||||
// this.form.parentId = this.parentId;
|
||||
// }
|
||||
|
||||
// });
|
||||
// },
|
||||
}
|
||||
};
|
||||
</script>
|
||||
@ -250,10 +250,10 @@
|
||||
</el-table-column>
|
||||
</XdTable>
|
||||
|
||||
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
|
||||
<!-- <el-dialog :title="titleForm" :visible.sync="openForm" width="70%" :destroy-on-close="true" v-dialogDrag append-to-body>
|
||||
<emisWaybillTransferForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWaybillTransferForm>
|
||||
</el-dialog>
|
||||
|
||||
-->
|
||||
|
||||
<!--
|
||||
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
|
||||
@ -268,11 +268,11 @@
|
||||
import { listEmisWaybillTransfer, getEmisWaybillTransfer, delEmisWaybillTransfer, addEmisWaybillTransfer, updateEmisWaybillTransfer } from "@/api/emis/emisWaybillTransfer";
|
||||
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
|
||||
// import emisWaybillTransferView from '@/views/emis/emisWaybillTransfer/emisWaybillTransferView';
|
||||
import emisWaybillTransferForm from '@/views/emis/emisWaybillTransfer/emisWaybillTransferForm';
|
||||
// import emisWaybillTransferForm from '@/views/emis/emisWaybillTransfer/emisWaybillTransferForm';
|
||||
|
||||
export default {
|
||||
name: "emisWaybillTransfer",
|
||||
components: { elDateSimplePicker,emisWaybillTransferForm },
|
||||
components: { elDateSimplePicker },
|
||||
dicts: [
|
||||
],
|
||||
data() {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form ref="queryForm" size="mini" :model="queryParams" label-width="80px">
|
||||
<SearchForm slot="pageHeader" class="queryForm" :isShowSearchBtn="false" :model="queryParams" ref="queryForm" size="mini" :maxShow="9" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="" prop="billCode">
|
||||
@ -61,7 +61,7 @@
|
||||
</el-col>
|
||||
</el-col>
|
||||
</el-row >
|
||||
</el-form>
|
||||
</SearchForm>
|
||||
|
||||
<xd-table v-loading="loading"
|
||||
border stripe
|
||||
@ -80,7 +80,6 @@
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
@click="getList"
|
||||
>查询</el-button>
|
||||
@ -88,19 +87,11 @@
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
>新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
@click="handleUpdate"
|
||||
>修改</el-button>
|
||||
>新增转件</el-button>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
@ -114,24 +105,12 @@
|
||||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
@click="getList"
|
||||
>导出</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
@click="getList"
|
||||
@click="handleImport"
|
||||
>导入</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
@click="getList"
|
||||
>下载导入模版</el-button>
|
||||
<a href="/static/tpl/转件管理导出模板.xlsx" style="color: blue;font-weight: 600;font-size:13px;text-decoration: underline">下载导入模版</a>
|
||||
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
@ -184,12 +163,14 @@
|
||||
</el-table-column>
|
||||
</xd-table>
|
||||
<!-- 添加或修改转件对话框 -->
|
||||
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" v-dialogDrag :close-on-click-modal="false" append-to-body>
|
||||
<el-dialog :title="titleForm" :visible.sync="openForm" width="60%" v-dialogDrag :close-on-click-modal="false" append-to-body>
|
||||
<el-form ref="form" :model="form" size="mini" label-width="80px" :rules="rules">
|
||||
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
|
||||
<el-col :span="8">
|
||||
<el-form-item :label="$t('运单编号')" prop="billCode" label-width="80px">
|
||||
<el-input v-model="form.billCode"></el-input>
|
||||
<el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput">
|
||||
<i slot="suffix" class="iconfont"></i>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
@ -207,6 +188,7 @@
|
||||
v-model="form.transferDate"
|
||||
type="datetime"
|
||||
placeholder="选择日"
|
||||
style="width:100%"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@ -237,12 +219,12 @@
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item :label="$t('重量')" prop="transferWeight" label-width="80px">
|
||||
<el-input v-model="form.transferWeight"></el-input>
|
||||
<el-input v-model="form.transferWeight" disabled></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item :label="$t('体积')" prop="transferVolume" label-width="80px">
|
||||
<el-input v-model="form.transferVolume"></el-input>
|
||||
<el-input v-model="form.transferVolume" disabled></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
@ -267,7 +249,7 @@
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<div slot="footer" class="dialog-footer" style="text-align:center;margin-bottom:20px">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="cancelForm">取 消</el-button>
|
||||
</div>
|
||||
@ -280,6 +262,7 @@ import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
|
||||
import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
|
||||
import { getDateTimeToString } from '@/utils/payutils'
|
||||
import { parseTime, dateToStr } from "@/utils/custom";
|
||||
import { getWaybillDetail } from "@/api/emis/emisWaybill";
|
||||
|
||||
export default {
|
||||
name: "WaybillTransfer",
|
||||
@ -391,6 +374,25 @@ export default {
|
||||
this.dateTimeRange=[start,end];
|
||||
},
|
||||
methods: {
|
||||
handleScanInput(){
|
||||
if(this.form.billCode==null || this.form.billCode==''){
|
||||
this.$message.error("输入单号后回车");
|
||||
return;
|
||||
}
|
||||
getWaybillDetail(billCode).then(response => {
|
||||
|
||||
if(response.code != 200){
|
||||
this.$modal.msgError(scanRstItem.msg);
|
||||
return;
|
||||
}
|
||||
|
||||
let record =Object.assign({}, response.data);
|
||||
this.form.transferWeigh=record.billWeight;
|
||||
this.form.transferVolume=record.totalVolume;
|
||||
|
||||
});
|
||||
|
||||
},
|
||||
/** 查询运单转件表列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user