jinhui.wang

获取查询增加预审状态条件,文本修正

...@@ -147,6 +147,14 @@ ...@@ -147,6 +147,14 @@
147 </el-select> 147 </el-select>
148 </el-form-item> 148 </el-form-item>
149 </el-col> 149 </el-col>
150 + <el-col :span="6">
151 + <el-form-item label="预审状态">
152 + <el-select v-model="formData.preStatus" placeholder="不限" class="formItem" clearable multiple>
153 + <el-option v-for="item in findConditionData.preQualificationStatus" :label="item == '' ? '非预审' : item"
154 + :value="item"> </el-option>
155 + </el-select>
156 + </el-form-item>
157 + </el-col>
150 </el-row> 158 </el-row>
151 </el-col> 159 </el-col>
152 </el-row> 160 </el-row>
...@@ -261,6 +269,7 @@ export default { ...@@ -261,6 +269,7 @@ export default {
261 cargoPlaneStart: null, 269 cargoPlaneStart: null,
262 cargoPlaneEnd: null, 270 cargoPlaneEnd: null,
263 cargoPlaneRoute: null, 271 cargoPlaneRoute: null,
272 + preStatus: undefined,
264 limitStart: 1, 273 limitStart: 1,
265 limitSize: 100, 274 limitSize: 100,
266 }, //表单数据 275 }, //表单数据
...@@ -319,6 +328,7 @@ export default { ...@@ -319,6 +328,7 @@ export default {
319 tableData: [], //表格数据 328 tableData: [], //表格数据
320 cargoLog: {}, 329 cargoLog: {},
321 routeList: [], 330 routeList: [],
331 + preQualificationStatusList: [],
322 allWeight: 0,//总重量 332 allWeight: 0,//总重量
323 allQty: 0,//总件数 333 allQty: 0,//总件数
324 shiftKey: false, 334 shiftKey: false,
......
...@@ -251,6 +251,7 @@ export default { ...@@ -251,6 +251,7 @@ export default {
251 } else { 251 } else {
252 this.msgWarning(res.msg) 252 this.msgWarning(res.msg)
253 } 253 }
254 + this.$refs['superAllocationForm'].clearValidate('flightRoute')
254 }).catch(err => { 255 }).catch(err => {
255 console.log(err) 256 console.log(err)
256 }) 257 })
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 </el-col> 18 </el-col>
19 <el-col :span="6"> 19 <el-col :span="6">
20 <el-form-item label="操作人"> 20 <el-form-item label="操作人">
21 - <el-input v-model="selectForm.userName" class="formItem" placeholder="请输入操作描述" clearable> 21 + <el-input v-model="selectForm.userName" class="formItem" placeholder="请输入操作" clearable>
22 </el-input> 22 </el-input>
23 </el-form-item> 23 </el-form-item>
24 </el-col> 24 </el-col>
......