From ff2cb928c693344e7721099e3538744fecf67c6a Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 20 Dec 2023 13:25:02 +0800
Subject: [PATCH] =?UTF-8?q?#73=E6=9C=89=E7=94=98=E7=89=B9=E5=9B=BE?=
 =?UTF-8?q?=E7=9A=84=E5=9C=B0=E6=96=B9=E5=8A=A0=E6=97=B6=E9=97=B4=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pm/utask_dept10.vue | 23 +++++++++++++++++++++++
 src/views/pm/utask_dept6.vue  |  9 ++++++---
 src/views/pm/utask_dept7.vue  | 23 +++++++++++++++++++++++
 3 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/src/views/pm/utask_dept10.vue b/src/views/pm/utask_dept10.vue
index 3a558b3c..a61a218c 100644
--- a/src/views/pm/utask_dept10.vue
+++ b/src/views/pm/utask_dept10.vue
@@ -9,6 +9,18 @@
                         <el-button type="primary" @click="utaskDepuse" v-loading="isLoading"
                         v-auth="'utask.assgin'">任务分解并下达</el-button>
                     </div>
+                    <div class="'right-panel'">
+                        <el-date-picker
+                            v-model="dateValue"
+                            type="daterange"
+                            range-separator="至"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间"
+                            value-format="YYYY-MM-DD"
+                            style="vertical-align: middle;margin-right:6px"
+                        />
+                        <el-button type="primary" @click="utaskSearch" v-loading="isLoading">搜索</el-button>
+                    </div>
                 </el-header>
                 <el-main class="nopadding">
                     <scTable ref="table" :apiObj="apiUtask" row-key="id" stripe :params="paramsUtask" @row-click="rowclick"
@@ -152,6 +164,7 @@ export default {
             tasks: {
                 data: []
             },
+            dateValue:'',
             apiUtask: null,
             apiObj: null,
             visibleRecord: false,
@@ -341,6 +354,16 @@ export default {
         handleSaveSuccess(data, mode) {
             this.$refs.table.refresh();
         },
+        utaskSearch(){
+            let start_date = this.dateValue[0];
+            let end_date = this.dateValue[1];
+            let obj = {};
+            obj.start_date__gte = start_date;
+            obj.end_date__lte = end_date;
+            obj.belong_dept__name = '10车间';
+            this.paramsUtask = obj;
+            this.getGantt();
+        },
     }
 }
 </script>
diff --git a/src/views/pm/utask_dept6.vue b/src/views/pm/utask_dept6.vue
index 98ff7ece..f7fec28d 100644
--- a/src/views/pm/utask_dept6.vue
+++ b/src/views/pm/utask_dept6.vue
@@ -108,10 +108,8 @@
                     </GanttComponent>
                 </el-main>
             </el-container>
-
         </el-main>
     </el-container>
-
     <save-dialog v-if="dialog.save" ref="saveDialog" :activeDept="currentDept.id" @success="handleSaveSuccess"
         @closed="dialog.save = false"></save-dialog>
     <showDrawer ref="showDrawer" v-if="visibleDrawer" :utaskId="utaskId" @closed="visibleDrawer = false">
@@ -386,9 +384,14 @@ export default {
             this.$refs.table.refresh();
         },
         utaskSearch(){
-            console.log(this.dateValue);
             let start_date = this.dateValue[0];
             let end_date = this.dateValue[1];
+            let obj = {};
+            obj.start_date__gte = start_date;
+            obj.end_date__lte = end_date;
+            obj.belong_dept__name = '6车间';
+            this.paramsUtask = obj;
+            this.getGantt();
         },
     }
 }
diff --git a/src/views/pm/utask_dept7.vue b/src/views/pm/utask_dept7.vue
index 57f06a4c..5e3531c8 100644
--- a/src/views/pm/utask_dept7.vue
+++ b/src/views/pm/utask_dept7.vue
@@ -9,6 +9,18 @@
                         <el-button type="primary" @click="utaskDepuse" v-loading="isLoading"
                             v-auth="'utask.assgin'">任务分解并下达</el-button>
                     </div>
+                    <div class="'right-panel'">
+                        <el-date-picker
+                            v-model="dateValue"
+                            type="daterange"
+                            range-separator="至"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间"
+                            value-format="YYYY-MM-DD"
+                            style="vertical-align: middle;margin-right:6px"
+                        />
+                        <el-button type="primary" @click="utaskSearch" v-loading="isLoading">搜索</el-button>
+                    </div>
                 </el-header>
                 <el-main class="nopadding">
                     <scTable ref="table" :apiObj="apiUtask" row-key="id" stripe :params="paramsUtask" @row-click="rowclick"
@@ -151,6 +163,7 @@ export default {
             tasks: {
                 data: []
             },
+            dateValue:'',
             apiUtask: null,
             apiObj: null,
             visibleRecord: false,
@@ -331,6 +344,16 @@ export default {
         handleSaveSuccess(data, mode) {
             this.$refs.table.refresh();
         },
+        utaskSearch(){
+            let start_date = this.dateValue[0];
+            let end_date = this.dateValue[1];
+            let obj = {};
+            obj.start_date__gte = start_date;
+            obj.end_date__lte = end_date;
+            obj.belong_dept__name = '7车间';
+            this.paramsUtask = obj;
+            this.getGantt();
+        },
     }
 }
 </script>