This commit is contained in:
linfso 2024-06-20 12:37:30 +08:00
parent c623eae5f6
commit c304e4232f
6 changed files with 57 additions and 593 deletions

View File

@ -80,7 +80,7 @@
methods: {
onChange() {
this.$emit("input", this.svalue);
let itemData ={};
let itemData =null;
this.optionItems.forEach(item=>{
if(item.custNo === this.svalue){
itemData = item;

View File

@ -1,492 +0,0 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="packNo">
<el-input
v-model="queryParams.packNo"
:placeholder="$t('合包号')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="packName">
<el-input
v-model="queryParams.packName"
:placeholder="$t('合包名称')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="packDate">
<el-input
v-model="queryParams.packDate"
:placeholder="$t('合包时间')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="destCountry">
<el-input
v-model="queryParams.destCountry"
:placeholder="$t('目的国家')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="destCountryName">
<el-input
v-model="queryParams.destCountryName"
:placeholder="$t('目的国家名称')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="blUnpack">
<el-input
v-model="queryParams.blUnpack"
:placeholder="$t('是否可拆')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="sendStiteCode">
<el-input
v-model="queryParams.sendStiteCode"
:placeholder="$t('发出网点')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="totalParcelQty">
<el-input
v-model="queryParams.totalParcelQty"
:placeholder="$t('总件数')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="totalWaybillQty">
<el-input
v-model="queryParams.totalWaybillQty"
:placeholder="$t('总运单数')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="totalVolume">
<el-input
v-model="queryParams.totalVolume"
:placeholder="$t('总体积')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="totalWeight">
<el-input
v-model="queryParams.totalWeight"
:placeholder="$t('总重量')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="packStatus">
<el-input
v-model="queryParams.packStatus"
:placeholder="$t('合包状态')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="opMan">
<el-input
v-model="queryParams.opMan"
:placeholder="$t('操作员')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="remark">
<el-input
v-model="queryParams.remark"
:placeholder="$t('备注')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="delFlag">
<el-input
v-model="queryParams.delFlag"
:placeholder="$t('删除标志(0代表存在')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</SearchForm>
<XdTable v-loading="loading"
border stripe
size="small"
:data="emisTmsPackList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
:total="total"
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['emis:emisTmsPack:add']"
>新增</el-button>
</el-col>
<!--
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['emis:emisTmsPack:edit']"
>修改</el-button>
</el-col> -->
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['emis:emisTmsPack:remove']"
>删除</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['emis:emisTmsPack:export']"
>导出</el-button>
</el-col> -->
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<!--
<el-table-column label="序号" align="center" min-width="60">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)"> </span>
</template>
</el-table-column>
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
</template>
</el-table-column>
<el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom" min-width="80">
<template slot-scope="scope">
<div v-if="scope.row.settleStatus == 0" style="color:red;">
<span class="el-tag el-tag--info">未结算</span>
</div>
<div v-if="scope.row.settleStatus == 10" style="color:red;">
<span class="el-tag">待确认</span>
</div>
<div v-if="scope.row.settleStatus == 11" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已确认</span>
</div>
<div v-if="scope.row.settleStatus == 20" >
<span class="el-tag el-tag--warning el-tag--light">待打款</span>
</div>
<div v-if="scope.row.settleStatus == 21" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已打款</span>
</div>
<div v-if="scope.row.settleStatus == 40" style="color:red;">
<span class="el-tag el-tag--danger">已拒绝</span>
</div>
</template>
</el-table-column>
-->
<el-table-column :label="$t('合包号')" align="center" prop="packNo" min-width="100" />
<el-table-column :label="$t('合包名称')" align="center" prop="packName" min-width="100" />
<el-table-column :label="$t('合包时间')" align="center" prop="packDate" min-width="100" />
<el-table-column :label="$t('目的国家')" align="center" prop="destCountry" min-width="100" />
<el-table-column :label="$t('目的国家名称')" align="center" prop="destCountryName" min-width="100" />
<el-table-column :label="$t('是否可拆')" align="center" prop="blUnpack" min-width="100" />
<el-table-column :label="$t('发出网点')" align="center" prop="sendStiteCode" min-width="100" />
<el-table-column :label="$t('总件数')" align="center" prop="totalParcelQty" min-width="100" />
<el-table-column :label="$t('总运单数')" align="center" prop="totalWaybillQty" min-width="100" />
<el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
<el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" />
<el-table-column :label="$t('合包状态')" align="center" prop="packStatus" min-width="100" />
<el-table-column :label="$t('操作员')" align="center" prop="opMan" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
<el-table-column :label="$t('删除标志(0代表存在')" align="center" prop="delFlag" min-width="100" />
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['emis:emisTmsPack:edit']"
>修改</el-button>
<!--
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['emis:emisTmsPack:remove']"
>删除</el-button> -->
</template>
</el-table-column>
</XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisTmsPackForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisTmsPackForm>
</el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<emisTmsPackView :id="id" ></EmisTmsPackView>
</el-dialog>
-->
</div>
</template>
<script>
import { listEmisTmsPack, getEmisTmsPack, delEmisTmsPack, addEmisTmsPack, updateEmisTmsPack } from "@/api/emis/emisTmsPack";
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
// import emisTmsPackView from '@/views/emis/emisTmsPack/emisTmsPackView';
import emisTmsPackForm from '@/views/emis/emisTmsPack/emisTmsPackForm';
export default {
name: "emisTmsPack",
components: { elDateSimplePicker,emisTmsPackForm },
dicts: [
],
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 创建时间搜索
dateTimeRange:[],
// 总条数
total: 0,
// TMS合包表格数据
emisTmsPackList: [],
currentId:null,
openForm: false,
titleForm: "",
// 弹出展示层
id:null,
titleView:"",
openView: false,
// 更新网点时间范围
daterangeCreateTime: [],
// 更新网点时间范围
daterangeUpdateTime: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
packNo: null,
packName: null,
packDate: null,
destCountry: null,
destCountryName: null,
blUnpack: null,
sendStiteCode: null,
totalParcelQty: null,
totalWaybillQty: null,
totalVolume: null,
totalWeight: null,
packStatus: null,
opMan: null,
remark: null,
delFlag: null,
},
};
},
created() {
this.getList();
},
methods: {
/** 查询TMS合包列表 */
getList() {
this.loading = true;
this.queryParams.params = {};
if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
}
if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
}
listEmisTmsPack(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
this.emisTmsPackList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
// 排序 查询字段是表格中字段名字 动态取值排序顺序
handleSortChange(column) {
this.queryParams.orderByColumn = column.prop;
this.queryParams.isAsc = column.order;
this.getList();
},
/** 新增按钮操作 */
handleAdd(row) {
this.currentId=null;
this.openForm= true;
this.titleForm = "新增";
},
handleShowMoreInput(){
this.moreInputVisible = !this.moreInputVisible;
},
/** 修改按钮操作 */
handleUpdate(row) {
this.currentId= row.id;
this.openForm = true;
this.titleForm = "修改";
},
handleView(row) {
this.id=row.id;
this.titleView="查看";
this.openView=true;
// this.router.push({ path: '/emis/emisTmsPack/viewDetail', query: { id: row.id }})
},
handleFormChanged(){
this.openForm = false;
this.getList();
},
cancelForm(){
this.openForm = false;
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除').then(function() {
return delEmisTmsPack(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
// this.download('emis/emisTmsPack/export', {
// ...this.queryParams
// }, `emisTmsPack_${new Date().getTime()}.xlsx`)
const loadingInstance = this.$loading({
text: '正在导出...'
})
var qParam = {...this.queryParams};
qParam.pageNum=1;
qParam.pageSize=5000;
listEmisTmsPack(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
this.downloadLoading = false
if (response.code === 200) {
const curList = response.rows
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['id','合包号','合包名称','合包时间','目的国家','目的国家名称','是否可拆','发出网点','下一网点','下一站','总件数','总运单数','总体积','总重量','合包状态','扩展数据','操作员','ext1','ext2','ext3','ext4','备注','租户ID','删除标志(0代表存在','创建者','创建时间','更新者','更新时间','创建网点','更新网点',];
const filterVal = ['id','packNo','packName','packDate','destCountry','destCountryName','blUnpack','sendStiteCode','nextSiteCode','nextStation','totalParcelQty','totalWaybillQty','totalVolume','totalWeight','packStatus','extData','opMan','ext1','ext2','ext3','ext4','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
const data = this.formatJson(filterVal, curList, response.rows)
excel.export_json_to_excel({
header: tHeader,
data,
filename: 'TMS合包',
autoWidth: true
})
loadingInstance.close()
})
}
});
},
formatJson(filterVal, jsonData, resData) {
let index = 0
return jsonData.map(v => filterVal.map(j => {
if (j === 'index') {
return ++index
}
if (j === 'status') {
var statusStr='xxx'
if(v[j] == 10){
statusStr='xxx'
}
return statusStr;
}
return v[j]
}))
},
/** 列索引函数 */
getIndex($index) {
return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
},
/** 时间搜索响应函数 */
dateTimeChange(value){
this.dateTimeRange=value;
},
}
};
</script>
<style scoped>
.el-divider{
margin-top: 0px;
background: 0 0;
border-top: 1px solid #E6EBF5;
}
.el-divider__text {
color: #0955ee;
cursor: pointer;
}
</style>

View File

@ -211,7 +211,7 @@ import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
export default {
name: "emisTransProduct",
name: "TransProduct",
components: { elDateSimplePicker,CountryTreePicker,CountryPicker,TransLinePicker,emisTransProductForm },
dicts: [
'sys_normal_disable',

View File

@ -119,7 +119,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="6">
<el-form-item label="派件方式" prop="dispatchMethod">
<el-radio-group v-model="form.dispatchMethod">
<el-radio
@ -132,6 +132,15 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="8">
<el-form-item label="月结客户" prop="custNo" :rules="(form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5)?rules.custNo:[]" >
<EmisMonthpayAccountPicker v-model="form.custNo" @onChange="onSelectMonthUser"></EmisMonthpayAccountPicker>
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-row>
@ -309,8 +318,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="派件网点" prop="dispatchSite">
<el-input v-model="form.dispatchSite" placeholder="" disabled />
<el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
<el-input v-model="form.dispatchUnderlingSiteCode" placeholder="" disabled />
</el-form-item>
</el-col>
<el-col :span="24">
@ -1179,9 +1188,9 @@ methods: {
},
onPaymentTypeChange(){
// 非月结清空月结客户选择
if(this.form.paymentType == 1 ||
this.form.paymentType == 3 ||
this.form.paymentType == 6
if(this.form.paymentType == '1' ||
this.form.paymentType == '3' ||
this.form.paymentType == '6'
){
this.form.custNo=null;
this.form.customerCode=null;
@ -1190,9 +1199,16 @@ methods: {
},
onSelectMonthUser(item){
this.form.payee=item.payee;
this.form.salesmen=item.salesmen;
if(item!=null){
this.form.payee=item.payee;
this.form.salesmen=item.salesmen;
this.form.paymentType= '2';
}else{
this.form.paymentType= '1';
this.form.payee=null;
this.form.salesmen=null;
this.onPaymentTypeChange();
}
this.calcBillFee();
},
handleAddFee(){
@ -1493,7 +1509,7 @@ methods: {
// 新开单才需要打印
if(this.action == "add"){
// 做揽收扫描记录
this.handDoGotScan();
// this.handDoGotScan();
// 弹出打印预览界面
this.handlePrintPreview();

View File

@ -119,7 +119,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-col :span="6">
<el-form-item label="派件方式" prop="dispatchMethod">
<el-radio-group v-model="form.dispatchMethod">
<el-radio
@ -132,6 +132,15 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="8">
<el-form-item label="月结客户" prop="custNo" :rules="(form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5)?rules.custNo:[]" >
<EmisMonthpayAccountPicker v-model="form.custNo" @onChange="onSelectMonthUser"></EmisMonthpayAccountPicker>
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-row>
@ -1179,9 +1188,9 @@ methods: {
},
onPaymentTypeChange(){
// 非月结清空月结客户选择
if(this.form.paymentType == 1 ||
this.form.paymentType == 3 ||
this.form.paymentType == 6
if(this.form.paymentType == '1' ||
this.form.paymentType == '3' ||
this.form.paymentType == '6'
){
this.form.custNo=null;
this.form.customerCode=null;
@ -1190,9 +1199,16 @@ methods: {
},
onSelectMonthUser(item){
this.form.payee=item.payee;
this.form.salesmen=item.salesmen;
if(item!=null){
this.form.payee=item.payee;
this.form.salesmen=item.salesmen;
this.form.paymentType= '2';
}else{
this.form.paymentType= '1';
this.form.payee=null;
this.form.salesmen=null;
this.onPaymentTypeChange();
}
this.calcBillFee();
},
handleAddFee(){

View File

@ -204,88 +204,12 @@
</el-table-column>
</xd-table>
<el-divider class="divider"></el-divider>
<el-row :gutter="0" class="reversion" v-show="showProblemDetail">
<el-row :gutter="0" class="reversion-title">
{{$t('问题件回复')}}
</el-row>
<el-row :gutter="0" >
<el-col :span="8">
<el-col :span="8" class="labeltext">
{{$t('登记网点联系人和电话')}}
</el-col>
<el-col :span="16" class="labelcontent">
<el-row>
{{$t("登记网点:") + (reversion.registerSiteCode || '总部')}}
</el-row>
<el-row>
{{$t("负责人:") + (reversion.registerManCode || '未填写')}}
</el-row>
<el-row>
{{$t("联系电话:") + (reversion.empPhone || '未填写')}}
</el-row>
</el-col>
</el-col>
<el-col :span="8">
<el-col :span="6" class="labeltext">
{{$t('问题原因:')}}
</el-col>
<el-col :span="18" class="labelcontent">
<el-row>
{{(reversion.problemCause || "暂无")}}
</el-row>
</el-col>
</el-col>
<el-col :span="8">
<el-row>
<el-col :span="4" class="labeltext">
<span>处理结果:</span>
</el-col>
<el-col :span="20">
<el-select v-model="reversion.dealResult" :placeholder="$t('请选择')" value="">
<el-option :label="$t('处理中')" value="1"></el-option>
<el-option :label="$t('处理完毕')" value="2"></el-option>
</el-select>
</el-col>
</el-row>
<el-row class="row-top">
<el-col :span="4" class="labeltext">
<span>回复:</span>
</el-col>
<el-col :span="20">
<el-input
v-model="reversion.content"
:placeholder="$t('请输入')"
clearable
type="textarea"
rows="2"
/>
</el-col>
<el-col :span="6">
<el-button
type="primary"
plain
size="mini"
@click="saveReversion"
>{{ $t('保存') }}</el-button>
</el-col>
<el-col :span="6">
<el-button
type="primary"
plain
size="mini"
@click="cancelReversion"
>{{ $t('取消') }}</el-button>
</el-col>
</el-row>
</el-col>
<el-col :span="8" class="labeltext">
<el-row >{{$t('回复列表:')}}</el-row>
<el-row>
<Comments ref="commentList" :billCode="currentRow.billCode"/>
</el-row>
</el-col>
</el-row >
</el-row>
<!-- 评论 -->
<el-drawer>
</el-drawer>
</div>
</template>