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-07-06 13:54:33 +08:00
parent 6fe4004999
commit 5e39140780
7 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/DatePickerAdv/elDateSimplePicker.vue
View File

@ -125,13 +125,13 @@
let day=this.getDay(-7);
start = day + " 00:00:00";
let nowDay=this.getDay(0);
end = nowDay + " 00:00:00";
end = nowDay + " 23:59:59";
}
else if(this.valueStr == -30){
let day=this.getDay(-30);
start = day + " 00:00:00";
let nowDay=this.getDay(0);
end = nowDay + " 00:00:00";
end = nowDay + " 59:59:59";
}
else if(this.valueStr == 3){
start = this.getCurrentMonthFirst() + " 00:00:00";

2
src/components/XdTable/index.vue
View File

@ -480,8 +480,6 @@ export default {
cell = cell.parentElement;
}
const rowIndex = cell.parentElement.rowIndex;
const cellIndex = cell.cellIndex;
const text = cell.innerText;

21
src/views/emis/emisWaybill/centerWaybillList.vue
View File

@ -308,6 +308,9 @@
:height="(slotProps.contentHeight)+'px'"
storageName="centerWaybillList_main"
ref="refTable"
row-key="id"
:row-class-name="tableRowClassName"
v-loading="loading"
border
@ -372,12 +375,12 @@
<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">
<el-table-column :label="$t('发件人')" align="center" prop="fjr" 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">
<el-table-column :label="$t('快件类型')" align="center" prop="kjlx" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.sendSiteName }}--{{ scope.row.dispatchUnderlingSiteName }}</span>
</template>
@ -985,6 +988,7 @@ export default {
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
const loadingInstance = this.$loading({
text: '正在导出...'
@ -993,7 +997,7 @@ export default {
var qParam = {...this.queryParams};
// 增加导出记录
let postExportRecord={
menuName: '寄件运单查询',
menuName: '中心运单查询',
dateRange: qParam.params.beginSendDate+"~"+qParam.params.endSendDate,
}
@ -1018,14 +1022,13 @@ export default {
const curList =selData
import('@/vendor/Export2Excel').then(excel => {
const exportParam=this.$refs.refTable.getExportParam();
const tHeader = exportParam.header;
const filterVal = exportParam.filter;
const data = this.formatJson(filterVal, curList, selData)
excel.export_json_to_excel({
header: tHeader,
data,
filename: '寄件运单列表',
filename: '中心运单列表',
autoWidth: true
})
loadingInstance.close()
@ -1034,15 +1037,15 @@ export default {
formatJson(filterVal, jsonData, resData) {
let index = 0
return jsonData.map(v => filterVal.map(j => {
if (j === 'index') {
return ++index
}
if (j === 'fjlx') {
return "";
if (j === 'kjlx') {
return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName'];
}
if (j === 'fjr') {
return "";
return v['sendName']+'--'+v['receiveName'];
}
if (j === 'sendMobile') {
return "";

22
src/views/emis/emisWaybill/dispatchWaybillList.vue
View File

@ -301,6 +301,10 @@
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
ref="refTable"
row-key="id"
storageName="dispatchWaybillList_main"
:row-class-name="tableRowClassName"
@ -374,12 +378,12 @@
<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">
<el-table-column :label="$t('发件人')" align="center" prop="fjr" 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">
<el-table-column :label="$t('快件类型')" align="center" prop="kjlx" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.sendSiteName }}--{{ scope.row.dispatchUnderlingSiteName }}</span>
</template>
@ -971,6 +975,7 @@ export default {
},
/** 导出按钮操作 */
/** 导出按钮操作 */
handleExport() {
const loadingInstance = this.$loading({
text: '正在导出...'
@ -979,7 +984,7 @@ export default {
var qParam = {...this.queryParams};
// 增加导出记录
let postExportRecord={
menuName: '寄件运单查询',
menuName: '派件运单查询',
dateRange: qParam.params.beginSendDate+"~"+qParam.params.endSendDate,
}
@ -1004,14 +1009,13 @@ export default {
const curList =selData
import('@/vendor/Export2Excel').then(excel => {
const exportParam=this.$refs.refTable.getExportParam();
const tHeader = exportParam.header;
const filterVal = exportParam.filter;
const data = this.formatJson(filterVal, curList, selData)
excel.export_json_to_excel({
header: tHeader,
data,
filename: '寄件运单列表',
filename: '派件运单列表',
autoWidth: true
})
loadingInstance.close()
@ -1020,15 +1024,15 @@ export default {
formatJson(filterVal, jsonData, resData) {
let index = 0
return jsonData.map(v => filterVal.map(j => {
if (j === 'index') {
return ++index
}
if (j === 'fjlx') {
return "";
if (j === 'kjlx') {
return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName'];
}
if (j === 'fjr') {
return "";
return v['sendName']+'--'+v['receiveName'];
}
if (j === 'sendMobile') {
return "";

2
src/views/emis/emisWaybill/sendWaybillList.vue
View File

@ -300,8 +300,8 @@
:height="(slotProps.contentHeight)+'px'"
ref="refTable"
row-key="id"
storageName="sendWaybillList_main_240702"
v-loading="loading"
border

13
src/views/emis/emisWaybillAjustApply/WaybillAjustApplyList.vue
View File

@ -29,11 +29,10 @@
<el-option label="中心驳回" :value="5"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="修改项目" prop="applyType">
<el-select clearable="" v-model="queryParams.applyType" placeholder="请选择">
<el-option label="运费" value="001"></el-option>
</el-select>
</el-form-item> -->
<el-form-item label="修改项目" prop="applyType">
<AjustApplyTypePicker v-model="queryParams.applyType"></AjustApplyTypePicker>
</el-form-item>
</el-row>
</el-col>
@ -201,9 +200,11 @@
import { listEmisWaybillAjustApply, getEmisWaybillAjustApply, delEmisWaybillAjustApply, addEmisWaybillAjustApply, updateEmisWaybillAjustApply } from "@/api/emis/emisWaybillAjustApply";
import emisWaybillAjustApplyForm from '@/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm';
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
import AjustApplyTypePicker from '@/views/emis/EmisBaseTools/AjustApplyTypePicker.vue';
export default {
name: "EmisWaybillAjustApply",
components: { elDateSimplePicker,emisWaybillAjustApplyForm },
components: { elDateSimplePicker,emisWaybillAjustApplyForm,AjustApplyTypePicker},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
'emis_calc_fee_type','emis_print_type'],

11
src/views/emis/emisWaybillAjustApply/WaybillAjustDestConfirm.vue
View File

@ -29,11 +29,9 @@
<el-option label="中心驳回" :value="5"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="修改项目" prop="applyType">
<el-select clearable="" v-model="queryParams.applyType" placeholder="请选择">
<el-option label="运费" value="001"></el-option>
</el-select>
</el-form-item> -->
<el-form-item label="修改项目" prop="applyType">
<AjustApplyTypePicker v-model="queryParams.applyType"></AjustApplyTypePicker>
</el-form-item>
</el-row>
</el-col>
@ -224,10 +222,11 @@
import { listEmisWaybillAjustApply, auditDestPass,auditDestNoPass} from "@/api/emis/emisWaybillAjustApply";
import emisWaybillAjustApplyForm from '@/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm';
import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
import AjustApplyTypePicker from '@/views/emis/EmisBaseTools/AjustApplyTypePicker.vue';
export default {
name: "EmisWaybillAjustApply",
components: { elDateAdvPicker,emisWaybillAjustApplyForm },
components: { elDateAdvPicker,emisWaybillAjustApplyForm,AjustApplyTypePicker },
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
'emis_calc_fee_type','emis_print_type'],