yy hace 1 año
padre
commit
a7f63ac59b
Se han modificado 2 ficheros con 39 adiciones y 5 borrados
  1. 9 0
      src/api/InTheSystem/index.js
  2. 30 5
      src/views/InTheSystem/components/search.vue

+ 9 - 0
src/api/InTheSystem/index.js

@@ -9,4 +9,13 @@ export async function getList (data) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
+}
+
+// 工序
+export async function produceTask (params) {
+  const res = await request.get( `/main/producetask/page`,  { params });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
 }

+ 30 - 5
src/views/InTheSystem/components/search.vue

@@ -31,7 +31,7 @@
                 </el-form-item>
             </el-col>
 
-            
+
 
             <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
                 <el-form-item label="工位:">
@@ -40,9 +40,19 @@
             </el-col>
 
 
+            <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+                <el-form-item label="工序:">
+                    <el-select v-model="where.taskId">
+                        <el-option v-for="(item,index) in produceTaskList" :key="index" :label="item.name" :value="item.id"></el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+
+
+
+
 
 
-            
 
 
             <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
@@ -58,7 +68,7 @@
 </template>
   
 <script>
-
+import { produceTask } from '../../../api/InTheSystem';
 export default {
     props: [],
     data() {
@@ -68,13 +78,17 @@ export default {
             categoryName: '',
             deviceName: '',
             workstationName: '',
-        
+
 
         };
+
+
         return {
             // 表单数据
             where: { ...defaultWhere },
 
+            produceTaskList: [ ],
+
         };
     },
     computed: {
@@ -85,7 +99,7 @@ export default {
     },
     watch: {},
     created() {
-
+        this.produceTaskFn();
     },
     methods: {
         /* 搜索 */
@@ -98,6 +112,17 @@ export default {
             this.search();
         },
 
+        produceTaskFn() {
+            let params = {
+                pageNum: 1,
+                size: -1
+            }
+            produceTask(params).then((res) => {
+                console.log(res);
+                this.produceTaskList = res.list;
+            })
+        }
+
 
     }
 };