Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
4d530748 1 parent 50e8ae4f

参数增加

Inline Side-by-side
Showing 2 changed files with 8 additions and 7 deletions
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
12 <el-col :span="6"> 12 <el-col :span="6">
13 <el-form-item label="航班日期"> 13 <el-form-item label="航班日期">
14 <el-date-picker class="formItem" v-model="queryParams.flightDate" type="date" placeholder="选择日期" 14 <el-date-picker class="formItem" v-model="queryParams.flightDate" type="date" placeholder="选择日期"
15 - value-format="yyyy-MM-dd" clearable :disabled="queryParams.querySpecifyData =='2'"> 15 + value-format="yyyy-MM-dd" clearable :disabled="queryParams.querySpecifyData == '2'">
16 </el-date-picker> 16 </el-date-picker>
17 </el-form-item> 17 </el-form-item>
18 </el-col> 18 </el-col>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 @click=" 36 @click="
37 $router.push({ 37 $router.push({
38 name: 'FlightAllocConfigInfo', 38 name: 'FlightAllocConfigInfo',
39 - params: { handle: 'add', fltNo: 'new', fltDate: ' ',status:null }, 39 + params: { handle: 'add', fltNo: 'new', fltDate: ' ', status: null },
40 }) 40 })
41 ">添加</el-button> 41 ">添加</el-button>
42 </div> 42 </div>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
48 <template v-slot:ruleDate="scope"> 48 <template v-slot:ruleDate="scope">
49 <el-link v-if="scope.row.ruleDate" type="primary" @click="toRouteOrder(scope.row)"> 49 <el-link v-if="scope.row.ruleDate" type="primary" @click="toRouteOrder(scope.row)">
50 {{ 50 {{
51 - scope.row.ruleDate 51 + scope.row.ruleDate
52 }}<i class="el-icon-link"></i> </el-link> 52 }}<i class="el-icon-link"></i> </el-link>
53 </template> 53 </template>
54 <template slot="optionColumn"> 54 <template slot="optionColumn">
...@@ -148,7 +148,8 @@ export default { ...@@ -148,7 +148,8 @@ export default {
148 fltDate: fltDate != null ? fltDate : ' ', 148 fltDate: fltDate != null ? fltDate : ' ',
149 route: ' ', 149 route: ' ',
150 routeStatus: 'FlightAllocConfig', 150 routeStatus: 'FlightAllocConfig',
151 - status: status 151 + status: status,
152 + createStatus: 1
152 } 153 }
153 this.$router.push({ 154 this.$router.push({
154 name: "FlightAllocConfigInfo", 155 name: "FlightAllocConfigInfo",
......
...@@ -27,16 +27,16 @@ ...@@ -27,16 +27,16 @@
27 style="margin-left:10px" :disabled="checkData.length == 0" @click="batchDel"> 27 style="margin-left:10px" :disabled="checkData.length == 0" @click="batchDel">
28 删 除 28 删 除
29 </el-button> 29 </el-button>
30 - <el-button type="primary" icon="el-icon-download" size="small" style="margin-right:10px" 30 + <el-button type="primary" icon="el-icon-download" size="small" style="margin-left:10px"
31 @click="downloadTempleate">下载模板 31 @click="downloadTempleate">下载模板
32 </el-button> 32 </el-button>
33 - <el-button icon="el-icon-download" type="primary" size="small" style="margin-right:10px" 33 + <el-button icon="el-icon-download" type="primary" size="small" style="margin-left:10px"
34 @click="downloadExcel"> 34 @click="downloadExcel">
35 导出Excel 35 导出Excel
36 </el-button> 36 </el-button>
37 <el-upload action="/goods/importGoods" name="file" :http-request="uploadExcel" :on-remove="handleRemove" 37 <el-upload action="/goods/importGoods" name="file" :http-request="uploadExcel" :on-remove="handleRemove"
38 :limit="1" :on-exceed="handleExceed" :file-list="fileList" accept=".xlsx" class="upload-demo" 38 :limit="1" :on-exceed="handleExceed" :file-list="fileList" accept=".xlsx" class="upload-demo"
39 - v-hasPermi="['base:goodsStation:add']"> 39 + v-hasPermi="['base:goodsStation:add']" style="margin-left:10px">
40 <el-button type="primary" icon="el-icon-upload2" size="small">导入Excel</el-button> 40 <el-button type="primary" icon="el-icon-upload2" size="small">导入Excel</el-button>
41 </el-upload> 41 </el-upload>
42 </div> 42 </div>
......