修改位置作业查询

build/utils.js

@@ -17,16 +17,9 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 // let devModules = ["index", "appoint", "statisticalReport"];
 // let devModules = ["index", "statisticalReport", "appoint", "TMS"];
-// let devModules = ["index", "statisticalReport", "TMS", "appoint"];
-
-<<<<<<< HEAD
-let devModules = ["all"];
+let devModules = ["index", "statisticalReport", "TMS", "appoint"];
+// let devModules = ["all"];
 // let devModules = ["index","appoint","TMS","WMS","statisticalReport"];
-=======
-
-// let devModules = ["index", "appoint", "statisticalReport"];
-let devModules = ["all"];
->>>>>>> 983a39765cfc7134e2c16e1e40a744b1fe7e3a0a
 // let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS','WMS']
 // let devModules = ["index", "ADMINISTRATORS", "RMS"];
 // let devModules = ["index", "inward", "statisticalReport"];

config/index.js

@@ -66,7 +66,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
     // target: "http://localhost:8080",
-    target: "http://172.16.33.166:80",
+    target: "http://localhost:8080",
     // target: "http://192.168.1.105:8080",
     // target: "http://192.168.1.106:8080",
     ws: true,
@@ -75,7 +75,7 @@ let proxyTable = {
     }
   },
   "/views/api/v1": {
-    target: "http://172.16.33.166:80",
+    target: "http://localhost:8080",
     // target: "http://192.168.1.109:8080",
     ws: true,
     pathRewrite: {

src/views/TMS/components/importedShip/shipLocation.vue

@@ -2,8 +2,7 @@
   <!-- 位置作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-date-picker v-model="value" type="date" placeholder="选择日期">
-      </el-date-picker>
+      <el-input  class="el-input" placeholder="请输入物资名称和外轮船名" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -39,7 +38,7 @@
             <template v-if="item.prop == 'shipLocation'">
               <el-input
                 v-model.number="scope.row.shipLocation"
-                style="width: 100px;"
+                style="width: 100px"
                 @blur="onblur(scope)"
               ></el-input>
             </template>
@@ -63,7 +62,7 @@
               <el-date-picker
                 type="date"
                 v-model.number="scope.row.locationRouteTime"
-                style="width: 150px;"
+                style="width: 150px"
                 :clearable="false"
               ></el-date-picker>
             </template>
@@ -95,20 +94,20 @@ export default {
       options: [
         {
           label: "未到闸船舶",
-          value: "未到闸船舶"
+          value: "未到闸船舶",
         },
         {
           label: "等闸船舶",
-          value: "等闸船舶"
+          value: "等闸船舶",
         },
         {
           label: "已过闸船舶",
-          value: "已过闸船舶"
+          value: "已过闸船舶",
         },
         {
           label: "到港待卸船舶",
-          value: "到港待卸船舶"
-        }
+          value: "到港待卸船舶",
+        },
       ],
       value: null,
       // 车辆表格表头
@@ -116,64 +115,65 @@ export default {
         {
           prop: "foreignShipName",
           label: "外轮船名",
-          width: "140"
+          width: "140",
         },
         {
           prop: "materialName",
           label: "物资名称",
-          width: "140"
+          width: "140",
         },
         {
           prop: "capacityName",
           label: "江船船名",
-          width: "140"
+          width: "140",
         },
         {
           prop: "locationRouteTime",
           label: "离港日期",
           width: "200",
-          slot: true
+          slot: true,
         },
         {
           prop: "startPortName",
           label: "起运港",
-          width: "140"
+          width: "140",
         },
         {
           prop: "shipLocation",
           label: "船舶位置",
           width: "130",
-          slot: true
+          slot: true,
         },
         {
           prop: "locationStatus",
           label: "位置状态",
           width: "180",
-          slot: true
+          slot: true,
         },
 
         {
           prop: "arrivePortName",
           label: "到达港",
-          width: "140"
+          width: "140",
         },
         {
           prop: "planWeight",
           label: "计划吨",
-          width: "100"
+          width: "100",
         },
         {
           prop: "realWeight",
           label: "实际吨",
-          width: "100"
+          width: "100",
         },
         {
           prop: "locationMemo",
           label: "备注",
-          width: "140"
-        }
+          width: "140",
+        },
       ],
-      selectionList: []
+      selectionList: [],
+      input:"",
     };
   },
   created() {
@@ -188,49 +188,55 @@ export default {
           "/api/v1/tms/getShipLocationStatus?shipLocation=" +
             scope.row.shipLocation
         )
-        .then(res => {
+        .then((res) => {
           // console.log(res.data.data);
           scope.row.locationStatus = res.data.data.locationStatus;
         });
     },
     initialization() {
-      this.axios.post("/api/v1/tms/getShipLocationList").then(res => {
+      this.axios.post("/api/v1/tms/getShipLocationList").then((res) => {
         if (res.data.code == "200") {
           this.selectionList = res.data.data;
         }
       });
     },
     onclick() {
-      this.value = sjTime(this.value);
-      this.axios
-        .post("/api/v1/tms/getShipLocationList", { dayTime: this.value })
-        .then(res => {
-          if (res.data.code == "200") {
-            this.selectionList = res.data.data;
-          }
-        });
+    
+      this.axios.post("/api/v1/tms/getShipLocationList?con=" + this.input).then((res) => {
+        if (res.data.code == "200") {
+          this.selectionList = res.data.data;
+        }
+      });
     },
     click(row) {
-      this.axios.post("/api/v1/tms/updateShipLocation", row).then(res => {
+      this.axios.post("/api/v1/tms/updateShipLocation", row).then((res) => {
         if (res.data.code == "200") {
           this.$message({
             type: "success",
-            message: "保存成功!"
+            message: "保存成功!",
           });
           this.initialization();
         }
       });
     },
-    refresh(){
+    refresh() {
       this.$router.go(0);
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss">
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 40rpx;
+    }
+    .btn {
+      width: 5.5%;
+      margin-left: 0.25rem;
+    }
   }
 }
 </style>