From b902e595883945b877ececc8024cf0c0f78332aa Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 25 Oct 2023 13:09:25 +0800
Subject: [PATCH] =?UTF-8?q?6=E8=BD=A6=E9=97=B4utask=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pm/mtask2.vue     | 88 +++++++++++++++++++++++++++++++------
 src/views/pm/mtask_form.vue | 13 ++++--
 2 files changed, 84 insertions(+), 17 deletions(-)

diff --git a/src/views/pm/mtask2.vue b/src/views/pm/mtask2.vue
index ed3e41ca..1ef7bed9 100644
--- a/src/views/pm/mtask2.vue
+++ b/src/views/pm/mtask2.vue
@@ -13,17 +13,11 @@
             <el-table-column label="任务编号" prop="number">
             </el-table-column>
             <el-table-column label="任务状态" prop="state">
-                <template #default="scope">
-                  <el-tag v-if="scope.row.state===10" type="success">
+              <template #default="scope">
+                  <el-tag v-if="scope.row.state!==40" type="primary">
                     {{ mtaskStateOptions[scope.row.state] }}
                   </el-tag>
-                  <el-tag v-else-if="scope.row.state===20" type="warning">
-                    {{ mtaskStateOptions[scope.row.state] }}
-                  </el-tag>
-                  <el-tag v-else-if="scope.row.state===30">
-                    {{ mtaskStateOptions[scope.row.state] }}
-                  </el-tag>
-                  <el-tag v-else type="danger">
+                  <el-tag v-else type="success">
                     {{ mtaskStateOptions[scope.row.state] }}
                   </el-tag>
                 </template>
@@ -40,8 +34,12 @@
             </el-table-column>
             <el-table-column label="完工时间" prop="end_date">
             </el-table-column>
-            <el-table-column label="操作" fixed="right" align="left" width="120">
+            <el-table-column label="操作" fixed="right" align="left" width="150">
               <template #default="scope">
+                <el-link type="primary" @click="table_show(scope.row)">
+                  查看
+                </el-link>
+                <el-divider direction="vertical"></el-divider>
                 <el-link type="primary" @click="table_edit(scope.row)">
                   编辑
                 </el-link>
@@ -134,6 +132,55 @@
         <el-button @click="visible = false">取消</el-button>
       </el-footer>
 	</el-dialog>
+  <el-drawer
+        title="任务详情"
+        v-model="visibleRecord"
+        :size="800"
+        destroy-on-close
+        @closed="visibleRecord=false"
+      >
+      <div class="right-panel tabsHeader">
+          <el-date-picker
+              v-model="paramsObj.start_date"
+              type="date"
+              value-format="YYYY-MM-DD"
+            />
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              @click="handleDetailQuery"
+            >查询</el-button>
+          </div>
+        <el-container v-loading="loading">
+          <el-main style="padding: 0 20px 20px 20px">
+            <scTable
+              ref="drawer_table"
+              :apiObj="apiObj"
+              row-key="id"
+              stripe
+              :params="paramsObj"
+            >
+              <el-table-column type="index" width="50"/>
+              <el-table-column label="工段" prop="mgroup_name" show-overflow-tooltip>
+              </el-table-column>
+              <el-table-column label="物料编号" prop="number">
+              </el-table-column>
+              <el-table-column label="工作日期" prop="start_date">
+              </el-table-column>
+              <el-table-column label="状态" prop="state" show-overflow-tooltip>
+                <template #default="scope">
+                  <el-tag v-if="scope.row.state!==40" type="primary">
+                    {{ mtaskStateOptions[scope.row.state] }}
+                  </el-tag>
+                  <el-tag v-else type="success">
+                    {{ mtaskStateOptions[scope.row.state] }}
+                  </el-tag>
+                </template>
+              </el-table-column>
+            </scTable>
+          </el-main>
+        </el-container>
+      </el-drawer>
 </template>
 <script>
 import GanttComponent from '@/components/GanttComponent.vue';
@@ -149,6 +196,7 @@ export default {
       mtaskStateOptions: {
         10: '创建中',
         20: '已下达',
+        30: '进行中',
         40: '已完成'
       },
       ganttHeight: '500px',
@@ -168,6 +216,8 @@ export default {
       dialog: {
         save: false,
       },
+      apiObj:null,
+      paramsObj:{start_date:''},
       apiUtask: this.$API.pm.utask.list,
       apiOrderItem: this.$API.sam.orderitem.list,
       paramsOrderItem: { utask__isnull: true },
@@ -177,6 +227,7 @@ export default {
         page_size: 20,
         date: ''
       },
+      visibleRecord:false,
       isSaveing:false,
       tableHeight:null,
       activeName: 'first',
@@ -184,6 +235,7 @@ export default {
       visible:false,
       orderitemList:[],
       selectedIds:[],
+      utaskDetail:[],
       state_: {
         10: '完好',
         20: '限用',
@@ -205,6 +257,7 @@ export default {
           {number:'GZ20231022',model:'GB2',cate:'100*50*2',count:0, text: "一天任务", start_date: "2023-10-22",id:'20231018010',duration: 1,progress: 0.2},
         ]
       },
+      loading:false,
     };
   },
   created() {
@@ -301,10 +354,17 @@ export default {
     },
     //查看
     table_show(row) {
-      this.dialog.save = true;
-      this.$nextTick(() => {
-        this.$refs.saveDialog.open("show").setData(row);
-      });
+      
+      this.utaskId = row.id;
+      this.paramsObj.utask = row.id;
+      this.apiObj = this.$API.pm.mtask.list;
+      this.visibleRecord = true;
+      // this.$API.pm.mtask.list.req({utask:row.id}).then(re=>{
+      //   this.utaskDetail = res;
+      // })
+    },
+    handleDetailQuery(){
+      this.$refs.drawer_table.refresh();
     },
     //删除
     async table_del(row) {
diff --git a/src/views/pm/mtask_form.vue b/src/views/pm/mtask_form.vue
index 3964ec6b..873a5953 100644
--- a/src/views/pm/mtask_form.vue
+++ b/src/views/pm/mtask_form.vue
@@ -17,7 +17,7 @@
           <el-row>
             <el-col :md="12" :sm="24">
               <el-form-item label="任务编号" prop="number">
-                <el-input v-model="form.number" placeholder="任务编号"/>
+                <el-input v-model="form.number" placeholder="任务编号" :disabled="mode=='edit'"/>
               </el-form-item>
             </el-col>
             <el-col :md="12" :sm="24">
@@ -32,6 +32,7 @@
                   placeholder="工段"
                   clearable
                   style="width:100%"
+                  :disabled="mode=='edit'"
                 >
                   <el-option
                   v-for="item in processOptions"
@@ -49,6 +50,7 @@
                   placeholder="产物"
                   clearable
                   style="width:100%"
+                  :disabled="mode=='edit'"
                 >
                   <el-option
                   v-for="item in materialOptions"
@@ -114,8 +116,7 @@ export default {
         },
       visible: false,
       isSaveing: false,
-      keeperOptions: [],
-      depOptions: [],
+      materialOptions:[],
       selectionFilters: [],
       setFiltersVisible: false,
       belong_dept_options: [],
@@ -123,6 +124,7 @@ export default {
     };
   },
   mounted() {
+    this.getMaterial();
   },
   methods: {
     //显示
@@ -131,6 +133,11 @@ export default {
       this.visible = true;
       return this;
     },
+    getMaterial(){
+      this.$API.mtm.material.list.req({page:0}).then(res=>{
+        this.materialOptions = res;
+      })
+    },
     //提交
     submit() {
       this.$refs.dialogForm.validate(async (valid) => {