jinhui.wang

增加服务代码列,无用代码删除,图标修改

...@@ -62,7 +62,7 @@ export const constantRoutes = [ ...@@ -62,7 +62,7 @@ export const constantRoutes = [
62 path: 'index', 62 path: 'index',
63 component: (resolve) => require(['@/views/index'], resolve), 63 component: (resolve) => require(['@/views/index'], resolve),
64 name: '首页', 64 name: '首页',
65 - meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } 65 + meta: { title: '首页', icon: 'home', noCache: true, affix: true }
66 } 66 }
67 ] 67 ]
68 }, 68 },
......
...@@ -333,7 +333,7 @@ ...@@ -333,7 +333,7 @@
333 import Dialog from "./info.vue"; 333 import Dialog from "./info.vue";
334 import { findConditionData, findCargoAllocationData } from "@/api/cargoSelect"; 334 import { findConditionData, findCargoAllocationData } from "@/api/cargoSelect";
335 import { allDictData } from "@/api/destinationFlight"; 335 import { allDictData } from "@/api/destinationFlight";
336 -import { findFltConditionDataApi } from "@/api/findAllFltData"; 336 +// import { findFltConditionDataApi } from "@/api/findAllFltData";
337 import { downLoadXlsx } from "@/utils/zipdownload"; 337 import { downLoadXlsx } from "@/utils/zipdownload";
338 import { upCase } from "@/utils/FedEx"; 338 import { upCase } from "@/utils/FedEx";
339 339
...@@ -458,6 +458,15 @@ export default { ...@@ -458,6 +458,15 @@ export default {
458 }, 458 },
459 { 459 {
460 type: "", 460 type: "",
461 + name: "服务代码",
462 + value: "serviceCode",
463 + width: "150",
464 + align: "center",
465 + sorTable: false,
466 + fixed:false,
467 + },
468 + {
469 + type: "",
461 name: "URSA", 470 name: "URSA",
462 value: "ursa", 471 value: "ursa",
463 width: "150", 472 width: "150",
...@@ -827,26 +836,47 @@ export default { ...@@ -827,26 +836,47 @@ export default {
827 }; 836 };
828 }, 837 },
829 created() { 838 created() {
839 + this.seleData();
840 + this.select();
841 + },
842 + mounted() {
843 + window.addEventListener("keydown", (code) => {
844 + if (code.keyCode === 16 && code.shiftKey) {
845 + this.shiftKey = true;
846 + }
847 + });
848 + window.addEventListener("keyup", (code) => {
849 + if (code.keyCode === 16) {
850 + this.shiftKey = false;
851 + }
852 + });
853 + },
854 + methods: {
830 //查询条件 855 //查询条件
831 - new Promise((resolve, reject) => { 856 + async seleData() {
832 - let obj = {}; 857 + // findFltConditionDataApi()
833 - findFltConditionDataApi() 858 + // .then((res) => {
834 - .then((res) => { 859 + // if (res.code === 200) {
835 - if (res.code === 200) { 860 + // this.selectData.fltTypes = res.data.flightType;
836 - obj.flightType = res.data.flightType; 861 + // }else{
837 - } else { 862 + // this.$message({
838 - reject(res.msg); 863 + // message: "查询条件不存在",
839 - } 864 + // type: "warning",
840 - }) 865 + // });
841 - .catch(() => {}); 866 + // }
867 + // })
868 + // .catch(() => {});
842 869
843 allDictData() 870 allDictData()
844 .then((res) => { 871 .then((res) => {
845 if (res.code === 200) { 872 if (res.code === 200) {
846 - obj.HandlingCode = res.data.handlingCode; 873 + this.selectData.HandlingCode = res.data.handlingCode;
847 - obj.SubCategory = res.data.subCategory; 874 + this.selectData.SubCategory = res.data.subCategory;
848 - } else { 875 + }else{
849 - reject(res.msg); 876 + this.$message({
877 + message: "查询条件不存在",
878 + type: "warning",
879 + });
850 } 880 }
851 }) 881 })
852 .catch(() => {}); 882 .catch(() => {});
...@@ -854,38 +884,16 @@ export default { ...@@ -854,38 +884,16 @@ export default {
854 findConditionData() 884 findConditionData()
855 .then((res) => { 885 .then((res) => {
856 if (res.code == 200) { 886 if (res.code == 200) {
857 - obj.findConditionData = res.data; 887 + this.selectData.findConditionData = res.data;
858 - } else { 888 + }else{
859 - reject(res.msg); 889 + this.$message({
890 + message: "查询条件不存在",
891 + type: "warning",
892 + });
860 } 893 }
861 - resolve(obj);
862 }) 894 })
863 .catch(() => {}); 895 .catch(() => {});
864 - this.select(); 896 + },
865 - })
866 - .then((res) => {
867 - this.selectData = res;
868 - })
869 - .catch((err) => {
870 - this.$message({
871 - message: "查询条件不存在",
872 - type: "warning",
873 - });
874 - });
875 - },
876 - mounted() {
877 - window.addEventListener("keydown", (code) => {
878 - if (code.keyCode === 16 && code.shiftKey) {
879 - this.shiftKey = true;
880 - }
881 - });
882 - window.addEventListener("keyup", (code) => {
883 - if (code.keyCode === 16) {
884 - this.shiftKey = false;
885 - }
886 - });
887 - },
888 - methods: {
889 //查询 897 //查询
890 select() { 898 select() {
891 this.loading = true; 899 this.loading = true;
......
...@@ -236,6 +236,7 @@ ...@@ -236,6 +236,7 @@
236 methods: { 236 methods: {
237 //跳转到查看,修改页面 237 //跳转到查看,修改页面
238 handleClick(flightiId, handle) { 238 handleClick(flightiId, handle) {
239 + this.openFlightDate = false;
239 this.$router.push({ 240 this.$router.push({
240 name: "FlightAllocConfigInfo", 241 name: "FlightAllocConfigInfo",
241 params: { 242 params: {
......
...@@ -36,8 +36,7 @@ ...@@ -36,8 +36,7 @@
36 </el-table> 36 </el-table>
37 </div> 37 </div>
38 </template> 38 </template>
39 -</div> 39 +
40 -</template>
41 <script> 40 <script>
42 import { 41 import {
43 downLoadTemplate, 42 downLoadTemplate,
......
...@@ -204,18 +204,6 @@ ...@@ -204,18 +204,6 @@
204 </el-select> 204 </el-select>
205 </el-form-item> 205 </el-form-item>
206 </el-col> 206 </el-col>
207 - <!-- <el-col :span="6">
208 - <el-form-item label="口岸代码">
209 - <el-select
210 - placeholder="不限"
211 - v-model="formData.portName"
212 - class="formItem"
213 - clearable
214 - >
215 -
216 - </el-select>
217 - </el-form-item>
218 - </el-col> -->
219 </el-row> 207 </el-row>
220 </el-col> 208 </el-col>
221 </el-row> 209 </el-row>
...@@ -228,9 +216,6 @@ ...@@ -228,9 +216,6 @@
228 @click="select" 216 @click="select"
229 >查询</el-button 217 >查询</el-button
230 > 218 >
231 - <!-- <el-button type="primary" size="small" @click="checks(tableData)"
232 - >全选/全否</el-button
233 - > -->
234 <el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(0)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading" 219 <el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(0)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading"
235 >{{downLoadingTip.downloading?downLoadingTip.tip:"导出本页查询结果"}}</el-button 220 >{{downLoadingTip.downloading?downLoadingTip.tip:"导出本页查询结果"}}</el-button
236 > 221 >
...@@ -243,7 +228,6 @@ ...@@ -243,7 +228,6 @@
243 <span style="paddingRight: 50px">总重量:{{ allWeight }}</span> 228 <span style="paddingRight: 50px">总重量:{{ allWeight }}</span>
244 <span>总件数:{{ allQty }}</span> 229 <span>总件数:{{ allQty }}</span>
245 </div> 230 </div>
246 - <!-- <RightToolbar :showSearch.sync="formShow" size="small"></RightToolbar> -->
247 <div class="formShow" @click="formShow = !formShow"><i class="el-icon-s-tools"></i>{{formShow?'收起条件':'更多条件'}}</div> 231 <div class="formShow" @click="formShow = !formShow"><i class="el-icon-s-tools"></i>{{formShow?'收起条件':'更多条件'}}</div>
248 </div> 232 </div>
249 </el-form> 233 </el-form>
...@@ -395,6 +379,15 @@ export default { ...@@ -395,6 +379,15 @@ export default {
395 }, 379 },
396 { 380 {
397 type: "", 381 type: "",
382 + name: "服务代码",
383 + value: "serviceCode",
384 + width: "150",
385 + align: "center",
386 + sorTable: false,
387 + fixed:false,
388 + },
389 + {
390 + type: "",
398 name: "URSA", 391 name: "URSA",
399 value: "ursa", 392 value: "ursa",
400 width: "150", 393 width: "150",
......