aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-09-08 21:21:36 +08:00
parent 2993220cf3
commit 5059c6f84a
8 changed files with 81 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/store/modules/user.js
View File

@ -9,6 +9,7 @@ const user = {
empName:'',
ownerSiteCode:'',
ownerSiteName:'',
ownerCountryCode:'',
name: '',
nickName: '',
avatar: '',
@ -28,6 +29,7 @@ const user = {
state.empCode = userInfo.empCode;
state.empName = userInfo.empName;
state.ownerSiteCode = userInfo.ownerSiteCode;
state.ownerCountryCode = userInfo.countryCode;
state.ownerSiteName = userInfo.ownerSiteName;
},
SET_NICK_NAME: (state, nickName) => {

4
src/views/emis/customerService/traceWaybillDetailView.vue
View File

@ -131,11 +131,14 @@ export default {
initData(){
let ownerSiteCode=this.$store.getters.ownerSiteCode;
let ownerCountryCode =this.$store.getters.ownerCountryCode;;
let empName = this.$store.getters.empName;
getWaybillDetail(this.scanBillCode).then(response => {
this.billDetail = Object.assign({},response.data);
// console.log("===>",this.billDetail);
//bug:848 调整后：与运单号关联的：寄件网点、目的网点、签收网点、总部、销售联系人、回款联系人 允许查看 运单信息；其他网点或员工若不相关则不允许查看；
if(
@ -146,6 +149,7 @@ export default {
|| ownerSiteCode == '88888'
|| empName ==this.billDetail.payee
|| empName ==this.billDetail.salesmen
|| (this.billDetail.reciever.country != '0086' && this.billDetail.reciever.country == ownerCountryCode )
){
this.canViewDetail=true;
}

4
src/views/emis/emisCustomerUser/monthUserForm.vue
View File

@ -385,8 +385,8 @@ export default {
contact: null,
phone: null,
mobile: null,
customerType: null,
settledType: null,
customerType: 2,
settledType: 2,
userType: null,
company: null,
licNo: null,

13
src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue
View File

@ -58,6 +58,13 @@
<el-option key="3" label="账单异常" value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否定制账单" prop="blMerge">
<el-select clearable v-model="queryParams.blMerge" placeholder="">
<el-option key="1" label="是" value="1"></el-option>
<el-option key="0" label="否" value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item label="线路" prop="params.transLineType">
<TransLinePicker v-model="queryParams.params.transLineType" isInitiated="true" @onChange="handleQuery"></TransLinePicker>
</el-form-item>
@ -317,6 +324,12 @@
<el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="120" :sortable="true" />
<el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="120" :sortable="true" />
<el-table-column :label="$t('是否定制账单')" align="center" prop="blMerge" min-width="120" >
<template slot-scope="scope">
<span v-if="scope.row.blMerge=='0'" >否</span>
<el-tag v-if="scope.row.blMerge=='1'" type="success">是</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('问题件')" align="center" prop="waybillDetail.blIsQuestion" min-width="150" >
<template slot-scope="scope">

16
src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
View File

@ -64,6 +64,13 @@
<el-option key="3" label="账单异常" value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否定制账单" prop="blMerge">
<el-select clearable v-model="queryParams.blMerge" placeholder="">
<el-option key="1" label="是" value="1"></el-option>
<el-option key="0" label="否" value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item label="线路" prop="params.transLineType">
<TransLinePicker v-model="queryParams.params.transLineType" isInitiated="true" @onChange="handleQuery"></TransLinePicker>
@ -339,6 +346,12 @@
<el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="120" :sortable="true" />
<el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="120" :sortable="true" />
<el-table-column :label="$t('是否定制账单')" align="center" prop="blMerge" min-width="120" >
<template slot-scope="scope">
<span v-if="scope.row.blMerge=='0'" >否</span>
<el-tag v-if="scope.row.blMerge=='1'" type="success">是</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('问题件')" align="center" prop="waybillDetail.blIsQuestion" min-width="150" >
<template slot-scope="scope">
@ -717,6 +730,7 @@ export default {
this.queryParams.blConfirmCenter=this.$route.query.blConfirmCenter;
this.queryParams.blConfirmSite=this.$route.query.blConfirmSite;
this.queryParams.blMerge=this.$route.query.blMerge;
this.queryParams.custNo=this.$route.query.custNo;
let startTime=this.$route.query.startTime;
let endTime=this.$route.query.endTime;
@ -747,6 +761,8 @@ export default {
this.actionType=this.$route.query.actionType;
this.queryParams.blConfirmCenter=this.$route.query.blConfirmCenter;
this.queryParams.blConfirmSite=this.$route.query.blConfirmSite;
this.queryParams.blMerge=this.$route.query.blMerge;
this.queryParams.custNo=this.$route.query.custNo;
let startTime=this.$route.query.startTime;
let endTime=this.$route.query.endTime;

17
src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
View File

@ -65,10 +65,18 @@
<el-option key="3" label="财务置账单异常" value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否定制账单" prop="blMerge">
<el-select clearable v-model="queryParams.blMerge" placeholder="">
<el-option key="1" label="是" value="1"></el-option>
<el-option key="0" label="否" value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item label="线路" prop="params.transLineType">
<TransLinePicker v-model="queryParams.params.transLineType" isInitiated="true" @onChange="handleQuery"></TransLinePicker>
</el-form-item>
<el-form-item label="产品类型" prop="productType">
<TransProductPicker placeholder="产品类型" v-model="queryParams.params.productType" :transLineCode="queryParams.params.transLineType" @onChange="handleQuery"></TransProductPicker>
</el-form-item>
@ -324,6 +332,12 @@
<el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="120" :sortable="true" />
<el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="120" :sortable="true" />
<el-table-column :label="$t('是否定制账单')" align="center" prop="blMerge" min-width="120" >
<template slot-scope="scope">
<span v-if="scope.row.blMerge=='0'" >否</span>
<el-tag v-if="scope.row.blMerge=='1'" type="success">是</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('问题件')" align="center" prop="waybillDetail.blIsQuestion" min-width="150" >
<template slot-scope="scope">
@ -346,6 +360,9 @@
<el-table-column :label="$t('财务确认时间')" align="center" prop="confirmCenterDate" min-width="170" />
<el-table-column :label="$t('财务备注')" align="center" prop="confirmCenterNote" min-width="100" />
<el-table-column :label="$t('业务确认状态')" align="center" prop="blConfirmSite" min-width="120" >
<template slot-scope="scope">
<span v-if="scope.row.blConfirmSite=='0'" >未确认</span>

1
src/views/emis/emisSettleSubBill/SubBillMonthSumList.vue
View File

@ -451,6 +451,7 @@ export default {
custNo: row.custNo,
blConfirmSite:this.queryParams.blConfirmSite,
blConfirmCenter:this.queryParams.blConfirmCenter,
blMerge:this.queryParams.blMerge,
startTime:this.dateTimeRange[0],
endTime:this.dateTimeRange[1],
}

124
src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
View File

@ -1,8 +1,8 @@
<template>
<div class="app-container">
<el-row :gutter="20">
<el-form ref="queryForm" size="mini" :model="queryParams" label-width="90px">
<!-- <search-form :model="queryParams" ref="queryForm" size="small" :maxShow="8" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery"> -->
<XdPageContainer class="app-container">
<el-form slot="pageHeader" ref="queryForm" size="mini" :model="queryParams" label-width="90px">
<el-row :gutter="20">
<!-- <search-form :model="queryParams" ref="queryForm" size="small" :maxShow="8" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery"> -->
<el-col :span="8">
<el-form-item label="" prop="billCode">
<div slot="label">
@ -66,13 +66,22 @@
</el-form-item>
</el-col>
</el-col>
</el-row >
</el-form>
<!-- </search-form> -->
</el-row >
<xd-table v-loading="loading"
<xd-table
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
ref="refTable"
border
size="small"
size="mini"
storageName="emisElectronicPagApply_main"
:data="emisElectronicPagApplyList"
:showSearch.sync="showSearch"
@ -82,7 +91,6 @@
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
v-if="tableHeight" :max-height="tableHeight + 'px'"
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
@ -137,7 +145,7 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('单号')" align="center" prop="queryType" min-width="170">
<el-table-column :label="$t('单号')" align="center" prop="billCode" min-width="170">
<template slot-scope="scope">
<span>{{scope.row.queryType=="1"?scope.row.billCode:scope.row.orderSN}}</span>
</template>
@ -174,7 +182,6 @@
</template>
</el-table-column>
<el-table-column :label="$t('所属业务员')" align="center" prop="salesmen" min-width="150" />
<el-table-column :label="$t('业务员编号')" align="center" prop="xxx" min-width="150" />
<el-table-column :label="$t('问题件回复')" align="center" prop="reversionStr" min-width="150" />
<el-table-column :label="$t('回复人')" align="center" prop="reversionManName" min-width="150" />
<el-table-column :label="$t('回复日期')" align="center" prop="reversionDate" min-width="170">
@ -210,7 +217,7 @@
</el-table-column>
<el-table-column :label="$t('数据产生来源')" align="center" prop="dataFrom" min-width="150" />
</xd-table>
</div>
</XdPageContainer>
</template>
<script>
@ -267,6 +274,8 @@ export default {
// 显示编辑框更多
moreInputVisible: false,
selectionList:[],
// 弹出展示层
@ -347,11 +356,7 @@ export default {
},
created() {
// this.getList();
this.$nextTick(function() {
let queryFormEl = this.$refs.queryForm.$el;
let tableH = queryFormEl.offsetHeight+190;
this.tableHeight = window.innerHeight - tableH;
});
},
mounted() {
const end = new Date()
@ -563,7 +568,7 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = [];
debugger;
this.selectionList=selection;
for(let i = 0; i< selection.length; i++){
if(selection[i].blReversion != "1"){
this.ids.push(selection[i].id)
@ -636,25 +641,6 @@ export default {
});
}
// this.$refs["form"].validate(valid => {
// if (valid) {
// if (this.form.id != null) {
// updateEmisElectronicPagApply(this.form).then(response => {
// this.$modal.msgSuccess("修改成功");
// this.open = false;
// this.getList();
// });
// } else {
// addEmisElectronicPagApply(this.form).then(response => {
// this.$modal.msgSuccess("新增成功");
// this.open = false;
// this.getList();
// });
// }
// }
// });
// todo
},
handleFormChanged(){
this.openForm = false;
@ -683,11 +669,10 @@ export default {
this.exportData(this.selectionList,loadingInstance);
}
else{
this.initQueryParams();
let qParam={...this.queryParams}
qParam.pageNum=1;
qParam.pageSize=5000;
listEmisWaybill(qParam).then(response => {
qParam.pageSize=20000;
listEmisWaybillProblemInfo(qParam).then(response => {
if (response.code === 200) {
this.exportData(response.rows,loadingInstance);
}
@ -704,7 +689,7 @@ export default {
excel.export_json_to_excel({
header: tHeader,
data,
filename: '寄件运单列表',
filename: '问题件列表',
autoWidth: true
})
loadingInstance.close()
@ -713,67 +698,10 @@ export default {
formatJson(filterVal, jsonData, resData) {
let index = 0
return jsonData.map(v => filterVal.map(j => {
if (j === 'index') {
return ++index
}
if (j === 'kjlx') {
return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName'];
}
if (j === 'fjr') {
return v['sendName']+'--'+v['receiveName'];
}
if (j === 'sendMobile') {
return "";
}
if (j === 'paymentStatus') {
return this.selectDictLabel(this.dict.type.emis_payment_status,v[j]);
}
if (j === 'pickupMethod') {
return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v[j]);
}
if (j === 'customsEclaration') {
return this.selectDictLabel(this.dict.type.emis_declare_mode,v[j]);
}
if (j === 'customsClear') {
return this.selectDictLabel(this.dict.type.emis_customs_clear,v[j]);
}
if (j === 'packType') {
return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v[j]);
}
if (j === 'dispatchMethod') {
if(v[j] == 1){
return '派送';
}else{
return '自提';
}
}
if (j === 'blMessage') {
if(v[j] == 1){
return '发送';
}else{
return '不发送';
}
}
if (j === 'blAcceptMessage') {
if(v[j] == 1){
return '发送';
}else{
return '不发送';
}
}
if (j === 'blSign') {
if(v[j] == 1){
return '已签收';
}else{
return '未签收';
}
}
if (j === 'paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
}
return v[j]
}))
},