apply-clients 7.1.36 → 7.1.37

package/src/components/app_apply/Ventilation.vue

@@ -0,0 +1,199 @@
+<template>
+  <div class="select-overspread repair-bg auto" >
+    <validator name="v" >
+      <div class="auto repair-info-content compatible" >
+        <div class="row auto">
+          <div class="col-xs-12 col-sm-6 col-md-6 form-input-group " :class="$v.f_gas_name.required ? 'has-error' : ''">
+            <label class="text-justify lb-left" for="f_gas_name">通气人员：</label>
+            <input type="text" class="form-control" id="f_gas_name"  v-model="model.f_gas_name" v-validate:f_gas_name='{required: true}'/>
+          </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="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="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>
+            <input type="text" class="form-control" id="f_regulatoruser" v-model="model.f_regulatoruser"  v-validate:f_regulatoruser='{required: true}'/>
+          </div>
+          <div class="col-xs-12 col-sm-12 col-md-6 form-input-group">
+            <input type="checkbox" class="" id="checkbox" v-model="model.f_fee_state"/>
+            <label for="checkbox" class="text-justify lb-left">费用是否结清</label>
+          </div>
+          <div class="col-xs-12 col-sm-6 col-md-6 form-input-group">
+            <label class="text-justify lb-left">通气前安检情况：</label>
+            <textarea class="form-control" cols="30" rows="4" style="resize: vertical;" v-model="model.f_gas_security" ></textarea>
+          </div>
+          <div class="col-xs-12 col-sm-6 col-md-6 form-input-group">
+            <label class="text-justify lb-left">通气备注：</label>
+            <textarea class="form-control" cols="30" rows="4" style="resize: vertical;" v-model="model.f_gas_remarks" ></textarea>
+          </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_gas_department" readonly  >
+          </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_gas_operator" readonly  >
+          </div>
+          <div class="col-xs-12 col-sm-6 col-md-6 form-input-group">
+            <label class="lb-left text-justify">分公司：</label>
+            <input type="text" class="form-control"  v-model="model.f_filiale" readonly  />
+          </div>
+          <div class="col-xs-12 col-sm-6 col-md-6 form-input-group">
+            <label class="lb-left text-justify">操作日期：</label>
+            <input type="text" class="form-control"  v-model="model.f_gas_date" readonly  >
+          </div>
+        </div>
+
+      </div>
+      <div style="text-align:center;margin-top: 5px;" v-if="model.canedit">
+        <button  @click="save" type="button" class="btn btn-primary radius_btn" >保存</button>
+        <button  @click="upload" type="button" class="btn btn-primary radius_btn" >上传</button>
+      </div>
+    </validator>
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+  import * as Util from '../Util'
+  import co from 'co'
+
+  let uploadApply = function * (self) {
+    // self.model.f_app_upload = '已上传'
+    var param = {
+      model: {
+        f_processid: self.model.f_process_id
+      },
+      loginUser: {
+        id: Vue.user.id,
+        name: Vue.user.name,
+        ename: Vue.user.ename
+      },
+      employeetemplate: self.employeetemplate,// 指派勘察人员
+      subdep: '提交'
+    }
+    var data ={tablename:'t_apply',parameters:self.model,param: param}
+    // var url = self.$androidUtil.getProxyUrl() + '/rs/logic/uploadapply'
+    // console.log(`即将上传，url>>>> ${url}`)
+    // let res = yield self.$resetpost(url, {data:data})
+    let res = yield self.$androidUtil.bzLogic('uploadapply',data)
+    console.log(`上传返回json>>>>>>>>>>>> ${JSON.stringify(res)}`)
+    if(!res){
+      self.$showMessage('上传失败！')
+      return
+    }
+    if(res.code != 200){
+      self.$showMessage('上传失败，原因:' + res.msg)
+      return
+    }
+    self.$showMessage('上传成功！')
+    self.updateState()
+    self.$parent.$back()
+  }
+
+  export default {
+    title: '通气点火',
+    props: {
+      model: { // 传入一条报建信息
+        type: Object
+      }
+    },
+    data () {
+      return {
+        signType:{
+          type: Boolean,
+          default: true
+        },
+      }
+    },
+    methods: {
+      upload() {
+        var reg = /^\d+$/
+        if (!reg.test(this.model.f_gas_number)) {
+          this.$showMessage('通气户数必须为整数！')
+          return false;
+        }
+        if (!reg.test(this.model.f_notgas_number)) {
+          this.$showMessage('未通气户数必须为整数！')
+          return false;
+        }
+        this.model.f_app_upload = '已完成'
+        console.log(`前台开始本地保存，传入数据json>>>>>>>${JSON.stringify(this.model)}`)
+        let res = this.$androidUtil.bzLogic('saveapplyforapp', {parameters:this.model})
+        if(res.code != 200){
+          this.$showMessage('保存失败,上传终止！')
+          return
+        }
+        let gen = uploadApply(this)
+        co(gen)
+      },
+      mute () {
+        HostApp.mute()
+      },
+      // 上传完成后回写本地上传状态
+      updateState(){
+        console.log(`前台上传完成，开始回写本地上传状态`)
+        this.model.f_app_upload = '已上传'
+        this.$androidUtil.bzLogic('saveapplyforapp', {parameters:this.model})
+      },
+      save() {
+        var reg = /^\d+$/
+        if (!reg.test(this.model.f_gas_number)) {
+          this.$showMessage('通气户数必须为整数！')
+          return false;
+        }
+        if (!reg.test(this.model.f_notgas_number)) {
+          this.$showMessage('未通气户数必须为整数！')
+          return false;
+        }
+        this.model.f_app_upload = '已完成'
+        console.log(`前台开始本地保存，传入数据json>>>>>>>${JSON.stringify(this.model)}`)
+        let res = this.$androidUtil.bzLogic('saveapplyforapp', {parameters:this.model})
+        console.log(`前台保存结束，返回res>>>>>>>${JSON.stringify(res)}`)
+        if(res.code == 200){
+          console.log(`前台保存成功!`)
+          this.$showMessage('保存成功！')
+        }else{
+          console.log('前台保存失败')
+          this.$showMessage('保存失败！')
+        }
+      }
+    },
+    ready(){
+      this.model.f_completed_date = Util.toStandardTimeString()
+      this.model.f_gas_date = Util.toStandardDateString()
+      if(navigator.userAgent.match('iPad') || navigator.userAgent.match('iPhone')){
+        this.signType = false
+      }
+      if(this.model && this.model.f_single_man){
+        this.model.f_single_man = this.f_single_man
+      }
+      if(Vue.user){
+        console.log('获取到Vue.user')
+        this.model.f_gas_department = Vue.user.f_parentname
+        this.model.f_gas_operator = Vue.user.name
+      }
+    },
+    watch:{
+      'model.f_fee_state'(val){
+        // this.$showMessage(val)
+        if(val){
+          this.model.f_fee_state = 1
+        }else{
+          this.model.f_fee_state = 0
+        }
+      }
+    }
+  }
+</script>
+<style>
+  .radius_btn{
+    border-radius:  5px;
+    margin-top: 0.1rem;
+  }
+</style>

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

@@ -4,19 +4,31 @@
         <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>
-              <input type="text" class="input_search" style="width: 60%" v-model="model.f_apply_num"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="a.f_apply_num like '%{}%'" placeholder='报建编号'>
+              <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 class="font_normal_body">用户名称：</label>
-              <input type="text" class="input_search" style="width: 60%" v-model="model.f_user_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="a.f_user_name like '%{}%'" placeholder='用户名称'>
+              <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 HH:mm:ss'"
+                          :show-reset-button="true"
+                          condition="cr.f_charge_date >= '{}'">
+              </datepicker>
             </div>
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">电&emsp;&emsp;话：</label>
-              <input type="text" class="input_search" style="width: 60%" v-model="model.f_phone"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="a.f_phone like '%{}%'" placeholder='电话'>
+              <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 HH:mm:ss'"
+                          :show-reset-button="true"
+                          condition="cr.f_charge_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>
@@ -36,6 +48,18 @@
             </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 = '{}'">
+            </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 = '{}'">
+            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">报建类型：</label>
               <v-select
@@ -78,28 +102,6 @@
                 :value-single="true"
                 close-on-select ></v-select>
             </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 HH:mm:ss'"
-                          :show-reset-button="true"
-                          condition="cr.f_charge_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 HH:mm:ss'"
-                          :show-reset-button="true"
-                          condition="cr.f_charge_date <= '{}'">
-              </datepicker>
-            </div>
           </div>
         </div>
       </criteria>
@@ -108,19 +110,16 @@
           <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>
+            <th>状态</th>
+            <th>地址</th>
           </tr>
         </template>
         <template partial='body'>
@@ -132,10 +131,7 @@
               <nobr><font>{{row.f_apply_num}}</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>
+              <nobr><font>{{row.f_apply_entry_name}}</font></nobr>
             </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_contract_number}}</font></nobr>
@@ -144,7 +140,7 @@
               <nobr><font>{{row.f_apply_type}}</font></nobr>
             </td>
             <td style="text-align: center;">
-              <nobr><font>{{row.f_apply_nature}}</font></nobr>
+              <nobr><font>{{row.f_charge_number}}</font></nobr>
             </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_charge_money}}</font></nobr>
@@ -159,56 +155,29 @@
               <nobr><font>{{row.f_charge_date}}</font></nobr>
             </td>
             <td style="text-align: center;">
-              <nobr><font>{{row.f_charge_status}}</font></nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr><font>{{row.f_bill_style}}</font></nobr>
+              <nobr><font>{{row.f_charging_status}}</font></nobr>
             </td>
             <td style="text-align: center;">
-              <nobr><font>{{row.f_bill_state}}</font></nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr v-if="row.f_charge_status !== '退款'">
-                <button
-                  type="button" name="button" class="btn btn-link"
-                  v-if="row.f_bill_state !== '开票成功'"
-                  @click="$parent.$parent.$parent.openBill(row)"
-                >开票</button>
-
-                <button
-                  type="button" name="button" class="btn btn-link"
-                  v-else
-                  @click="$parent.$parent.$parent.showPrintModal(row)"
-                >查看发票</button>
-              </nobr>
+              <nobr><font>{{row.f_address}}</font></nobr>
             </td>
           </tr>
         </template>
       </data-grid>
     </criteria-paged>
-
-    <modal v-if="showPrint" :show.sync="showPrint" v-ref:modal :large="true" :backdrop="false">
-      <header slot="modal-header" class="modal-header">
-        <button type="button" class="close" @click="showPrint = !showPrint"><span>&times;</span></button>
-        <h4 class="modal-title">票据信息</h4>
-      </header>
-      <article slot="modal-body" class="modal-body clearfix">
-        <iframe width="100%" height="500px" :src="charge.f_bill_url" v-if="charge.f_bill_url"></iframe>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-      </footer>
-    </modal>
 </template>
 
 <script>
 import {PagedList} from 'vue-client'
 import {HttpResetClass} from 'vue-client'
-import {isEmpty} from '../../Util'
 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
       }),
       applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
@@ -219,23 +188,22 @@ export default {
         {label: '作废', value: '作废'}
       ],
       criteriaShow: false,
+      chargeAll: {
+        count: 0,
+        sum: 0
+      },
       getfield: {
         'f_apply_num': '报建编号',
-        'f_user_name': '用户名称',
-        'f_phone': '电话',
+        'f_entry_name': '项目名称',
         'f_contract_number': '合同编号',
         'f_apply_type': '报建类型',
-        'f_apply_nature': '报建性质',
         'f_charge_money': '收费金额',
         'f_payment_method': '付款方式',
         'f_charge_collectors': '收费人员',
         'f_charge_date': '收费日期',
-        'f_charge_status': '缴费状态',
-        'f_bill_style': '票据类型',
-        'f_bill_state': '票据状态'
-      },
-      charge: null,
-      showPrint: false
+        'f_charging_status': '状态',
+        'f_address': '地址'
+      }
     }
   },
   ready () {
@@ -251,66 +219,19 @@ export default {
     // 查询
     search () {
       this.$refs.cp.$refs.cri.search()
+      this.getChargeAll()
     },
-    // 查看发票
-    showPrintModal(row) {
-      this.charge = row
-
-      this.showPrint = true
-    },
-    // 开票
-    async openBill (charge) {
-      this.charge = charge
-      let data = null
-      let res = null
-
+    async getChargeAll () {
       let http = new HttpResetClass()
-
-      if (isEmpty(this.charge.f_bill_id)) {
-        data = {
-          id: this.charge.id,
-          charge_type: '报装收费'
+      let data = {
+        condition: this.model.condition,
+        data: {
+          orgid: this.$login.f.orgid
         }
-        res = await http.load('POST', 'rs/logic/bjEticketCharge', {data:data}, {
-          resolveMsg: null,
-          rejectMsg: '开票失败！！！'
-        })
-        this.charge.f_bill_id = res.data
       }
+      let res = await http.load('POST', 'rs/sql/getChargeAll', {data: data}, {resolveMsg: null, rejectMsg: null})
 
-      data = {
-        id: this.charge.f_bill_id,
-        f_sell_id: this.charge.id
-      }
-      try {
-        res = await http.load('POST', 'rs/logic/bjOpenEticket', {data:data}, {
-          resolveMsg: null,
-          rejectMsg: '开票失败！！！'
-        })
-
-        // res.data.f_bill_url = 'https://dlj.51fapiao.cn/dlj/v7/de4c9b985021111ef1c722c2914e34d9273291'
-
-        if (res.data.f_bill_state !== '开票成功') {
-          throw '开票失败！！！'
-        }
-        this.charge.f_bill_state = res.data.f_bill_state
-        this.charge.f_bill_url = res.data.f_bill_url
-
-        this.showPrint = true
-      } catch (e) {
-        console.error(e)
-        this.charge.f_bill_state = '开票失败'
-
-        data = {
-          id: this.charge.id
-        }
-        res = await http.load('POST', 'rs/logic/updateChargeBill', {data:data}, {
-          resolveMsg: null,
-          rejectMsg: '收费信息更新失败！！！'
-        })
-
-        throw e
-      }
+      this.chargeAll = res.data[0]
     }
   },
   computed: {

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

@@ -0,0 +1,107 @@
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <criteria-paged :model="model" :pager="false" 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  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 HH:mm:ss'"
+                            :show-reset-button="true"
+                            condition="f_charge_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 HH:mm:ss'"
+                            :show-reset-button="true"
+                            condition="f_charge_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>
+              </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>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr >
+              <td style="text-align: center;">
+                <nobr><font>{{row.depname}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.address_count}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.sum_money}}</font></nobr>
+              </td>
+            </tr>
+          </template>
+          <template partial='foot'>
+            <tr>
+              <td style="text-align: center;">合计</td>
+              <td style="text-align: center;">{{model.sums.address_count}}</td>
+              <td style="text-align: center;">{{model.sums.sum_money}}</td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+
+export default {
+  title: '报建收费报表',
+  data () {
+    return {
+      model: new PagedList('rs/sql/countApplyCharge', 30, {
+        data: {
+          orgid: this.$login.f.orgid
+        }
+      }, {
+        address_count: 0,
+        sum_money: 0
+      })
+    }
+  },
+  ready () {
+    // 调用查询
+    this.search()
+  },
+  methods: {
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = []
+      })
+    },
+    // 查询
+    search () {
+      this.$refs.cp.$refs.cri.search()
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

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

@@ -5,8 +5,8 @@
         <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">{{$refs.query.model.count}}</span>笔，
-        合计金额<span style="color: red">{{$refs.query.model.sums.f_charge_money}}</span>元
+        <span style="color: red">{{$refs.query.chargeAll.count}}</span>笔，
+        合计金额<span style="color: red">{{$refs.query.chargeAll.sum}}</span>元
       </p>
     </div>
   </div>