Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
dd3fb5d8 1 parent 814e887e

【IMAC-ET86】配舱设置-新增ET86配舱modify

Inline Side-by-side
Showing 6 changed files with 9 additions and 8 deletions
...@@ -153,7 +153,7 @@ export default { ...@@ -153,7 +153,7 @@ export default {
153 this.$refs.minNumOfPieces.innerHTML = "件数范围1~100"; 153 this.$refs.minNumOfPieces.innerHTML = "件数范围1~100";
154 return false; 154 return false;
155 } 155 }
156 - } else if (Number(this.queryForm[name]) < 1) { 156 + } else if (this.queryForm[name] !== "" && Number(this.queryForm[name]) < 1) {
157 this.$refs.minNumOfPieces.innerHTML = ""; 157 this.$refs.minNumOfPieces.innerHTML = "";
158 this.$refs.minNumOfPieces.innerHTML = 158 this.$refs.minNumOfPieces.innerHTML =
159 "最少件数1~100，并且最少件数不得大于最多件数"; 159 "最少件数1~100，并且最少件数不得大于最多件数";
...@@ -192,7 +192,7 @@ export default { ...@@ -192,7 +192,7 @@ export default {
192 this.$refs.minNumOfPieces.innerHTML = "件数范围1~100"; 192 this.$refs.minNumOfPieces.innerHTML = "件数范围1~100";
193 return false; 193 return false;
194 } 194 }
195 - } else if (Number(this.queryForm[name]) < 1) { 195 + } else if (this.queryForm[name] !== "" && Number(this.queryForm[name]) < 1) {
196 this.$refs.minNumOfPieces.innerHTML = ""; 196 this.$refs.minNumOfPieces.innerHTML = "";
197 this.$refs.minNumOfPieces.innerHTML = 197 this.$refs.minNumOfPieces.innerHTML =
198 "最多件数1~100，并且最多件数不得小于最小件数"; 198 "最多件数1~100，并且最多件数不得小于最小件数";
......
...@@ -460,7 +460,7 @@ ...@@ -460,7 +460,7 @@
460 <el-card shadow="never" style="width: 95%"> 460 <el-card shadow="never" style="width: 95%">
461 <el-checkbox-group v-model="val.puporpuxCode" @change="change"> 461 <el-checkbox-group v-model="val.puporpuxCode" @change="change">
462 <el-row> 462 <el-row>
463 - <el-col :span="2" v-for="item in checkBoxItem.puporpux" :key="item"> 463 + <el-col :span="2" v-for="item in checkBoxItem.puporpux" :key="item.code">
464 <el-checkbox 464 <el-checkbox
465 v-if="item.status === 1 || val.puporpuxCode.includes(item.chineseName)" 465 v-if="item.status === 1 || val.puporpuxCode.includes(item.chineseName)"
466 :label="item.chineseName" :name="item.chineseName" 466 :label="item.chineseName" :name="item.chineseName"
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <el-form-item label="货站名称" prop="goodsStation"> 20 <el-form-item label="货站名称" prop="goodsStation">
21 <el-select class="selectWidth100" v-model.lazy="formData.goodsStation" filterable 21 <el-select class="selectWidth100" v-model.lazy="formData.goodsStation" filterable
22 :loading="goodsStationLoading" placeholder="不限"> 22 :loading="goodsStationLoading" placeholder="不限">
23 - <el-option v-for="(item, index) in goodsStationList" :label="item" :value="item" :key="item"> 23 + <el-option v-for="item in goodsStationList" :label="item" :value="item" :key="item">
24 </el-option> 24 </el-option>
25 </el-select> 25 </el-select>
26 </el-form-item> 26 </el-form-item>
...@@ -279,4 +279,4 @@ export default { ...@@ -279,4 +279,4 @@ export default {
279 margin-left: 10px; 279 margin-left: 10px;
280 } 280 }
281 } 281 }
282 -</style>
...\ No newline at end of file ...\ No newline at end of file
282 +</style>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <el-form-item label="货站名称" prop="goodsStation"> 20 <el-form-item label="货站名称" prop="goodsStation">
21 <el-select class="selectWidth100" v-model.lazy="formData.goodsStation" filterable 21 <el-select class="selectWidth100" v-model.lazy="formData.goodsStation" filterable
22 :loading="goodsStationLoading" placeholder="不限"> 22 :loading="goodsStationLoading" placeholder="不限">
23 - <el-option v-for="(item, index) in goodsStationList" :label="item" :value="item" :key="item"> 23 + <el-option v-for="item in goodsStationList" :label="item" :value="item" :key="item">
24 </el-option> 24 </el-option>
25 </el-select> 25 </el-select>
26 </el-form-item> 26 </el-form-item>
...@@ -279,4 +279,4 @@ export default { ...@@ -279,4 +279,4 @@ export default {
279 margin-left: 10px; 279 margin-left: 10px;
280 } 280 }
281 } 281 }
282 -</style>
...\ No newline at end of file ...\ No newline at end of file
282 +</style>
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
42 </el-form-item> 42 </el-form-item>
43 </el-form> 43 </el-form>
44 <el-row class="card2"> 44 <el-row class="card2">
45 - <el-col :span="1" v-for="item in fltBox" :key="item"> 45 + <el-col :span="1" v-for="item in fltBox" :key="item.fltNo">
46 <div class="fltBox" @click="rowClick({ fltNo: item.fltNo, fltDate: item.fltDate, route: '' })" 46 <div class="fltBox" @click="rowClick({ fltNo: item.fltNo, fltDate: item.fltDate, route: '' })"
47 :style="{ backgroundColor: (item.percentage * 100).toFixed(2) >= 90 ? '#13ce66' : (item.percentage * 100).toFixed(2) >= 75 ? '#ffba00' : '#ff4949' }"> 47 :style="{ backgroundColor: (item.percentage * 100).toFixed(2) >= 90 ? '#13ce66' : (item.percentage * 100).toFixed(2) >= 75 ? '#ffba00' : '#ff4949' }">
48 <div class="fltName">{{ item.fltNo }}</div> 48 <div class="fltName">{{ item.fltNo }}</div>
......
...@@ -71,6 +71,7 @@ export default { ...@@ -71,6 +71,7 @@ export default {
71 const username = localStorage.getItem("username"); 71 const username = localStorage.getItem("username");
72 const password = localStorage.getItem("password"); 72 const password = localStorage.getItem("password");
73 const rememberMe = localStorage.getItem("rememberMe"); 73 const rememberMe = localStorage.getItem("rememberMe");
74 + console.log("rememberMe：", rememberMe)
74 this.loginForm = { 75 this.loginForm = {
75 username: username === undefined ? this.loginForm.username : username, 76 username: username === undefined ? this.loginForm.username : username,
76 password: password === undefined ? this.loginForm.password : password, 77 password: password === undefined ? this.loginForm.password : password,
......