apply-clients 3.4.85 → 3.4.88

package/src/filiale/hongda/pc/ApplyChargeList.vue

@@ -0,0 +1,475 @@
+<template>
+    <criteria-paged :model="model" v-ref:cp>
+      <criteria partial='criteria' @condition-changed='$parent.searchCondition' 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>
+            </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="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 23:59:59'"
+                          :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>
+              <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="getApplyCharge"
+                            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 = '{}'">
+            </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
+                v-model="model.f_apply_type"
+                placeholder='请选择'
+                condition="a.f_apply_type = '{}'"
+                :value.sync="model.f_apply_type"
+                :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>
+              <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="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" style="width:60%" class="input_search" placeholder='身份证号' v-model="model.f_idnumber"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="a.f_idnumber 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_number"
+                     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>
+              <v-select
+                v-model="model.f_payment_method"
+                placeholder='请选择'
+                condition="cr.f_payment_method = '{}'"
+                :value.sync="model.f_payment_method"
+                :options='$parent.$parent.paymentMethod'
+                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>
+              <v-select
+                v-model="model.f_payment_term"
+                placeholder='请选择'
+                condition="cr.f_payment_term = '{}'"
+                :value.sync="model.f_payment_term"
+                :options='$parent.$parent.paymentTerm'
+                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">流&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">部&emsp;&emsp;门：</label>
+              <res-select
+                restype='department'
+                :parentresid="$parent.$parent.curorgid"
+                :initresid='$parent.$parent.curdepid'
+                @res-select="$parent.$parent.getdep"
+                :is-mul="true"
+              ></res-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">人&emsp;&emsp;员：</label>
+              <res-select
+                restype='user'
+                :parentresid="$parent.$parent.curdepid"
+                :initresid='$parent.$parent.curuserid'
+                @res-select="$parent.$parent.getuser"
+                :is-mul="true"></res-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">缴费状态：</label>
+              <v-select
+                v-model="model.f_charge_status"
+                placeholder='请选择'
+                condition="cr.f_charge_status = '{}'"
+                :value.sync="model.f_charge_status"
+                :options='$parent.$parent.chargeStatus'
+                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>
+              <v-select
+                v-model="model.f_servicer"
+                placeholder='请选择'
+                condition="a.f_servicer = '{}'"
+                :value.sync="model.f_servicer"
+                class="select select_list"
+                :options='$parent.$parent.servicerList'
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">报建发起人：</label>
+              <v-select
+                v-model="model.f_operator"
+                placeholder='请选择'
+                condition="a.f_operator = '{}'"
+                :value.sync="model.f_operator"
+                class="select select_list"
+                :options='$parent.$parent.operatorList'
+                :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_invoice_num"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="f_invoice_num like '%{}%'" placeholder='发票号'>
+            </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 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>
+            <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'>
+          <tr >
+            <td style="text-align: center;">
+              <nobr><font>{{$index+1}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_apply_num}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_contract_number}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_apply_type}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_invoice_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>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_address}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_idnumber}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_charge_number}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_payment_term}}</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_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_servicer}}</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_charge_collectors}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_charge_date}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_actual_date}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_charge_status}}</font></nobr>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
+import {isEmpty} from "../../../components/Util";
+export default {
+  title: '报建收费列表',
+  data () {
+    return {
+      model: new PagedList('rs/sql/getApplyCharge', 30, null, {
+        f_charge_money: 0
+      }),
+      curorgid: [this.$login.f.orgid],
+      curdepid: [],
+      servicerList:[],
+      operatorList:[],
+      curuserid: [],
+      paymentTerm :[{label: '全部', value: ''}, ...this.$appdata.getParam('收费项目')],
+      applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
+      applyNatures: [{label: '全部', value: ''}], // 报建性质
+      paymentMethod: [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')],
+      chargeStatus: [
+        {label: '全部', value: ''},
+        {label: '有效', value: '有效'},
+        {label: '作废', value: '作废'},
+        {label: '退款', value: '退款'}
+      ],
+      criteriaShow: false,
+      chargeAll: {
+        count: 0,
+        sum: 0
+      },
+      getfield: {
+        'f_apply_num': '工程编号',
+        'f_contract_number': '合同编号',
+        'f_apply_type': '报建类型',
+        'f_apply_nature': '报建性质',
+        'f_user_name': '用户名称',
+        'f_phone': '用户电话',
+        'f_address': '用户地址',
+          'f_idnumber': '身份证号',
+        'f_charge_number': '缴费编码',
+        'f_charge_money': '收费金额',
+        'f_payment_method': '付款方式',
+        'f_payer_number': '流水号',
+        'f_charge_collectors': '收费人员',
+        'f_charge_date': '收费日期',
+        'f_actual_date': '实际收费时间',
+        'f_charge_status': '状态'
+      }
+    }
+  },
+  ready () {
+    // 调用查询
+    this.search()
+    this.getservicer()
+    this.getapplyoperator()
+  },
+  methods: {
+   async getservicer(){
+      debugger
+      let data = {
+        tablename: 't_user',
+        condition: `1=1`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `rs/sql/apply_singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '服务人查询失败！！！'}
+      )
+      res.data.forEach(item => {
+         this.servicerList.push({
+             'label': item.name,
+              'value': item.name
+     })
+})},
+
+    async getapplyoperator(){
+      debugger
+      let data = {
+        condition: `1=1`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load('POST', 'rs/sql/getapplyOperator', {data: data}, {resolveMsg: null, rejectMsg: null})
+      res.data.forEach(item => {
+        this.operatorList.push({
+          'label': item.f_operator,
+          'value': item.f_operator
+        })
+      })},
+
+    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] = ''
+      })
+      this.curdepid = []
+      this.curuserid = []
+    },
+    searchCondition (args) {
+      args.condition = args.condition + ` and cr.f_orgid in (${this.curorgid})`
+      if (this.curdepid.length > 0) {
+        args.condition = args.condition + ` and cr.f_depid in (${this.curdepid})`
+      }
+      if (this.curuserid.length > 0) {
+        args.condition = args.condition + ` and cr.f_charge_collectors_id in (${this.curuserid})`
+      }
+      this.model.search(args.condition, args.model)
+    },
+    // 查询
+    search () {
+      this.$refs.cp.$refs.cri.search()
+      this.getChargeAll()
+      this.getapplyoperator()
+    },
+    async getChargeAll () {
+      let http = new HttpResetClass()
+      let data = {
+        condition: this.model.condition
+      }
+      let res = await http.load('POST', 'rs/sql/getChargeAll', {data: data}, {resolveMsg: null, rejectMsg: null})
+
+      this.chargeAll = res.data[0]
+    },
+    getuser (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curuserid = val
+      this.search()
+    },
+    getdep (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curdepid = val
+      this.curuserid = []
+      this.search()
+    },
+    getorg (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curorgid = val
+      this.curdepid = []
+      this.curuserid = []
+      this.search()
+    },
+
+  },
+  computed: {
+    getCondition () {
+      return {
+        condition: this.model.condition
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

package/src/filiale/hongda/pc/ServiceView.vue

@@ -74,7 +74,7 @@
 
             <div :style="item.style ? item.style+';height: 40px;margin-bottom: 20px':'height: 40px;margin-bottom: 20px'"
                  v-if="item.label === '用户电话'"
-                 :class="[$v.f_user_phone.minlength || $v.f_user_phone.maxlength ? 'has-error' : '',item.bootstraped ? item.bootstraped + ' form-group':'col-sm-4 form-group']">
+                 :class="[item.required && !(item.value) ? 'has-error' : '',item.bootstraped ? item.bootstraped + ' form-group':'col-sm-4 form-group']">
               <label :style="item.label_style ? item.label_style : ''"
                      :class="item.label_bootstraped ? item.label_bootstraped+' control-label-justify control-label' : 'control-label-justify control-label col-sm-6'">{{ item.label }}</label>
               <div :style="item.value_style ? item.value_style:''"
@@ -82,7 +82,6 @@
                 <input class="form-control input_view" style=""
                        type="number"
                        oninput="if(value.length > 11) value=value.slice(0,11)"
-                       v-validate:f_user_phone="{minlength: 7, maxlength: 11  }"
                        v-model="data.fields[index].value"
                        :placeholder="item.placeholder"
                        :value="data.fields[index].value"

package/src/filiale/hongda/pc/addMaterialScience.vue

@@ -8,6 +8,7 @@
           <th class="textNoLineBreak">材料型号</th>
           <th class="textNoLineBreak">材料单位</th>
           <th class="textNoLineBreak">材料数量</th>
+          <th class="textNoLineBreak">应免数量</th>
           <th class="textNoLineBreak">材料价格</th>
           <th class="textNoLineBreak">材料状态</th>
 
@@ -38,6 +39,9 @@
           <td style="text-align: center;">
             <nobr>{{row.f_material_number}}</nobr>
           </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_quantity_payable}}</nobr>
+          </td>
           <td style="text-align: center;">
             <nobr>{{row.f_material_price}}</nobr>
           </td>
@@ -133,6 +137,16 @@
               />
             </div>
           </div>
+          <div class="form-group col-sm-6" :class="[item.f_quantity_payable ? '' : 'has-error']">
+            <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="item.f_quantity_payable"
+                     :value="item.f_quantity_payable"
+              />
+            </div>
+          </div>
           <div class="form-group col-sm-6">
             <label class="col-sm-4 control-label">材料价格：</label>
             <div class="col-sm-8">
@@ -252,7 +266,8 @@
             f_material_style:'',
             f_material_unit:'',
             f_material_number:'',
-            f_material_price:''
+            f_material_price:'',
+            f_quantity_payable:0
           }
         ],
         meterialOptions:[],
@@ -269,7 +284,9 @@
       }
     },
     ready(){
-      this.getOnetoManyData()
+      this.$nextTick(() => {
+        this.getOnetoManyData()
+      })
     },
     methods: {
       async getOnetoManyData () {
@@ -277,12 +294,14 @@
           tablename: `t_material_apply`,
           condition: `f_process_id='${this.selectdata.f_process_id}'`
         }
-        let res = await this.$resetpost(
+        let http = new HttpResetClass()
+        let res = await http.load('post',
           'rs/sql/apply_singleTable',
           {data: data},
           {resolveMsg: null, rejectMsg: 'onetomany查询失败'}
         )
         this.onetomany.rows = res.data
+        console.log('材料信息', this.onetomany.rows)
       },
       async openMaterialModal () {
         this.getMateralNames()
@@ -294,7 +313,8 @@
             f_material_style:'',
             f_material_unit:'',
             f_material_number:'',
-            f_material_price:''
+            f_material_price:'',
+            f_quantity_payable:0
           }
         ],
         this.showMaterialModal = true
@@ -316,7 +336,8 @@
           f_material_style:'',
           f_material_unit:'',
           f_material_number:'',
-          f_material_price:''
+          f_material_price:'',
+          f_quantity_payable:0
         })
       },
       // 获取模态框材料
@@ -346,7 +367,6 @@
         this.materials[index].f_material_name = material.f_material_name
         this.materials[index].f_material_style = material.f_material_style
         this.materials[index].f_material_unit = material.f_material_unit
-        this.materials[index].f_material_number = material.f_material_number
         this.materials[index].f_material_price = material.f_material_price
       },
       // 新增材料
@@ -397,6 +417,7 @@
             f_material_unit:row.f_material_unit,
             f_material_number:row.f_material_number,
             f_material_price:row.f_material_price,
+            f_quantity_payable:row.f_quantity_payable
           }
         ]
         this.showMaterialModal = true
@@ -408,6 +429,7 @@
         data.f_material_unit = this.materials[0].f_material_unit
         data.f_material_number = this.materials[0].f_material_number
         data.f_material_price = this.materials[0].f_material_price
+        data.f_quantity_payable = this.materials[0].f_quantity_payable
         let res = await this.$resetpost(
           `apply/rs/entity/t_material_apply`,
           data
@@ -514,7 +536,7 @@
           this.pricesum = 0
           if (res.length>0){
             for (let row of res){
-              let num = row.f_material_price * row.f_material_number
+              let num = row.f_material_price * (row.f_material_number - row.f_quantity_payable )
               this.pricesum += num
             }
           }else {

package/src/filiale/hongda/pc/chargeManagement.vue

@@ -448,27 +448,19 @@ export default {
       this.$refs.print.$refs.print.PrintTable()
       // 保存票据号
         let data = {
-          f_userinfo_id: this.selectdata.f_userinfo_id,
-          f_user_id: this.selectdata.f_user_id,
-          f_user_name: this.selectdata.f_user_name,
-          f_charge_id: this.charge.id,//收费记录id
-          f_type: '报建收费',
+          f_charge_id: this.charge.id, //收费记录id
+          f_charge_type: this.charge.f_payment_term,
+          f_use_type: '国税发票', // 使用类型
           f_using_bill: {
             number: this.billnum.bill.number,
             id: this.billnum.bill.id
           },
-          f_biL_type: '正常',
-          f_biLl_state: '有效',
-          f_operator: this.$login.f.f_operator,
-          f_operate_date: this.$login.f.f_operate_date,
-          f_orgid: this.$login.f.f_orgid,
-          f_orgname: this.$login.f.f_orgname,
-          f_depid: this.$login.f.f_depid,
-          f_depname: this.$login.f.f_depname,
-          f_operatorid: this.$login.f.f_operatorid
         }
+        debugger
         let http = new HttpResetClass()
-        http.load('post', 'rs/logic/sale_billReprint', data, {resolveMsg: null, rejectMsg: null})
+        http.load('post', 'rs/logic/sale_openBill', data, {resolveMsg: null, rejectMsg: null}).then(()=>{
+          http.load('post','apply/rs/entity/t_charge_record',{id:this.charge.id,version:this.charge.version,f_invoice_num:this.billnum.bill.number},{resolveMsg: null, rejectMsg: null})
+        })
     },
     showPrintModal(row) {
       this.charge = row
@@ -478,7 +470,7 @@ export default {
         f_bill_user: this.$login.f.name, // 票据使用人
         f_bill_type: '国税发票', // 票据类型
         f_orgid: this.$login.f.orgid,
-        f_use_type: '新装开户费' // 票据使用类型（燃气费、其他费用等）可不传
+        f_use_type: '燃气费' // 票据使用类型（燃气费、其他费用等）可不传
       }
       let http = new HttpResetClass()
       http.load('post', 'rs/logic/sale_validateBill', data, {resolveMsg: null, rejectMsg: null}).then(res=>{