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

Merge pull request 'master-dev' (#108) from master-dev into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/108
This commit is contained in:
wuteng 2025-09-28 17:54:21 +08:00
commit 0ad4a79f82
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/emis/emisTmsSiteBatchMissStatistics/index.vue
View File

@ -3,8 +3,8 @@
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="small" :maxShow="30" label-width="68px" <SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="small" :maxShow="30" label-width="68px"
v-show="showSearch" @search="handleQuery" @reset="resetQuery"> v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="月份" prop="billMonth"> <el-form-item label="月份" prop="billMonth">
<el-date-picker type="month" value-format="yyyy-MM" v-model="queryParams.billMonth" <el-date-picker type="monthrange" value-format="yyyy-MM" v-model="dateRange"
placeholder="请选择月份"></el-date-picker> placeholder="请选择月份" start-placeholder="开始月份" end-placeholder="结束月份"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="起始网点" prop="startSiteCode"> <el-form-item label="起始网点" prop="startSiteCode">
<EmisSiteSimplePicker1 v-model="queryParams.startSiteCode" placeholder="请选择起始网点"> <EmisSiteSimplePicker1 v-model="queryParams.startSiteCode" placeholder="请选择起始网点">
@ -72,12 +72,15 @@ export default {
total: 0, total: 0,
// TMS漏组批次信息表表格数据 // TMS漏组批次信息表表格数据
emisTmsSiteBatchMissStatisticsList: [], emisTmsSiteBatchMissStatisticsList: [],
// 时间搜索
dateRange:[],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 20, pageSize: 20,
billMonth: null,
startSiteCode: null, startSiteCode: null,
startTime: null,
endTime: null,
} }
}; };
@ -90,6 +93,11 @@ export default {
/** 查询TMS漏组批次信息表列表 */ /** 查询TMS漏组批次信息表列表 */
getList() { getList() {
this.loading = true; this.loading = true;
this.queryParams = this.addDateRange(this.queryParams, this.dateRange);
if (this.dateRange.length > 0) {
this.queryParams.startTime = this.queryParams.params.beginTime;
this.queryParams.endTime = this.queryParams.params.endTime;
}
emisTmsSiteBatchMissStatistics(this.queryParams).then(response => { emisTmsSiteBatchMissStatistics(this.queryParams).then(response => {
this.emisTmsSiteBatchMissStatisticsList = response.rows; this.emisTmsSiteBatchMissStatisticsList = response.rows;
this.total = response.total; this.total = response.total;

2
src/views/emis/emisWaybillAjustApply/adjustPanel.vue
View File

@ -210,7 +210,7 @@
</el-col> </el-col>
<el-col :span="14"> <el-col :span="14">
<el-form-item :label="$t('取件方式')" prop="pickupMethod"> <el-form-item :label="$t('取件方式')" prop="pickupMethod">
<el-radio-group v-model="form.dispatchMethod"> <el-radio-group v-model="form.pickupMethod">
<el-radio <el-radio
v-for="dict in dict.type.emis_qujian_fangshi" v-for="dict in dict.type.emis_qujian_fangshi"
:key="dict.value" :key="dict.value"