From 9ff377bc05f70f154226b612edd9a489372f8fbd Mon Sep 17 00:00:00 2001
From: zhusiyu <410827992@qq.com>
Date: Wed, 19 Oct 2022 15:57:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E7=BB=93=E3=80=81=E7=89=A9=E5=93=81?=
 =?UTF-8?q?=E3=80=81=E5=8D=B3=E6=97=B6=E5=BA=93=E5=AD=98=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goodsUseCensusLarge/departmentLarge.vue   |  2 +-
 .../goodsUseCensusSmall/departmentSmall.vue   |  4 +-
 .../adminCenter/moduleCom/oa/stock/stock.vue  | 24 +++++++---
 .../moduleCom/oa/stock/stockLarge.vue         | 23 +++++++---
 .../component/largeSummaryTable.vue           |  3 +-
 .../component/myLargeSummary.vue              |  2 +-
 .../oa/summaryRecord/component/submitInfo.vue | 46 +++++++++----------
 .../summaryRecord/component/totalRecord.vue   |  4 +-
 .../oa/summaryRecord/summaryRecordLarge.vue   |  8 ++--
 9 files changed, 68 insertions(+), 48 deletions(-)

diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/goodsUseCensus/components/goodsUseCensusLarge/departmentLarge.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/goodsUseCensus/components/goodsUseCensusLarge/departmentLarge.vue
index b8b8980..d76acdb 100644
--- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/goodsUseCensus/components/goodsUseCensusLarge/departmentLarge.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/goodsUseCensus/components/goodsUseCensusLarge/departmentLarge.vue
@@ -89,7 +89,7 @@
             },
             selected_data: {
                 handler(select_data) {
-                    if (select_data.length == 0) {
+                    if (select_data.length === undefined) {
                         this.deptId = this.BaseConfig.person_info_my.dep_id;
                     } else {
                         this.deptId = select_data[select_data.length - 1].id
diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/goodsUseCensus/components/goodsUseCensusSmall/departmentSmall.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/goodsUseCensus/components/goodsUseCensusSmall/departmentSmall.vue
index 26812fc..e6a9731 100644
--- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/goodsUseCensus/components/goodsUseCensusSmall/departmentSmall.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/goodsUseCensus/components/goodsUseCensusSmall/departmentSmall.vue
@@ -151,7 +151,7 @@
             }
         },
         watch: {
-            depObjs: function (newVal) {
+            depObjs(newVal) {
                 let depObjs = [];
                 let depNames = "全部";
                 let depIds = "";
@@ -175,7 +175,7 @@
             },
             selected_data: {
                 handler(select_data) {
-                    if (select_data.length == 0) {
+                    if (select_data.length === undefined) {
                         this.deptId = this.BaseConfig.person_info_my.dep_id;
                     } else {
                         this.deptId = select_data[select_data.length - 1].id
diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/stock/stock.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/stock/stock.vue
index 2791eb3..2cb3fc4 100644
--- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/stock/stock.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/stock/stock.vue
@@ -37,12 +37,13 @@
 <script>
     import {Table, Icon, Cascader, InputNumber} from 'ant-design-vue';
     import InterConfig from './interConfig';
-    export default{
-        data(){
+
+    export default {
+        data() {
             return {
                 showPage: false,
                 listScroll: this.StaticParams.scrollOption,
-                loading:false,
+                loading: false,
                 columns: [
                     {title: '类别编码', dataIndex: 'supplies_code', width: 100, key: 'supplies_code',},
                     {title: '物品（分类）', dataIndex: 'name', width: 120, key: 'name',},
@@ -82,7 +83,7 @@
             ACascader: Cascader,
             AInputNumber: InputNumber
         },
-        created(){
+        mounted() {
             this.getCategoryTree();
             this.getStockData();
         },
@@ -101,9 +102,18 @@
                     method: InterConfig.getStock.method,
                     isTestLogin: InterConfig.getStock.isTestLogin,
                 }], (result) => {
-                    let res = result[0].data;
-                    if (res.code === 2000) {
-                        this.options = res.data.list;
+                    //console.log('即时库存', result[0].data)
+                    if (result[0].data.code === 2000) {
+                        let res = result[0].data;
+                        // this.options = this.formatData(res.data.list)
+                        res.data.list.forEach(item => {
+                            if (item.children && item.children.length > 0) {
+                                this.options.push(item);
+                            } else {
+                                delete item.children
+                                this.options.push(item)
+                            }
+                        })
                     }
                 })
             },
diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/stock/stockLarge.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/stock/stockLarge.vue
index e425dd0..e3b561b 100644
--- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/stock/stockLarge.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/stock/stockLarge.vue
@@ -37,8 +37,9 @@
 <script>
     import {Table, Icon, Cascader, InputNumber} from 'ant-design-vue';
     import InterConfig from './interConfig';
-    export default{
-        data(){
+
+    export default {
+        data() {
             return {
                 showPage: false,
                 listScroll: this.StaticParams.scrollOption,
@@ -93,7 +94,7 @@
             ACascader: Cascader,
             AInputNumber: InputNumber
         },
-        created(){
+        created() {
             this.getCategoryTree();
             this.getStockData()
         },
@@ -112,13 +113,21 @@
                     method: InterConfig.getStock.method,
                     isTestLogin: InterConfig.getStock.isTestLogin,
                 }], (result) => {
-                    let res = result[0].data;
-                    if (res.code === 2000) {
-                        this.options = res.data.list;
+                    if (result[0].data.code === 2000) {
+                        let res = result[0].data;
+                        // this.options = this.formatData(res.data.list)
+                        res.data.list.forEach(item => {
+                            if (item.children && item.children.length > 0) {
+                                this.options.push(item);
+                            } else {
+                                delete item.children
+                                this.options.push(item)
+                            }
+                        })
                     }
                 })
             },
-            getStockData(){
+            getStockData() {
                 let param = {
                     org_id: this.BaseConfig.person_info_my.bureau_id,//机构id，必填
                     person_id: this.BaseConfig.userInfo.person_id,//当前登录人员ID，必填
diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/largeSummaryTable.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/largeSummaryTable.vue
index aaf3f65..af548db 100644
--- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/largeSummaryTable.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/largeSummaryTable.vue
@@ -3,7 +3,8 @@
         <vue-scroll :ops="listScroll"
                     :style="showPage?'height:20rem':'height:20rem'"
                     class="score-list-div">
-            <a-table :dataSource="dataSource" :columns="columns" bordered :pagination="false"></a-table>
+            <a-table :dataSource="dataSource" :columns="columns" bordered :pagination="false"
+                     rowKey="person_id||dept_id"></a-table>
         </vue-scroll>
     </div>
 </template>
diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/myLargeSummary.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/myLargeSummary.vue
index fb72c8d..d6ab27c 100644
--- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/myLargeSummary.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/myLargeSummary.vue
@@ -168,7 +168,7 @@
                             let day = resData.data.day;
                             this.begin_date = moment(year + "-" + month + "-01");
                             this.end_date = moment(year + "-" + month + "-" + day);
-                            this.searchTime = this.begin_date + "|" + this.end_date;
+                            this.dataSearchTime = this.begin_date + "|" + this.end_date;
                             this.workSummaryPersonOverview()
                         }
                     }
diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/submitInfo.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/submitInfo.vue
index b86fa0b..e2e5662 100644
--- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/submitInfo.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/submitInfo.vue
@@ -36,15 +36,15 @@
                     <a-spin class="brandCreat" :spinning="spinning2">
                         <vue-scroll class="summary-record-list-div" :ops="listScroll" style="height:10rem">
                             <a-table v-show="tableKey===1" :dataSource="dataSourceDept" :columns="columnsYear"
-                                     bordered :pagination="false"></a-table>
+                                     bordered :pagination="false" rowKey="person_id"></a-table>
                             <a-table v-show="tableKey===2" :dataSource="dataSourceDept" :columns="columnsTerm"
-                                     bordered :pagination="false"></a-table>
+                                     bordered :pagination="false" rowKey="person_id"></a-table>
                             <a-table v-show="tableKey===3" :dataSource="dataSourceDept" :columns="columnsMonth"
-                                     bordered :pagination="false"></a-table>
+                                     bordered :pagination="false" rowKey="person_id"></a-table>
                             <a-table v-show="tableKey===4" :dataSource="dataSourceDept" :columns="columnsWeek"
-                                     bordered :pagination="false"></a-table>
+                                     bordered :pagination="false" rowKey="person_id"></a-table>
                             <a-table v-show="tableKey===5" :dataSource="dataSourceDept" :columns="columnsDay"
-                                     bordered :pagination="false"></a-table>
+                                     bordered :pagination="false" rowKey="person_id"></a-table>
                         </vue-scroll>
                     </a-spin>
                 </div>
@@ -52,15 +52,15 @@
                     <a-spin class="brandCreat" :spinning="spinning3">
                         <vue-scroll class="summary-record-list-div" :ops="listScroll" style="height:10rem">
                             <a-table v-show="orgTableKey===1" :dataSource="dataSourceOrg" :columns="columnsDeptYear"
-                                     bordered :pagination="false"></a-table>
+                                     bordered :pagination="false" rowKey="dept_id"></a-table>
                             <a-table v-show="orgTableKey===2" :dataSource="dataSourceOrg" :columns="columnsDeptTerm"
-                                     bordered :pagination="false"></a-table>
+                                     bordered :pagination="false" rowKey="dept_id"></a-table>
                             <a-table v-show="orgTableKey===3" :dataSource="dataSourceOrg" :columns="columnsDeptMonth"
-                                     bordered :pagination="false"></a-table>
+                                     bordered :pagination="false" rowKey="dept_id"></a-table>
                             <a-table v-show="orgTableKey===4" :dataSource="dataSourceOrg" :columns="columnsDeptWeek"
-                                     bordered :pagination="false"></a-table>
+                                     bordered :pagination="false" rowKey="dept_id"></a-table>
                             <a-table v-show="orgTableKey===5" :dataSource="dataSourceOrg" :columns="columnsDeptDay"
-                                     bordered :pagination="false"></a-table>
+                                     bordered :pagination="false" rowKey="dept_id"></a-table>
                         </vue-scroll>
                     </a-spin>
                 </div>
@@ -436,10 +436,10 @@
             },
             selectedData: {
                 handler(select_data) {
-                    if (select_data.length == 0) {
+                    if (select_data.length === undefined) {
                         this.deptId = this.BaseConfig.person_info_my.dep_id;
                     } else {
-                        this.deptId = select_data[0].id
+                        this.deptId = select_data[select_data.length - 1].id
                         this.getWorkSummaryDeptPersonOverview()
                     }
                 },
@@ -499,9 +499,9 @@
                         method: interConfig.getWorkSummaryPersonCycleStatistics.method,
                         isTestLogin: interConfig.getWorkSummaryPersonCycleStatistics.isTestLogin,
                     }], (result) => {
-                        let resData = result[0].data;
                         // console.log('我的总结-提交情况', resData)
-                        if (resData.code === 2000) {
+                        if (result[0].data.code === 2000) {
+                            let resData = result[0].data;
                             this.dayList = resData.data.day_list;
                             this.weekList = resData.data.week_list;
                             this.monthList = resData.data.month_list;
@@ -511,7 +511,7 @@
                 }
             },
             getWorkSummaryDeptPersonOverview: function () {
-                this.spinning2 = true
+                this.spinning2 = true;
                 let timeStr = this.searchTime;
                 if (timeStr !== "") {
                     let startDate = timeStr.split("|")[0];
@@ -528,18 +528,18 @@
                         method: interConfig.workSummaryDeptPersonOverview.method,
                         isTestLogin: interConfig.workSummaryDeptPersonOverview.isTestLogin,
                     }], (result) => {
-                        this.spinning2 = false
-                        let resData = result[0].data;
-                        if (resData.code === 2000) {
+                        this.spinning2 = false;
+                        if (result[0].data.code === 2000) {
+                            let resData = result[0].data;
                             let dataSource = resData.data.person_list;//1学年2学期3月报4周报5日报
-                            this.dataSourceDept = dataSource
+                            this.dataSourceDept = dataSource;
                             this.changeType();
                         }
                     })
                 }
             },
             getWorkSummaryOrgDeptOverview: function () {
-                this.spinning3 = true
+                this.spinning3 = true;
                 let timeStr = this.searchTime;
                 if (timeStr !== "") {
                     let startDate = timeStr.split("|")[0];
@@ -555,11 +555,11 @@
                         method: interConfig.workSummaryOrgDeptOverview.method,
                         isTestLogin: interConfig.workSummaryOrgDeptOverview.isTestLogin,
                     }], (result) => {
-                        let resData = result[0].data;
+                        this.spinning3 = false;
                         //console.log('小块机构表格', resData)
-                        if (resData.code === 2000) {
+                        if (result[0].data.code === 2000) {
+                            let resData = result[0].data;
                             this.dataSourceOrg = resData.data.dept_list;
-                            this.spinning3 = false
                             this.changeType();
                         }
                     })
diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/totalRecord.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/totalRecord.vue
index 7aff8f7..4a81919 100644
--- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/totalRecord.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/totalRecord.vue
@@ -100,10 +100,10 @@
             },
             selectedData: {
                 handler(select_data) {
-                    if (select_data.length == 0) {
+                    if (select_data.length === undefined) {
                         this.deptId = this.BaseConfig.person_info_my.dep_id;
                     } else {
-                        this.deptId = select_data[0].id
+                        this.deptId = select_data[select_data.length - 1].id
                         this.getRecordData()
                     }
                 },
diff --git a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecordLarge.vue b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecordLarge.vue
index 55cd729..5123b51 100644
--- a/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecordLarge.vue
+++ b/src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecordLarge.vue
@@ -41,7 +41,7 @@
             <!--我的总结-提交情况-->
             <a-col :span="13" v-if="tabIndex==0">
                 <bgBox :largeBgTitle="submit">
-                    <submitInfo :type="tabIndex+1" :searchTime="searchTime" :largeSummary="true"></submitInfo>
+                    <submitInfo :type="tabIndex+1" :searchTime="searchTime" :largeSummary="true" :selectedData="selected_data"></submitInfo>
                 </bgBox>
             </a-col>
             <!--总结概览-->
@@ -476,12 +476,12 @@
             },
             selected_data: {
                 handler(select_data) {
-                    if (select_data[select_data.length - 1].id) {
+                    if (select_data.length === undefined) {
+                        this.deptId = this.BaseConfig.person_info_my.dep_id;
+                    } else {
                         this.deptId = select_data[select_data.length - 1].id
                         this.workSummaryDeptPersonOverview()
                         this.workSummaryDeptCycleStatistics()
-                    } else {
-                        this.deptId = this.BaseConfig.person_info_my.dep_id;
                     }
                 },
                 immediate: true