Merge branch 'dev' into feature-electrophoresis

src/interface/apis.js

@@ -593,6 +593,10 @@
 			"url": "/area/bus/statistics",
 			"method": "get"
 		},
+		"workOrderNo-get": {
+			"url": "/area/currentPosition/orderNo/workOrderNo",
+			"method": "get"
+		},
 		"busNo-get": {
 			"url": "/area/detail/busNo",
 			"method": "get"

src/views/Monitor/index.vue

@@ -8,8 +8,9 @@
                     <el-input
                         size="mini"
                         style="width: 150px"
-                        placeholder="请输入订单号"
-                        v-model="orderNo">
+                        :placeholder="workOrderNo !== '' ? '已输入工单号' : '请输入订单号'"
+                        v-model="orderNo"
+                        :disabled="workOrderNo !== ''">
                     </el-input>
                 </div>
                 <div class="work-order-number">
@@ -17,13 +18,15 @@
                     <el-input
                         size="mini"
                         style="width: 150px"
-                        placeholder="请输入工单号"
-                        v-model="workOrderNo">
+                        :placeholder="orderNo !== '' ? '已输入订单号' : '请输入工单号'"
+                        v-model="workOrderNo"
+                        :disabled="orderNo !== ''">
                     </el-input>
                 </div>
                 <el-button
                     size="mini"
-                    type="primary">
+                    type="primary"
+                    @click="doSearchClick">
                     搜索
                 </el-button>
             </div>
@@ -1521,6 +1524,13 @@
                 } else {
                     return 'monitor-car-external'
                 }
+            },
+            // 点击搜索按钮
+            doSearchClick () {
+                let queryParams = { orderNo: this.orderNo, workOrderNo: this.workOrderNo }
+                this.$fetch('area-controller/busNo-get', queryParams).then(response => {
+                    console.log(response)
+                })
             }
         },
         mounted () {
@@ -1574,6 +1584,7 @@
 
                         input::-webkit-input-placeholder {
                             color: rgb(64, 158, 255);
+                            font-weight: bold;
                         }
                     }
                 }