From 0c8fd90feb1b37fa0821116485deb5020158ebba Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 26 Oct 2023 08:52:42 +0800
Subject: [PATCH] =?UTF-8?q?utask=E5=88=86=E8=BD=A6=E9=97=B4=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E5=B7=A5=E6=AE=B5=E6=8E=A7=E5=88=B6=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pm/mtask2.vue     |  4 ++--
 src/views/pm/mtask_form.vue | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/views/pm/mtask2.vue b/src/views/pm/mtask2.vue
index 803cabf0..c8589778 100644
--- a/src/views/pm/mtask2.vue
+++ b/src/views/pm/mtask2.vue
@@ -7,7 +7,7 @@
       </div>
       <el-tabs v-model="activeName" class="demo-tabs">
         <el-tab-pane label="粗加工6车间" name="6车间">
-          <scTable ref="table1" :apiObj="apiUtask" row-key="id" stripe :params="paramsMtask" :height="tableHeight" @selection-change="handleSelectionChange" hidePagination>
+          <scTable ref="table1" :apiObj="apiUtask" row-key="id" stripe :params="paramsUtask" :height="tableHeight" @selection-change="handleSelectionChange" hidePagination>
             <el-table-column type="selection" width="55" />
             <el-table-column type="index" width="50" />
             <el-table-column label="任务编号" prop="number">
@@ -221,7 +221,7 @@ export default {
       apiUtask: this.$API.pm.utask.list,
       apiOrderItem: this.$API.sam.orderitem.list,
       paramsOrderItem: { utask__isnull: true },
-      paramsMtask: { parent__isnull: true, mgroup__belong_dept__name: '6车间', material_out__is_hidden: true },
+      paramsUtask: { material__type: 10 },
       query: {
         page: 1,
         page_size: 20,
diff --git a/src/views/pm/mtask_form.vue b/src/views/pm/mtask_form.vue
index 8f983e9a..bfc3d61e 100644
--- a/src/views/pm/mtask_form.vue
+++ b/src/views/pm/mtask_form.vue
@@ -144,7 +144,18 @@ export default {
       });
     },
     getMaterial(){
-      this.$API.mtm.material.list.req({page:0,type__in:'10,20'}).then(res=>{
+      //type:20,is_hidden:false 一部
+      //二部 page:0,type:'10'
+      let obj ={};
+      obj.page = 0;
+      if(this.activeName=='6车间'){
+        obj.type = 10;
+        obj.is_hidden = false;
+      }else{
+        obj.type = 20;
+        obj.is_hidden = false;
+      }
+      this.$API.mtm.material.list.req(obj).then(res=>{
         this.materialOptions = res;
       })
     },