运营指标验收等功能

src/admin/index/pages/sys.role.vue

@@ -470,6 +470,7 @@
             //未绑定组织机构
             changebind(value){
                 if(value){
+                    this.cur_page = 1;
                     this.tableListunbind(value[value.length - 1]);
                 }
             },
@@ -546,6 +547,7 @@
             //绑定组织机构
             changeunbind(value){
                 if(value){
+                    this.cur_pageunbind = 1;
                     this.tableListbind(value[value.length - 1]);
                 }
             },

src/views/findeventpage/eventlive.vue

@@ -6,7 +6,7 @@
                 <img class="event_iconchange_img" src="../../assets/img/changeImg.png" alt="">
             </el-tooltip>
         </div>
-        <div class="gendisplay event_all">
+        <div v-if="isVisible" class="gendisplay event_all">
             <div @click="userClick = false" class="event_l"></div>
             <div class="event_r" :class="userClick?'event_rshow':''">
                 <img @click="userClick = false" src="../../assets/img/pull.png" :style="userClick?'':'display: none;'">
@@ -120,6 +120,9 @@
             document.getElementsByTagName("body")[0].style.overflow = "hidden";
             this.userHistory(0);
             this.isShowChange();
+            setTimeout(function () {
+                document.body.scrollTop=document.documentElement.scrollTop=0;
+            },1500)
         },
         beforeRouteLeave(to,from,next) { // 在组件生命周期结束的时候销毁。、
             // this.userHistory(1);

src/views/indexAccepting/projectManage.vue

@@ -2,7 +2,7 @@
     <div style="margin-top: 10px;">
         <el-row class="tabPdding">
             <el-row class="statebottm">
-                <page-screen :screenlist="screenlist" :checkboxGroupstate="checkStateIds"  :checkboxGroupchildstate="search.checkState" :screenchildListIf="true" ref="screenchild" titleName="验收状态"  @changecheck="screenData"></page-screen>
+                <page-screen :screenlist="screenlist" :checkboxGroupstate="checkStateIds"  :checkboxGroupchildstate="search.authenticationState" :screenchildListIf="true" ref="screenchild" titleName="验收状态"  @changecheck="screenData"></page-screen>
             </el-row>
             <el-row class="statebottm" style="padding: 20px 10px;line-height: 40px;">
                 <el-col :span="12">
@@ -15,7 +15,7 @@
                 </el-col>
                 <el-col :span="12">
                     <span style="font-weight: bold;margin: 0 60px 0 40px;">区域：</span>
-                    <el-select v-model="search.orgIdList" multiple placeholder="请选择区域" style="width: 280px;">
+                    <el-select v-model="search.selectOrgIdList" multiple placeholder="请选择区域" style="width: 280px;">
                         <el-option
                                 v-for="item in areaList"
                                 :key="item.orgId"
@@ -124,7 +124,7 @@
                 search:{
                     authBegin:'',
                     authEnd:'',
-                    orgIdList:null,
+                    selectOrgIdList:null,
                 },
                 areaList:[],
                 auditlist:[],
@@ -140,8 +140,8 @@
                 vm.pathfrom = from.path;
                 if(vm.pathfrom == '/auditinside'){
                     vm.search = vm.publicFun.getCookie("projectSearch")?JSON.parse(vm.publicFun.getCookie("projectSearch")):{};
-                    if(vm.search.checkState !=''||vm.search.checkState !=null){
-                        vm.checkStateIds.push(vm.search.checkState)
+                    if(vm.search.authenticationState !=''||vm.search.authenticationState !=null){
+                        vm.checkStateIds.push(vm.search.authenticationState)
                     }
                     vm.getAcceptanceAxios();
                 }else{
@@ -152,7 +152,7 @@
         components:{pageScreen,exportFieldBar},
         methods:{
             screenData(a){
-                this.search.checkState = a;
+                this.search.authenticationState = a;
                 this.searchCik();
             },
             getselectAreaList(){
@@ -222,7 +222,7 @@
                 this.search = {
                     authBegin:'',
                     authEnd:'',
-                    orgIdList:null,
+                    selectOrgIdList:null,
                 };
                 this.$refs.screenchild.stateinit();
                 this.cur_page = 1;

src/views/innovatecompany/acceptintention/intentionbar.vue

@@ -186,9 +186,9 @@
         },
         mounted() {
             const empinfo = JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType()));
+            this.stateData.projectId = this.projectId;
             if(this.publicFun.isgetUserRoleFunc(2)&&this.publicFun.isgetUserRoleFunc(5)){
                 this.isempinfo = true;
-                this.stateData.projectId = this.projectId;
                 this.isempurl = '/business/purpose/getRequirementsBelongProject';
             }else{
                 this.isempinfo = false;

src/views/innovatecompany/lreleaseproject/litemlist.vue

@@ -14,7 +14,7 @@
                             <el-table-column :label="$t('litemlistjson.projectName')" width="330" >
                                 <template slot-scope="scope">
                                     <p @click="setDatalist(scope.row)" class="projectNamep">{{scope.row.projectName}}</p>
-                                    <span class="stateclass">{{scope.row.authenticationState=='AS02'?$t('operationjson.pendingreview'):scope.row.authenticationState=='AS03'?$t('operationjson.audited'):scope.row.authenticationState=='AS04'?$t('operationjson.dismissed'):scope.row.authenticationState=='AS05'?'验收通过不展示':scope.row.authenticationState=='AS06'?'验收不通过展示':''}}</span>
+                                    <span class="stateclass">{{scope.row.authenticationState=='AS02'?$t('operationjson.pendingreview'):scope.row.authenticationState=='AS03'?$t('operationjson.audited'):scope.row.authenticationState=='AS04'?$t('operationjson.dismissed'):scope.row.authenticationState=='AS05'?(publicFun.isgetUserRoleFunc(5)?'验收通过不展示':$t('operationjson.audited')):scope.row.authenticationState=='AS06'?(publicFun.isgetUserRoleFunc(5)?'验收不通过展示':$t('operationjson.audited')):''}}</span>
                                 </template>
                             </el-table-column>
                             <el-table-column prop="projectModel" :label="$t('litemlistjson.projectModel')" align='center'>

src/views/innovatecompany/registeruser/registeruserlist.vue

@@ -100,6 +100,10 @@
                             {{scope.row.frozenState == '0' ? $t('usermanagement.normal'): scope.row.frozenState == '1' ? $t('usermanagement.Frozen') : ''}}
                         </template>
                     </el-table-column>
+                    <el-table-column prop="orgName" label="区域" align="center">
+                    </el-table-column>
+                    <el-table-column prop="refereeName" label="区域联系人" align="center">
+                    </el-table-column>
                     <el-table-column :label="$t('listjson.action')" width="150" align='center'>
                         <template slot-scope="scope">
                             <el-button v-if="scope.row.frozenState == 0" type="text" @click="frozenStatebtn(scope.row)">{{$t('usermanagement.freeze')}}</el-button>

src/views/innovatecompany/registeruser/relevantproject.vue

@@ -5,7 +5,7 @@
                 <el-table-column :label="$t('litemlistjson.projectName')" width="330" >
                     <template slot-scope="scope">
                         <p class="projectNamep">{{scope.row.projectName}}</p>
-                        <span class="stateclass">{{scope.row.authenticationState=='AS02'?$t('operationjson.pendingreview'):scope.row.authenticationState=='AS03'?$t('operationjson.audited'):scope.row.authenticationState=='AS04'?$t('operationjson.dismissed'):''}}</span>
+                        <span class="stateclass">{{scope.row.authenticationState=='AS02'?$t('operationjson.pendingreview'):scope.row.authenticationState=='AS03'?$t('operationjson.audited'):scope.row.authenticationState=='AS04'?$t('operationjson.dismissed'):scope.row.authenticationState=='AS05'?'验收通过不展示':scope.row.authenticationState=='AS06'?'验收不通过展示':''}}</span>
                     </template>
                 </el-table-column>
                 <el-table-column prop="projectModel" :label="$t('litemlistjson.projectModel')" align='center'>

src/views/innovatecompany/submitprojects/submittwo.vue

@@ -103,6 +103,7 @@
                 </el-row>
             </el-form-item>
             <el-form-item :label="$t('releasejson.uploadbp')"  ref="formBpUrl" :prop="publicFun.isgetUserRoleFunc(5)?'projectBpUrl':''">
+                <el-input v-show="false" maxlength="36" v-model="formData.projectBpUrl"></el-input>
                 <el-row>
                     <p style="margin-bottom: 10px;color: #9197B4"><i style="color: #FF9E29;font-size: 12px;padding-right: 5px" class="iconfont icon-gantanhao-quan"></i>{{$t('Otherjson.message3')}}<span style="color: #9197B4">（{{$t('releasejson.uploadexl')}}）</span></p>
                 </el-row>

src/views/keySearchpage/bigBusinesslist.vue

@@ -99,6 +99,7 @@
             },
             groupdata(val){
                 this.stateData = val;
+                this.cur_page = 1;
                 this.getselectdatas();
             },
             getselectdatas(){

src/views/keySearchpage/projectlist.vue

 <template>
     <div class="search_content">
-        <choice-group @active="groupdata" @stateinit="stateinit"></choice-group>
+        <choice-group @active="groupdata"></choice-group>
         <div class="noDatalist" v-if="totalListResult == 0">
             <img src="../../assets/img/mobile/noProject.png" alt="">
             <p>相关的搜索结果较少，您可以换个搜索词试试！</p>
@@ -97,6 +97,7 @@
             },
             groupdata(val){
                 this.stateData = val;
+                this.cur_page = 1;
                 this.getselectdatas();
             },
             getselectdatas(){