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

Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/108

src/views/emis/emisTmsSiteBatchMissStatistics/index.vue

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

src/views/emis/emisWaybillAjustApply/adjustPanel.vue

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