apply-clients 3.3.34 → 3.3.38

package/src/components/android/Supervisory/AppProcessSupervisory.vue

@@ -157,7 +157,7 @@
               <p class="col-xs-3 text-left font"><b>报建日期：</b></p>
               <p class="col-xs-9 text-left input-font">{{ row.f_apply_date }}</p>
             </div>
-            <div class="col-xs-12">
+            <div class="col-xs-12" style="color: red">
               <p class="col-xs-3 text-left font"><b>施工备注：</b></p>
               <p class="col-xs-9 text-left input-font">{{ row.f_construction_remarks }}</p>
             </div>

package/src/components/android/Supervisory/AppSupervisoryCart.vue

@@ -1,115 +1,115 @@
-<template>
-  <div style="padding: 10px">
-    <div partial class="auto app-text panel" style="margin-bottom: 20px">
-      <div class="panel-body panel-self">
-        <div class="col-xs-12">
-          <p class="col-xs-3 text-left font"><b>客户名称：</b></p>
-          <p class="col-xs-9 text-left input-font">{{ selectdata.f_user_name }}</p>
-        </div>
-        <div class="col-xs-12">
-          <p class="col-xs-3 text-left font"><b>电&emsp;&emsp;话：</b></p>
-          <p class="col-xs-9 text-left input-font">{{ selectdata.f_phone }}</p>
-        </div>
-        <div class="col-xs-12">
-          <p class="col-xs-3 text-left font"><b>工程编号：</b></p>
-          <p class="col-xs-9 text-left input-font">{{ selectdata.f_apply_num }}</p>
-        </div>
-        <div class="col-xs-12">
-          <p class="col-xs-3 text-left font"><b>客户编号：</b></p>
-          <p class="col-xs-9 text-left input-font">{{ selectdata.f_userinfo_code }}</p>
-        </div>
-        <div class="col-xs-12">
-          <p class="col-xs-3 text-left font"><b>报建类型：</b></p>
-          <p class="col-xs-9 text-left input-font">{{ selectdata.f_apply_type }}</p>
-        </div>
-        <div class="col-xs-12">
-          <p class="col-xs-3 text-left font"><b>办理环节：</b></p>
-          <p class="col-xs-9 text-left input-font">{{ selectdata.defname }}</p>
-        </div>
-        <div class="col-xs-12">
-          <p class="col-xs-3 text-left font"><b>地&emsp;&emsp;址：</b></p>
-          <p class="col-xs-9 text-left input-font">{{ selectdata.f_address }}</p>
-        </div>
-        <div class="col-xs-12">
-          <p class="col-xs-3 text-left font"><b>报建日期：</b></p>
-          <p class="col-xs-9 text-left input-font">{{ selectdata.f_apply_date }}</p>
-        </div>
-      </div>
-    </div>
-    <div class="row" v-for="(i,row) in defnames">
-        <div :class="row.id === selectdata.actid ? 'item selectIndex' : 'item'">
-          {{row.defname}}
-          <br>
-          {{ row.finishtime ? row.finishtime : row.sendtime }}
-        </div>
-        <div class="arrow glyphicon glyphicon-menu-down" v-if="i != defnames.length-1" aria-hidden="true"></div>
-      </div>
-  </div>
-</template>
-
-<script>
-import {HttpResetClass} from 'vue-client'
-export default {
-  title: '流程节点',
-  props: ['selectdata'],
-  data () {
-    return {
-      defnames: []
-    }
-  },
-  ready () {
-    this.initial()
-  },
-  methods: {
-    async initial() {
-      // 获取流程节点信息
-      let http = new HttpResetClass()
-      let data = {
-        processid: this.selectdata.f_process_id
-      }
-      let res = await http.load(
-        'POST',
-        `${this.$androidUtil.getProxyUrl()}/rs/sql/getAllNode`,
-        // `rs/sql/getAllNode`,
-        {data: data},
-        {
-          resolveMsg:null,
-          rejectMsg:null
-        })
-      this.defnames = res.data
-    },
-  },
-  watch: {
-  }
-}
-</script>
-
-<style scoped>
-.app-text {
-  font-size: 12px;
-}
-.panel-self{
-  border-radius: 10px;
-  border:1px solid #499EDF;
-  background-color: #F8F8F8;
-}
-.row{
-  padding: 0 40px;
-  text-align: center;
-  height: auto;
-}
-.item{
-  border-radius: 2em;
-  border: 1px solid silver;
-  line-height: 25px;
-}
-.arrow{
-  width: 100%;
-  color: #5ac0d9;
-  font-weight: bold;
-}
-.selectIndex{
-  background-color: #5ac0d9;
-  color: #ffffff;
-}
-</style>
+<template>
+  <div style="padding: 10px">
+    <div partial class="auto app-text panel" style="margin-bottom: 20px">
+      <div class="panel-body panel-self">
+        <div class="col-xs-12">
+          <p class="col-xs-3 text-left font"><b>客户名称：</b></p>
+          <p class="col-xs-9 text-left input-font">{{ selectdata.f_user_name }}</p>
+        </div>
+        <div class="col-xs-12">
+          <p class="col-xs-3 text-left font"><b>电&emsp;&emsp;话：</b></p>
+          <p class="col-xs-9 text-left input-font">{{ selectdata.f_phone }}</p>
+        </div>
+        <div class="col-xs-12">
+          <p class="col-xs-3 text-left font"><b>工程编号：</b></p>
+          <p class="col-xs-9 text-left input-font">{{ selectdata.f_apply_num }}</p>
+        </div>
+        <div class="col-xs-12">
+          <p class="col-xs-3 text-left font"><b>客户编号：</b></p>
+          <p class="col-xs-9 text-left input-font">{{ selectdata.f_userinfo_code }}</p>
+        </div>
+        <div class="col-xs-12">
+          <p class="col-xs-3 text-left font"><b>报建类型：</b></p>
+          <p class="col-xs-9 text-left input-font">{{ selectdata.f_apply_type }}</p>
+        </div>
+        <div class="col-xs-12">
+          <p class="col-xs-3 text-left font"><b>办理环节：</b></p>
+          <p class="col-xs-9 text-left input-font">{{ selectdata.defname }}</p>
+        </div>
+        <div class="col-xs-12">
+          <p class="col-xs-3 text-left font"><b>地&emsp;&emsp;址：</b></p>
+          <p class="col-xs-9 text-left input-font">{{ selectdata.f_address }}</p>
+        </div>
+        <div class="col-xs-12">
+          <p class="col-xs-3 text-left font"><b>报建日期：</b></p>
+          <p class="col-xs-9 text-left input-font">{{ selectdata.f_apply_date }}</p>
+        </div>
+      </div>
+    </div>
+    <div class="row" v-for="(i,row) in defnames">
+        <div :class="row.id === selectdata.actid ? 'item selectIndex' : 'item'">
+          {{row.defname}}
+          <br>
+          {{ row.finishtime ? row.finishtime : row.sendtime }}
+        </div>
+        <div class="arrow glyphicon glyphicon-menu-down" v-if="i != defnames.length-1" aria-hidden="true"></div>
+      </div>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+export default {
+  title: '流程节点',
+  props: ['selectdata'],
+  data () {
+    return {
+      defnames: []
+    }
+  },
+  ready () {
+    this.initial()
+  },
+  methods: {
+    async initial() {
+      // 获取流程节点信息
+      let http = new HttpResetClass()
+      let data = {
+        processid: this.selectdata.f_process_id
+      }
+      let res = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/getAllNode`,
+        // `rs/sql/getAllNode`,
+        {data: data},
+        {
+          resolveMsg:null,
+          rejectMsg:null
+        })
+      this.defnames = res.data
+    },
+  },
+  watch: {
+  }
+}
+</script>
+
+<style scoped>
+.app-text {
+  font-size: 12px;
+}
+.panel-self{
+  border-radius: 10px;
+  border:1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+.row{
+  padding: 0 40px;
+  text-align: center;
+  height: auto;
+}
+.item{
+  border-radius: 2em;
+  border: 1px solid silver;
+  line-height: 25px;
+}
+.arrow{
+  width: 100%;
+  color: #5ac0d9;
+  font-weight: bold;
+}
+.selectIndex{
+  background-color: #5ac0d9;
+  color: #ffffff;
+}
+</style>

package/src/components/product/ApplyCharge/ApplyChargeList.vue

@@ -64,12 +64,6 @@
                      v-on:keyup.enter="$parent.$parent.search()"
                      condition="a.f_contract_number = '{}'">
             </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">流&ensp;水&ensp;号：</label>
-              <input type="text" style="width: 60%" class="input_search" placeholder='流水号' v-model="model.f_payer_number"
-                     v-on:keyup.enter="$parent.$parent.search()"
-                     condition="cr.f_payer_number = '{}'">
-            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">报建类型：</label>
               <v-select
@@ -80,13 +74,44 @@
                 :options='$parent.$parent.applytype'
                 class="select select_list"
                 :value-single="true"
+                @change="$parent.$parent.applyTypeChange()"
                 close-on-select ></v-select>
             </div>
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">收费人员：</label>
-              <input type="text" class="input_search" style="width: 60%" placeholder='收费人员' v-model="model.f_charge_collectors"
+              <label class="font_normal_body">报建性质：</label>
+              <v-select
+                v-model="model.f_apply_nature"
+                placeholder='报建性质'
+                condition="a.f_apply_nature = '{}'"
+                :value.sync="model.f_apply_nature"
+                :options='$parent.$parent.applyNatures'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">用户名称：</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="a.f_user_name like '%{}%'" placeholder='用户名称'>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">用户电话：</label>
+              <input type="text" style="width:60%" class="input_search" placeholder='用户电话' v-model="model.f_phone"
                      v-on:keyup.enter="$parent.$parent.search()"
-                     condition="cr.f_charge_collectors like '%{}%'">
+                     condition="a.f_phone like '%{}%'">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">用户地址：</label>
+              <input type="text" style="width:60%" class="input_search" placeholder='用户地址' v-model="model.f_address"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="a.f_address like '%{}%'">
+            </div>
+
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">缴费编码：</label>
+              <input type="text" class="input_search" style="width: 60%" placeholder='缴费编码' v-model="model.f_charge_collectors"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="cr.f_charge_number like '%{}%'">
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">付款方式：</label>
@@ -100,6 +125,18 @@
                 :value-single="true"
                 close-on-select ></v-select>
             </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">流&ensp;水&ensp;号：</label>
+              <input type="text" style="width: 60%" class="input_search" placeholder='流水号' v-model="model.f_payer_number"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="cr.f_payer_number = '{}'">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">收费人员：</label>
+              <input type="text" class="input_search" style="width: 60%" placeholder='收费人员' v-model="model.f_charge_collectors"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="cr.f_charge_collectors like '%{}%'">
+            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">缴费状态：</label>
               <v-select
@@ -118,17 +155,21 @@
       <data-grid :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
         <template partial='head'>
           <tr>
-            <th>序号</th>
-            <th>工程编号</th>
-            <th>合同编号</th>
-            <th>报建类型</th>
-            <th>缴费编码</th>
-            <th>收费金额(退款金额)</th>
-            <th>付款方式</th>
-            <th>流水号</th>
-            <th>收费人员(退款人员)</th>
-            <th>收费日期(退款日期)</th>
-            <th>状态</th>
+            <th style="white-space: nowrap;">序号</th>
+            <th style="white-space: nowrap;">工程编号</th>
+            <th style="white-space: nowrap;">合同编号</th>
+            <th style="white-space: nowrap;">报建类型</th>
+            <th style="white-space: nowrap;">报建性质</th>
+            <th style="white-space: nowrap;">用户名称</th>
+            <th style="white-space: nowrap;">用户电话</th>
+            <th style="white-space: nowrap;">用户地址</th>
+            <th style="white-space: nowrap;">缴费编码</th>
+            <th style="white-space: nowrap;">收费金额(退款金额)</th>
+            <th style="white-space: nowrap;">付款方式</th>
+            <th style="white-space: nowrap;">流水号</th>
+            <th style="white-space: nowrap;">收费人员(退款人员)</th>
+            <th style="white-space: nowrap;">收费日期(退款日期)</th>
+            <th style="white-space: nowrap;">状态</th>
           </tr>
         </template>
         <template partial='body'>
@@ -145,6 +186,18 @@
             <td style="text-align: center;">
               <nobr><font>{{row.f_apply_type}}</font></nobr>
             </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_apply_nature}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_user_name}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_phone}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_address}}</font></nobr>
+            </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_charge_number}}</font></nobr>
             </td>
@@ -175,6 +228,7 @@
 <script>
 import {PagedList} from 'vue-client'
 import {HttpResetClass} from 'vue-client'
+import {isEmpty} from "../../Util";
 export default {
   title: '报建收费列表',
   data () {
@@ -184,6 +238,7 @@ export default {
       }),
       curorgid: [this.$login.f.orgid],
       applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
+      applyNatures: [{label: '全部', value: ''}], // 报建性质
       paymentMethod: [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')],
       chargeStatus: [
         {label: '全部', value: ''},
@@ -198,11 +253,16 @@ export default {
       },
       getfield: {
         'f_apply_num': '工程编号',
-        'f_entry_name': '项目名称',
         'f_contract_number': '合同编号',
         'f_apply_type': '报建类型',
+        'f_apply_nature': '报建性质',
+        'f_user_name': '用户名称',
+        'f_phone': '用户电话',
+        'f_address': '用户地址',
+        'f_charge_number': '缴费编码',
         'f_charge_money': '收费金额',
         'f_payment_method': '付款方式',
+        'f_payer_number': '流水号',
         'f_charge_collectors': '收费人员',
         'f_charge_date': '收费日期',
         'f_charge_status': '状态'
@@ -214,6 +274,13 @@ export default {
     this.search()
   },
   methods: {
+    applyTypeChange () {
+      if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
+        this.applyNatures = isEmpty(this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)) ? [{label: '全部', value: ''}] : [{label: '全部', value: ''}, ...this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)]
+      } else {
+        this.applyNatures = [{label: '全部', value: ''}]
+      }
+    },
     clear () {
       Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
         this.$refs.cp.$refs.cri.model[key] = ''

package/src/components/product/ApplyCharge/ApplyChargeSearch.vue

@@ -1,30 +1,30 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main">
-      <div style="height: 95%">
-        <apply-charge-list v-ref:query ></apply-charge-list>
-      </div>
-      <p class="bg-info text-center" style="font-size: 20px;height: 5%">
-        合计记录共<span style="color: red">&ensp;{{$refs.query.chargeAll.count}}&ensp;</span>笔，
-        合计金额<span style="color: red">&ensp;{{$refs.query.chargeAll.sum}}&ensp;</span>元
-      </p>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  title: '报建收费明细',
-  data () {
-    return {
-    }
-  },
-  ready () {
-  },
-  methods: {
-  }
-}
-</script>
-
-<style scoped>
-</style>
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <div style="height: 95%">
+        <apply-charge-list v-ref:query ></apply-charge-list>
+      </div>
+      <p class="bg-info text-center" style="font-size: 20px;height: 5%">
+        合计记录共<span style="color: red">&ensp;{{$refs.query.chargeAll.count}}&ensp;</span>笔，
+        合计金额<span style="color: red">&ensp;{{$refs.query.chargeAll.sum}}&ensp;</span>元
+      </p>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '报建收费明细',
+  data () {
+    return {
+    }
+  },
+  ready () {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style scoped>
+</style>

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

@@ -89,6 +89,16 @@
         // 调用查询
         this.$refs.query.$refs.cp.$refs.cri.search()
       },
+      'loadPage' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        this.$refs.query.$refs.cp.loadPage(this.$refs.query.model.pageIndex)
+      },
       // 点击功能操作
       'func' (funcdata, row) {
         this.selectdata = Object.assign({}, funcdata, row)

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

@@ -26,6 +26,7 @@
             </div>
             <div class="form-group col-sm-3 button-range">
               <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
+              <button class="button_search button_spacing" @click="$parent.$parent.loadPage()">返回</button>
               <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
               <div
                 :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
@@ -212,6 +213,9 @@
       search () {
         this.$dispatch('search')
       },
+      loadPage () {
+        this.$dispatch('loadPage')
+      },
       // 获取配置
       async checkfuncs (row) {
 

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

@@ -294,7 +294,7 @@
           this.show_data,
           {resolveMsg: null, rejectMsg: '用户信息修改失败！！！'}
         )
-        this.$dispatch('search')
+        this.$dispatch('loadPage')
       },
       async 'stopApply' () {
 
@@ -309,7 +309,7 @@
           {resolveMsg: null, rejectMsg: '终止报建失败！！！'}
         )
 
-        this.$dispatch('search')
+        this.$dispatch('loadPage')
       },
       async 'pauseApply' () {
 
@@ -324,7 +324,7 @@
           {resolveMsg: null, rejectMsg: '暂停报建失败！！！'}
         )
 
-        this.$dispatch('search')
+        this.$dispatch('loadPage')
       },
       // 获取view层button事件
       async 'button' (){
@@ -335,7 +335,7 @@
           {resolveMsg: null, rejectMsg: '数据保存失败！！！'}
         )
 
-        this.$dispatch('search')
+        this.$dispatch('loadPage')
       },
       // 失去焦点出触发事件
       'onchange' (index) {