From 2c062c01059a1cd4400fc48379f645216cb09301 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Tue, 29 Nov 2022 16:01:50 +0800
Subject: [PATCH] =?UTF-8?q?0412=20=E6=96=B0=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/taskmanage/tasklist.js                |  2 +-
 src/views/modules/production/cancelSfdc.vue   | 15 +----
 .../modules/production/generateReport.vue     |  3 +-
 .../modules/production/scheduleForSOTask.vue  | 25 +++++---
 .../production/scheduleForShopOrder.vue       | 16 ++++-
 .../modules/taskmanage/mysendtasklist.vue     | 10 +++-
 src/views/modules/taskmanage/mytasklist.vue   | 12 +++-
 src/views/modules/taskmanage/taskReport.vue   | 58 ++++++-------------
 8 files changed, 72 insertions(+), 69 deletions(-)

diff --git a/src/api/taskmanage/tasklist.js b/src/api/taskmanage/tasklist.js
index 941dbb3..d3ad4fb 100644
--- a/src/api/taskmanage/tasklist.js
+++ b/src/api/taskmanage/tasklist.js
@@ -19,4 +19,4 @@ export const getTaskDetailList = data => createAPI(`taskmanage/taskDetail/taskDe
 export const updateTaskDetail = data => createAPI(`taskmanage/taskDetail/updateTaskDetail`, 'post', data);
 
 
-
+export const getTaskDetailListBoard= data => createAPI(`board/getTaskDetailListBoard`, 'post', data);
diff --git a/src/views/modules/production/cancelSfdc.vue b/src/views/modules/production/cancelSfdc.vue
index 166dfa9..b034181 100644
--- a/src/views/modules/production/cancelSfdc.vue
+++ b/src/views/modules/production/cancelSfdc.vue
@@ -168,8 +168,7 @@
         <el-button type="primary" @click="defectModalFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
-    <!-- 动态列    -->
-    <column v-if="visible" ref="column" @refreshData="getTableUserColumn" v-drag></column>
+
 
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
   </div>
@@ -182,17 +181,7 @@
 
   } from '@/api/production/generateReport.js'
   import Chooselist from '@/views/modules/common/Chooselist'
-  import {
-    saveTableDefaultList,
-    getTableDefaultListLanguage,
-    getTableUserListLanguage,
-    removerDefault,
-    removerUser
-  } from "@/api/table.js"
-  import column from "../common/column";
-  // import {
-  //   printSeqNoLabel,
-  // } from "@/views/modules/production/print_seqNo_label.js"
+
 
   export default {
     name: 'searchSOScheduleRouting',
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index 7092362..7c1572c 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -966,7 +966,8 @@
             this.qty2 ='';
             this.saveHeaderData.planStartTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00')
             this.saveHeaderData.planFinishTime = this.dayjs(new Date()).format('YYYY-MM-DD 00:00:00')
-            searchReportedQty(this.saveHeaderData).then(({data}) => {
+
+             (this.saveHeaderData).then(({data}) => {
               if(data.code===0) {
                 this.cavity= data.row.cavity
                 this.qty1 = data.row.qtyReported;
diff --git a/src/views/modules/production/scheduleForSOTask.vue b/src/views/modules/production/scheduleForSOTask.vue
index be632e5..14d8a89 100644
--- a/src/views/modules/production/scheduleForSOTask.vue
+++ b/src/views/modules/production/scheduleForSOTask.vue
@@ -498,6 +498,7 @@
           orderDate:'',
           operatorId:'',
           efficiency:'',
+          partPlanQty:'',
         },
         scheduledModalFlag: false,
         availableResourceList: [],
@@ -571,6 +572,7 @@
         }
         this.schedulingModalData = {
           weightFactor: row.weightFactor,
+          partPlanQty: row.partPlanQty,
           orderNo: row.orderNo,
           site: row.site,
           orderRef1: row.orderRef1,
@@ -615,13 +617,22 @@
         //   })
         //   return false
         // }
-        this.schedulingModalTableData.push({
-          scheduleQty: '',
-          resourceId: this.schedulingModalData.resourceId,
-          shiftNo: this.schedulingModalData.shiftNo,
-          scheduleDate: null,
-          operatorId:this.schedulingModalData.operatorId,
-        })
+          let data={
+            scheduleQty: '',
+            weight:'',
+            resourceId: this.schedulingModalData.resourceId,
+            shiftNo: this.schedulingModalData.shiftNo,
+            scheduleDate: null,
+            operatorId:this.schedulingModalData.operatorId,
+          }
+        if(this.schedulingModalData.partPlanQty!=null&&this.schedulingModalData.partPlanQty!=''&&this.schedulingModalData.partPlanQty!=0){
+          data.scheduleQty=this.schedulingModalData.partPlanQty;
+          if(this.schedulingModalData.weightFactor==null||this.schedulingModalData.weightFactor==''||this.schedulingModalData.weightFactor=='0'){
+          }else {
+            data.weight=Math.round( data.scheduleQty*this.schedulingModalData.weightFactor)
+          }
+        }
+        this.schedulingModalTableData.push(data)
         this.sumQty += this.schedulingModalData.scheduleQty
       },
       changeSum () {
diff --git a/src/views/modules/production/scheduleForShopOrder.vue b/src/views/modules/production/scheduleForShopOrder.vue
index 710949c..a1e05c6 100644
--- a/src/views/modules/production/scheduleForShopOrder.vue
+++ b/src/views/modules/production/scheduleForShopOrder.vue
@@ -560,6 +560,7 @@
           efficiency:'',
           qty1:'',
           lastApproveQty:'',
+          partPlanQty:'',
         },
         scheduledModalFlag: false,
         availableResourceList: [],
@@ -628,6 +629,7 @@
         }
         this.schedulingModalData = {
           weightFactor: row.weightFactor,
+          partPlanQty: row.partPlanQty,
           orderNo: row.orderNo,
           site: row.site,
           needDate: row.needDate,
@@ -684,14 +686,22 @@
         //   })
         //   return false
         // }
-        this.schedulingModalTableData.push({
+        let data={
           scheduleQty: '',
+          weight:'',
           resourceId: this.schedulingModalData.resourceId,
           shiftNo: this.schedulingModalData.shiftNo,
           scheduleDate: null,
           operatorId:this.schedulingModalData.operatorId,
-          weight:'',
-        })
+        }
+        if(this.schedulingModalData.partPlanQty!=null&&this.schedulingModalData.partPlanQty!=''&&this.schedulingModalData.partPlanQty!=0){
+          data.scheduleQty=this.schedulingModalData.partPlanQty;
+          if(this.schedulingModalData.weightFactor==null||this.schedulingModalData.weightFactor==''||this.schedulingModalData.weightFactor=='0'){
+          }else {
+            data.weight=Math.round( data.scheduleQty*this.schedulingModalData.weightFactor)
+          }
+        }
+        this.schedulingModalTableData.push(data)
         this.sumQty += this.schedulingModalData.scheduleQty
       },
       changeSum () {
diff --git a/src/views/modules/taskmanage/mysendtasklist.vue b/src/views/modules/taskmanage/mysendtasklist.vue
index 3b46260..167f6a3 100644
--- a/src/views/modules/taskmanage/mysendtasklist.vue
+++ b/src/views/modules/taskmanage/mysendtasklist.vue
@@ -85,6 +85,7 @@
           border
           :height="height"
           v-loading="dataListLoading"
+          :row-class-name="tableRowClassName"
           @selection-change="selectionChangeHandle"
           highlight-current-row
           style="width: 100%;">
@@ -558,6 +559,11 @@
           })
         })
       },
+      tableRowClassName({row, rowIndex}) {
+        if (row.chatLastType == '有新回复'&&row.finalStatus=='未完成') {
+          return 'newChat'
+        }
+      },
       // 新增 / 修改
       addOrUpdateHandle(id) {
         this.addOrUpdateVisible = true
@@ -587,5 +593,7 @@
   }
 </script>
 <style>
-
+  .mod-config .newChat {
+    background-color: #00d9ff;
+  }
 </style>
diff --git a/src/views/modules/taskmanage/mytasklist.vue b/src/views/modules/taskmanage/mytasklist.vue
index b757f1f..9ffc5d3 100644
--- a/src/views/modules/taskmanage/mytasklist.vue
+++ b/src/views/modules/taskmanage/mytasklist.vue
@@ -78,6 +78,7 @@
           border
           :height="height"
           v-loading="dataListLoading"
+          :row-class-name="tableRowClassName"
           @selection-change="selectionChangeHandle"
           highlight-current-row
           style="width: 100%;">
@@ -466,6 +467,11 @@
       })
     },
     methods: {
+      tableRowClassName({row, rowIndex}) {
+        if (row.chatLastType == '有新消息'&&row.finalStatus=='未完成') {
+          return 'newChat'
+        }
+      },
       // 获取数据列表
       getDataList() {
         this.dataListLoading = true
@@ -564,6 +570,8 @@
     }
   }
 </script>
-<style>
-
+<style >
+  .mod-config .newChat {
+    background-color: #00d9ff;
+  }
 </style>
diff --git a/src/views/modules/taskmanage/taskReport.vue b/src/views/modules/taskmanage/taskReport.vue
index ebb4773..02c408b 100644
--- a/src/views/modules/taskmanage/taskReport.vue
+++ b/src/views/modules/taskmanage/taskReport.vue
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import {getTaskDetailList} from '@/api/taskmanage/tasklist.js'
+import {getTaskDetailListBoard} from '@/api/taskmanage/tasklist.js'
 
 let domTimer = '' // 自动滚动的定时任务
 let dataTimer = '' // 数据定时任务
@@ -68,8 +68,11 @@ export default {
         finishStartDate: '',
         finishEndDate: '',
         status: '',
-        ipAddress: this.$route.query.ip
+        ipAddress: this.$route.query.ip,
+        number:'',
       },
+      pageIndex: 1,
+      totalPage: 1,
       // 展示列集
       columnList: [
         {
@@ -221,9 +224,16 @@ export default {
 
     // 获取数据列表
     getDataList() {
-      getTaskDetailList(this.dataForm).then(({data}) => {
-        if (data && data.code === 0) {
-          this.dataList = data.data
+      this.dataForm.number=this.pageIndex;
+      getTaskDetailListBoard(this.dataForm).then(({data}) => {
+        if (data && data.code === 200) {
+          this.dataList = data.rows
+          this.totalPage= data.maxPage;
+          if(this.pageIndex+1>data.maxPage){
+            this.pageIndex=1
+          }else {
+            this.pageIndex=this.pageIndex+1
+          }
         } else {
           this.dataList = []
         }
@@ -245,50 +255,16 @@ export default {
       }
       // return ''
     },
-    // 鼠标进入
-    mouseEnter(time) {
-      // 鼠标进入停止滚动和切换的定时任务
-      this.autoRoll(true)
-    },
-    // 鼠标离开
-    mouseLeave() {
-      // 开启
-      this.autoRoll()
-    },
-    // 设置自动滚动
-    autoRoll(stop) {
-      if (stop) {
-        clearInterval(domTimer)
-        return
-      }
-      this.$nextTick(() => {
-        // 拿到表格挂载后的真实DOM
-        const table = this.$refs.task_table
-        // 拿到表格中承载数据的div元素
-        const divData = table.bodyWrapper
-        // 拿到元素后，对元素进行定时增加距离顶部距离，实现滚动效果
-        domTimer = setInterval(() => {
-          // 元素自增距离顶部像素
-          divData.scrollTop = this.decimalUtil.add(Number(divData.scrollTop), Number(this.rollPx))
-          // 判断元素是否滚动到底部(可视高度+距离顶部=整个高度)
-          if (divData.clientHeight + divData.scrollTop + 1 >= divData.scrollHeight) {
-            // 重置table距离顶部距离
-            divData.scrollTop = 0
-          }
-        }, this.rollTime * 10)
-      })
 
-    },
   },
   created() {
-    this.autoRoll()
+    this.getDataList()
     dataTimer = setInterval(() => {
       this.getDataList()
-    }, 3000)
+    }, 30000)
   },
   beforeUnmount() {
     clearInterval(dataTimer)
-    clearInterval(domTimer)
   }
 }
 </script>