Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
f7390d80 1 parent 0f5235aa

位置修改

Inline Side-by-side
Showing 1 changed file with 16 additions and 16 deletions
...@@ -3,20 +3,27 @@ ...@@ -3,20 +3,27 @@
3 <el-form ref="reportForm" class="form-header" :model="formData" label-position="right" label-width="auto" 3 <el-form ref="reportForm" class="form-header" :model="formData" label-position="right" label-width="auto"
4 size="small"> 4 size="small">
5 <el-row> 5 <el-row>
6 + <el-col :span="4">
7 + <el-form-item label="取件日期">
8 + <el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期"
9 + value-format="yyyy-MM-dd" clearable>
10 + </el-date-picker>
11 + </el-form-item>
12 + </el-col>
6 <el-col :span="5"> 13 <el-col :span="5">
7 - <el-form-item label="地区"> 14 + <el-form-item label="区域">
8 - <el-select v-model="formData.areaArray" class="formItem" filterable multiple clearable 15 + <el-select v-model="formData.regionArray" class="formItem" filterable multiple clearable
9 placeholder="不限"> 16 placeholder="不限">
10 - <el-option v-for="item in selectOptionList.area" :label="item" :value="item" :key="item"> 17 + <el-option v-for="item in selectOptionList.region" :label="item" :value="item" :key="item">
11 </el-option> 18 </el-option>
12 </el-select> 19 </el-select>
13 </el-form-item> 20 </el-form-item>
14 </el-col> 21 </el-col>
15 <el-col :span="5"> 22 <el-col :span="5">
16 - <el-form-item label="区域"> 23 + <el-form-item label="地区">
17 - <el-select v-model="formData.regionArray" class="formItem" filterable multiple clearable 24 + <el-select v-model="formData.areaArray" class="formItem" filterable multiple clearable
18 placeholder="不限"> 25 placeholder="不限">
19 - <el-option v-for="item in selectOptionList.region" :label="item" :value="item" :key="item"> 26 + <el-option v-for="item in selectOptionList.area" :label="item" :value="item" :key="item">
20 </el-option> 27 </el-option>
21 </el-select> 28 </el-select>
22 </el-form-item> 29 </el-form-item>
...@@ -41,13 +48,6 @@ ...@@ -41,13 +48,6 @@
41 </el-select> 48 </el-select>
42 </el-form-item> 49 </el-form-item>
43 </el-col> 50 </el-col>
44 - <el-col :span="4">
45 - <el-form-item label="取件日期">
46 - <el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期"
47 - value-format="yyyy-MM-dd" clearable>
48 - </el-date-picker>
49 - </el-form-item>
50 - </el-col>
51 </el-row> 51 </el-row>
52 </el-form> 52 </el-form>
53 <div class="ml20 mt20 mb20"> 53 <div class="ml20 mt20 mb20">
...@@ -58,8 +58,8 @@ ...@@ -58,8 +58,8 @@
58 <el-form label-position="right" label-width="auto" size="small"> 58 <el-form label-position="right" label-width="auto" size="small">
59 <el-form-item label="坐标系切换"> 59 <el-form-item label="坐标系切换">
60 <el-radio-group v-model="formData.dimensionName" @change="typeChange"> 60 <el-radio-group v-model="formData.dimensionName" @change="typeChange">
61 - <el-radio label="area">地区</el-radio>
62 <el-radio label="region">区域</el-radio> 61 <el-radio label="region">区域</el-radio>
62 + <el-radio label="area">地区</el-radio>
63 <el-radio label="ursa">URSA</el-radio> 63 <el-radio label="ursa">URSA</el-radio>
64 <el-radio label="serviceType">serviceType</el-radio> 64 <el-radio label="serviceType">serviceType</el-radio>
65 </el-radio-group> 65 </el-radio-group>
...@@ -90,12 +90,12 @@ export default { ...@@ -90,12 +90,12 @@ export default {
90 regionArray: [], 90 regionArray: [],
91 areaArray: [], 91 areaArray: [],
92 pickUpDate: null, 92 pickUpDate: null,
93 - dimensionName: 'area', 93 + dimensionName: 'region',
94 }, 94 },
95 tableHeader: this.tableHeaders['report'], 95 tableHeader: this.tableHeaders['report'],
96 barChartData: [], 96 barChartData: [],
97 selectOptionList: { 97 selectOptionList: {
98 - ursaList: ["A_", "B_", "C_", "D_", "E_", "F_", "G_", "H_", "I_", "J_", "K_", "L_", "M_", "N_", "O_", "P_", "Q_", "R_", "S_", "T_", "U_", 'V_', "W_", "X_", "Y_", "Z_", '1_', '2_', '3_', '4_', '5_', '6_', '7_', '8_', '9_', 'other'], 98 + ursaList: ["A_", "B_", "C_", "D_", "E_", "F_", "G_", "H_", "I_", "J_", "K_", "L_", "M_", "N_", "O_", "P_", "Q_", "R_", "S_", "T_", "U_", 'V_', "W_", "X_", "Y_", "Z_", '1_', '2_', '3_', '4_', '5_', '6_', '7_', '8_', '9_'],
99 serviceType: [], 99 serviceType: [],
100 region: [], 100 region: [],
101 area: [], 101 area: [],
......