From 3249a6c29df688ee3929c439d01c515c8302521b Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 25 Oct 2023 18:51:52 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pm/mtask.vue      | 1 +
 src/views/pm/mtask2.vue     | 6 +++---
 src/views/pm/mtask_form.vue | 7 +++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/views/pm/mtask.vue b/src/views/pm/mtask.vue
index ac8cb174..fe5e4d29 100644
--- a/src/views/pm/mtask.vue
+++ b/src/views/pm/mtask.vue
@@ -236,6 +236,7 @@
     <save-dialog
       v-if="dialog.save"
       ref="saveDialog"
+      :activeName="activeName"
       @success="handleSaveSuccess"
       @closed="dialog.save = false"
     ></save-dialog>
diff --git a/src/views/pm/mtask2.vue b/src/views/pm/mtask2.vue
index 1ef7bed9..803cabf0 100644
--- a/src/views/pm/mtask2.vue
+++ b/src/views/pm/mtask2.vue
@@ -6,7 +6,7 @@
         <el-button type="primary" @click="utaskAssgin">任务下达</el-button>
       </div>
       <el-tabs v-model="activeName" class="demo-tabs">
-        <el-tab-pane label="粗加工6车间" name="first">
+        <el-tab-pane label="粗加工6车间" name="6车间">
           <scTable ref="table1" :apiObj="apiUtask" row-key="id" stripe :params="paramsMtask" :height="tableHeight" @selection-change="handleSelectionChange" hidePagination>
             <el-table-column type="selection" width="55" />
             <el-table-column type="index" width="50" />
@@ -91,7 +91,7 @@
       </el-tabs>
     </el-main>
   </el-container>
-  <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
+  <save-dialog v-if="dialog.save" ref="saveDialog" :activeName="activeName" @success="handleSaveSuccess"
     @closed="dialog.save = false"></save-dialog>
   <el-dialog
     title="排产"
@@ -230,7 +230,7 @@ export default {
       visibleRecord:false,
       isSaveing:false,
       tableHeight:null,
-      activeName: 'first',
+      activeName: '6车间',
       activeNameSub: 'order',
       visible:false,
       orderitemList:[],
diff --git a/src/views/pm/mtask_form.vue b/src/views/pm/mtask_form.vue
index bac3efed..8f983e9a 100644
--- a/src/views/pm/mtask_form.vue
+++ b/src/views/pm/mtask_form.vue
@@ -20,12 +20,12 @@
                 <el-input v-model="form.number" placeholder="任务编号" :disabled="mode=='edit'"/>
               </el-form-item>
             </el-col>
-            <el-col :md="12" :sm="24">
+            <el-col :md="12" :sm="24" v-if="activeName!=='6车间'">
               <el-form-item label="任务数">
                 <el-input-number style="width:100%" v-model="form.count" :min="1" controls-position="right" placeholder="任务数"/>
               </el-form-item>
             </el-col>
-            <el-col :md="12" :sm="24">
+            <el-col :md="12" :sm="24" v-if="activeName!=='6车间'">
               <el-form-item label="工段" prop="mgroup">
                 <el-select
                   v-model="form.mgroup"
@@ -98,6 +98,9 @@
 <script>
 export default {
   emits: ["success", "closed"],
+  props:{
+    activeName:{ type: String, default: '' },
+  },
   data() {
     return {
       loading: false,