apply-clients 3.0.4 → 3.0.5-2

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

package/src/components/product/Function/Service/FunctionServiceControl.vue

@@ -1,19 +1,25 @@
 <template>
   <div>
-    <service-view :data="data" v-if="showview"></service-view>
+    <service-view :data="data" v-if="showview" v-ref:serviceview></service-view>
     <installfee :infee="selectdata" v-if="showinfee"></installfee>
     <!--预存款-->
     <preparationfee :selectdata="selectdata" v-if="showpreparation"></preparationfee>
     <!--预存报建收费-->
     <prestorefee :infee="selectdata" v-if="showprestorefee" v-ref:prestorefee></prestorefee>
+    <!--材料导入-->
+    <material-message v-if="showmaterialmessage" v-ref:material
+                      :selectdata="selectdata"
+                      :state="2"
+                      :flag ="'fc'"
+                      :edit="true"></material-message>
     <!-- 费用变更 -->
     <!--<updatefee :upfee="selectdata" v-if="showupfee"></updatefee>-->
     <!-- 费用减免 -->
     <!--<reducefee :redufee="selectdata" v-if="showreducefee"></reducefee>-->
     <!-- 购货方信息 -->
-    <buyer-message v-ref:buyermessagev :selectdata="selectdata" v-if="showbuyer"   ></buyer-message>
+    <buyer-message v-ref:buyermessagev :selectdata="selectdata" :state="1" v-if="showbuyer"   ></buyer-message>
     <!-- 领取材料 -->
-    <receive-batch :selectdata="selectdata" v-if="showreceivebatch" ></receive-batch>
+    <receive-batch :selectdata="selectdata"  :state="1" v-if="showreceivebatch" ></receive-batch>
     <!-- 添加合同 -->
     <addcontract :addcontract="selectdata" v-if="showcontract"></addcontract>
     <!-- 终止报建 -->
@@ -42,10 +48,35 @@
         showstop: false, // 终止报建
         showbill: false, // 打印票据
         showpreparation: false, // 预付款
-        show_material:false//报建材料
+        show_material:false,//报建材料
+        showmaterialmessage:false, // 显示材料导入
       }
     },
     methods: {
+      getmodel(){
+        return {}
+      },
+      // 材料导入
+      materialImport(){
+        this.$parent.$refs.installselect.clifun(this.selectdata)
+        // this.selectdata = row
+        this.$parent.clishow= true
+        this.$parent.show = false
+
+        this.showbuyer = false
+        this.showreceivebatch = false
+        this.show_material = false
+        this.showview = false
+        this.showinfee = false
+        this.showprestorefee = false
+        this.showupfee = false
+        this.showreducefee = false
+        this.showstop = false
+        this.showcontract = false
+        this.showbill = false
+        this.showpreparation = false
+        this.showmaterialmessage = true
+      },
       // 购货方信息
       buyerMessage(){
         this.$parent.$refs.installselect.clifun(this.selectdata)
@@ -54,6 +85,7 @@
         this.$parent.show = false
 
         this.showbuyer = true
+        this.showmaterialmessage = false
         this.showreceivebatch = false
         this.show_material = false
         this.showview = false
@@ -74,6 +106,7 @@
         this.$parent.show = false
 
         this.showreceivebatch = true
+        this.showmaterialmessage = false
         this.showbuyer = false
         this.show_material = false
         this.showview = false
@@ -94,6 +127,7 @@
         this.$parent.show = false
 
         this.show_material = true
+        this.showmaterialmessage = false
         this.showbuyer = false
         this.showreceivebatch = false
         this.showview = false
@@ -114,6 +148,7 @@
         this.$parent.show = false
 
         this.showreceivebatch = false
+        this.showmaterialmessage = false
         this.showbuyer = false
         this.show_material = false
         this.showview = false
@@ -134,6 +169,7 @@
         this.$parent.show = false
 
         this.showreceivebatch = false
+        this.showmaterialmessage = false
         this.showbuyer = false
         this.showview = false
         this.showinfee = false
@@ -154,6 +190,7 @@
         this.$parent.show = false
 
         this.showreceivebatch = false
+        this.showmaterialmessage = false
         this.showbuyer = false
         this.showview = false
         this.showinfee = false
@@ -174,6 +211,7 @@
         this.$parent.show = false
 
         this.showreceivebatch = false
+        this.showmaterialmessage = false
         this.showbuyer = false
         this.showview = false
         this.showupfee = false
@@ -200,6 +238,7 @@
         this.$parent.show = false
 
         this.showreceivebatch = false
+        this.showmaterialmessage = false
         this.showbuyer = false
         this.showview = false
         this.showbill = false
@@ -275,6 +314,9 @@
           if(this.funcdata.title==='派工单'){
             this.receiveBatch()
           }
+          if(this.funcdata.title==='材料导入'){
+            this.materialImport()
+          }
         }
       }
     },
@@ -295,6 +337,7 @@
           }
         }
         */
+        this.$refs.serviceview.update();
       },
       // 获取view层button事件
       async 'button'(model){