From 29d52b93fff98fdfd6461d5d94479b33fa572b63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 6 Feb 2023 04:30:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmRptData/XmRptDataMng.vue  |  3 +--
 src/views/xm/rpt/his/rptDataSelect.vue        | 14 ++++++++------
 src/views/xm/rpt/index/CompsCard.vue          | 17 +++++------------
 src/views/xm/rpt/index/CompsCardHisDetail.vue |  5 +++--
 src/views/xm/rpt/index/indexForHis.vue        | 17 ++++++++++++-----
 5 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/views/xm/core/xmRptData/XmRptDataMng.vue b/src/views/xm/core/xmRptData/XmRptDataMng.vue
index 961540c6..fa7ce390 100644
--- a/src/views/xm/core/xmRptData/XmRptDataMng.vue
+++ b/src/views/xm/core/xmRptData/XmRptDataMng.vue
@@ -4,8 +4,7 @@
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input>
 			<el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmRptDatas" icon="el-icon-search">查询</el-button>
 			<span style="float:right;">
-			    <el-button type="primary" @click="showAdd" icon="el-icon-plus" plain> </el-button>
-			    <el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete" plain></el-button>
+ 			    <el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete" plain></el-button>
 		    </span>
 		</el-row>
 		<el-row class="padding-top">
diff --git a/src/views/xm/rpt/his/rptDataSelect.vue b/src/views/xm/rpt/his/rptDataSelect.vue
index eedaa1ea..67fcc0f0 100644
--- a/src/views/xm/rpt/his/rptDataSelect.vue
+++ b/src/views/xm/rpt/his/rptDataSelect.vue
@@ -1,12 +1,10 @@
 <template>
 	<section class="page-container border padding">
 		<el-row>
-			<el-input v-model="filters.key" style="width: 40%;" placeholder="模糊查询"></el-input>
-            <mdp-date-range v-model="filters" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
-			<el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmRptDatas" icon="el-icon-search">查询</el-button>
-			<span style="float:right;">
- 			    <el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete" plain></el-button>
-		    </span>
+			<el-input v-model="filters.key" style="width: 30%;" placeholder="模糊查询"></el-input>
+            <el-checkbox v-model="filters.myCreate" true-label="1" false-label="0">我的</el-checkbox>
+            <mdp-date-range v-model="filters" style="width:220px" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
+			<el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmRptDatas" icon="el-icon-search"></el-button> 
 		</el-row>
 		<el-row class="padding-top">
 			<!--列表 XmRptData xm_rpt_data-->
@@ -68,6 +66,7 @@ export default {
                 key: '',
                 startBizDate:'',
                 endBizDate:'',
+                myCreate:'',
             },
             xmRptDatas: [],//查询结果
             pageInfo:{//分页数据
@@ -147,6 +146,9 @@ export default {
             if(this.filters.key){
                 params.key=this.filters.key
             }
+            if(this.filters.myCreate=='1'){
+                params.cuserid=this.userInfo.userid
+            }
             if(this.filters.startBizDate){
                 params.startBizDate=this.filters.startBizDate
                 params.endBizDate=this.filters.endBizDate
diff --git a/src/views/xm/rpt/index/CompsCard.vue b/src/views/xm/rpt/index/CompsCard.vue
index c236da02..ef7a3d17 100644
--- a/src/views/xm/rpt/index/CompsCard.vue
+++ b/src/views/xm/rpt/index/CompsCard.vue
@@ -317,17 +317,10 @@ export default {
                 }) 
                  return;
             }
-            var compCfgListTemp=JSON.parse(JSON.stringify(this.compCfgList))
-            compCfgListTemp.sort((i1,i2)=>{
-                return i2.i-i1.i
-            })
-            var maxI=(compCfgListTemp.length>0?(compCfgListTemp[0].i+1):1);
-            compCfgListTemp.sort((i1,i2)=>{
-                return i2.y-i1.y
-            })
-            var maxY=(compCfgListTemp.length>0?(compCfgListTemp[0].y+6):0);
-            var compCfg={...comp,i:maxI, x: 0,  y: maxY,  w: 12, h: 6,id:comp.compId+seq.sn()} 
-            this.compCfgList.push(compCfg) 
+            var allCheckedList=this.$refs.compsSet.datas.filter(k=>k.isChecked)
+            var index=allCheckedList.findIndex(k=>k.compId==comp.compId)
+            var compCfg={...comp,id:comp.compId+seq.sn()} 
+            this.compCfgList.splice(index,0,compCfg)
             this.$nextTick(()=>{ 
                 setTimeout(()=>{
                     this.scrollToComp(compCfg) 
@@ -436,7 +429,7 @@ export default {
         },
         onCompChange(compCfg,checked){  
             if(checked=='false'||!checked){
-                var index=this.compCfgList.findIndex(k=>k.id==compCfg.id) 
+                var index=this.compCfgList.findIndex(k=>k.compId==compCfg.compId) 
                 if(index>=0){ 
                     this.compCfgList.splice(index,1)   
                 } 
diff --git a/src/views/xm/rpt/index/CompsCardHisDetail.vue b/src/views/xm/rpt/index/CompsCardHisDetail.vue
index 683b7fbe..de5368e6 100644
--- a/src/views/xm/rpt/index/CompsCardHisDetail.vue
+++ b/src/views/xm/rpt/index/CompsCardHisDetail.vue
@@ -130,9 +130,10 @@ export default {
                 }) 
                  return;
             }
-             
+            var allCheckedList=this.$refs.compsSet.datas.filter(k=>k.isChecked)
+            var index=allCheckedList.findIndex(k=>k.compId==comp.compId)
             var compCfg={...comp,id:comp.compId+seq.sn()} 
-            this.compCfgList.push(compCfg) 
+            this.compCfgList.splice(index,0,compCfg)
             this.$nextTick(()=>{ 
                 setTimeout(()=>{
                     this.scrollToComp(compCfg) 
diff --git a/src/views/xm/rpt/index/indexForHis.vue b/src/views/xm/rpt/index/indexForHis.vue
index 6e7003b3..fe19fe43 100644
--- a/src/views/xm/rpt/index/indexForHis.vue
+++ b/src/views/xm/rpt/index/indexForHis.vue
@@ -1,9 +1,11 @@
 <template>
 	<section class="padding">
 		<el-row>
-			<el-input v-model="filters.key" style="width: 40%;" placeholder="模糊查询"></el-input>
-            <mdp-date-range v-model="filters" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
-			<el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmRptDatas" icon="el-icon-search">查询</el-button>
+			<el-input v-model="filters.key" style="width: 30%;" placeholder="模糊查询"></el-input>           
+            <el-checkbox v-model="filters.myCreate" true-label="1" false-label="0">我的</el-checkbox>
+
+            <mdp-date-range v-model="filters" start-key="startBizDate" style="width:250px;" end-key="endBizDate"></mdp-date-range>
+			<el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmRptDatas" icon="el-icon-search"></el-button>
 			<span style="float:right;">
  			    <el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete" plain></el-button>
 		    </span>
@@ -12,12 +14,12 @@
 			<!--列表 XmRptData xm_rpt_data-->
 			<el-table ref="xmRptDataTable" :data="xmRptDatas" :height="maxTableHeight" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
                 <el-table-column  type="selection" width="55" show-overflow-tooltip fixed="left"></el-table-column> 
-                <el-table-column prop="rptName" label="报告名称" min-width="120" show-overflow-tooltip>
+                <el-table-column prop="rptName" label="报告名称" min-width="250" show-overflow-tooltip>
 				    <template slot-scope="scope">
 				        <span> {{scope.row.rptName}} </span>
                     </template>
 				</el-table-column>  
-				<el-table-column prop="bizDate" label="业务日期" min-width="120" show-overflow-tooltip>
+				<el-table-column prop="bizDate" label="业务日期" min-width="100" show-overflow-tooltip>
 				    <template slot-scope="scope">
 				        <span> {{scope.row.bizDate}} </span>
                     </template>
@@ -67,6 +69,7 @@ export default {
                 key: '',
                 startBizDate:'',
                 endBizDate:'',
+                myCreate:'0',
             },
             xmRptDatas: [],//查询结果
             pageInfo:{//分页数据
@@ -150,6 +153,10 @@ export default {
                 params.startBizDate=this.filters.startBizDate
                 params.endBizDate=this.filters.endBizDate
             } 
+            
+            if(this.filters.myCreate=='1'){
+                params.cuserid=this.userInfo.userid
+            }
             this.load.list = true;
             listXmRptData(params).then((res) => {
                 var tips=res.data.tips;