Merge branch 'test' into 'master'

会议申报部署

See merge request spfm-group/spfm-market-front!36

src/components/deptTreeUser.vue

@@ -1,8 +1,9 @@
 <template>
     <div class="treebox" v-loading="loading">
+        <el-input placeholder="输入关键字进行过滤" v-model="filterText"></el-input>
         <el-tree :highlight-current="true" :check-strictly="true" ref="tree" @check-change="handleCheckChange"
             :data="treeList" node-key="id" :default-checked-keys="defaultListc" :default-expanded-keys="defaultListc"
-            @node-click="handleNodeClick">
+            @node-click="handleNodeClick" :filter-node-method="filterNode">
             <span class="custom-tree-node" slot-scope="{ node, data }" @click="cs(node)">
                 <em style="display: inline-block;width: 20px;" v-if="node.data.haveUserFlag == 'N'&& node.data.children.length == 0"></em>
                 <i class="el-icon-caret-right" v-if="node.data.haveUserFlag == 'Y' && node.data.children.length == 0"></i>
@@ -25,10 +26,15 @@
                     label: "label",
                 },
                 defaultListc: [],
-                loading:false
+                loading:false,
+                filterText: '',
             };
         },
         methods: {
+            filterNode(value, data) {
+                if (!value) return true;
+                return data.label.indexOf(value) !== -1;
+            },
             cs(v){
                 // console.log(v)
             },
@@ -115,6 +121,9 @@
             this.defaultListc = this.defaultList;
         },
         watch: {
+            filterText(val) {
+                this.$refs.tree.filter(val);
+            },
             type() {
                 this.defaultListc = this.defaultList;
                 this.$forceUpdate();

src/components/deptTreeUserNew.vue

@@ -1,8 +1,9 @@
 <template>
     <div class="treebox" v-loading="loading">
+        <el-input placeholder="输入关键字进行过滤" v-model="filterText"></el-input>
         <el-tree :highlight-current="true" :check-strictly="true" ref="tree" @check-change="handleCheckChange"
             :data="treeList" node-key="id" :default-checked-keys="defaultListc" :default-expanded-keys="defaultListc"
-            @node-click="handleNodeClick">
+            @node-click="handleNodeClick" :filter-node-method="filterNode">
             <span class="custom-tree-node" slot-scope="{ node, data }" @click="cs(node)">
                 <em style="display: inline-block;width: 20px;" v-if="node.data.haveUserFlag == 'N'&& node.data.children.length == 0"></em>
                 <i class="el-icon-caret-right" v-if="node.data.haveUserFlag == 'Y' && node.data.children.length == 0"></i>
@@ -12,7 +13,6 @@
         </el-tree>
     </div>
 </template>
-
 <script>
     export default {
         props: ["defaultList", "type", "closeList","fillLists"],
@@ -25,11 +25,15 @@
                     label: "label",
                 },
                 defaultListc: [],
-                loading:false
+                loading:false,
+                filterText: '',
             };
         },
         methods: {
-            
+            filterNode(value, data) {
+                if (!value) return true;
+                return data.label.indexOf(value) !== -1;
+            },
             cs(v){
                 // console.log(v)
                 
@@ -130,6 +134,9 @@
             this.defaultListc = this.defaultList;
         },
         watch: {
+            filterText(val) {
+                this.$refs.tree.filter(val);
+            },
             type() {
                 this.defaultListc = this.defaultList;
                 this.$forceUpdate();

src/components/p-header.vue

@@ -111,7 +111,7 @@ export default {
               window.sessionStorage.userInfo = undefined;
               window.sessionStorage.childrenMenus = undefined;
               window.opener=null;
-              window.open('','_self');
+              window.open(' ','_self');
               window.close();
               // window.parent.close();
             //返回到登录页面

src/pages/main/memberFamily/dataStatistics.vue

@@ -76,17 +76,21 @@
 				lastUpdateTime: '',
                 sts:1,
                 companyFlag:'',
+				// excelCityparam: ""
+				memberFamilyBtnShow: "-1"
 			}
 		},
 		methods: {
             outexl(){
                 let url = '';
                 let paramsf = {};
+				if(window.sessionStorage.excelCityparam){
+					paramsf.regionName = window.sessionStorage.excelCityparam
+				}
                 if(this.sts == 1){
                     url = '/market/cMemberWo/excelExportSummaryByProv';
                 }else{
                     url = '/market/cMemberWo/excelExportSummaryByArea';
-                    // paramsf.regionName =
                 }
                 this.$http({
                     url: url,
@@ -118,8 +122,30 @@
                 });
             },
 			choseperson(v){
-                console.log(v)
+				if(v.showButton){
+					window.sessionStorage.memberFamilyBtnShow = v.showButton;
+				}
                 if(this.companyFlag == 0){
+					if(v.regionName == "省公司"){
+						 this.$router.push({
+                        	path: "/employeeInfo",
+                            query:{
+                                regionName:v.regionName
+                            }
+                        });
+                        this.setabList("员工信息", "/employeeInfo?regionName="+v.regionName);
+						return
+					}
+					// if(v.areaName == "省公司"){
+					// 	this.$router.push({
+                    //     	path: "/employeeInfo",
+                    //         query:{
+                    //             regionName:v.areaName
+                    //         }
+                    //     });
+                    //     this.setabList("员工信息", "/employeeInfo?regionName="+v.areaName);
+					// 	return
+					// }
                     if(this.sts == 2){
                         this.$router.push({
                         	path: "/employeeInfo",
@@ -130,6 +156,7 @@
                         this.setabList("员工信息", "/employeeInfo?regionName="+v.areaName);
                         return
                     }
+					window.sessionStorage.excelCityparam = v.regionName;
                     this.$http({
                     	url: "/market/cMemberWo/querySummaryByAreaPage",
                     	method: "post",
@@ -144,14 +171,16 @@
                     	this.loading = false;
                         this.sts = 2;
                     });
+					
                 }else{
                     this.$router.push({
-                    	path: "/employeeInfo?regionName="+v.regionName,
+                    	path: "/employeeInfo?regionName="+v.areaName,
                         query:{
-                            regionName:v.regionName
+                            regionName:v.areaName
                         }
                     });
-                    this.setabList("员工信息", "/employeeInfo?regionName="+v.regionName);
+					
+                    this.setabList("员工信息", "/employeeInfo?regionName="+v.areaName);
                 }
 			},
 			setabList(n, p) {
@@ -172,7 +201,7 @@
 				this.$store.commit("setTabList", Array.from(set));
 			},
 			handleSelectionChange(val) {
-				console.log(val)
+				console.log(val) 
 			},
 			//搜索数据
 			searchInfo(v) {
@@ -192,6 +221,8 @@
                 }else if(this.companyFlag == 1){
                     url="/market/cMemberWo/querySummaryByAreaPage"
                     v.regionName = this.userInfo.cityName
+					window.sessionStorage.excelCityparam = this.userInfo.cityName;
+					this.sts = 2
                 }
 				this.$http({
 					url: url,
@@ -205,6 +236,7 @@
 					this.tableData = res.data.data;
 					this.total = res.data.totalRecord;
 					this.loading = false;
+					
 				});
 			},
 			// 分页
@@ -268,6 +300,7 @@
 		},
 		mounted() {
 			this.getUser();
+			window.sessionStorage.memberFamilyBtnShow = this.memberFamilyBtnShow
 		},
 		created() {
 

src/pages/main/memberFamily/employeeInfo.vue

@@ -100,7 +100,7 @@
                 searchList: [
                     {
                         type: 'input',
-                        tit: '供应商名称',
+                        tit: '人员名称',
                         value: '',
                         width: '98%',
                     }
@@ -121,12 +121,19 @@
                 delid: '',
                 loading:false,
                 loadinged:false,
+                memberFamilyBtnShow: "",
             }
         },
         methods: {
             outexl(){
                 let url = '/market/cMemberWo/excelExportDetailSummary';
-                let paramsf = {areaName:this.$route.query.regionName};
+                let paramsf = {};
+                
+                if(this.memberFamilyBtnShow && (this.memberFamilyBtnShow == "1")){
+                    paramsf.areaName = this.$route.query.regionName
+                }else{
+                    paramsf.regionName = this.$route.query.regionName
+                }
                 this.$http({
                     url: url,
                     method: "post",
@@ -198,8 +205,10 @@
                 let _this = this;
                 this.loading = true;
                 this.tableData = [];
-                v.areaName = this.$route.query.regionName
-                v.isShow = 0
+                v.areaName = this.$route.query.regionName;
+                v.isShow = 0;
+                var memberFamilyBtnShow = JSON.parse(window.sessionStorage.memberFamilyBtnShow)
+                v.showButton = memberFamilyBtnShow
                 this.$http({
                     url: "/market/cMemberWo/queryMkMemberFillDetailSummaryPage",
                     method: "post",
@@ -342,6 +351,7 @@
         mounted() {
             this.getList({}, 1);
             this.getUser();
+            this.memberFamilyBtnShow = JSON.parse(window.sessionStorage.memberFamilyBtnShow)
         },
         created() {
 

src/pages/main/memberFamily/haveInHand.vue

@@ -107,8 +107,10 @@
         </el-dialog>
 
         <el-dialog title="选择负责人" :visible.sync="dialogStatusp" width="50%" :destroy-on-close="true"
-            :modal-append-to-body="false" :close-on-click-modal="false">
+            :modal-append-to-body="false" :close-on-click-modal="false" :before-close="closeDutydia">
+            <el-input placeholder="输入关键字进行过滤" v-model="filterText" @input="dutyNameSearch"></el-input>
             <el-form :model="infolist" ref="infolist" style="height: 50vh;overflow-y: scroll;">
+                
                 <div class="treeUserp">
 					<p v-for="(item,index) in treeListponly" :key="index" @click="chofz(item)" v-if="item.loginNameStr">
 					    {{item.groupName}} -
@@ -187,7 +189,9 @@
                 companyFlag: '',
                 dialogStatusp: false,
                 choone: {},
-                fillLists:[]
+                fillLists:[],
+                filterText: '',
+                filterData: []
             }
         },
         methods: {
@@ -292,6 +296,7 @@
             },
             chofz(v) {
                 this.dialogStatusp = false;
+                this.filterText = "";
                 for (let i = 0; i < this.treeListp.length; i++) {
                     if (this.treeListp[i].o == this.fadept.o) {
                         this.treeListp[i].loginNameStr = v.loginNameStr;
@@ -337,6 +342,8 @@
                        }).then((ress) => {
                           this.treeListponly.push({bumen:item.ou})
                           this.treeListponly=this.treeListponly.concat(ress.data);
+
+                          this.filterData = this.treeListponly;
                        });
                    })
                 });
@@ -403,6 +410,11 @@
             closedia() {
                 this.infolist = {};
                 this.dialogStatus = false;
+                
+            },
+            closeDutydia(){
+                this.dialogStatusp = false;
+                this.filterText = "";
             },
             //搜索数据
             searchInfo(v) {
@@ -622,6 +634,43 @@
                     this.companyFlag = res.data.companyFlag;
                     this.getList({}, 1);
                 });
+            },
+            dutyNameSearch() {
+
+                if(this.filterText == "" || this.filterText == null){
+                    this.treeListponly = this.filterData;
+                    return;
+                }
+                
+                this.treeListponly.forEach((item)=>{
+                        if(item.groupName !== undefined){
+                            if(item.groupName.indexOf(this.filterText) !== -1){
+                            this.treeListponly = this.treeListponly.filter(m=>{
+                                if(m.groupName)
+                                return m.groupName.indexOf(this.filterText)!=-1;
+                                else
+                                {
+                                    return false;
+                                }
+                            })
+                            }
+                        }
+                        if(item.loginNameStr !== undefined){
+                             
+                            if(item.loginNameStr.indexOf(this.filterText) !== -1){
+                                this.treeListponly = this.treeListponly.filter(n=>{
+                                    if(n.loginNameStr)
+                                return n.loginNameStr.indexOf(this.filterText)!=-1;
+                                else
+                                {
+                                    return false;
+                                }
+                                })
+                            }
+                        }
+                    
+                })
+
             }
         },
         mounted() {

src/pages/main/memberFamily/speedOfProgress.vue

@@ -28,15 +28,21 @@
 					</el-table-column>
                     <el-table-column label="操作" width="160px" align="center">
                         <template slot-scope="scope">
-                            <el-button size="mini" type="primary" @click="dialogCheck(2,scope.row)" v-if="!scope.row.areaDutyNme">查看</el-button>
+                            <el-button size="mini" type="primary" @click="dialogCheck(2,scope.row,1)" v-if="!scope.row.areaDutyNme">查看</el-button>
                             <el-button size="mini" type="danger">催办</el-button>
                         </template>
                     </el-table-column>
                 </el-table>
-                <el-pagination class="pageBox" @current-change="currchange" layout="prev, pager, next" background
-                    :total="total">
+                <el-pagination
+                    class="pageBox"
+                    @current-change="currchange"
+                    layout="prev, pager, next"
+                    background
+                    :total="total"
+                >
                 </el-pagination>
             </div>
+            
         </div>
     </fullscreen>
 
@@ -80,6 +86,7 @@
                 loading:false,
                 loadinged:false,
                 companyFlag:'',
+                secParams:{}
             }
         },
         methods: {
@@ -133,29 +140,32 @@
                     data: v,
                 }).then((res) => {
                     this.tableData = res.data;
-                    this.total = res.data.totalRecord;
+                    // this.total = res.data.totalRecord;
                     this.loading = false;
-                });
+                })
             },
             // 分页
             currchange(v) {
                 this.pageSize = v;
-                this.getList(this.params, this.pageSize);
+                // this.getList(this.params, this.pageSize);
+                this.dialogCheck(2, this.secParams, this.pageSize);
             },
             //申请
-            dialogCheck(v, n) {
+            dialogCheck(v, n, page) {
+                
                 this.$http({
                     url: '/market/cMemberWo/queryProgressByAreaPage',
                     method: "post",
                     headers: {
                         "Content-Type": "application/json",
-                        "page": '{"pageNo":"' + 1 + '","pageSize":"10"}'
+                        "page": '{"pageNo":"' + page + '","pageSize":"10"}'
                     },
                     data: {regionName:n.regionName},
                 }).then((res) => {
                     this.tableData = res.data.data;
                     this.total = res.data.totalRecord;
                 });
+                this.secParams = n
             },
             //添加
             dialogCli(v) {

src/router/index.js

@@ -1700,6 +1700,25 @@ const routes = [{
             name: 'approvalExamination',
             component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/gridDivision/approvalExamination.vue'], resolve)
         },
+        {
+            meta: {
+                name: '专题汇报',
+                keepAlive: false
+            },
+            path: '/specialReport',
+            name: 'specialReport',
+            component: (resolve) => require( /* webpackChunkName: "system" */ ['../pages/main/meetingDeclaration/specialReport'], resolve)
+        },
+        {
+            meta: {
+                name: '市场决策会',
+                keepAlive: false
+            },
+            path: '/marketDecisionMeeting',
+            name: 'marketDecisionMeeting',
+            component: (resolve) => require( /* webpackChunkName: "system" */ ['../pages/main/meetingDeclaration/marketDecisionMeeting'], resolve)
+        },
+        
     ]
 },
 {