apply-clients 3.1.41 → 3.1.42

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

@@ -5,7 +5,7 @@
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
             <div class="form-group col-sm-4">
-              <label class="font_normal_body">客户名称/联系人：</label>
+              <label class="font_normal_body">客户名称：</label>
               <input type="text" class="input_search" v-model="model.f_user_name"
                      v-on:keyup.enter="search" condition=" (f_user_name like '%{}%' or f_contact like '%{}%') " placeholder='二选一输入'>
             </div>
@@ -18,6 +18,7 @@
             <div class="form-group col-sm-3 operate">
               <label class="font_normal_body"></label>
               <button type="button" class="btn btn-info head-but" @click="search(),$parent.$parent.close()" v-el:cx>查询</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}"
                 @click="$parent.$parent.hidden()"
@@ -34,7 +35,7 @@
                      condition="f_contract_number like '%{}%'">
             </div>
             <div class="form-group col-sm-4">
-              <label class="font_normal_body">票号：</label>
+              <label class="font_normal_body">票&emsp;&emsp;号：</label>
               <input type="text" class="input_search" placeholder='票号' v-model="model.f_ticket_number"
                      v-on:keyup.enter="search"
                      condition="c.f_ticket_number like '%{}%'">
@@ -45,6 +46,18 @@
                      v-on:keyup.enter="search"
                      condition="f_address like '%{}%'">
             </div>
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">小&emsp;&emsp;区：</label>
+              <v-select
+                v-model="model.f_residential_area"
+                placeholder='请选择'
+                condition="u.f_residential_area = '{}'"
+                :value.sync="model.f_residential_area"
+                :options='$parent.$parent.area'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
             <div class="col-sm-4  form-group">
               <label class="font_normal_body">报建类型：</label>
               <v-select
@@ -173,15 +186,22 @@
             org: this.$login.f.orgs
           }
         }),
-        criteriaShow: false // 控制查询条件
+        criteriaShow: false, // 控制查询条件
+        area:[]
       }
     },
     ready () {
       // 调用查询
       this.$refs.cp.$refs.cri.search()
       this.getDefnames()
+      this.getAreaAll()
     },
     methods: {
+      clear () {
+        Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+          this.$refs.cp.$refs.cri.model[key] = ''
+        })
+      },
       // 获取配置
       checkfuncs (row) {
         this.funcs = this.$function_vue.functions
@@ -202,6 +222,18 @@
         this.$dispatch('hidden', this.criteriaShow)
         this.criteriaShow = !this.criteriaShow
       },
+      async getAreaAll () {
+        let http = new HttpResetClass()
+        let condition = "f_filialeid = " + this.$login.f.orgid
+        let res = await http.load('POST','rs/logic/apply_queryArea',{data:{condition:condition}}, {resolveMsg: null, rejectMsg: null})
+
+        this.area = res.data.queryArea.map(item => {
+          return {
+            'label': item.f_residential_area,
+            'value': item.f_residential_area,
+          }
+        })
+      },
       // 关闭
       close () {
         this.$dispatch('close')

package/src/components/product/Function/functions/ChargeManagement.vue

@@ -139,6 +139,84 @@
           <span>点击刷新按钮刷新应交金额、累计缴费金额、欠费金额</span>
           <button type="button" class="btn btn-primary" @click="apply_data()" style="float: right">刷新</button>
         </div>
+        <div class="form-group col-sm-12" :class="charge.f_payment_type ? '':'has-error'">
+          <label class="col-sm-2 control-label">付款类型：</label>
+          <div class="col-sm-10">
+            <input-select
+              v-model="charge.f_payment_type"
+              placeholder='请选择'
+              :value.sync="charge.f_payment_type"
+              :options='paymentType'
+              class="select select_list"
+              :value-single="true"
+              @keyup="changeDevice"
+              width="100%"
+              close-on-select ></input-select>
+          </div>
+        </div>
+        <div v-if="data.f_apply_type === '散户报建' && showDevice" class="form-group col-sm-12 panel panel-info">
+          <div class="panel-heading head col-sm-12" style="background-color: #e8f4ff;margin-bottom: 10px">
+            <div class="col-sm-6 text-left">设备信息</div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">设备品牌：</label>
+            <div class="col-sm-8">
+              <input-select
+                class="select select_list"
+                :value.sync="userfile.devicesinfo.f_brand"
+                v-model="userfile.devicesinfo.f_brand"
+                :options="brandList"
+                :disable="mark === 1"
+                :valueSingle="true"></input-select>
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">设备类型：</label>
+            <div class="col-sm-8">
+              <input-select
+                class="select select_list"
+                :value.sync="userfile.devicesinfo.f_devices_type"
+                v-model="userfile.devicesinfo.f_devices_type"
+                :options="devicesType"
+                :disable="mark === 1"
+                :valueSingle="true"></input-select>
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">设备数量：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style="" type="number"
+                     placeholder="设备数量"
+                     v-model="userfile.devicesinfo.f_devices_num"
+                     :readonly="mark === 1"/>
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">安&ensp;装&ensp;人：</label>
+            <div class="col-sm-8">
+              <input-select
+                class="select select_list"
+                v-model="userfile.devicesinfo.f_input_person"
+                :options="personList"
+                :disable="mark === 1"
+                :value.sync = "userfile.devicesinfo.f_input_person"
+                :valueSingle="true"></input-select>
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">安装日期：</label>
+            <div class="col-sm-8">
+              <datepicker
+                placeholder="安装日期"
+                :value.sync="userfile.devicesinfo.f_input_date"
+                v-model="userfile.devicesinfo.f_input_date"
+                format="yyyy-MM-dd HH:mm:ss"
+                :value="userfile.devicesinfo.f_input_date"
+                :disabled="mark === 1">
+              </datepicker>
+            </div>
+          </div>
+        </div>
         <div class="form-group col-sm-12" :class="charge.f_charge_money ? '':'has-error'">
           <label class="col-sm-2 control-label">收费金额：</label>
           <div class="col-sm-10">
@@ -324,6 +402,17 @@
 <!--                   v-model="charge.f_useraddres" />-->
 <!--          </div>-->
 <!--        </div>-->
+        <div class="form-group col-sm-12">
+          <label class="col-sm-2 control-label">付款类型：</label>
+          <div class="col-sm-10">
+            <input
+              type="text"
+              v-model="charge.f_payment_type"
+              class="form-control input_view"
+              style="width: 100%"
+              readonly/>
+          </div>
+        </div>
         <div class="form-group col-sm-12">
           <label class="col-sm-2 control-label">收费金额：</label>
           <div class="col-sm-10">
@@ -510,6 +599,7 @@ export default {
         parameters : {
           f_charge_money: this.charge.f_charge_money,
           f_charge_date: this.charge.f_charge_date,
+          f_payment_type: this.charge.f_payment_type,
           f_charge_state: '有效',
           f_amount_words: this.charge.f_amount_words,
           f_payment_method: this.charge.f_payment_method,
@@ -521,6 +611,11 @@ export default {
           f_process_id: this.data.f_process_id
         }
       }
+      if (this.data.f_apply_type === '散户报建' && this.userfile.devicesinfo){
+        data.userfile = this.userfile
+        data.user = this.$login.f
+        data.userfile.devicesinfo.f_ticket_number = this.charge.f_ticket_number
+      }
       console.log("开始收费：" + JSON.stringify(data))
       try {
         let res = await http.load('POST', 'rs/logic/addCharge', {data: data}, {
@@ -531,8 +626,8 @@ export default {
       } catch (e) {
         this.$showAlert(e.data, 'danger', 3000)
       }
-      if (this.data.f_apply_type === '散户报建'){
-        this.addDevice()
+      if (this.data.f_apply_type === '散户报建' && this.userfile.devicesinfo){
+        // this.addDevice()
       }
       this.showCharge = false
       this.charge.f_charge_money = 0
@@ -792,6 +887,9 @@ export default {
     paymentMethod() {
       return this.$appdata.getParam("付款方式")
     },
+    paymentType() {
+      return this.$appdata.getParam("报建收费类型")
+    },
     cumulativePaymentMoney() {
       return isEmpty(this.chargeUseraddress.f_cumulative_payment_money) ? 0 : this.chargeUseraddress.f_cumulative_payment_money
     },

package/src/components/product/Process/ExplorationSelect.vue

@@ -5,7 +5,7 @@
         <div novalidate 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>
+                <label class="font_normal_body">客户名称：</label>
                 <input type="text" class="input_search" v-model="model.f_user_name"
                        v-on:keyup.enter="search"
                        condition=" (f_user_name like '%{}%' or f_contact like '%{}%') " placeholder='二选一输入'>
@@ -25,6 +25,7 @@
               <div class="form-group col-sm-2 operate">
                 <button type="button" class="btn btn-info head-but" @click="$parent.$parent.show = !$parent.$parent.show">工程发起</button>
                 <button type="button" class="btn btn-info head-but" @click="search(),$parent.$parent.close()" v-el:cx>查询</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}"
                   @click="$parent.$parent.hidden()"
@@ -41,7 +42,19 @@
                        condition="f_address like '%{}%'">
               </div>
               <div class="form-group col-sm-3">
-                <label class="font_normal_body">票号：</label>
+                <label class="font_normal_body">小&emsp;&emsp;区：</label>
+                <v-select
+                  v-model="model.f_residential_area"
+                  placeholder='请选择'
+                  condition="u.f_residential_area = '{}'"
+                  :value.sync="model.f_residential_area"
+                  :options='$parent.$parent.area'
+                  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">票&emsp;&emsp;号：</label>
                 <input type="text" class="input_search" placeholder='票号' v-model="model.f_ticket_number"
                        v-on:keyup.enter="search"
                        condition="c.f_ticket_number like '%{}%'">
@@ -219,7 +232,8 @@
         startname: null, // 启动节点
         criteriaShow: false,
         show: false,
-        applyButton_disabled: true
+        applyButton_disabled: true,
+        area:[]
       }
     },
     ready() {
@@ -227,8 +241,14 @@
       this.$refs.cp.$refs.cri.search()
       // 获取所有办理环节
       this.getDefnames()
+      this.getAreaAll()
     },
     methods: {
+      clear () {
+        Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+          this.$refs.cp.$refs.cri.model[key] = ''
+        })
+      },
       hidden() {
         this.$dispatch('hidden', this.criteriaShow)
         this.criteriaShow = !this.criteriaShow
@@ -280,6 +300,18 @@
         this.show = false
         this.f_apply_type = null
       },
+      async getAreaAll () {
+        let http = new HttpResetClass()
+        let condition = "f_filialeid = " + this.$login.f.orgid
+        let res = await http.load('POST','rs/logic/apply_queryArea',{data:{condition:condition}}, {resolveMsg: null, rejectMsg: null})
+
+        this.area = res.data.queryArea.map(item => {
+          return {
+            'label': item.f_residential_area,
+            'value': item.f_residential_area,
+          }
+        })
+      },
       // ExplorationUser 关闭组件
       close() {
         this.$dispatch('close')

package/src/components/product/Report/ApplyDevicesList.vue

@@ -0,0 +1,249 @@
+<template>
+  <criteria-paged :model="model" v-ref:cp>
+    <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">票&emsp;&emsp;号：</label>
+            <input type="text" class="input_search" placeholder='票号' v-model="model.f_ticket_number"
+                   v-on:keyup.enter="$parent.$parent.search()"
+                   condition="b.f_ticket_number like '%{}%'">
+          </div>
+          <div class="form-group col-sm-3">
+            <label  for="startDate" class="font_normal_body">开始时间：</label>
+            <datepicker id="startDate" placeholder="开始日期"
+                        style="width: 60%!important;"
+                        v-model="model.startDate"
+                        :value.sync="model.startDate"
+                        :format="'yyyy-MM-dd 00:00:00'"
+                        :show-reset-button="true"
+                        condition="b.f_operation_date >= '{}'">
+            </datepicker>
+          </div>
+          <div class="form-group col-sm-3">
+            <label for="endDate" class="font_normal_body">结束时间：</label>
+            <datepicker id="endDate" placeholder="结束日期"
+                        style="width: 60%!important;"
+                        v-model="model.endDate"
+                        :value.sync="model.endDate"
+                        :format="'yyyy-MM-dd 23:59:59'"
+                        :show-reset-button="true"
+                        condition="b.f_operation_date <= '{}'">
+            </datepicker>
+          </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_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
+            <export-excel :data="$parent.$parent.getCondition"
+                          :field="$parent.$parent.getfield"
+                          sqlurl="rs/logic/applyExportfile"
+                          sql-name="getDeviceList"
+                          template-name='销售台账记录导出'
+                          :choose-col="true"></export-excel>
+            <div
+              :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+              @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"
+              class="button_spacing"
+              style="float: right">
+            </div>
+          </div>
+        </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"
+                   v-on:keyup.enter="$parent.$parent.search()"
+                   condition="a.f_apply_num 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_contract_number"
+                   v-on:keyup.enter="$parent.$parent.search()"
+                   condition="a.f_contract_number 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_operator"
+                   v-on:keyup.enter="$parent.$parent.search()"
+                   condition="b.f_operator like '%{}%'">
+          </div>
+          <div class="form-group col-sm-3">
+            <label class="font_normal_body">增值产品类型：</label>
+            <v-select
+              v-model="model.f_devices_type"
+              placeholder='请选择'
+              condition="d.f_devices_type like '%{}%'"
+              :value.sync="model.f_devices_type"
+              :options='$parent.$parent.paymentMethod'
+              class="select select_list"
+              :value-single="true"
+              close-on-select ></v-select>
+          </div>
+        </div>
+      </div>
+    </criteria>
+    <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>售价</th>
+          <th>收费票号</th>
+          <th>营销人员</th>
+          <th>增值产品安装人</th>
+          <th>安装日期</th>
+
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr >
+          <td style="text-align: center;">
+            <nobr><font>{{ $index+1 }}</font></nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr><font>{{ row.f_operation_date }}</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_residential_area }}</font></nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr><font>{{ row.f_room }}</font></nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr><font>{{ row.f_devices_type }}</font></nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr><font>{{ row.f_brand }}</font></nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr><font>{{ row.f_devices_num }}</font></nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr><font>{{ row.f_payment_type }}</font></nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr><font>{{ row.f_payment_method }}</font></nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr><font>{{ row.f_charge_money }}</font></nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr><font>{{ row.f_ticket_number }}</font></nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr><font>{{ row.f_operator }}</font></nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr><font>{{ row.f_input_person }}</font></nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr><font>{{ row.f_input_date }}</font></nobr>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+  </criteria-paged>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
+export default {
+  title: '报建设备收费记录',
+  props:['data'],
+  data () {
+    return {
+      model: new PagedList('rs/sql/getDeviceList', 20, {
+        data: {
+          org: this.$login.f.orgs
+        }
+      }, {
+        f_charge_money: 0
+      }),
+      applytype: [{label:"集中报建",value:'集中报建'},{label:"非民用报建",value:'非民用报建'},{label:"散户报建",value:'散户报建'}], // 所有报建类型
+      paymentMethod: [{label: '全部', value: ''}, ...this.$appdata.getParam('设备类型')],
+      chargingStatus: [
+        {label: '全部', value: ''},
+        {label: '有效', value: '有效'},
+        {label: '作废', value: '作废'}
+      ],
+      criteriaShow: false,
+      chargeAll: {
+        count: 0,
+        sum: 0
+      },
+      getfield: {
+        'f_operation_date': '     收 费 时 间     ',
+        'f_user_name': '  姓  名  ',
+        'f_phone': '    电  话    ',
+        'f_residential_area': '  小 区 名 称   ',
+        'f_room': '     房  号       ',
+        'f_devices_type': '  增 值 产 品  ',
+        'f_brand': '  增值产品品牌  ',
+        'f_devices_num': '  增值产品数量  ',
+        'f_payment_type': ' 收费类型 ',
+        'f_payment_method': '  收款方式  ',
+        'f_charge_money': '  收费金额  ',
+        'f_ticket_number': '  收 费 票 号  ',
+        'f_operator': '  收费人员  ',
+        'f_input_person': '  增值产品安装人  ',
+        'f_input_date': '   安 装 日 期     '
+      }
+    }
+  },
+  ready () {
+    // 调用查询
+    this.search()
+  },
+  methods: {
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = ''
+      })
+    },
+    searchCondition (args) {
+      args.condition = args.condition + ` and a.f_orgid = '${this.curorgid[0]}'`
+      this.model.search(args.condition, args.model)
+    },
+    // 查询
+    search () {
+      this.$refs.cp.$refs.cri.search()
+    },
+    getorg (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curorgid = val
+      this.search()
+    }
+  },
+  computed: {
+    getCondition () {
+      return {
+        condition: this.$refs.cp.$refs.cri.condition,
+        data: {
+          org: this.$login.f.orgs
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>