apply-clients 7.1.37 → 7.1.40

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

@@ -4,31 +4,19 @@
         <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_entry_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="a.f_entry_name like '%{}%'" placeholder='项目名'>
+              <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='报建编号'>
             </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>
+              <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='用户名称'>
             </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>
+              <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='电话'>
             </div>
             <div class="form-group col-sm-3 button-range">
               <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
@@ -48,18 +36,6 @@
             </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
@@ -102,6 +78,28 @@
                 :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>
@@ -110,16 +108,19 @@
           <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'>
@@ -131,7 +132,10 @@
               <nobr><font>{{row.f_apply_num}}</font></nobr>
             </td>
             <td style="text-align: center;">
-              <nobr><font>{{row.f_apply_entry_name}}</font></nobr>
+              <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_contract_number}}</font></nobr>
@@ -140,7 +144,7 @@
               <nobr><font>{{row.f_apply_type}}</font></nobr>
             </td>
             <td style="text-align: center;">
-              <nobr><font>{{row.f_charge_number}}</font></nobr>
+              <nobr><font>{{row.f_apply_nature}}</font></nobr>
             </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_charge_money}}</font></nobr>
@@ -155,29 +159,56 @@
               <nobr><font>{{row.f_charge_date}}</font></nobr>
             </td>
             <td style="text-align: center;">
-              <nobr><font>{{row.f_charging_status}}</font></nobr>
+              <nobr><font>{{row.f_charge_status}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_bill_style}}</font></nobr>
             </td>
             <td style="text-align: center;">
-              <nobr><font>{{row.f_address}}</font></nobr>
+              <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>
             </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, {
-        data: {
-          orgid: this.$login.f.orgid
-        }
-      }, {
+      model: new PagedList('rs/sql/getApplyCharge', 30, null, {
         f_charge_money: 0
       }),
       applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
@@ -188,22 +219,23 @@ export default {
         {label: '作废', value: '作废'}
       ],
       criteriaShow: false,
-      chargeAll: {
-        count: 0,
-        sum: 0
-      },
       getfield: {
         'f_apply_num': '报建编号',
-        'f_entry_name': '项目名称',
+        'f_user_name': '用户名称',
+        'f_phone': '电话',
         'f_contract_number': '合同编号',
         'f_apply_type': '报建类型',
+        'f_apply_nature': '报建性质',
         'f_charge_money': '收费金额',
         'f_payment_method': '付款方式',
         'f_charge_collectors': '收费人员',
         'f_charge_date': '收费日期',
-        'f_charging_status': '状态',
-        'f_address': '地址'
-      }
+        'f_charge_status': '缴费状态',
+        'f_bill_style': '票据类型',
+        'f_bill_state': '票据状态'
+      },
+      charge: null,
+      showPrint: false
     }
   },
   ready () {
@@ -219,19 +251,66 @@ export default {
     // 查询
     search () {
       this.$refs.cp.$refs.cri.search()
-      this.getChargeAll()
     },
-    async getChargeAll () {
+    // 查看发票
+    showPrintModal(row) {
+      this.charge = row
+
+      this.showPrint = true
+    },
+    // 开票
+    async openBill (charge) {
+      this.charge = charge
+      let data = null
+      let res = null
+
       let http = new HttpResetClass()
-      let data = {
-        condition: this.model.condition,
-        data: {
-          orgid: this.$login.f.orgid
+
+      if (isEmpty(this.charge.f_bill_id)) {
+        data = {
+          id: this.charge.id,
+          charge_type: '报装收费'
         }
+        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})
 
-      this.chargeAll = res.data[0]
+      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
+      }
     }
   },
   computed: {

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

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

@@ -1,147 +1,131 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main" style="overflow: auto;width: 100%">
-      <div class="col-sm-12">
-        <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%;">
-          <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 class="col-sm-2">
-          <stop-apply-cardlist v-ref:card></stop-apply-cardlist>
-        </div>
-      -->
-    </div>
-  </div>
-
-</template>
-<script>
-  import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
-  export default {
-    title: '报建业务',
-    data () {
-      return {
-        selectdata: null,
-        funcdata: null, // 选中功能
-        showtotal: false, // 控制详情显示
-        showData: true     // 控制列表数据
-      }
-    },
-    created () {
-      this.getConfig()
-    },
-    methods: {
-      // 获取功能配置
-      getConfig () {
-        let http = new HttpResetClass()
-        let data = {
-          data: this.$login.f
-        }
-        http.load('POST', 'rs/logic/ApplyGetFunction', {data: data}, {resolveMsg: null, rejectMsg: null}
-        ).then((res) => {
-          if (res.data.code && res.data.code === 200) {
-            Vue.prototype.$function_vue = res.data.function_vue
-          } else {
-            this.$showMessage('获取配置失败,原因:' + res.data.msg)
-            return
-          }
-        })
-      }
-    },
-    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.f_orgids
-          }
-        }
-
-        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.funcdata = funcdata
-        this.selectdata = row
-        // 关闭分页
-        this.$refs.query.$refs.cp.pager = false
-        // 关闭列表数据
-        this.showData = false
-
-        this.$nextTick(() => {
-          this.showtotal = true
-        })
-      }
-      /*
-        'operate' (row) {
-          this.show = false
-          this.funcdata = {
-            title: '撤销'
-          }
-          let http = new HttpResetClass()
-          let data = {
-            tablename: 't_apply',
-            condition: `f_process_id='${row.processid}'`
-          }
-          http.load('POST', 'rs/sql/singleTable', {data: data}, {resolveMsg: null,rejectMsg: '工程查询失败'})
-            .then(res => {
-              console.log(res.data[0])
-              this.selectdata = res.data[0]
-              this.selectdata.stopapply = row
-              this.selectheight = '10%'
-              this.funcheight = '90%'
-              this.$refs.installselect.$refs.cp.pager = false
-              this.show = 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>
+    </div>
+  </div>
+
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '报建业务',
+    data () {
+      return {
+        selectdata: null,
+        showtotal: false, // 控制详情显示
+        showData: true     // 控制列表数据
+      }
+    },
+    ready () {
+      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: {
+            f_filiale: this.$login.f.f_fengongsi
+          }
+        }
+
+        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()
+      },
+      '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)
+
+        // 关闭分页
+        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>