Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dev

src/api/aps/index.js

@@ -31,6 +31,13 @@ export async function getPlanDeviceList ({ produceVersionId }) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+// 选择工艺路线
+export async function routeList(params) {
+  const res = await request.get('/main/producerouting/page', { params });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+}
 // 工序
 export async function getProduceTaskList(params) {
   const res = await request.post('/main/producerouting/taskinstance/page',params);

src/views/unacceptedProduct/components/order-search.vue

@@ -11,7 +11,7 @@
         <el-form-item label="工单号:">
           <el-input
             clearable
-            v-model="where.workOrderId"
+            v-model="where.workOrderCode"
             placeholder="请输入"
           />
         </el-form-item>