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

src/api/pick/pickApply.js

@@ -12,6 +12,14 @@ export async function getPage(params) {
   return Promise.reject(new Error(res.data.message));
 }
 
+export async function getAllPage(params) {
+  const res = await request.get('/mes/pickorder/allPage',  { params });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
 
 // 退料(过滤不要的数据的领料接口)
 export async function returnPage(params) {
@@ -24,4 +32,4 @@ export async function returnPage(params) {
 
 
 
-returnPage
+returnPage

src/views/pick/pickApply/index.vue

@@ -71,7 +71,7 @@
 </template>
 
 <script>
-  import { getPage, returnPage } from '@/api/pick/pickApply';
+  import { getAllPage, returnPage, getPage } from '@/api/pick/pickApply';
 
   import pickSearch from './components/pick-search.vue';
 
@@ -186,7 +186,7 @@
     methods: {
       /* 表格数据源 */
       async datasource({ page, limit, where }) {
-        let URL = this.isReturn ? returnPage : getPage;
+        let URL = this.isReturn ? returnPage : getAllPage;
 
         let parma = {
           ...where,

src/views/produce/components/new_produceOrder.vue

@@ -455,7 +455,11 @@
           return this.$message.warning('请选择报工类型相同的工单');
         }
 
-        if (this.produceTaskInfo.isPrenatalPreProduction && val.length > 0) {
+        if (
+          this.produceTaskInfo &&
+          this.produceTaskInfo.isPrenatalPreProduction &&
+          val.length > 0
+        ) {
           // 判断是否要求先完成 产前准备
           const result = await isPreProductionResult({
             produceTaskId: this.produceTaskInfo.id,

vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
         // target: 'http://192.168.1.116:18086',
         target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.103:18086',192.168.1.116
-        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.144:18086',
         // target: 'http://192.168.1.30:18086',