From 59d8c6f3dfc509bfc1c7f79b705006309b8f6b53 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 24 Oct 2023 14:58:57 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/em/equipmentc.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/em/equipmentc.vue b/src/views/em/equipmentc.vue
index 9fff45dd..a6aabd31 100644
--- a/src/views/em/equipmentc.vue
+++ b/src/views/em/equipmentc.vue
@@ -160,7 +160,7 @@
         @closed="visibleRecord=false"
       >
         <el-container v-loading="loading">
-          <el-button type="primary" icon="el-icon-plus" @click="record_create" v-auth="'equipment.create'" style="position: absolute;z-index: 10;left: 110px;top: 16px;"></el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="record_create" v-auth="'equipment'" style="position: absolute;z-index: 10;left: 110px;top: 16px;"></el-button>
           <el-main style="padding: 0 20px 20px 20px">
             <scTable
               ref="drawer_table"

From d15cc32e7d84224673d2be4d934b06e2cda82ac3 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 25 Oct 2023 10:27:10 +0800
Subject: [PATCH 2/6] =?UTF-8?q?6=E8=BD=A6=E9=97=B4=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/wpm.js           |   8 ++
 src/views/pm/mtask2.vue        | 160 ++++++++++++++++++++++++---------
 src/views/pm/mtask_form.vue    |  42 +++------
 src/views/wpm/flog_form.vue    | 118 +++++++++++++-----------
 src/views/wpm/worktask.vue     |   3 +-
 src/views/wpm/worktask2.vue    |  38 +++++++-
 src/views/wpm/worktaskFlog.vue |  24 ++---
 7 files changed, 258 insertions(+), 135 deletions(-)

diff --git a/src/api/model/wpm.js b/src/api/model/wpm.js
index f570412e..02158cdb 100644
--- a/src/api/model/wpm.js
+++ b/src/api/model/wpm.js
@@ -187,6 +187,14 @@ export default {
 					`${config.API_URL}/wpm/mlog/${id}/`);
 			}
 		},
+		relatedFirst:{
+			name: "获取相关任务的第一道工序日志",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/wpm/mlog/related_first/`,
+					data);
+			}
+		}
 	},
 	//车间库存
 	wmaterial: {
diff --git a/src/views/pm/mtask2.vue b/src/views/pm/mtask2.vue
index df9d332b..ed3e41ca 100644
--- a/src/views/pm/mtask2.vue
+++ b/src/views/pm/mtask2.vue
@@ -1,11 +1,11 @@
 <template>
   <el-container style="flex-direction: column">
     <el-main id="topContainer" class="nopadding" style="position: relative;margin-bottom: 10px;">
-      <div class="right-panel" style=" display: inline-block;position: absolute;right: 20px;margin-top: 4px;z-index: 100">
+      <div class="right-panel btnsContainer" style=" ">
         <el-button type="primary" icon="el-icon-plus" @click="add">新增</el-button>
-        <el-button type="primary" @click="mtaskAssgin">任务下达</el-button>
+        <el-button type="primary" @click="utaskAssgin">任务下达</el-button>
       </div>
-      <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+      <el-tabs v-model="activeName" class="demo-tabs">
         <el-tab-pane label="粗加工6车间" name="first">
           <scTable ref="table1" :apiObj="apiUtask" row-key="id" stripe :params="paramsMtask" :height="tableHeight" @selection-change="handleSelectionChange" hidePagination>
             <el-table-column type="selection" width="55" />
@@ -13,17 +13,23 @@
             <el-table-column label="任务编号" prop="number">
             </el-table-column>
             <el-table-column label="任务状态" prop="state">
-              <template #default="scope"><span>{{ mtaskStateOptions[scope.row.state] }}</span>
-              </template>
+                <template #default="scope">
+                  <el-tag v-if="scope.row.state===10" type="success">
+                    {{ 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">
+                    {{ mtaskStateOptions[scope.row.state] }}
+                  </el-tag>
+                </template>
+              <!-- <template #default="scope"><span>{{ mtaskStateOptions[scope.row.state] }}</span>
+              </template> -->
             </el-table-column>
-            <!-- <el-table-column label="工段" prop="mgroup_name">
-              <template #default="scope"><span>{{ mtaskStateOptions[scope.row.state] }}</span>
-              </template>
-            </el-table-column> -->
-            <!-- <el-table-column label="产品名称" prop="material" show-overflow-tooltip>
-            </el-table-column>
-            <el-table-column label="型号" prop="number">
-            </el-table-column> -->
             <el-table-column label="任务量" prop="count">
             </el-table-column>
             <el-table-column label="实际生产数" prop="count_real">
@@ -34,8 +40,6 @@
             </el-table-column>
             <el-table-column label="完工时间" prop="end_date">
             </el-table-column>
-            <!-- <el-table-column label="完成量" prop="count">
-            </el-table-column> -->
             <el-table-column label="操作" fixed="right" align="left" width="120">
               <template #default="scope">
                 <el-link type="primary" @click="table_edit(scope.row)">
@@ -52,14 +56,12 @@
       </el-tabs>
     </el-main>
     <el-main class="nopadding" style="position: relative;height: 50%;">
-      <div class="right-panel" v-if="activeNameSub == 'order'"
-        style="display: inline-block;position: absolute;right: 20px;margin-top: 4px;">
+      <div class="right-panel btnsContainer" v-if="activeNameSub == 'order'">
         <el-button type="primary" @click="startPlan">排产</el-button>
-        <!-- <el-button type="primary" icon="el-icon-plus">合并任务</el-button> -->
       </div>
       <el-tabs v-model="activeNameSub" class="demo-tabs" @tab-click="handleClick">
         <el-tab-pane label="订单排产" name="order">
-          <scTable ref="table2" :apiObj="apiOrderItem" row-key="id" stripe :height="tableHeight" :params="paramsOrderItem" hidePagination>
+          <scTable ref="table2" :apiObj="apiOrderItem" row-key="id" stripe :height="tableHeight" :params="paramsOrderItem" @selection-change="selectionOrderItemChange" hidePagination>
             <el-table-column type="selection" width="55" />
             <el-table-column label="订单编号" prop="number">
               <template #default="scope">
@@ -93,13 +95,50 @@
   </el-container>
   <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess"
     @closed="dialog.save = false"></save-dialog>
-  <el-dialog title="排产">
-
-  </el-dialog>
+  <el-dialog
+    title="排产"
+    destroy-on-close
+    v-model="visible"
+    @closed="closeAssginVisible"
+	>
+    <el-form ref="dialogForm" :model="form" :rules="rules" label-width="120px">
+      <el-row>
+        <el-col :md="12" :sm="24">
+          <el-form-item label="计划开工日期" prop="start_date">
+            <el-date-picker
+              v-model="form.start_date"
+              type="date"
+              placeholder="计划开工日期"
+              value-format="YYYY-MM-DD"
+              style="width:90%"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :md="12" :sm="24">
+          <el-form-item label="计划完工日期" prop="end_date">
+            <el-date-picker
+              v-model="form.end_date"
+              type="date"
+              placeholder="计划完工日期"
+              value-format="YYYY-MM-DD"
+              style="width:90%"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-footer>
+        <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
+        <el-button @click="visible = false">取消</el-button>
+      </el-footer>
+	</el-dialog>
 </template>
 <script>
 import GanttComponent from '@/components/GanttComponent.vue';
 import saveDialog from "./mtask_form.vue";
+import { useTransitionFallthroughEmits } from 'element-plus';
 export default {
   name: "rparty",
   components: {
@@ -117,7 +156,15 @@ export default {
       projectId: '',
       orderitems: [],
       
-
+      form:{
+        orderitems:[],
+        start_date:'',
+        end_date:'',
+      },
+      rules: {
+        start_date: [{required: true, message: "请选择计划开工日期", trigger: "blur"}],
+        end_date: [{required: true, message: "请选择计划完工日期", trigger: "blur"}],
+      },
       dialog: {
         save: false,
       },
@@ -130,10 +177,12 @@ export default {
         page_size: 20,
         date: ''
       },
+      isSaveing:false,
       tableHeight:null,
       activeName: 'first',
       activeNameSub: 'order',
-      selectedId:[],
+      visible:false,
+      orderitemList:[],
       selectedIds:[],
       state_: {
         10: '完好',
@@ -174,31 +223,31 @@ export default {
         this.selectedIds.push(item.id)
       });
     },
-    mtaskAssgin(){
-      if(this.selectedIds.length>0){
-
+    utaskAssgin(){
+      let that = this;
+      if(that.selectedIds.length>0){
+        that.$API.pm.utask.assgin.req({ids:that.selectedIds}).then(res=>{
+          that.$message.success('下达任务成功');
+          that.ref.table1.refresh();
+        })
       }else{
         this.$message.error('未选择任何任务')
       }
     },
-    selectionChange(selection){
-      this.selectedId = [];
+    selectionOrderItemChange(selection){
+      this.orderitemList = [];
       selection.forEach(item => {
-        this.selectedId.push(item.id)
+        this.orderitemList.push(item.id)
       });
     },
-    // mtaskAssgin() {
-    //   let rows = this.$refs.table1.getSelectionRows()
-    //   if (rows.length == 0) {
-    //     this.$message.error('未选择任何任务')
-    //     return
-    //   }
-    // },
+    //排产
     startPlan() {
-      let rows = this.$refs.table2.getSelectionRows()
-      if (rows.length == 0) {
+      debugger;
+      let that = this;
+      if(this.orderitemList.length>0){
+       that.visible = true;
+      }else{
         this.$message.error('未选择任何订单明细项目')
-        return
       }
     },
     //获取甘特图数据
@@ -262,8 +311,9 @@ export default {
       this.$confirm(`确定删除吗？`, "提示", {
         type: "warning",
       }).then(() => {
-        this.$API.pm.mtask.delete.req(row.id).then((res) => {
+        this.$API.pm.utask.delete.req(row.id).then((res) => {
           this.$message.success("删除成功");
+          that.$refs.table1.refresh();
           return res;
         }).catch((err) => {
           return err;
@@ -285,6 +335,25 @@ export default {
     resetQuery() {
       this.query = {};
     },
+    closeAssginVisible(){},
+    submit(){
+      let that = this;
+      that.$refs.dialogForm.validate(async (valid) => {
+        if (valid) {
+          that.isSaveing = true;
+          that.form.orderitems = that.orderitemList;
+          console.log(that.form)
+          that.$API.pm.utask.schedueutasks.req(that.form).then(res=>{
+            that.visible = false;
+            that.$message.success("操作成功");
+            that.$refs.table1.refresh();
+            that.$refs.table2.refresh();
+          }).catch(err=>{
+            that.visible = false;
+          })  
+        }
+      });
+    },
   },
 };
 </script>
@@ -292,7 +361,13 @@ export default {
 .el-main.nopadding {
   padding: 0 20px 0 20px
 }
-
+.btnsContainer{
+  display: inline-block;
+  position: absolute;
+  right: 20px;
+  margin-top: 4px;
+  z-index: 100
+}
 
 .gantt-container {
   height: 30%;
@@ -303,4 +378,5 @@ export default {
   padding: 10px;
   border-radius: 4px;
 }
+
 </style>
\ No newline at end of file
diff --git a/src/views/pm/mtask_form.vue b/src/views/pm/mtask_form.vue
index bbe52020..3964ec6b 100644
--- a/src/views/pm/mtask_form.vue
+++ b/src/views/pm/mtask_form.vue
@@ -42,23 +42,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :md="12" :sm="24">
-              <el-form-item label="领用物" prop="material_before">
-                <el-select
-                  v-model="form.material_before"
-                  placeholder="领用物"
-                  clearable
-                  style="width:100%"
-                >
-                  <el-option
-                  v-for="item in materialOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
             <el-col :md="12" :sm="24">
               <el-form-item label="产物" prop="material">
                 <el-select
@@ -77,11 +60,11 @@
               </el-form-item>
             </el-col>
             <el-col :md="12" :sm="24">
-              <el-form-item label="计划开工日期">
+              <el-form-item label="开工日期" prop="start_date">
                 <el-date-picker
                   v-model="form.start_date"
                   type="date"
-                  placeholder="计划开工日期"
+                  placeholder="开工日期"
                   value-format="YYYY-MM-DD"
                   style="width:100%"
                 >
@@ -89,11 +72,11 @@
               </el-form-item>
             </el-col>
             <el-col :md="12" :sm="24">
-              <el-form-item label="计划完工日期">
+              <el-form-item label="完工日期" prop="end_date">
                 <el-date-picker
                   v-model="form.end_date"
                   type="date"
-                  placeholder="计划完工日期"
+                  placeholder="完工日期"
                   value-format="YYYY-MM-DD"
                   style="width:100%"
                 >
@@ -118,15 +101,16 @@ export default {
       loading: false,
       mode: "add",
       titleMap: {
-        add: "新增仓库",
-        edit: "编辑仓库",
-        show: "查看仓库",
+        add: "新增任务",
+        edit: "编辑任务",
+        show: "查看任务",
       },
       form: {},
       rules: {
-          name: [{required: true, message: "请输入仓库名称", trigger: "blur"}],
-          number: [{required: true, message: "请输入仓库编号", trigger: "blur"}],
-          place: [{required: true, message: "请输入仓库地点", trigger: "blur"}]
+        start_date: [{required: true, message: "请选择开始时间", trigger: "blur"}],
+        end_date: [{required: true, message: "请选择结束时间", trigger: "blur"}],
+          number: [{required: true, message: "请输入任务编号", trigger: "blur"}],
+          material: [{required: true, message: "请选选择产品", trigger: "blur"}]
         },
       visible: false,
       isSaveing: false,
@@ -155,9 +139,9 @@ export default {
           try {
             var res;
             if (this.mode == "add") {
-              res = await this.$API.pm.mtask.create.req(this.form);
+              res = await this.$API.pm.utask.create.req(this.form);
             } else if (this.mode == "edit") {
-              res = await this.$API.pm.mtask.update.req(this.form.id,this.form);
+              res = await this.$API.pm.utask.update.req(this.form.id,this.form);
             }
             this.isSaveing = false;
             this.$emit("success", this.form, this.mode);
diff --git a/src/views/wpm/flog_form.vue b/src/views/wpm/flog_form.vue
index c5e9be3f..900206f3 100644
--- a/src/views/wpm/flog_form.vue
+++ b/src/views/wpm/flog_form.vue
@@ -7,10 +7,10 @@
         destroy-on-close
         @closed="$emit('closed')"
     >
-        <el-form ref="ruleForm" :model="form" :rules="rules" label-width="80px">
+        <el-form ref="saveDialog" :model="form" :rules="rules" label-width="80px">
             <el-form-item label="产品编号" prop="material">
                 <el-select
-                    v-model="material"
+                    v-model="form.batch"
                     placeholder="产品编号"
                     clearable
                     style="width:100%"
@@ -26,8 +26,8 @@
             <sc-form-table ref="table" v-model="formList" :addTemplate="addTemplate" drag-sort placeholder="暂无数据">
                 <el-table-column prop="type" label="工序" min-width="100">
                     <template #default="scope">
-                        <span v-if="!scope.row.change">{{ scope.row.processName }}</span>
-                        <el-select v-else v-model="scope.row.process" placeholder="请选择">
+                        <span v-if="!scope.row.change">{{ scope.row.batchName }}</span>
+                        <el-select v-else v-model="scope.row.batch" placeholder="请选择">
                             <el-option v-for="item in options" :key="item" :label="item" :value="item"></el-option>
                         </el-select>
                     </template>
@@ -45,7 +45,7 @@
                 <el-table-column label="不合格数量" align="center">
                     <el-table-column prop="val" label="原因1" width="100">
                         <template #default="scope">
-                            <el-input v-model="scope.row.count_no1" placeholder="不合格数量1"></el-input>
+                            <el-input v-model="scope.row.count_notok" placeholder="不合格数量1"></el-input>
                         </template>
                     </el-table-column>
                     <el-table-column prop="val" label="原因2" width="100">
@@ -61,13 +61,14 @@
                 </el-table-column>
                 <el-table-column prop="type" label="操作人" min-width="120" align="center">
                     <template #default="scope">
-                        <span style="display:flex">
-                            <el-input readonly v-model="scope.row.handle_user"></el-input>
-                            <ehsUserSelect :listIndex="index" :multiple="false" @submit="getReceptionist"/>
-                        </span>
-                        <!-- <el-select v-model="scope.row.handle_user" placeholder="请选择">
-                            <el-option v-for="item in typeDic" :key="item.value" :label="item.label" :value="item.value"></el-option>
-                        </el-select> -->
+                        <el-select v-model="scope.row.handle_user" filterable style="width: 100%" :disabled="bindType == 20">
+                            <el-option
+                                v-for="item in userList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            />
+                        </el-select>
                     </template>
                 </el-table-column>
                 <!-- <el-table-column prop="type" label="操作" min-width="90" align="center">
@@ -80,17 +81,15 @@
         <el-footer>
             <el-button type="primary" @click="submitForm">保存</el-button>
             <el-button @click="resetForm">取消</el-button>
-            
         </el-footer>
     </el-dialog>
 </template>
 <script>
-import { index } from 'd3';
-
     export default {
         emits: ["success", "closed"],
         props:{
             mtask: { type: String, default: '' },
+            date: { type: String, default: '' },
         },
         data() {
             return {
@@ -101,49 +100,69 @@ import { index } from 'd3';
                     edit: "编辑记录",
                     show: "查看记录",
                 },
-                form:{},
+                form:{batch:''},
                 addTemplate: {
-					process: '',
-                    processName: '',
+					batch: '',
+                    batchName: '',
                     count_use:1,
                     count_ok: 1,
-                    count_no1: 1,
-                    count_no2: 1,
-                    count_no3: 1,
+                    count_notok: 1,
+                    count_notok1: 1,
+                    count_notok2: 1,
+                    count_notok3: 1,
                     handle_user:'',
-                    user_name:'',
+                    handle_date:'',
+                    mtask:'',
                     change:true
 				},
+                handleDate:'',
+                userList:[],
                 formList: [],
-                material:'',
                 visible: false,
                 isSaveing: false,
                 setFiltersVisible: false,
                 options: [],
                 materialOptions:[],
+                rules: {
+                    batch: [{required: true, message: "请选选择批次", trigger: "blur"}]
+                },
             };
         },
         mounted() {
+            console.log('date',this.date)
             this.getBatchs();
             this.getFormList();
+            this.getUserList();
         },
         methods: {
+             //显示
+             open(mode = "add") {
+                this.mode = mode;
+                this.visible = true;
+                return this;
+            },
+            getUserList(){
+                let that = this;
+                this.$API.system.user.list.req({belong_dept:'3423857962907983872',page:0}).then(res=>{
+                    debugger;
+					that.userList = res;
+                    console.log(res)
+				});
+            },
             getFormList(){
                 this.$API.pm.mtask.related.req(this.mtask).then(res=>{
-                    // debugger;
-                    console.log('工序进度')
-                    console.log(res)
                     res.forEach(item=>{
                     let obj = {
-                        process: item.mgroup,
-                        processName: item.mgroup_name,
+                        mtask:item.id,
+                        batch: item.mgroup,
+                        batchName: item.mgroup_name,
                         count_use:1,
                         count_ok: 1,
-                        count_no1: 0,
-                        count_no2: 0,
-                        count_no3: 0,
+                        count_notok: 1,
+                        count_notok1: 1,
+                        count_notok2: 1,
+                        count_notok3: 1,
                         handle_user:'',
-                        user_name:'',
                         change:false
                     }
                     this.formList.push(obj)
@@ -160,15 +179,16 @@ import { index } from 'd3';
 			},
             pushRow(){
 				let obj = {
-					process: '',
-                    processName:"",
+					batch: '',
+                    batchName:"",
                     count_use:1,
                     count_ok: 1,
-                    count_no1: 1,
-                    count_no2: 1,
-                    count_no3: 1,
+                    count_notok: 1,
+                    count_notok1: 1,
+                    count_notok2: 1,
+                    count_notok3: 1,
                     handle_user:'',
-                    user_name:'',
+                    mtask:'',
                     change:true
 				}
 				this.formList.push(obj);
@@ -176,12 +196,7 @@ import { index } from 'd3';
 			deleteRow(){
 				this.$refs.table.deleteRow(0)
 			},
-            //显示
-            open(mode = "add") {
-                this.mode = mode;
-                this.visible = true;
-                return this;
-            },
+           
             getList(){
                 this.$API.mtm.material.list.req({page:0}).then(res=>{
                     this.options = res;
@@ -193,21 +208,24 @@ import { index } from 'd3';
                 console.log(data.listIndex);
                 debugger;
             },
-            //提交
-            submit() {
-                this.$refs.dialogForm.validate(async (valid) => {
+            //保存
+            submitForm() {
+                this.$refs.saveDialog.validate(async (valid) => {
                     if (valid) {
                         this.isSaveing = true;
                         try {
                             var res;
+                            for(let i=0;i<this.formList.length;i++){
+                                this.formList[i].batch = this.form.batch;
+                                this.formList[i].handle_date = this.date;
+                            }
                             this.form.pu_plan = this.puPlan;
                             if (this.mode == "add") {
-                                res = await this.$API.pum.planitem.create.req(this.form);
+                                res = await this.$API.wpm.mlog.create.req(this.formList);
                             } else if (this.mode == "edit") {
-                                res = await this.$API.pum.planitem.update.req(this.form.id,this.form);
+                                res = await this.$API.wpm.mlog.update.req(this.formList.id,this.formList);
                             }
                             this.isSaveing = false;
-                            this.$emit("success", this.form, this.mode);
                             this.visible = false;
                             this.$message.success("操作成功");
                         } catch (err) {
diff --git a/src/views/wpm/worktask.vue b/src/views/wpm/worktask.vue
index f90cd971..4f7e9ee7 100644
--- a/src/views/wpm/worktask.vue
+++ b/src/views/wpm/worktask.vue
@@ -242,7 +242,8 @@ export default {
         save: false,
       },
       sumLog:false,
-      apiObj: this.$API.pm.mtask.list,
+      // apiObj: this.$API.pm.mtask.list,
+      apiObj: null,
       query: {
         page:1,
         page_size:20,
diff --git a/src/views/wpm/worktask2.vue b/src/views/wpm/worktask2.vue
index 5c24fbf0..53277289 100644
--- a/src/views/wpm/worktask2.vue
+++ b/src/views/wpm/worktask2.vue
@@ -1,6 +1,18 @@
 <template>
     <el-container style="flex-direction: column">
       <el-main id="topContainer" class="nopadding" style="position: relative;margin-bottom: 10px;">
+        <div class="right-panel tabsHeader">
+          <el-date-picker
+              v-model="query.date"
+              type="date"
+              value-format="YYYY-MM-DD"
+            />
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              @click="handleQuery"
+            >查询</el-button>
+          </div>
         <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
           <el-tab-pane label="粗加工6车间" name="first">
               <scTable
@@ -52,11 +64,12 @@
         <div>
           <el-row :gutter="20">
             <el-col :span="13" style="border-right: 1px solid #eeeeee;">
-              <div>工序进度</div>
+              <div class="tableTitle">工序进度</div>
               <scTable
                 ref="table"
                 row-key="id"
                 stripe
+                :hideDo="hideDo"
                 :data="processList"
                 :height="bottomHeight"
               >
@@ -80,11 +93,12 @@
               </scTable>
             </el-col>
             <el-col :span="11">
-              <div>车间物料</div>
+              <div class="tableTitle">车间物料</div>
               <scTable
                 ref="table"
                 row-key="id"
                 stripe
+                :hideDo="hideDo"
                 :data="wMaterial"
                 :height="bottomHeight"
               >
@@ -142,6 +156,7 @@ export default {
           30: '在修',
           40: '禁用',
         },
+        hideDo:true,
         topHeight:null,
         bottomHeight:null,
     };
@@ -150,8 +165,11 @@ export default {
     let heights = document.getElementById('topContainer').clientHeight;
     console.log('heights',heights)
     this.topHeight = (heights-50)+'px';
-    this.bottomHeight = (heights-40)+'px';
+    this.bottomHeight = (heights-50)+'px';
     this.getWorkSpaceMaterial();
+    let NowDate = new Date();
+    let month = NowDate.getMonth()>8?NowDate.getMonth()+1:'0'+(NowDate.getMonth()+1)
+    this.query.date  = NowDate.getFullYear()+'-'+(NowDate.getMonth()+1)+'-'+NowDate.getDate();
   },
   methods: {
     //车间物料
@@ -236,7 +254,21 @@ export default {
 };
 </script>
 <style scoped>
+    .tabsHeader{
+      display: inline-block;
+      position: absolute;
+      right: 20px;
+      margin-top: 4px;
+      z-index:100
+    }
     .el-main.nopadding{
       padding:0 20px 0 20px
     }
+    .tableTitle{
+      height: 40px;
+    line-height: 40px;
+    font-size: 14px;
+    box-sizing: border-box;
+    border-bottom: 1px solid #eeeeee;
+    }
 </style>
\ No newline at end of file
diff --git a/src/views/wpm/worktaskFlog.vue b/src/views/wpm/worktaskFlog.vue
index 963342a9..ae4d8861 100644
--- a/src/views/wpm/worktaskFlog.vue
+++ b/src/views/wpm/worktaskFlog.vue
@@ -34,10 +34,11 @@
         :apiObj="apiObj"
         row-key="id"
         stripe
+        :hidePagination="true"
         :params="query"
       >
         <el-table-column type="index" width="50"/>
-        <el-table-column label="产品编号" prop="material">
+        <el-table-column label="产品编号" prop="batch">
         </el-table-column>
         <el-table-column label="产品名称" prop="number">
         </el-table-column>
@@ -45,15 +46,15 @@
         </el-table-column>
         <el-table-column label="规格" prop="number">
         </el-table-column>
-        <el-table-column label="领料数量" prop="count">
+        <el-table-column label="领料数量" prop="count_use">
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="left" width="120">
+        <el-table-column label="操作" fixed="right" align="center" width="100">
           <template #default="scope">
             <el-link
               type="primary"
               @click="table_edit(scope.row)"
-              v-if="scope.row.status==10"
-              v-auth="'equipment.update'"
+              v-if="orderObj.state==10||orderObj.state==20"
+              v-auth="'equipment'"
             >编辑
             </el-link>
             <!-- 提交后变查看 -->
@@ -61,11 +62,12 @@
               v-else
               type="primary"
               @click="table_edit(scope.row)"
-              v-auth="'equipment.update'"
+              v-auth="'equipment'"
             >查看
             </el-link>
+            <el-divider direction="vertical"></el-divider>
             <el-link
-              type="primary"
+              type="danger"
               @click="table_edit(scope.row)"
             >删除
             </el-link>
@@ -78,6 +80,7 @@
     v-if="dialog.save"
     ref="saveDialog"
     :mtask="orderObj.id"
+    :date="orderObj.start_date"
     @success="handleSaveSuccess"
     @closed="dialog.save = false"
   ></save-dialog>
@@ -96,17 +99,18 @@
         },
         task:'',
         orderObj:{},
-        // apiObj: this.$API.wpm.mlog.list,
         apiObj: null,
         query: {
-          page:1,
-          page_size:20
+          page:0,
+          mtask:''
         },
         materialId:'',
       };
     },
     mounted(){
       this.mtask = this.$route.query.mtask;
+      this.query.mtask = this.$route.query.mtask;
+      this.apiObj = this.$API.wpm.mlog.relatedFirst;
       this.getTask();//获取任务详情
     },
     methods: {

From fbc7806a735d9531ffd6b2ace8161f52379af3ca Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 25 Oct 2023 12:35:32 +0800
Subject: [PATCH 3/6] =?UTF-8?q?6=E8=BD=A6=E9=97=B4=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm/flog_form.vue | 62 ++++++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 21 deletions(-)

diff --git a/src/views/wpm/flog_form.vue b/src/views/wpm/flog_form.vue
index 900206f3..baceec51 100644
--- a/src/views/wpm/flog_form.vue
+++ b/src/views/wpm/flog_form.vue
@@ -26,7 +26,7 @@
             <sc-form-table ref="table" v-model="formList" :addTemplate="addTemplate" drag-sort placeholder="暂无数据">
                 <el-table-column prop="type" label="工序" min-width="100">
                     <template #default="scope">
-                        <span v-if="!scope.row.change">{{ scope.row.batchName }}</span>
+                        <span v-if="!scope.row.change">{{ scope.row.mgroup_name }}</span>
                         <el-select v-else v-model="scope.row.batch" placeholder="请选择">
                             <el-option v-for="item in options" :key="item" :label="item" :value="item"></el-option>
                         </el-select>
@@ -100,10 +100,11 @@
                     edit: "编辑记录",
                     show: "查看记录",
                 },
+                obj:{},
                 form:{batch:''},
                 addTemplate: {
 					batch: '',
-                    batchName: '',
+                    mgroup_name: '',
                     count_use:1,
                     count_ok: 1,
                     count_notok: 1,
@@ -116,8 +117,10 @@
                     change:true
 				},
                 handleDate:'',
+                related:[],
                 userList:[],
                 formList: [],
+                recordId:'',
                 visible: false,
                 isSaveing: false,
                 setFiltersVisible: false,
@@ -144,28 +147,27 @@
             getUserList(){
                 let that = this;
                 this.$API.system.user.list.req({belong_dept:'3423857962907983872',page:0}).then(res=>{
-                    debugger;
 					that.userList = res;
-                    console.log(res)
 				});
             },
             getFormList(){
                 this.$API.pm.mtask.related.req(this.mtask).then(res=>{
+                    this.related = res;
                     res.forEach(item=>{
-                    let obj = {
-                        mtask:item.id,
-                        batch: item.mgroup,
-                        batchName: item.mgroup_name,
-                        count_use:1,
-                        count_ok: 1,
-                        count_notok: 1,
-                        count_notok1: 1,
-                        count_notok2: 1,
-                        count_notok3: 1,
-                        handle_user:'',
-                        change:false
-                    }
-                    this.formList.push(obj)
+                        let obj = {
+                            mtask:item.id,
+                            batch: '',
+                            mgroup_name: item.mgroup_name,
+                            count_use:1,
+                            count_ok: 1,
+                            count_notok: 1,
+                            count_notok1: 1,
+                            count_notok2: 1,
+                            count_notok3: 1,
+                            handle_user:'',
+                            change:false
+                        }
+                        this.formList.push(obj)
                     })
                 })
             },
@@ -180,7 +182,7 @@
             pushRow(){
 				let obj = {
 					batch: '',
-                    batchName:"",
+                    mgroup_name:"",
                     count_use:1,
                     count_ok: 1,
                     count_notok: 1,
@@ -223,7 +225,7 @@
                             if (this.mode == "add") {
                                 res = await this.$API.wpm.mlog.create.req(this.formList);
                             } else if (this.mode == "edit") {
-                                res = await this.$API.wpm.mlog.update.req(this.formList.id,this.formList);
+                                res = await this.$API.wpm.mlog.update.req(this.recordId,this.formList);
                             }
                             this.isSaveing = false;
                             this.visible = false;
@@ -238,7 +240,25 @@
             },
             //表单注入数据
             setData(data) {
-                Object.assign(this.form, data);
+                console.log('data:',data)
+                this.form.batch = data.batch;
+                this.recordId = data.id;
+                let obj =  {};
+                obj.batch = data.batch;
+                obj.handle_date = data.handle_date;
+                obj.mtask__mgroup__belong_dept__name = '6车间';
+                this.$API.wpm.mlog.list.req(obj).then(res=>{
+                    let data = res.results;
+                    for(let i=0;i<this.formList.length;i++){
+                        data.forEach(item=>{
+                            if(item.mgroup_name==this.formList[i].mgroup_name){
+                                Object.assign(this.formList[i],item)
+                            }
+                        })
+                    }
+                    console.log('formList:',this.formList)
+                    console.log('data:',data)
+                })
             },
             //设置过滤项
             setFilters(filters) {

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 4/6] =?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) => {

From 33343150bff368af2b35683ab28fa22c75809e09 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 25 Oct 2023 13:17:04 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html          | 2 +-
 src/views/wpm/worktask.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/index.html b/public/index.html
index 140f0fea..0dc70dfc 100644
--- a/public/index.html
+++ b/public/index.html
@@ -7,7 +7,7 @@
 		<link rel="icon" href="<%= BASE_URL %>favicon.ico">
 		<title><%= VUE_APP_TITLE %></title>
 		<!-- <script src="./jsmap/jsmap.js"> </script> -->
-		<link type="text/css" href="./jsmap/jsmap.css" rel="stylesheet"/>
+		<!-- <link type="text/css" href="./jsmap/jsmap.css" rel="stylesheet"/> -->
 		<script type="text/javascript">
 			document.write("<script src='config.js?"+new Date().getTime()+"'><\/script>");
 		</script>
diff --git a/src/views/wpm/worktask.vue b/src/views/wpm/worktask.vue
index 4f7e9ee7..ed9a074d 100644
--- a/src/views/wpm/worktask.vue
+++ b/src/views/wpm/worktask.vue
@@ -5,8 +5,8 @@
         <el-col :span="10" style="border-right: 1px solid #eeeeee;position: relative;">
           <div class="right-panel" style="    display: inline-block;position: absolute;right: 20px;margin-top: 4px;z-index:100">
             <el-button type="primary" icon="el-icon-plus" @click="add">新增</el-button>
-            <el-button type="primary" icon="el-icon-plus" @click="add">任务下达</el-button>
-            <el-button type="primary" icon="el-icon-search" @click="handleQuery" >导出</el-button>
+            <el-button type="primary" @click="add">任务下达</el-button>
+            <el-button type="primary" @click="handleQuery" >导出</el-button>
           </div>
           <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
             <el-tab-pane label="10车间" name="first">

From 8837579a5d597272156b6d66358ffe5583806678 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 25 Oct 2023 14:02:08 +0800
Subject: [PATCH 6/6] =?UTF-8?q?mtask=E6=97=A5=E5=BF=97=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/favicon.ico             | Bin 11862 -> 1670 bytes
 public/favicon1.ico            | Bin 0 -> 11862 bytes
 public/img/gz_logo.png         | Bin 1670 -> 10640 bytes
 src/api/model/pm.js            |   4 ++--
 src/config/route.js            |   6 +++---
 src/style/app.scss             |   2 +-
 src/views/wpm/worktaskFlog.vue |   5 +++++
 7 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 public/favicon1.ico

diff --git a/public/favicon.ico b/public/favicon.ico
index 68e3d2ee91d7c2c0f64abe7bca56db3afd5965fe..e665c8672e331991479f59fc64496393d80874d4 100644
GIT binary patch
literal 1670
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
Qt^fc407*qoM6N<$g68%*g8%>k

literal 11862
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
RBzf%MB1@?w&0xM;{vY!?C3gS-

diff --git a/public/favicon1.ico b/public/favicon1.ico
new file mode 100644
index 0000000000000000000000000000000000000000..68e3d2ee91d7c2c0f64abe7bca56db3afd5965fe
GIT binary patch
literal 11862
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
RBzf%MB1@?w&0xM;{vY!?C3gS-

literal 0
HcmV?d00001

diff --git a/public/img/gz_logo.png b/public/img/gz_logo.png
index e665c8672e331991479f59fc64496393d80874d4..cb0296f674bdc0000d2e7fd8f3bcfe92d9b163f1 100644
GIT binary patch
literal 10640
zcmdUUcTf~v_ofa*&UpZl90Y_x2?7d|BqN}}0LnBX83}?Y*%rw;!;n-IB@ZA;(hx-$
zkRUK1Q8EmmL}7s0dB3f%YU``tZtd=0yInJVpFVxgbDn#;@2y+6qfLx;=xMlVE?l@k
zucxbJcHsgUK>9zTA|qMgudVY)%?A_1``V;-`~u_u<G<9o79vTgg0GqJy$iS7PKr6P
zdudABq93x3-i*Dfmab2DIK2F|%ZGnq#`MMGXo+AJgK;gn4G)H93WN?W(mBuK^!<s+
zg$v@3^|aLQznH?$#ClBKX1YDR;1Ky<_6nmWf0AI#Ju<;T%{^j)MJ=;y>TURoiMr;a
z)6TK7=Q{isOen54Gh><?3jf;USTUdfn*VV$w1ZzgFT!!jK;bSw%}*CiVTMz?X9u&I
z!Y{Abw6>|DNQOx|Ha>qgitBZpG2eUGC|IY0yHyWVF0S=+Cw3&68zLk9-Hilt=y#CF
z_3NEU-7D6A(mez*jTv|y-g}kQUiloWor@k<=vJ*pEV(=DE=+&78AZ}~m2d}t7+b2l
zyzgKd$rUmBxhG~HWpi<)$vz~nh>teOBDU37z6k#N+`%;SXTVUVwh@gc_qXz2mnI;W
z*!^Sn<j8LbzLlW~lfOC`Y1O=YnPRq0ikr%7$oyflQRH0tSAkoHh1G7mrBgW1_M=Sd
zhcun4!zS&4u=7rW<&|5sw~^z}Ir0}`Atoj;spxFv9eD~%2!6j|4qmQlhqHpWVVjs<
zww6)jP#ws`>*3_*S{JfMGeyoB!99(W>eY`J@0Q|@%f`_Oiy^bpp;x^SggbU)F?kG;
zX8~r2m3vt=EGK>Hi`hhPzk4^#mKL<<-{@>J`uzG%K1jVTsaR+-pB1&YV8<2_w>>%6
zI~LQCo8qO4wF+y|iu`edZ$%n#>*JDNvAk%(wi0!qZ~Ahw1#>agKwF@QZRI8PUMV~?
z`OPnu6-)4ymWd1L+C<0^@j-jv94)30Dk-%TglM>u)0WPDtxf-Bd2tEqZww37)GHe6
zQA@oz@v>KIr8hlXU&Ulo#*F;VvSZ)tI9u>M+}6J0%^%g_CB!cs!%y{!)1*<{U17NF
zkf1h|VeXb*Ydbz7Y<QPAcirpSbth#3@s?VCLCYmcIL``;P)d~=opH`<ZK1+Bsv$X6
zExYy;_V?7QXz`^bNt4t@OtafAdl`>v$&=Z1!3T>)n9t0cmP3A%BB-9zJ8OQ<oAfHB
zk`ToOUZ)!AM&h;k*WZvihmmDSQNv6~;9(-00)9k<J593e#)>L7*C3oXn8gvxyee}q
zK`Ao3BdAi|@Z9=o5qc&6b+&q|l=8AFHljVh;~mA57HUSC9Bw(@1%oD<(vw$1-fixa
z#r*EH;SOh7OciOznwwvIqZjleX*N%S%vJ7Fp9RsKkf}$FQ^vrCL?~Pa&n%_5U;R$1
zeBlcP7f#vJZ>gJP@M>#q2uq1m6FPCeFTN`Amm&WwNJ19oPuUB})R{u$*qBR@v=Ea`
z$#=e4v~?c-Wl?O@KU-fPf6AgKM`8&5e}%`<<@&vrOB=N9<8teag%gj87HfJrTj!H}
za2Y?=7$1H@($oQG1`D0pZ=O;g?}oiLulRNvAyi)QN<S}E#&Sv+FSJBE_v2*XrzD^K
zIhtz5)F#h530)%Wu{Vb3-_Xc=R8%Nf&-$z+HKrGD8|?a!S_1tvr_xU1ZZ+$Hi)M!e
z{CQ60gY!O*A0G#FO{({JpGn+Zo^&r$<sF26u+A^JNAJH-@xeG5Z6<%V;&xT0ylCT|
zBx{<ZaclmqfG5g5Sdk3J`NPu#cv7f?ZGS#Jwd6PKrl!r_ecQnOF9y@o)cPiy#rHJ*
zNBf?PwijSC-mD+&>ZlYqKUuCTccPb^p58h~r}hOp+VUxLN~*sdw@uui3Km1Qek|J7
zgB?q>ss&x$Q$AKHr>3ddIZ!X3sSR?kGcB0H`mz<R*QvSFErnXxvKA%2(!e&`{%!v0
z370>3jFqlp5~@_=p9xHsK_yHC)W7m9^}p5QCS8!`KcjKf;C<dX%X|2qUi%_U6>FRU
z%1O*eDC2!|=$ZB6SBb>W%o#@BSD(nxZZ@t4w`K>+#>zbL{N94UdUW!qtlJEQ3cU4k
zvA-OUvGmwsWG!w#N7t(A7;QPs*HzX$m_qosL_A!51>C9(RX{C`3{G$Q;K)~fp*H@!
zwWIqFT+wRydOo~2Lt0}?2)lvH&hX~ee)nyr`Qfdo4y``;sOj=a&YN1B%24TmYBn0T
zWmIj~cz~@UtHN6BnVlzZ0qvC6DLZ9nOluZu%HfWk3=AlrB(h`9il?qyD8C?%y{~-m
z%B$p1)+aiC*`w{Tv{GhpdGq;dFzG#bi`@kB@}(ME7@lLT9|_S`^0ogYv~}DH%tHmt
zE0uvxl`=k`leqDWrLrsBJ(>aYLHFg2$3p&K40Yo3f38-(g)ZFRx>`WKZ(gM)LiN$r
zGsm0$r=6<V$C8srt|jHNtK*iaFAwKF%@MoL(M7YSh;W|z&ApFi3B|=sPSYY8)(yeu
z62f#JT{C%T&+C-UKC0>}6%~oc9mFSKb!6phMHZx!k2`w^Z8*O1+21Ym>DbLhjj?l?
zqN2mJr}Tji8wYj*4Kl`K6{$~44*7fzToJRJlDtGr*5nD2B6Guh?S$f^t75V=x!Xt5
z#W~5-V?}HJ_-xm5GQ75nq0LTi>D#7|#_u4ukFNI+KG{Ey<L@)9HBBVS?t~kSl@9F{
z-Z0PUK-qk<)RT^sKRPj=VEwZ>vU$2-it2xRYcOawp6|o2v96wzg|+Pvq11SMNcq6`
zmf4(wi6!E<0G^+1-v{SH3-NQ;SxZw3JJt#4j$W}19rf@klu4A%T~{b*#b~(G#iz2#
z19en|-(vUl_(2D$;mc}r!{xm_(1gVDqgyLGqz<$JS!huqk4}@N`_^3nGz@a@YID%_
zt}!j6by^8w*KZm@uuoT^9C|>&6=^1fTpam$K@267gWeug;wl$IJ2N3TnGteSWwBIJ
z+|Y4t(jCaAaBVo}fOoUAtw9%gZ8(Ms%kjT)X0w&k3F91is09r3qooD^Yi2=6ECu+C
z8PpELDC<30(7rB%dSYrrg%>0ErLyR->6kWiYfuR=r0^>bQ&0*f+~400b*XqWc1X5!
z+_v|#W6{KX$BzeQfS|)-5FL*IiXIjYvg_~+G%O3OdfknoixZKea0J8|2JCOhDPBX%
z(v>BH@peEwojV<w+hf2Uh7cm->BMkz;b0Wwy_g<2THnsw+0WULIu_*m|Ae=3W@*Uq
z-~Gm^6G?T5H&*0D6L{IkBtQ4QZT>zGtjnR)pLBZMwvIltx=mL$7#-Y#Uw67eR~8=}
z9}rQ_40CpFo!T$q88rIJt$AGxEkC%}>Bk8o7H`Xf<=&SH=25#D4L#9jkU-r2oxonB
zNRVA=Qf{lL6BBSVAoNAt=H3Mug8pb(Xp1VG3lYnA_^eC?^Bl(wUW{-Iom1H>vX6h;
zsD^IKxijkvLy!{!KAt&z;X;tjF@8N)!(wQpo>C$0C(h_>mfT0NgyZ%(JBq`t=}fUX
z5pLXbf&(&@)<y{J<hSjm7|l=9`8!EmT(n#*ZGgjD)?$c-Udv~jIC5$yY-E#>U4#vC
zS_ziExJ%(Tn9F`y&Zq5&9RF;`_p_|?IDJ|Ccj9Xf52M;Y<oy)mJzopjZ4cfT#(N^<
z;j@e;XFf1c#GYu7vgUFN6j?koMJc4PIzbFNf~>NZ%CC^Xd1iI=ybpp0q-H=h&JmC^
zV!Ti2PzMluwdH~hS|Rj}{pC)yJZX5v9%s_Jit$4IF7tg6d*nIhvDBm>QW*lhd4JQU
zmRgE|fDF;i^JPK^Z+rfg-4`v4$GoN(z=t}ZC;S=Q?1#!&VSCG?CDV*T=(5>UnqIrg
zYb5A>8lv>!>4-Y8T18w=*0qBw#O!Id$sKl5N#$%-UUVAsbBn>;A>EtQnm5)ViKIiR
zJq^j4D>@}f4qMp;WswOM6MB?jJV5MkS!nqn08a$}5YkIf^{%Wq`=DNVy(anY=R0ut
zVO##&jDL*X4}DY%Dp08mkU;JuMTu+E2swz4g7eC$3C7Xk3QUeb9Y@$>`Q>TEoK=d!
z5m{uF5SJi(Y_Oxk$6fipOj(8h7+I`f;4!s(EA`NyuaB6r3NY^7YFfPglCkPQ0;Fd9
z*~^F->^r8cQuRGwDib*NDtDNp8fbObj)voUtQOD;saaQj^I7IOM=U0n+|g!RFrzNl
zMh>#akySoRAzbn+C=7FLJu6bAxL5|#|8_M#YPqaZiX2p;!-lldiZA*(>QP}w-yDBh
zR4R+>&bvhx=I9Ad#vDCOgJY$b!DBjX9kz4#XIiMrEiiszJk70XH<%frdh6qXllik&
zbs*bF?Bek>&1ncT!Xomedj?G#5}ILobano7z_#aS4g{R}UVi7DAJ0N?BX6uk;fI~O
zh)?_4K;r?n)3_8M#$xn08%Did-11tfq}sl-9U|gad7u`$U)#D2PRf69g6TswExWga
z_hcZF>zyB8_9NU5#&iLRu$96q1iPajpNV5DZ>*%@D!)0vz|%Hl8s>+4<8k2qxifl*
zWa3sjXZ<}ws4gHfV}kf}LMjE#W*g<}zQZ;uLtW0_nJp@ac)_T5@SD)+`8%8)Ywp;-
z@F=Qw!g=CKAD$vxILXH&bWV~^ZRTEmNkI1*4w7TIS|G-;ov8c(a0zpqv-N*6M>e6z
zAm^MwkJbOW`8V}AL>yiJ{12T?L#QU8ghyFFJ2wElgWh_spG06Za<@<c(O+>yB!t%6
zTh)Di&j8@cW&ByIw&4YSU_ccF9b`0koc-1fTltGw!3W`df(&*HfGet2<!v)Ne_Np(
zo$>D#1F<BV(l#Dd(yFEptV<6@&ioPxI2S?RK58>gD<HBUu7#)1&IRscMkojFZnub3
zSgG9{dDAEgU+t{Jwm~^I23^lyo$)~WpUHZk7evb3(*(TnsEt`Q8MLp{cl7KY5+dp4
z9pGSqgv9zLAsx;L3w9xW8R~m#e8vy{cz?NMKQzsOBd}UF=SV{ggyEn$Gme`C(DKj>
zUBHb>Dj74*gb)PF1<<;q%U`1<Rqtln)1k=gA~1qRoFH{szb|tZ=8NHf1xsLZm3Bk9
z|3RY#vC#ygp(FwpYIk~2goTtZR_@_+tn<*c!xt(;;9*fL20H$~faY|l3AnTIf2Hw1
z$hA?@6ay3k{}aaZ>gUf}NSgu|B0i>gG^M=i`CTP~4r2dusNsq|B^Ef!$!n2SrPpj`
zXCF0gKJ=W;y|zkcZu56X0_qq$r2+i=Ov5?g;WeBq1n~*OJk<g`m=Fn6Sb9i5GuWsO
zC<($9sibtED-_^z6lR(qEmeHAS$pZ-<bSLy>ZATm_dinqcl>{zplJ2oWJV)O1F(f`
z2B$OiMO*&^n^O7vH0TB3Vqm<g9$V2M9J0rZ3lQ>_i%^YZ&Wgo221mcoEn$bQ@T1!;
zUR^mNt;8l7%Z^MtxNNe0y@uV1@05D!YX+=-4d??ZXw&z{J*JH&th4l?+$}H$ne$^C
zp_wLYv6HhzH6AYWa{B>ALt|x@99zAK{8=}XdfD$X22O~8)I8tK^*i?5)7_0og^<PE
z`=$n&j;4f>mwTGAsR{crt-ek?b(Psr%aEZrC6w!Z*YK;Azk{RWI*pZA;(ZGl0z=~8
z4Kiknoc|6=lE%NwN45;@#TSa=k<odE${U}8yC;c{M*i^8{*2h#%-D-{Ia@Lf(Lv%v
zYu``@E;c(aLATpT^R(Saa>uFlIfg)g*ft_rApeOFf2x6urhC;k2XEoacwlaz(qpF<
z8a_>Yl<~sYJ4vBT)y+ixsO>Z;_O>g*Y=kFrOA>$1nVR5JBokgm>^>eV8tIL34<Lk5
z?U5*_#$UI1OS>}vlS?^X@9T0&JQV@SX+!fu{@KWx{7xZ`=sK5)F6dmL-&vg`Du-D;
zg2d_^wn-1uo}QUbN4DHC^$DpWKBGuYxM^#2wR2GM1)sKEsQINVzG~t#hB@7U#^BE5
z?(+#fL*<k#wcjC&TLJh`?}!$&v5zvO^ok6Dix0-|p|WZ>qxE!H#*ELqCESrhvq!t-
zQ=YO{CMzEkOM{K3^>jK{D|hfS!>+8ROce8<W8XHy$7%1qGO~=JitW&l2_ovS%0O!;
z{Zey3I1L8PsazU4b2=|R`$S#cC3ptkF(A6dlul*Z9GxJ2e0MeVzGk1n2|U-cLf0en
z)=%=zGtVb>dp@(SMmF+s+D{#csHOQnnD_cnuq${bV_7Tn^k{&98lRj?@_pbuM<Di}
zAiw+DE!Pz-MQ+C$duhLU`7{0>3e%JXK?XIvXG7?XcJnRB_|fdYd7pWne;_`~eP3ue
z@|O4yDlcZ)uGnuo-xXGS(35nif`{V@CWy-V8Hlx#x}e3o#QvR$Hf(2~FmFiPQY5P|
z?+1b%vR*B9gm{w3Y0-DkawdLOxg78EeA6>>|A_IRO%%5-zF=2#Qht{}_&}8ZX1;ap
z41Ok)q4@rc;pb8G(P~R2r=GGtE>xG$iq~oBF@Lh(_Nq6~T;<B~>7}|NbQ`nQYzRVQ
zH{M^EH+S()t87jP>|=l&GK5ESD%wZlu+W%)eO@l_e4_Zl*qsoV)@*sP@P6B%fI(M~
zQk3i#I|$8R;_<vYGAu=$drRZbllA0ht0J<Z6ZkbPNH85s@|DvimI~Gtq4s8uERA+;
z$2`)4TCY`iWw;MymfBw)XF9$UF3da7U}Y*GQ^vf~pU#aRufI(!wN6Q(Xh?im)ofX7
z^Ok6?XmhXKADN!&`})v9d)cqT^{dDn6~=rEt?G|t?q#vxAoU7%nhr}o`ve!}y*Qaj
z(?v_WT66qVxWbjPkjNhQUMR(wD4Cl#Fn42#=VD_CZ$yxgu$~Un2~z#Z1Li19Fdj{c
z`+G)%HQ$<gqBfNnW2jd4^aR<ir(9A*WS<@MM6_HE4((no@vGf$L;a3z3H%xji+Fb-
zCe6_d{!WjZn}%BfbDkN|r9(3)e&b@Q6Cw8&BFtm9g`|!fuOr`agie~)k=GnyP9l7Y
zcwx7&7AoIe;s-xL#wYt~y(5n0TYXiEQ*RySx4dWf0%?@u3zco$c`~}DC<P(l2C7SV
zUy|a!u_O)=J4*aS_S?9{)^DWmAO~_<&@=mO=#qyQkL@^xdBui_8(nL=ikSrQGS>-p
zVyRGdm-`74!5np$Sb9ArLF$lE$+>RjFm!uH=RilzJ?ES=B|%~>^qIbzd)U8XNY%Hm
z?i#819?}-D5{R%0JGWdF=2ct^eamM-c1&SWd+!7}t*0#UhS=R?`t>;VoD=!Lh<r6z
zz(8tsIGC-X$m|3ug&0fdBM8a{+J!m}5j94tgy-f(^>l6@7AE<YH6;ELEuE@rNbDH9
zFB^8wX;B;7xDje+9;i)>y?SD&Zg{TR6@z&d6m}^kf$B6Q+2QkwBVSHhX))QfPV&Im
zkL>)@kOkKbo-?+?s*=2KgkSt;XjVGTP`>Jk*d4oFdW#1}4#UJ>zSUZ1GG-RFJ`IV2
z5X*aNBmWdmgBU9=%$w6Jv)|d59Yp+9-xF!M#3Nkh%Bkp&>}6p+tfJOY!xAU#yN$l0
z&croF7)S5g4U`;G?!>O`cXCK?7tZ1uHF;jz@l(9yoi|NqFwH-6G7!ur*P&^!&-k`T
zDO%=w_nc>XXQ#H=G#Mvx*m^ZERF&_`Q6T9P!T;UyvVC^u$p?BZJJ_s%xN!GxMvjh3
zsB0lE!*7oGLB7Mbyn-&~v8W;T=#tVP`sSa9U36R*|CPx%`pY0Qbd_pnyY;oeMf@{D
zx)9YM^KaUUHZFOKP03f)PbGq&>MNMnJgjMKkn7x84FWCWrRGg74-N_Ojy1=GqSi}g
zJJjy4F}qY!qAex4zfP|9NzmoJUY(iqtcPmTxX<21#H=j$2ymG%eg+Hz#;o4n;VNgF
z{L=nDOi_nG=2j&?mG(#(&AiN<RiFfa(2o~Dzau})iMa&Z788Q^li8SF2A|N8D+t{N
zEGX;V+=P^(sLSpE{OEZO(1jMyxXg^h83IBOGH~XQDXR`Mo~8+aPNHaK5X6WMR72~Y
zh!njODS9M+KEN0$+~Fjwp-!7QYC&ApcFnzo-gzvFmIcqiU<bG9B&NB)nh<4JjYYO1
z%3t5=DpOXk0D6E0ykfo%c-R0}H9>kRI_Tj6HF#yfogS|o2s9YTJf$l8#SdqHZc~k!
zmcIz;zlvr^zY2#yGmrool!6M20O|!GWKc&bw1fa04Tr}nqBPH6$|tYYSWGIS6w}6N
zKoKS!Iav-9B&-AKx9HE<!D{{0U<*88g0YFArL);x7^Ut2FEP3g))}Otm|*;HdoZ2~
zya>6@fus9ZlVu<yC6V6e{Db-1L|`7hq@has>$0{xfWy=Fc*jgb6_>)sCcOu-1L|9N
zr?(RqKW?ps%ix@)S)oNEDr&FhTQog2pcbN3h7KJxLL|wCI)GayyCW4H4GcGPQ<ljm
z*?W3`0~f;{R4s<4fb=7OJR4+Uv~q!|IBneFqjeuVsjVTmSg!frmfyH@=98{sL4EZF
zWo$aQ(0gHc%W@FDZ}pAOV(`Zfhbr35!t3$VR(-lI{ZpPJgx&tr;4t&)`41FZN;Oqk
zyuB}!7UV+t_o{6>_;>tIg&$ih+1^Kd$h0L!_VpH{*(HpJ$@YSbc~a&t?K@ZYSYcf%
zzfI8>$CWYQ<KtH@ZgLj<wL{8BvUB&484%GgYd&ofd!rkQu4w>YAa0UGHg$jsOViDW
zm;7i%4GO>|*;LV2CHI+O5c_}NMac&OaA=Q(cn~m=s~`xCz~E@Y8ROV*k`Pl?24*UE
z{2!w`L)mSff$d}<_RH`zuw{M!4waz+U~f#gOp1=ce1<A4d{+J!^o1&{$W3ShRAp$e
zTm79V#FSN9@~j~A@Z`YbQHTe?$g^Cj0?`D*>G4L4Mi$PuvI5>6b4p4*Wh@KB;P<YO
z6|zgl^_l>0zq{~!vy$?Q=A+!q!!fcnNl4y2x8eKxXFHkQZ?k0vBzcEnswov7ha=Nc
zmT?L(R^V$i!5<DigtV-l);M1Glq(1{?kY?O(;2NB#YUQaD*Su+McslwJy3=vKdOQ|
zsOzY9wZ)ovo6@d>c>#=@U=2a4oSj@vXNL5{5Np-?XJ%mWn3eO5NyRVA&l?{?phW^`
zv4Zs83XC;3S*#URu0%M-kbK45YAf?0s9h$D)*+Q*mkPg8%!x+b^&?jphh?$y!%2Ig
zXzl*h!plMdeqy@4&%Y3LW^TniG<NIXOg+|8F#t5<!5KKIBr9a4dpbkvy#d3~2qa+o
z62pYZzzBwc!HtH1Pdr%51qP!q?z7GnyE@au?GBJqmmr!E9n#}%#eB)6!-IF}uu98Q
z7f25odZ@qp8Pn6rTJg?}s!R?H7l<}VqT(t0z4!N|>u`^v=Oa|%XgRl0aSH~fi^9iC
zj$FtHJ{ka7!I9{GoeilQOj%6n&&hI(?l$WXx~T9nfzPMLM47_9Peu9VK1Er5yBsh2
zL}5a8j#y|e^lXs<o1~!|5GoTec;9<{0ZDy5jwK6v*j=8(f+#NuwyY8Z^?(m_?uqs5
zo=J~~Z5Lya?-jzJe)mC<yK;*K)rr3E{N-OIOB9on!bHK~v52=^#nYOQRE#jXG64QV
zIQ=cual1ki<n;mMVWru(_Nwy@0P2cW5r#4!caWZ=vKd|-^;#8Xv8LUjSoP<XS-G9N
z(M{Uig@)K01+SqNzJTj<j$bFAo332@>rg#kqRoO}X~Jek5siQtG1T)_{xD`)?)fLe
zXf0l9!|U)K(Ov&jS~|D8pi%O-+eF82*Y$vC>As+7#7eZIh@=6a`m4g(>Dl9JzjnOD
zHLUxM5;TM9{gOa%VM`2c!#5eXp3_c-FrdaKd5-cK0h;;>hm)z#Ex-4EDs3DcND@YC
z<~ysRFpw$h!&zU!7G0-{5l4Rxb=?i4C8V!a_XO0qShC=lDaUu}g;IM7xQm^Ep@D5`
z{&h@^0bFfa%UlS>k4UR(f+V^-eDG-kQyFCnW*>6h@)gE!^4c2?xZ);hSTuamyV=~B
zh>;kYFXNcM?^`5XAq+o0(0%}v>IA{IIdDaX`!^w{<|7M-st}*gkiw9SL^SK~%ethh
zXJNP*RGS7b;pQvM4_fC^<`bn=(PC@lcM3l*UwZi4Ll{lQC{+-z^ZjAaLPCxEP3uN?
z3RTq~spEU9!xlBYm<MZAQ5E+rgzGRo=UaD4gsR5bsK}i!D`4Z_K@~lO*?!YsjJq>+
z+Lem6ffjOGBa+J_FfVNQoD#H4@zQCscmaqFG2*YeD19v=v&|HSQ%iAVkw-Xjz~)@U
z7G`H$7C>`)NFn)+z8yLJe-!@$C+B|{k^K~JLkGewv?&jHM8Pp8r@N{3eXYqD-%R~<
z4O8$*#C#k*S)me9`m}h<Y#5CHOt#2VoIhgGN$F|KlC}M4&P-eau1x;*I!)Y;^ZU~u
zh407$BdmaXK?@3I^$RcqAV4}oJiG%^sCr{H0!$9iO5f;wPRmesF`;%I65ICJhp=8R
zI3WzKH+q@UkQ>WQwEqs-ZvC@H-h!wuXv9T3^5q8HvhzGi{FT2pgVVRAlVTlMM{(%C
z#b6XVL#t3BMK9uxSiJqJK>2p>(8&#qf_mBnd+;Z^w?Hbi=*lS(vM9q}u2O@sxEOj6
zkkG)lzcOuhp<jP7$6fx!a0By>$QkkEWa%*jd8i1uuA#@q1ycfUID*4ML;?5148Lmg
z0t39aw$*e1z?>%%G$AJKRo;a7tEdOCAT)qB=K2Ojy0Vq3O!ompMq(4*G`p-_`7T2o
z%4mhJz$q14SC2V`?;G$TPIJ+Cb}sUs0>srrH@}@?^ev?yO{3yui?wgA2~)d=g5d*>
zh;xi_P|&aoD;MQqSAO8dqxx=gg@bk!jKa@Bz5V10$aSHA^FGq|CTv&v@bM$ddI&AE
z<fqon7Y<Z$qJO*G@=PKy3IdNZrhk;(0{|iP%3}`P8AM`Lm=suAQ+8h>JE7F*qx=f4
z580of4&+@DMJ*DXDb(UGTP{e(zpne9p69qBxSfwBpEtjM_nfk8GVTqF@jC6~3%Q>R
zT>iY4#Ti2A_SN-;I57EJQTvmx-mjuq{rMQ%5jXatSQmQKV^!taOH-`?fwT-^@Qe~H
zH%6KZ{%l{ZqVMTkJt~O*U8GF7(P{@n@LoE{=`20Y`|_G>yVwf2oc4v}&j{Y)XJm{3
z^ECP!(3mM&uaG1?p!9;iW(sLeBfUYQa)>Ze<HG4JoelMCibz2wW9Y(Lp&7T(G;%NQ
zKL9?L2st{k;EJegc~UTR@|x6Afxvxj<&S90U(N{5$1DhT*Jmjh!?U%2f|Sq-Beyu%
zVWBhJDSE)gAD4|q;P$C}1L)6Su^1|{SMzI-)0~7^o)#n5YFE*Y^zUeuH&KIHKAf%=
zIdzZUO?Kfu9$DI3$2UXVK9`hPEW*j$gxJ~HU`Rv(9mGaRJysa*BNpaT&NA9CAc_8Y
zCw#2o78c{2z-Fut{t1`YQ$wpiLb|13%+eMPTc<#Zah(_kS@4foi@^z)H<%1)k>*=!
zL(L=sxJJx?Dx`_NN`8p3%uWDQOUJP20siFUI)aIZ%rNu1#?N{xXjzt8J<?VtxXca<
z*WGO{z&JzZQJ={+ZFENjsim@^88(2ua54T0yxLT33uFB)c#P!kodlA9C~yv`&DI>?
zWm;Ap#x@n{o@niHv5>O~@g#-_fy*4Qhw9~e$qujxTj99o#9(-tR~4dbR!u=wh<yfA
zq$#|s3o&?>1g3`;{}?Z!`JlRf;~Dc&YTRQ+sSh%x>Y?AvuGB8l;G2*7qW1-x624cH
z-#Ox7Yvy*DbOYpCbe*xhq+z<y0O{B3!F-|)m*>?0WHK0DSQH4uud*OQz_B-8{^B6>
z0L1IE9%Pgxh!Yk*Kfw5lMfT~cK#wT3Vd_6C=zFvh<(<@V{-{QMmaGagy0YIqm}1s}
z=6JGNw7T|_n|;^)FS{$RhK798@=>Ois>fVTb`GvrO2b5XG=C4)15Sj|%@CDm$?sIM
zFY5z8*7(gtsIf0e-vfY)BlMeFWYqZJpSklEkm~~AG8=+3VESYq4iVy!xjFJ91yh$G
z49{h<PXs67L(OWhF>5Tal!{hp-7_h${ir;O&outw#F_H!iCjXE(q%_*1~c?K=mFR1
z9)@DH@9+BhZkg*PSShki<Y683@K+S1Kidj0pym3j-coyMVy)6D0~3<qRx@`ub<^o5
zm;d-&P(0bsF?wM%CnXo+<w%3@cwsoc*>1>f>U(+4BqLnfb<2;ivEedFoC!JGTiL~9
zD-=s_eO!eW4(+u&bKRBOS(>n?WWh;NOC@3klf`IznvLv0`ku_0w~V@g4GV$+JTOr(
z=#z(2&glW3!f4)y83d6>!taB~a;#XgUO^8l$#OE*N(rNbE!(0ruk9{{F8$CCfBE9g
z82HS5Tx#l8?amo;$^$i7=K`gm5$ZZRqL!ZL>tM<!jwFzUb%S|d!CGEi-v^DmtY4x;
zzA(6d2iakd0fUWrM$#7See8v&UtSxnf(xaO0A?8F_zm>jeL+=7!*#tTPr^1CSuq!Q
zpoYGjC-~w;4LgmHQ=R&k0fA@7Z~b-jpTZf+>;Q&zCLLY>+t$aFykPqhW^f*3O-Fav
z(Hm*gT+M0C+7y|Akus~gu!uoXL>P*1^Pm6Ko|@jE#*1C?`U+e^)L`_-rw7>hcv(g|
zvHMU8^|1`#63z+I*<%^Jcf(rLg-P=sz+s*fMlTN+qPuk^&AO$am^`AY@TL~=ual^9
zB6f%!VVvG|+5HW8;B*a>|6|fPD8Jy*#)!TpU{fHGbp^)+*(Cg4;|%!v;EjG=4$X%C
z=)&;HBZ<{LYD&s+eL&aKmAKG0*fD9~&`FPdYes$44c4;3?nvvY{CHabJD11R^o<Of
zI=u>W16>E{)Ro&X2zZb<dUL<|8@}C&0%Q{8@V+FLl5~ID=YF64mE`k>#-?)-F<Bkf
zVcx(NNh-f!XqY5RUZP}nz;{5CMyf#z@Vcb=^!@0%@9kvWq(Fy{jtO2y0n4G!i|R|`
y_#R$DD83`Oohb^%yxW>u@wAnRfWhnw{&22gE~1VsY%MO34n1vStqKj`)qew=yC^6C

literal 1670
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
Qt^fc407*qoM6N<$g68%*g8%>k

diff --git a/src/api/model/pm.js b/src/api/model/pm.js
index 1e07a0cf..26085002 100644
--- a/src/api/model/pm.js
+++ b/src/api/model/pm.js
@@ -70,9 +70,9 @@ export default {
 		},
 		submitSameDay:{
 			name: "提交同一天的该部门下的所有兄弟小任务",
-			req: async function(data){
+			req: async function(id,data){
 				return await http.post(
-					`${config.API_URL}/pm/mtask/submit_related_same_day/`,
+					`${config.API_URL}/pm/mtask/${id}/submit_related_same_day/`,
 					data
 				);
 			}
diff --git a/src/config/route.js b/src/config/route.js
index 3bad0a4d..2d5436ac 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -1854,7 +1854,7 @@ const routes = [
     "name": "bigScreenP",
     "meta": {
       "title": "数据看板",
-      "icon": "el-icon-position",
+      "icon": "el-icon-platform",
       "perms": ["bigScreenP"],
       "fullpage": true,
     },
@@ -1866,7 +1866,7 @@ const routes = [
     "name": "bigScreenP",
     "meta": {
       "title": "车间看板",
-      "icon": "el-icon-position",
+      "icon": "el-icon-trend-charts",
       "perms": ["bigScreenP"],
       "fullpage": true,
     },
@@ -1878,7 +1878,7 @@ const routes = [
     "name": "bigScreenP",
     "meta": {
       "title": "统计分析",
-      "icon": "el-icon-position",
+      "icon": "el-icon-histogram",
       "perms": ["bigScreenP"],
       "fullpage": true,
     },
diff --git a/src/style/app.scss b/src/style/app.scss
index 0268754b..06ae5118 100644
--- a/src/style/app.scss
+++ b/src/style/app.scss
@@ -28,7 +28,7 @@ a,button,input,textarea{-webkit-tap-highlight-color:rgba(0,0,0,0);box-sizing: bo
 .adminui-header-left {display: flex;align-items: center;padding-left:4px;}
 .adminui-header-right {display: flex;align-items: center;}
 .adminui-header .logo-bar {font-size: 20px;font-weight: bold;display: flex;align-items: center;}
-.adminui-header .logo-bar .logo {margin-right: 10px;height: 52px;background: #ffffff;display: inline-block;padding: 4px 10px;border-radius: 5px;margin:auto}
+.adminui-header .logo-bar .logo {margin-right: 10px;height: 52px;display: inline-block;padding: 4px;border-radius: 5px;margin:auto}
 .adminui-header .nav {display: flex;height: 100%;margin-left: 40px;}
 .adminui-header .nav li {padding:0 10px;margin: 0 10px 0 0;font-size: 14px;color: rgba(255, 255, 255, 0.6);list-style: none;height: 100%;display: flex;align-items: center;cursor: pointer;}
 .adminui-header .nav li i {margin-right: 5px;}
diff --git a/src/views/wpm/worktaskFlog.vue b/src/views/wpm/worktaskFlog.vue
index ae4d8861..c9707f46 100644
--- a/src/views/wpm/worktaskFlog.vue
+++ b/src/views/wpm/worktaskFlog.vue
@@ -170,6 +170,11 @@
       resetQuery() {
         this.query = {};
       },
+      submitForm(){
+        this.$API.pm.mtask.submitSameDay.req(this.orderObj.id).then(re=>{
+          console.log(res)
+        })
+      },
     },
   };
 </script>