apply-clients 3.3.217 → 3.4.2

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

@@ -1,16 +1,12 @@
 <template>
     <criteria-paged :model="model" v-ref:cp>
-      <criteria partial='criteria' @condition-changed='$parent.searchCondition' v-ref:cri>
+      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
         <div class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">组织机构：</label>
-              <res-select
-                restype='organization'
-                :initresid='$parent.$parent.curorgid'
-                @res-select="$parent.$parent.getorg"
-                is-mul="false"
-              ></res-select>
+              <label class="font_normal_body">项目名称：</label>
+              <input type="text" class="input_search" style="width: 60%" v-model="model.f_entry_name"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="a.f_entry_name like '%{}%'" placeholder='项目名'>
             </div>
             <div class="form-group col-sm-3">
               <label  for="startDate" class="font_normal_body">开始时间：</label>
@@ -20,7 +16,7 @@
                           :value.sync="model.startDate"
                           :format="'yyyy-MM-dd HH:mm:ss'"
                           :show-reset-button="true"
-                          condition="cr.f_charge_date >= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
+                          condition="cr.f_charge_date >= '{}'">
               </datepicker>
             </div>
             <div class="form-group col-sm-3">
@@ -31,7 +27,7 @@
                           :value.sync="model.endDate"
                           :format="'yyyy-MM-dd HH:mm:ss'"
                           :show-reset-button="true"
-                          condition="cr.f_charge_date <= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
+                          condition="cr.f_charge_date <= '{}'">
               </datepicker>
             </div>
             <div class="form-group col-sm-3 button-range">
@@ -53,8 +49,8 @@
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
             <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_apply_num"
+              <label class="font_normal_body">报建编号：</label>
+              <input type="text" style="width: 60%" class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
                      v-on:keyup.enter="$parent.$parent.search()"
                      condition="a.f_apply_num = '{}'">
             </div>
@@ -64,12 +60,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
@@ -103,11 +93,11 @@
             <div class="form-group col-sm-3">
               <label class="font_normal_body">缴费状态：</label>
               <v-select
-                v-model="model.f_charge_status"
+                v-model="model.f_charging_status"
                 placeholder='请选择'
-                condition="cr.f_charge_status = '{}'"
-                :value.sync="model.f_charge_status"
-                :options='$parent.$parent.chargeStatus'
+                condition="cr.f_charging_status = '{}'"
+                :value.sync="model.f_charging_status"
+                :options='$parent.$parent.chargingStatus'
                 class="select select_list"
                 :value-single="true"
                 close-on-select ></v-select>
@@ -119,16 +109,17 @@
         <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>收费人员(退款人员)</th>
-            <th>收费日期(退款日期)</th>
+            <th>收费人员</th>
+            <th>收费日期</th>
             <th>状态</th>
+            <th>地址</th>
           </tr>
         </template>
         <template partial='body'>
@@ -139,6 +130,9 @@
             <td style="text-align: center;">
               <nobr><font>{{row.f_apply_num}}</font></nobr>
             </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_apply_entry_name}}</font></nobr>
+            </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_contract_number}}</font></nobr>
             </td>
@@ -154,9 +148,6 @@
             <td style="text-align: center;">
               <nobr><font>{{row.f_payment_method}}</font></nobr>
             </td>
-            <td style="text-align: center;">
-              <nobr><font>{{row.f_payer_number}}</font></nobr>
-            </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_charge_collectors}}</font></nobr>
             </td>
@@ -164,7 +155,10 @@
               <nobr><font>{{row.f_charge_date}}</font></nobr>
             </td>
             <td style="text-align: center;">
-              <nobr><font>{{row.f_charge_status}}</font></nobr>
+              <nobr><font>{{row.f_charging_status}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_address}}</font></nobr>
             </td>
           </tr>
         </template>
@@ -179,17 +173,19 @@ export default {
   title: '报建收费列表',
   data () {
     return {
-      model: new PagedList('rs/sql/getApplyCharge', 30, null, {
+      model: new PagedList('rs/sql/getApplyCharge', 30, {
+        data: {
+          orgid: this.$login.f.orgid
+        }
+      }, {
         f_charge_money: 0
       }),
-      curorgid: [this.$login.f.orgid],
       applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
       paymentMethod: [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')],
-      chargeStatus: [
+      chargingStatus: [
         {label: '全部', value: ''},
         {label: '有效', value: '有效'},
-        {label: '作废', value: '作废'},
-        {label: '退款', value: '退款'}
+        {label: '作废', value: '作废'}
       ],
       criteriaShow: false,
       chargeAll: {
@@ -197,7 +193,7 @@ export default {
         sum: 0
       },
       getfield: {
-        'f_apply_num': '工程编号',
+        'f_apply_num': '报建编号',
         'f_entry_name': '项目名称',
         'f_contract_number': '合同编号',
         'f_apply_type': '报建类型',
@@ -205,7 +201,8 @@ export default {
         'f_payment_method': '付款方式',
         'f_charge_collectors': '收费人员',
         'f_charge_date': '收费日期',
-        'f_charge_status': '状态'
+        'f_charging_status': '状态',
+        'f_address': '地址'
       }
     }
   },
@@ -216,13 +213,9 @@ export default {
   methods: {
     clear () {
       Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
-        this.$refs.cp.$refs.cri.model[key] = ''
+        this.$refs.cp.$refs.cri.model[key] = []
       })
     },
-    searchCondition (args) {
-      args.condition = args.condition + ` and cr.f_orgid = '${this.curorgid[0]}'`
-      this.model.search(args.condition, args.model)
-    },
     // 查询
     search () {
       this.$refs.cp.$refs.cri.search()
@@ -239,13 +232,6 @@ export default {
       let res = await http.load('POST', 'rs/sql/getChargeAll', {data: data}, {resolveMsg: null, rejectMsg: null})
 
       this.chargeAll = res.data[0]
-    },
-    getorg (val) {
-      if (val.length <= 0) {
-        return
-      }
-      this.curorgid = val
-      this.search()
     }
   },
   computed: {

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

@@ -4,9 +4,9 @@
       <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 class="bg-info text-center" style="font-size: 20px;height: 5%">合计收费记录共
+        <span style="color: red">{{$refs.query.chargeAll.count}}</span>笔，
+        合计金额<span style="color: red">{{$refs.query.chargeAll.sum}}</span>元
       </p>
     </div>
   </div>

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

@@ -1,122 +1,125 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main">
-      <div :class="showData ? 'top' : 'auto'">
-        <installinfoselect :show-data="showData" v-ref:query></installinfoselect>
-      </div>
-      <div v-if="showtotal" class="panel panel-info" style="height: 90%;">
-        <tabset v-ref:tabs :close="false">
-          <tab :header='selectdata.title'>
-            <function-service-control  v-ref:service :selectdata="selectdata"></function-service-control>
-          </tab>
-          <tab header='附件'>
-            <apply-upload :blodid="show_data.f_process_id"
-                          :isupload = "true"
-                          :isdelete="true"
-                          :isusetype="true"
-                          :isremark = "true"
-                          :takeimg="false"
-                          :issearch="true"
-                          :defname="show_data.defname"
-            >
-            </apply-upload>
-          </tab>
-        </tabset>
-      </div>
-    </div>
-  </div>
-
-</template>
-<script>
-  import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
-  export default {
-    title: '报建业务',
-    data () {
-      return {
-        selectdata: null,
-        showtotal: false, // 控制详情显示
-        showData: true     // 控制列表数据
-      }
-    },
-    created () {
-      this.getConfig()
-    },
-    methods: {
-      // 获取功能配置
-      async getConfig () {
-        let res = await this.$resetpost(
-          'rs/logic/ApplyGetFunction',
-          null,
-          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
-        )
-        Vue.prototype.$function_vue = res.data
-      }
-    },
-    events: {
-      // 刷新控制层
-      async 'breakControl' (servicedata) {
-        let http = new HttpResetClass()
-        let data = {
-          condition: `u.id = ${servicedata.id}`,
-          data: {
-            id: this.$login.f.id,
-            orgid: this.$login.f.orgid
-          }
-        }
-
-        let res = await http.load('POST', 'rs/sql/checkuserfunction', {data:data}, {
-          resolveMsg: null,
-          rejectMsg: '数据更新失败！！！'
-        })
-
-        this.showtotal = false
-
-        this.selectdata = Object.assign({}, this.selectdata, res.data[0])
-
-        this.$nextTick(() => {
-          this.showtotal = true
-        })
-      },
-      // 查询
-      'search' () {
-        // 关闭详细
-        this.showtotal = false
-        // 显示列表数据
-        this.showData = true
-        // 显示分页
-        this.$refs.query.$refs.cp.pager = true
-        // 调用查询
-        this.$refs.query.$refs.cp.$refs.cri.search()
-      },
-      // 点击功能操作
-      'func' (funcdata, row) {
-        this.selectdata = Object.assign({}, funcdata, row)
-
-        // 关闭分页
-        this.$refs.query.$refs.cp.pager = false
-        // 关闭列表数据
-        this.showData = false
-
-        this.$nextTick(() => {
-          this.showtotal = true
-        })
-      }
-    }
-  }
-</script>
-<style scoped>
-  /*清除浮动*/
-  .clearfix:after,.clearfix:before{
-    display: table;
-  }
-  .clearfix:after{
-    clear: both;
-  }
-  .head{
-    height: auto;
-    font-weight: bold;
-    color: #000000;
-    font-family: 微软雅黑;
-  }
-</style>
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <div :class="showData ? 'top' : 'auto'">
+        <installinfoselect :show-data="showData" v-ref:query></installinfoselect>
+      </div>
+      <div v-if="showtotal" class="panel panel-info" style="height: 90%;">
+        <tabset v-ref:tabs :close="false">
+          <tab :header='selectdata.title'>
+            <function-service-control  v-ref:service :selectdata="selectdata"></function-service-control>
+          </tab>
+          <tab header='附件'>
+            <apply-upload :blodid="show_data.f_process_id"
+                          :isupload = "true"
+                          :isdelete="true"
+                          :isusetype="true"
+                          :isremark = "true"
+                          :takeimg="false"
+                          :issearch="true"
+                          :defname="show_data.defname"
+            >
+            </apply-upload>
+          </tab>
+        </tabset>
+<!--        <div class="panel-heading head" style="background-color: #e8f4ff">{{funcdata.title}}</div>-->
+<!--        <div class="panel-body" style="height: 89%">-->
+<!--          <function-service-control v-ref:func :funcdata="funcdata" :selectdata="selectdata"></function-service-control>-->
+<!--        </div>-->
+      </div>
+    </div>
+  </div>
+
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '报建业务',
+    data () {
+      return {
+        selectdata: null,
+        showtotal: false, // 控制详情显示
+        showData: true     // 控制列表数据
+      }
+    },
+    created () {
+      this.getConfig()
+    },
+    methods: {
+      // 获取功能配置
+      async getConfig () {
+        let res = await this.$resetpost(
+          'rs/logic/ApplyGetFunction',
+          null,
+          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
+        )
+        Vue.prototype.$function_vue = res.data
+      }
+    },
+    events: {
+      // 刷新控制层
+      async 'breakControl' (servicedata) {
+        let http = new HttpResetClass()
+        let data = {
+          condition: `u.id = ${servicedata.id}`,
+          data: {
+            id: this.$login.f.id,
+            orgid: this.$login.f.orgid
+          }
+        }
+
+        try {
+          let res = await http.load('POST', 'rs/sql/checkuserfunction', {data: data}, {resolveMsg: null, rejectMsg: null})
+
+          this.showtotal = false
+          this.selectdata = res.data[0]
+          this.$nextTick(() => {
+            this.showtotal = true
+          })
+        } catch (e) {
+          this.$showAlert('数据更新失败，请手查询更新！！！', 'danger', 3000)
+        }
+      },
+      // 查询
+      'search' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        this.$refs.query.$refs.cp.$refs.cri.search()
+      },
+      // 点击功能操作
+      'func' (funcdata, row) {
+        this.selectdata = Object.assign({}, funcdata, row)
+
+        // 关闭分页
+        this.$refs.query.$refs.cp.pager = false
+        // 关闭列表数据
+        this.showData = false
+
+        this.$nextTick(() => {
+          this.showtotal = true
+        })
+      }
+    }
+  }
+</script>
+<style scoped>
+  /*清除浮动*/
+  .clearfix:after,.clearfix:before{
+    display: table;
+  }
+  .clearfix:after{
+    clear: both;
+  }
+  .head{
+    height: auto;
+    font-weight: bold;
+    color: #000000;
+    font-family: 微软雅黑;
+  }
+</style>