apply-clients 3.0.4 → 3.0.5-4

package/src/bootstrap/less/standard.less

@@ -0,0 +1,208 @@
+
+/*=========================通用样式表=========================*/
+    @font-face {
+      font-family: PingFang;
+      src:url('../fonts/PingFangSC-Regular.ttf');
+    }
+
+
+ /********************字体*****************/
+    /*字体标题_粗体*/
+    .font_bold_title{font-weight: bold; color: #333333;text-align: right;vertical-align: middle;}
+    /*字体正文_粗体*/
+    .font_bold_body{ font-family: PingFang; font-weight: bold;color: #666666;text-align: right;vertical-align: middle; }
+    /*字体_粗体*/
+    .font_bold_title1{ font-family: PingFang; font-weight: bold;color: #999999;text-align: right;vertical-align: middle;}
+    /*字体按钮_粗体*/
+    .font_bold_button{ font-family: PingFang; font-weight: bold;color: #ffffff;text-align: right;vertical-align: middle;}
+    /*字体蓝色_粗体*/
+    .font_bold_blue{ font-family: PingFang; font-weight: bold;color: #6aa6e2;text-align: right;vertical-align: middle;}
+
+    /*字体标题_正常*/
+    .font_normal_title{ font-family: PingFang; font-weight: normal;color: #333333!important;text-align: right;vertical-align: middle;}
+    /*字体正文_正常*/
+    .font_normal_body{ font-family: PingFang; font-weight: normal !important;color: #666666!important;text-align: right;vertical-align: middle;}
+    /*字体_正常*/
+    .font_normal_title1{ font-family: PingFang;font-weight: normal;color: #999999!important;text-align: right;vertical-align: middle;}
+    /*字体按钮_正常*/
+    .font_normal_button{ font-family: PingFang;font-weight: normal;color: #ffffff!important;text-align: right;vertical-align: middle;}
+    /*字体蓝色_正常*/
+    .font_normal_blue{ font-family: PingFang;font-weight: normal;color: #6aa6e2!important;text-align: right;vertical-align: middle;}
+
+    .search_area{background-color: #ffffff; border-radius: 10px;margin-bottom: 20px;padding: 20px}
+    .list_area{background-color: #ffffff; border-radius: 10px;padding: 20px}
+
+
+/********************表格*****************/
+    .table_sy{margin-top: 6px}
+    /*表格表头*/
+    .table_sy thead tr th{background-color: #eaf5ff!important;color: #666666 !important;font-family: PingFang !important;font-weight: normal!important;}
+    /*表格主体_奇数行*/
+    .table_sy tbody tr:nth-child(odd){background-color: #ffffff !important;border: solid 1px #f0f4fa !important;color: #666666!important;font-size: 15px!important;font-family: PingFang!important;}
+    /*表格主体_偶数行*/
+    .table_sy tbody tr:nth-child(even){background-color: #f6fbff !important;border: solid 1px #f0f4fa !important;color: #666666!important;font-size: 15px!important;font-family: PingFang!important;}
+    /*表格主体_移动行*/
+    .table_sy tbody tr:hover{	background-color: #ecf6ff!important;border: solid 1px #f0f4fa !important;color: #666666!important;font-size: 15px!important;font-family: PingFang!important;}
+    /*表格底部*/
+    .pager{background-color: #eaf5ff !important;}
+    /*表格主体_点击行*/
+    .success td{background-color: #ecf6ff !important;}
+
+    .foot{font-family: PingFang !important;}
+
+    /*下拉列表滑动变色*/
+    .select_list li a:hover{background-color: #eaf5ff !important;border-radius: 2px;border: solid 1px #eaeaea;}
+
+     /*弹窗*/
+    .pop_windows{background-color: #d9e9f8;border-radius: 16px 16px 0px 0px;}
+     /*标签*/
+    .tab_color{border-bottom: 1px solid #6aa6e2; color: #6aa6e2; font-family: PingFang;}
+
+    /*按钮间隔*/
+    .button_spacing{margin: 0px  0px 0px 10px;}
+
+
+    //报表样式
+    //报表头部
+    .report-head{ background-color: #b3dff7;border: solid 1px #999999;}
+    //头部字体
+    .head-font{color: #333333;font-size: 18px; }
+    //报表左侧
+    .report-left{background-color: #dff0f9;border: solid 1px #999999;}
+    //报表主体
+    .report-main {background-color: #ffffff; border: solid 1px #999999;}
+    //报表主体字体
+    .main-font{font-size: 18px;color: #1b1b1b; }
+
+
+/*=========================特殊样式表=========================*/
+
+/*分辨率@1920*1080*/
+@media screen and (max-width: 1920px) {
+
+  /********************按钮*****************/
+
+  .font_normal_body{font-size: 16px!important;    line-height: 42px;}
+  .font_bold_body{font-size: 16px!important;    line-height: 42px;}
+  .font_bold_title{font-size: 16px!important;    line-height: 42px;}
+  .table_sy thead tr th{font-size: 16px !important;}
+  .foot .pager{ font-size: 16px!important;	color: #666666!important;font-weight: normal!important;}
+  .foot .pager a{ font-size: 16px!important;	color: #666666!important;font-weight: normal!important;}
+  .foot .pager li{ font-size: 16px!important;	color: #666666!important;font-weight: normal!important;}
+
+
+  /*按钮查询*/
+  .button_search{width: 75px; height: 40px; background-color: #6aa6e2; border-radius: 4px;	border:none; font-family: PingFang; font-size: 16px; 	color: #ffffff;}
+  .button_search:hover{	background-color: #3592ef;}
+
+  /*按钮清空*/
+  .button_clear{width: 75px; height: 40px;  background-color: #5ac0d9; border-radius: 4px;border:none;	font-family: PingFang; font-size: 16px; 	color: #ffffff;}
+  .button_clear:hover{	background-color: #27c4eb;}
+
+  /*按钮新建*/
+  .button_new{width: 75px; height: 40px;  background-color: #ffffff;border-radius: 4px;border: solid 1px #6aa6e2;	font-family: PingFang; font-size: 16px; color: #6aa6e2;}
+  .button_new:hover{background-color: #f0f8ff;}
+
+  /*按钮导出*/
+  .button_export {width: 110px; height: 40px; background-color: #ffffff;border-radius: 4px;border: solid 1px #6aa6e2;	font-family: PingFang; font-size: 16px; color: #6aa6e2;}
+  .button_export:hover{background-color: #f0f8ff;}
+  .button_export button{width: 110px; height: 40px; background-color: #ffffff;border-radius: 4px;border: solid 1px #6aa6e2;	font-family: PingFang; font-size: 16px; color: #6aa6e2;}
+  .button_export button:hover{background-color: #f0f8ff;}
+
+  /*查询输入框*/
+  .input_search{	width: 270px;height: 40px;background-color: #ffffff;border-radius: 2px;border: solid 1px #c7c7c7;color: #333333;	font-size: 16px;font-family: PingFang;}
+  .input_search .datepicker .datepicker-input input{	width: 270px!important;height: 42px!important;background-color: #ffffff!important;border-radius: 2px;border: solid 1px #c7c7c7 !important;color: #333333;	font-size: 16px;font-family: PingFang;}
+  .input_search::-webkit-input-placeholder{color: #999999;	font-size: 16px;padding-left:15px;font-family: PingFang;}
+  .input_search:focus{	border: solid 1px #6aa6e2;}
+
+
+  /*下拉框*/
+  .select  button{width: 270px!important;height: 40px!important;background-color: #ffffff!important;border-radius: 2px!important;border: solid 1px #c7c7c7!important;color: #666666;	font-size: 16px;font-family: PingFang;font-weight: normal!important;}
+  .select  button:focus{	border: solid 1px #6aa6e2!important;}
+
+}
+
+/*分辨率@1600*900*/
+@media screen and (max-width: 1600px) {
+
+  /********************按钮*****************/
+  /*按钮间隔*/
+  /*.button_spacing{margin: 0px  0px 0px 20px;}*/
+  .font_normal_body{font-size: 15px!important;    line-height: 38px; }
+  .font_bold_body{font-size: 15px!important;    line-height: 38px; }
+  .font_bold_title{font-size: 15px!important;    line-height: 38px; }
+  .table_sy thead tr th{font-size: 15px !important;}
+  .foot .pager{ font-size: 15px!important;	color: #666666!important;font-weight: normal!important;}
+  .foot .pager a{ font-size: 15px!important;	color: #666666!important;font-weight: normal!important;}
+  .foot .pager li{ font-size: 15px!important;	color: #666666!important;font-weight: normal!important;}
+
+  /*按钮查询*/
+  .button_search{width: 70px; height: 36px; background-color: #6aa6e2; border-radius: 4px;	border:none; font-family: PingFang; font-size: 15px; 	color: #ffffff;}
+  .button_search:hover{	background-color: #3592ef;}
+
+  /*按钮清空*/
+  .button_clear{width: 70px; height: 36px; background-color: #5ac0d9; border-radius: 4px;border:none;	font-family: PingFang; font-size: 15px; 	color: #ffffff;}
+  .button_clear:hover{	background-color: #27c4eb;}
+
+  /*按钮新建*/
+  .button_new{width: 70px; height: 36px; background-color: #ffffff;border-radius: 4px;border: solid 1px #6aa6e2;	font-family: PingFang; font-size: 15px; color: #6aa6e2;}
+  .button_new:hover{background-color: #f0f8ff;}
+
+  /*按钮导出*/
+  .button_export {width: 110px; height: 36px; background-color: #ffffff;border-radius: 4px;border: solid 1px #6aa6e2;	font-family: PingFang; font-size: 15px; color: #6aa6e2;}
+  .button_export:hover{background-color: #f0f8ff;}
+  .button_export button{width: 120px; height: 32px; background-color: #ffffff;border-radius: 4px;border: solid 1px #6aa6e2;	font-family: PingFang; font-size: 15px; color: #6aa6e2;}
+  .button_export button:hover{background-color: #f0f8ff;}
+
+  /*查询输入框*/
+  .input_search{	width: 200px;height: 36px;background-color: #ffffff;border-radius: 2px;border: solid 1px #c7c7c7!important;color: #333333!important;	font-size: 15px!important;font-family: PingFang;}
+  .input_search::-webkit-input-placeholder{color: #999999;	font-size: 14px;padding-left:15px;font-family: PingFang;}
+  .input_search:focus{	border: solid 1px #6aa6e2;}
+
+  /*下拉框*/
+  .select  button{width: 200px!important;height: 36px!important;background-color: #ffffff!important;border-radius: 2px!important;border: solid 1px #c7c7c7!important;color: #666666!important;	font-size: 15px!important;font-family: PingFang;font-weight: normal!important;}
+  .select  button:focus{	border: solid 1px #6aa6e2!important;}
+}
+
+/*分辨率@1366*768*/
+@media screen and (max-width: 1366px) {
+
+  /********************按钮*****************/
+  /*按钮间隔*/
+  /*.button_spacing{margin: 0px  0px 0px 20px;}*/
+  .font_normal_body{font-size: 14px!important;    line-height: 36px; }
+  .font_bold_body{font-size: 14px!important;    line-height: 36px; }
+  .font_bold_title{font-size: 14px!important;    line-height: 36px; }
+  .table_sy thead tr th{font-size: 14px !important;}
+  .foot .pager{ font-size: 14px!important;	color: #666666!important;font-weight: normal!important;}
+  .foot .pager a{ font-size: 14px!important;	color: #666666!important;font-weight: normal!important;}
+  .foot .pager li{ font-size: 14px!important;	color: #666666!important;font-weight: normal!important;}
+
+  /*按钮查询*/
+  .button_search{width: 60px; height: 34px; background-color: #6aa6e2; border-radius: 4px;	border:none; font-family: PingFang; font-size: 14px; 	color: #ffffff;}
+  .button_search:hover{	background-color: #3592ef;}
+
+  /*按钮清空*/
+  .button_clear{width: 60px; height: 34px; background-color: #5ac0d9; border-radius: 4px;border:none;	font-family: PingFang; font-size: 14px; 	color: #ffffff;}
+  .button_clear:hover{	background-color: #27c4eb;}
+
+  /*按钮新建*/
+  .button_new{width: 60px; height: 34px; background-color: #ffffff;border-radius: 4px;border: solid 1px #6aa6e2;	font-family: PingFang; font-size: 14px; color: #6aa6e2;}
+  .button_new:hover{background-color: #f0f8ff;}
+
+  /*按钮导出*/
+  .button_export {width: 110px; height: 34px; background-color: #ffffff;border-radius: 4px;border: solid 1px #6aa6e2;	font-family: PingFang; font-size: 14px; color: #6aa6e2;}
+  .button_export:hover{background-color: #f0f8ff;}
+  .button_export button{width: 110px !important; height: 34px!important; background-color: #ffffff!important;border-radius: 4px!important;border: solid 1px #6aa6e2!important;	font-family: PingFang; font-size: 14px!important; color: #6aa6e2!important;}
+  .button_export button:hover{background-color: #f0f8ff;}
+
+  /*查询输入框*/
+  .input_search{	width: 180px;height: 34px;background-color: #ffffff;border-radius: 2px;border: solid 1px #c7c7c7;color: #333333;	font-size: 14px;font-family: PingFang;}
+  .input_search::-webkit-input-placeholder{color: #999999;	font-size: 14px;padding-left:15px;font-family: PingFang;}
+  .input_search:focus{	border: solid 1px #6aa6e2;}
+
+  /*下拉框*/
+  .select  button{width: 180px!important;height: 34px!important;background-color: #ffffff!important;border-radius: 2px!important;border: solid 1px #c7c7c7!important;color: #666666!important;	font-size: 14px!important;font-family: PingFang;font-weight: normal!important;}
+  .select  button:focus{	border: solid 1px #6aa6e2!important;}
+
+}

package/src/components/Util.js

@@ -21,6 +21,10 @@ export function getAttendanceState (item, timeToWork, timeToGo) {
   }
 }
 
+export function isEmpty (str) {
+  return str === undefined || str === null || str.toString().trim() === ''
+}
+
 export function toStandardYearMonth () {
   let dt = new Date()
   let month = dt.getMonth() + 1

package/src/components/app_apply/FieldExploration.vue

@@ -5,11 +5,11 @@
         <div class="row auto">
           <div class="col-xs-12 col-sm-6 col-md-6 form-input-group mg8">
             <label class="text-justify lb-left" for="f_install_num">实际可安装用户:</label>
-            <input  type="text" class="form-control" id="f_install_num" v-model="model.f_install_num" >
+            <input  type="number" class="form-control" id="f_install_num" v-model="model.f_install_num" >
           </div>
           <div class="col-xs-12 col-sm-6 col-md-6 form-input-group" >
             <label class="text-justify lb-left" for="costmatter">缴费户数:</label>
-            <input  type="text" class="form-control" id="costmatter" v-model="model.f_payfee_num" >
+            <input  type="number" class="form-control" id="costmatter" v-model="model.f_payfee_num" >
           </div>
           <div class="col-xs-12 col-sm-6 col-md-6 form-input-group">
             <label class="text-justify lb-left" >用气类型:</label>

package/src/components/app_apply/Ventilation.vue

@@ -9,11 +9,11 @@
           </div>
           <div class="col-xs-12 col-sm-6 col-md-6 form-input-group" :class="[$v.f_gas_number.pattern ? 'has-error' : '']">
             <label class="text-justify lb-left" for="f_gas_number">通气户数：</label>
-            <input type="text" class="form-control" id="f_gas_number" v-model="model.f_gas_number" v-validate:f_gas_number="{pattern:'/^[+]{0,1}(\\d+)$|^[+]{0,1}(\\d+\\.\\d+)$/'}">
+            <input type="number" class="form-control" id="f_gas_number" v-model="model.f_gas_number" v-validate:f_gas_number="{pattern:'/^[+]{0,1}(\\d+)$|^[+]{0,1}(\\d+\\.\\d+)$/'}">
           </div>
           <div class="col-xs-12 col-sm-6 col-md-6 form-input-group" :class="[$v.f_notgas_number.pattern ? 'has-error' : '']">
             <label class="text-justify lb-left" for="f_notgas_number">未通气户数：</label>
-            <input type="text" class="form-control" id="f_notgas_number" v-model="model.f_notgas_number" v-validate:f_notgas_number="{pattern:'/^[+]{0,1}(\\d+)$|^[+]{0,1}(\\d+\\.\\d+)$/'}">
+            <input type="number" class="form-control" id="f_notgas_number" v-model="model.f_notgas_number" v-validate:f_notgas_number="{pattern:'/^[+]{0,1}(\\d+)$|^[+]{0,1}(\\d+\\.\\d+)$/'}">
           </div>
           <div class="col-xs-12 col-sm-6 col-md-6 form-input-group" :class="$v.f_regulatoruser.required ? 'has-error' : ''">
             <label class="text-justify lb-left" for="f_regulatoruser">调压人员：</label>

package/src/components/product/Function/InstallFunction.vue

@@ -1,7 +1,7 @@
 <template>
-  <div class="full">
+  <div class="full" style="background-color:  #f6f6f6;">
     <div class="flex-row">
-      <div class="flex" style="flex: 1" :style="{height: totalheight}">
+      <div class="flex" style="flex: 1" :style="{height: totalheight,width:'80%'}">
         <div class="flex col-sm-12" :style="{height: leftheight}">
           <installinfoselect v-ref:installselect></installinfoselect>
         </div>
@@ -21,7 +21,7 @@
           <route v-ref:route></route>
         </div>
       </div>
-      <div style="width: 350px;padding:0px 0px 10px 0px;margin-left: 20px">
+      <div style="width: 20%;padding:0px 0px 0px 0px;margin-left: 0px">
         <install-apply-cardlist :btns="operatebtn" :userinfoid="row ? row.f_userinfo_id : ''" @list-select-oper="recordCancel"
                           v-ref:card></install-apply-cardlist>
       </div>
@@ -50,7 +50,11 @@
     },
     created(){
       let http = new HttpResetClass()
-      http.load('POST','rs/logic/ApplyGetConfigs', {data:this.$login.f}, {resolveMsg: null, rejectMsg: null}
+      let xmldata = {
+        data: this.$login.f,
+        workname: '工商业报建流程'
+      }
+      http.load('POST','rs/logic/ApplyGetConfigs', {data: xmldata}, {resolveMsg: null, rejectMsg: null}
       ).then((res)=>{
         if(res.data.code && res.data.code == 200){
           Vue.function_vue = Vue.prototype.$function_vue = res.data.function_vue
@@ -91,7 +95,7 @@
         // this.show = true
         this.showallbtn = true
         this.leftheight = '25%'
-        this.totalheight = '80%'
+        this.totalheight = '100%'
       },
       'hiddenbtn'() {
         this.showallbtn = false

package/src/components/product/Function/InstallInfoSelect.vue

@@ -1,75 +1,60 @@
 <template>
   <div class="d1 flex">
-    <div class="left col-sm-12">
+    <div class="left col-sm-12" v-if="refreshed">
       <criteria-paged :model="model" v-ref:cp>
-        <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+        <criteria partial='criteria' @condition-changed='search' v-ref:cri style="padding: 20px;background-color:  #f6f6f6;">
           <form novalidate class="" partial>
-            <div class="col-sm-10">
-              <div class="col-sm-2">
-                <div class="col-sm-11">
-                  <input type="text" class="form-control" v-model="model.f_user_name" v-on:keyup.enter="search"
-                         condition="f_user_name like '{}%'" placeholder="用户姓名">
+            <div class="col-sm-12">
+              <div class="form-group col-sm-4">
+                <label class=" col-sm-6" style="padding-top: 8px">联系人/项目名称/用户名称:</label>
+                <div class="col-sm-6">
+                  <input type="text" class="form-control" v-model="model.f_user_name"
+                         condition=" (f_user_name like '%{}%' or f_entry_name like '%{}%' or f_company_name like '%{}%') " placeholder='三选一输入'>
                 </div>
               </div>
-              <div class="col-sm-2">
-                <div class="col-sm-11">
-                  <input type="text" class="form-control" v-model="model.f_apply_num" v-on:keyup.enter="search"
-                         condition="f_apply_num like '{}%'" placeholder="报建编号">
+              <div class="col-sm-1">
+                <!--<label class="col-sm-6">合同编号</label>-->
+                <div class="col-sm-12">
+                  <input type="text" class="form-control" placeholder='合同编号' v-model="model.f_contract_number"
+                         v-on:keyup.enter="search"
+                         condition="f_contract_number like '%{}%'">
                 </div>
               </div>
-              <!-- <div class="col-sm-2">
-                <label for="f_user_name" class="col-sm-6"><nobr> 地址：</nobr></label>
-                <div class="col-sm-6">
-                  <input type="text" class="form-control" v-model="model.f_address" v-on:keyup.enter="search"
-                  condition="f_address like '{}%'" >
-                </div>
-              </div> -->
-              <div class="col-sm-2">
-                <!--<label for="f_user_name" class="col-sm-6"><nobr> 小区：</nobr></label>-->
-                <div class="col-sm-11">
-                  <input type="text" class="form-control" v-model="model.f_residential_area" v-on:keyup.enter="search"
-                         condition="f_residential_area like '{}%'" placeholder="小区">
+              <div class="col-sm-1">
+                <!--<label class="col-sm-6">用户地址</label>-->
+                <div class="col-sm-12">
+                  <input type="text" class="form-control" placeholder='用户地址' v-model="model.f_address"
+                         v-on:keyup.enter="search"
+                         condition="f_address like '%{}%'">
                 </div>
               </div>
-              <div class="col-sm-2">
-                <!--<label for="f_user_name" class="col-sm-6"><nobr> 用户类型：</nobr></label>-->
-                <div class="col-sm-11" v-if="this.$login.f.f_fengongsi.includes('中燃')">
-                  <v-select :options="$parent.$parent.fapplytype" placeholder='用户类型' condition="f_user_type  like '{}%'"
+              <div class="col-sm-1">
+                <!--<label class="col-sm-6"> 报建类型：</label>-->
+                <div class="col-sm-12" v-if="!this.$login.f.f_fengongsi.includes('中燃')">
+                  <v-select :width ="'100%'" style="width: 100%" :options="$parent.$parent.applytype" placeholder='报建类型' condition="f_apply_type  like '%{}%'"
                             v-model="model.f_apply_type" :value.sync="model.f_apply_type" close-on-select>
                   </v-select>
                 </div>
-                <div class="col-sm-11" v-else>
-                  <v-select :options="$parent.$parent.usertype" placeholder='用户类型' condition="f_user_type  like '{}%'"
-                            v-model="model.f_user_type" :value.sync="model.f_user_type" close-on-select>
-                  </v-select>
-                </div>
               </div>
               <div class="col-sm-2">
-                <!--<label for="f_user_type" class="col-sm-6"><nobr> 流程状态：</nobr></label>-->
-                <div class="col-sm-12">
-                  <v-select :options="$parent.$parent.defnameType" placeholder='流程状态'
-                            condition="act.defname  like '%{}%'"
+                <label class="col-sm-6">办理环节:</label>
+                <div class="col-sm-6">
+                  <v-select :width ="'90%'" @change="$dispatch('setQueryCondition',model)" :options="$parent.$parent.defnames"
+                            condition="defname = '{}'" placeholder='办理环节'
                             v-model="model.defname" :value.sync="model.defname" close-on-select>
                   </v-select>
                 </div>
               </div>
-              <div class="col-sm-2">
-                <!--<label for="f_user_name" class="col-sm-6"><nobr> 报建类型：</nobr></label>-->
-                <div class="col-sm-12" v-if="!this.$login.f.f_fengongsi.includes('中燃')">
-                  <v-select :options="$parent.$parent.applytype" placeholder='报建类型' condition="f_apply_type  like '{}%'"
-                            v-model="model.f_apply_type" :value.sync="model.f_apply_type" close-on-select>
-                  </v-select>
-                </div>
+              <div class="col-sm-1">
+                <input type="text" class="form-control" placeholder='经办人' v-model="model.f_survey_name"
+                       v-on:keyup.enter="search"
+                       condition=" (f_apply_kefu_employee like '%{}%' or  f_survey_name like '%{}%') ">
+              </div>
+              <div class="col-sm-1">
+                <button class="btn btn-primary btn-sm" type="button" @click="search(),$parent.$parent.showpager()">
+                  <span class="glyphicon glyphicon-search"></span>查询
+                </button>
               </div>
-            </div>
-
-            <div class="col-sm-2">
-              <center>
-                <div class="col-sm-10  pull-right">
-                  <button class="btn btn-primary btn-sm" type="button" @click="search(),$parent.$parent.showpager()">
-                  <span class="glyphicon glyphicon-search"></span>查询</button>
-                </div>
-              </center>
             </div>
           </form>
         </criteria>
@@ -80,26 +65,30 @@
                 <nobr>序号</nobr>
               </th>
               <th>
-                <nobr>当前状态</nobr>
+                <nobr>当前环节</nobr>
               </th>
+              <th><nobr>联系人/项目名称/用户名称</nobr></th>
               <th>
-                <nobr>用户姓名</nobr>
+                <nobr>合同编号</nobr>
               </th>
               <th>
-                <nobr>小区</nobr>
+                <nobr>电话</nobr>
+              </th>
+              <th>
+                <nobr>地址</nobr>
               </th>
               <th v-if="!this.$login.f.f_fengongsi.includes('中燃')">
                 <nobr>用户类型</nobr>
               </th>
               <th>
-                <nobr>流程状态</nobr>
+                <nobr>报建类型</nobr>
               </th>
               <th>
                 <nobr>报建日期</nobr>
               </th>
-              <th>
-                <nobr>申请户数</nobr>
-              </th>
+              <!--<th>-->
+                <!--<nobr>申请户数</nobr>-->
+              <!--</th>-->
               <th>
                 <nobr>操作</nobr>
               </th>
@@ -114,30 +103,36 @@
                 <nobr>{{row.defname}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_user_name}}</nobr>
+                <nobr>{{row.f_user_name}}/{{row.f_entry_name}}/{{row.f_company_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_contract_number}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_phone}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_residential_area}}</nobr>
+                <nobr>{{row.f_address}}</nobr>
               </td>
               <td style="text-align: center;" v-if="!this.$login.f.f_fengongsi.includes('中燃')">
                 <nobr>{{row.f_user_type}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.defname}}</nobr>
+                <nobr>{{row.f_apply_type}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_apply_date}}</nobr>
               </td>
+              <!--<td style="text-align: center;">-->
+                <!--<nobr>{{row.f_apply_count}}</nobr>-->
+              <!--</td>-->
               <td style="text-align: center;">
-                <nobr>{{row.f_apply_count}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <dropdown v-if="row.defname != '完工'">
-                  <button type="button" data-toggle="dropdown" style="border: 0px;background: none;">
+                <dropdown v-if="row.defname != '完工'" >
+                  <button @click="$dispatch('checkfuncs',row)" type="button" data-toggle="dropdown" style="border: 0px;background: none;">
                     <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
                   </button>
                   <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
-                    <li v-for="(index,func) in $function_vue.functions">
+                    <li v-for="(index,func) in $parent.$parent.$parent.funcs">
                       <a href="#" @click="$dispatch('func',func,row)">{{func.title}}</a>
                     </li>
                   </ul>
@@ -151,6 +146,7 @@
   </div>
 </template>
 <script>
+  import {HttpResetClass} from 'vue-client'
   import {
     PagedList
   } from 'vue-client'
@@ -159,13 +155,16 @@
     title: '报建业务信息',
     data() {
       return {
+        refreshed:true,
         usertype: this.$appdata.getParam('用户类型'),
         defnameType: this.$appdata.getParam('流程状态'),
         applytype: this.$appdata.getParam('报建类型'),
         //中燃 专用
         fapplytype: this.$appdata.getParam('用户类型'),
+        funcs:[],
+        defnames:[],
         showbtn: false,
-        model: new PagedList('rs/sql/checkuser', 20, {
+        model: new PagedList('rs/sql/checkuserfunction', 20, {
           data: {
             id: this.$login.f.id,
             fengongsi: this.$login.f.f_fengongsi
@@ -176,8 +175,38 @@
     },
     ready() {
       this.$refs.cp.$refs.cri.search()
+      let http = new HttpResetClass()
+      http.load('POST', 'rs/sql/getDefnamesForActivityins', {data:{}}, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).then((res)=>{
+        //  先获取所有流程环节
+        this.defnames = [{label: '全部', value: ''}]
+        for(let i=0;i<res.data.length;i++){
+          this.defnames.push({label:res.data[i].defname,value:res.data[i].defname})
+        }
+      })
+    },
+    events:{
+      async checkfuncs(row){
+        if(row.defname =='报装申请'||row.defname =='任务分配'||row.defname =='勘察初设'||row.defname =='合同信息'||row.defname =='合同审核'){
+          let temp = JSON.parse(JSON.stringify(this.$function_vue.functions))
+          delete temp[0]
+          this.funcs =   temp            // test.splice(1, 1);
+          // this.update()
+        }else {
+          this.funcs = this.$function_vue.functions
+          // this.update()z
+        }
+      }
     },
     methods: {
+      update(){
+        this.refreshed = false
+        this.$nextTick(()=>{
+          this.refreshed = true
+        })
+      },
       clifun(row) {
         this.$refs.cp.$refs.grid.model.rows = [row]
         this.$refs.cp.pager = false