produ пре 1 година
родитељ
комит
0d44079eaa

+ 10 - 0
src/api/materialPlan/index.js

@@ -128,3 +128,13 @@ export async function getTaskListById(id) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+
+// 配料计划选择生产工单分页
+export async function dosingPage(data) {
+  const res = await request.post(`/mes/workorder/dosingPage`,data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

+ 8 - 8
src/views/materialPlan/components/workOrder-search.vue

@@ -23,14 +23,14 @@
                     <el-input clearable v-model="where.productName" placeholder="请输入" />
                 </el-form-item>
             </el-col>
-            <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+            <!-- <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
                 <el-form-item label="状态:">
                     <el-select v-model="where.status" placeholder="请选择">
                         <el-option v-for="item in statusOpt" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
                 </el-form-item>
-            </el-col>
+            </el-col> -->
 
 
 
@@ -70,17 +70,17 @@ export default {
             productionPlanCode: '',
             produceRoutingName: '',
             productName: '',
-            status: '',
+            // status: '',
             createTime: []
         };
         return {
             // 表单数据
             where: { ...defaultWhere },
-            statusOpt: [
-                { label: '待下达', value: 8 },
-                { label: '待生产', value: 4 },
-                { label: '生产中', value: 5 }
-            ],
+            // statusOpt: [
+            //     { label: '待下达', value: 8 },
+            //     { label: '待生产', value: 4 },
+            //     { label: '生产中', value: 5 }
+            // ],
             teamList: [],
         };
     },

+ 6 - 5
src/views/materialPlan/components/workOrderPop.vue

@@ -21,7 +21,7 @@
   
 <script>
 import workOrderSearch from './workOrder-search'
-import { getList } from '@/api/workOrder/index.js';
+import { dosingPage } from '@/api/materialPlan/index.js';
 import dictMixins from '@/mixins/dictMixins';
 export default {
     components: { workOrderSearch },
@@ -29,7 +29,7 @@ export default {
     data() {
         return {
             visible: false,
-            title: '生产单',
+            title: '生产单',
 
             // 表格列配置
             columns: [
@@ -48,7 +48,7 @@ export default {
                     prop: 'code',
                     label: '生产订单号',
                     align: 'center',
-                    minWidth: 110
+                    minWidth: 120
                 },
                 {
                     prop: 'salesOrderCode',
@@ -151,10 +151,11 @@ export default {
         /* 表格数据源 */
         async datasource({ page, limit, where }) {
 
-            const data = await getList({
+            const data = await dosingPage({
                 ...where,
                 pageNum: page,
-                size: limit
+                size: limit,
+                statusList: [4]
             });