sale-client 3.7.56 → 3.7.57

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl, v4Url ] = ['https://www.qtxbnrq.cn:6300/', 'http://localhost:8080/', 'https://www.qtxbnrq.cn:6300/']
+const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.67:30785/', 'http://localhost:8080/', 'http://192.168.50.67:30785']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -20,15 +20,14 @@ var devConfig = {
     },
     proxy: {
 
-      // '/rs/file': {
-      //   pathRewrite: {
-      //     '^/rs/file/': '/api/af-revenue/file/'
-      //   },
-      //   target: serverRul
-      // },
+      '/rs/file': {
+        pathRewrite: {
+          '^/rs/file/': '/api/af-revenue/file/'
+        },
+        target: serverRul
+      },
       '/api': {
-        target: v4Url,
-        ws: true
+        target: v4Url
       },
       '/sketch': {
         target: serverRul,
@@ -47,8 +46,7 @@ var devConfig = {
         target: serverRul
       },
       '/rs/sql/singleTable': {
-        target: serverRul,
-        ws: true
+        target: localUrl
       },
       '/invoice': {
         // pathRewrite: {
@@ -62,18 +60,65 @@ var devConfig = {
 
       // 查找资源服务数据
       '/rs/search': {
-        target: serverRul,
-        ws: true
+        target: serverRul
       },
       // 查找资源服务数据
       '/rs/logic/getLogin': {
-        target: serverRul,
-        ws: true
+        target: serverRul
+      },
+      // 查找资源服务数据
+      '/rs/logic/getInitData': {
+        target: serverRul
+      },
+      '/rs/logic/getSaleInitData': {
+        target: localUrl
+      },
+      // 用户登录服务地址
+      '/rs/user': {
+        target: serverRul
+      },
+      '/rs/path': {
+        target: serverRul
+      },
+      '/rs/data': {
+        target: serverRul
+      },
+      '/rs/license': {
+        target: serverRul
+      },
+      '/rs/db': {
+        target: serverRul
+      },
+      '/excel': {
+        target: serverRul
+      },
+      '/rs/config': {
+        target: serverRul
+      },
+      '/rs/report': {
+        target: serverRul
+      },
+      '/rs/vue': {
+        target: serverRul
+      },
+      '/rs/logic/webHandReverse': {
+        target: 'http://localhost:8085'
+      },
+      '/rs/logic': {
+        target: localUrl
+      },
+      '/rs/entity': {
+        target: localUrl
+      },
+      '/rs/sql': {
+        target: localUrl
+      },
+      '/webmeter': {
+        target: serverRul
       },
       '/rs': {
-        target: serverRul,
-        changeOrigin: true,
-        ws: true
+        target: serverRul
+        // changeOrigin: true
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.7.56",
+  "version": "3.7.57",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -24,7 +24,7 @@
     "qrcodejs2": "^0.0.2",
     "vue": "^1.0.17",
     "webpack-dev-server": "^2.11.5",
-    "vue-client": "1.25.38",
+    "vue-client": "1.26.8",
     "yarn": "^1.22.10"
   },
   "devDependencies": {
@@ -76,7 +76,7 @@
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
     "ldap-clients": "3.0.96",
-    "system-clients": "4.0.12",
+    "system-clients": "3.2.90-tongchuan",
     "less": "^2.7.3",
     "manage-client": "3.1.8-88",
     "mkdirp": "^0.5.1",

package/src/filiale/jingwei/CustQueryEticket.vue

@@ -0,0 +1,338 @@
+<template>
+  <div class="auto basic-main" style="height:95%">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="col-sm-2  form-group">
+              <label class="font_normal_body">组织机构</label>
+              <res-select restype='organization'
+                          @res-select="$parent.$parent.getorg"
+                          is-mul="false"
+                          :initresid='$parent.$parent.curorgid'>
+              </res-select>
+            </div>
+          <div  class="form-group col-sm-2">
+            <label class="font_normal_body">客户编号</label>
+            <input  type="text" class="form-control" v-model="model.f_userinfo_code" style="width:60%"
+                    condition="f_userinfo_code = '{}' "  placeholder="客户编号"
+            >
+          </div>
+          <div  class="form-group col-sm-2">
+            <label class="font_normal_body">用户姓名</label>
+            <input  type="text" class="form-control" v-model="model.f_user_name" style="width:60%"
+                    condition="f_user_name = '{}'" placeholder="用户姓名"
+            >
+          </div>
+            <div style="float: right">
+              <button class="button_search"  @click="search()">查 询</button>
+              <!--<button class="button_search"  @click="$parent.$parent.open_eTicket()">开票</button>-->
+              <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-2" >
+              <label class="font_normal_body">业务类型</label>
+              <v-select id="f_charge_type"
+                        style="width:60%"
+                        v-model="model.f_type"
+                        placeholder='业务类型'
+                        condition="f_type ='{}'"
+                        :value.sync="model.f_type"
+                        :options='$parent.$parent.chargetypes'
+                        close-on-select clear-button>
+              </v-select>
+            </div>
+            <div class="form-group col-sm-2">
+              <label for="startDate" class="font_normal_body">开始日期</label>
+              <datepicker id="startDate" placeholder="开始日期"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :disabled-days-of-Week="[]"
+                          format="yyyy-MM-dd"
+                          condition="f_operate_date >='{} 00:00:00'"
+                          style="width:60%"
+                          >
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-2">
+              <label for="endDate" class="font_normal_body">结束日期</label>
+              <datepicker id="endDate" placeholder="结束日期"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          format="yyyy-MM-dd"
+                          condition="f_operate_date <='{} 23:59:59'"
+                          style="width:60%"
+                          >
+              </datepicker>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid  :model="model" partial='list'  class="list_area table_sy" v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <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'  >
+          <td style="text-align:center">{{$index+1}}</td>
+          <td style="text-align:center">{{row.f_userinfo_code}}</td>
+          <td style="text-align:center">{{row.f_user_name}}</td>
+          <td style="text-align:center">{{row.f_address}}</td>
+          <td style="text-align:center">{{row.f_pregas}}</td>
+          <td style="text-align:center">{{row.f_preamount}}</td>
+          <td style="text-align:center">{{row.f_collection}}</td>
+          <td style="text-align:center">{{row.f_type}}</td>
+          <td style="text-align:center">{{row.f_operate_date}}</td>
+          <td>
+            <button class="btn btn-link" @click="$parent.$parent.$parent.kp(row)">开具发票</button>
+          </td>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+  <modal :show.sync="eticket_msg" v-ref:modal large backdrop="false" :width="900">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="eticket_msg = false"><span>&times;</span></button>
+      <h4 class="modal-title">发票信息</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="auto select-overspread form-horizontal">
+        <div class="row auto">
+          <div class="col-sm-6 form-group form-input-group" :class="[!row.f_paper_name ? 'has-error' : '']">
+            <label class="control-label" style="width: 100px">开票名称:</label>
+            <input class="form-control col-sm-2"
+                   v-model="row.f_paper_name" placeholder="开票名称">
+          </div>
+          <div class="col-sm-6 form-group form-input-group" :class="[!invoice_is_pax ? 'has-error' : '']">
+            <nobr class="col-sm-4"><label class="control-label" style="width: 100px">是否征税:</label></nobr>
+            <v-select v-model="invoice_is_pax"
+                      placeholder='请选择'
+                      :value.sync="invoice_is_pax"
+                      close-on-select
+                      :width="60"
+                      :value-single="true"
+                      :search="false"
+                      :options='is_pax' clear-button>
+            </v-select>
+          </div>
+          <div class="col-sm-6 form-group form-input-group" :class="[!row.f_paper_type || row.f_paper_type === '' ? 'has-error' : '']">
+            <label class="control-label" style="width: 100px">发票种类:</label>
+            <v-select v-model="row.f_paper_type"
+                      placeholder='请选择'
+                      :value.sync="row.f_paper_type"
+                      close-on-select
+                      :width="60"
+                      :value-single="true"
+                      :search="false"
+                      :options='invoice_types' clear-button>
+            </v-select>
+          </div>
+          <div class="col-sm-12 form-group form-input-group">
+            <label class="control-label" style="width: 100px">开户行及账号:</label>
+            <input class="form-control col-sm-2"
+                   v-model="row.f_paper_account" placeholder="购方开户行及账号">
+          </div>
+          <div class="col-sm-12 form-group form-input-group" >
+            <label class="control-label" style="width: 100px">纳税人识别号:</label>
+            <input class="form-control col-sm-2"
+                   v-model="row.f_taxpayer_id" placeholder="纳税人识别号">
+          </div>
+          <div class="col-sm-12 form-group form-input-group" :class="[!row.f_address_phone ? 'has-error' : '']">
+            <label class="control-label" style="width: 100px">开票地址电话:</label>
+            <input class="form-control col-sm-2"
+                   v-model="row.f_address_phone" placeholder="开票地址">
+          </div>
+          <div class="col-sm-12 form-group form-input-group">
+            <label class="control-label" style="width: 100px">邮箱推送:</label>
+            <input class="form-control col-sm-2"
+                   v-model="row.f_email" placeholder="邮箱推送">
+          </div>
+          <div class="col-sm-12 form-group form-input-group">
+            <label class="control-label" style="width: 100px">备注:</label>
+            <input class="form-control col-sm-2"
+                   v-model="row.f_remarks" placeholder="备注">
+          </div>
+        </div>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn button_search"
+              :disabled="!(row.f_paper_name&&row.f_paper_type&&invoice_is_pax&&row.f_paper_type!== '')"
+              @click='confirm'>确认开票
+      </button>
+    </footer>
+  </modal>
+  <ticket-print :show="eticket_show" @toggle="eticket_toggle" v-ref:eticketbill></ticket-print>
+</template>
+
+<script>
+  /**
+   *发票冲红管理
+   */
+  import {HttpResetClass, PagedList} from 'vue-client'
+  import Vue from 'vue'
+  export default {
+    title: '结算开票',
+    data () {
+      return {
+        criteriaShow: false,
+        f_filialeids: Vue.$login.f.orgids,
+        model: new PagedList('rs/sql/openSellelent', 50, {}),
+        f_outlets: Vue.$login.f.f_parentname,
+        f_filiale: Vue.$login.f.f_fengongsi,
+        f_operator: Vue.$login.f.name,
+        f_orgstr: Vue.$login.f.orgpathstr,
+        invoice_types: this.$appdata.getParam('发票种类'),
+        invoice_is_pax: '征税',
+        is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
+        selecteds: [],
+        eticket_show: false,
+        eticket_msg: false,
+        invoice_show_gas: '否',
+        show_gas: [{label: '是', value: '是'}, {label: '否', value: '否'}],
+        row: {},
+        disabled: false,
+        printstyle: this.$appdata.getParam('打印电子格式') ? this.$appdata.getParam('打印电子格式') : [{label: '电子发票', value: '电子发票'}],
+        mid: [{label: '全部', value: ''}, {label: '是', value: ' > 0 '}, {label: '否', value: ' is null'}],
+        curorgid: [this.$login.f.orgid]
+      }
+    },
+    ready () {
+      const day = this.$login.toStandardDateString()
+      this.$refs.paged.$refs.cri.model.startDate = day
+      this.$refs.paged.$refs.cri.model.endDate = day
+    },
+    methods: {
+      async kp (row) {
+        let HttpReset = new HttpResetClass()
+        let _row = await HttpReset.load('POST', 'rs/sql/sale_getUser', {
+          data: {
+            orderitem: 'f_userinfo_code',
+            condition: `f_userinfo_code = '${row.f_userinfo_code}'`
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        this.row = _row.data[0]
+        this.row.id = row.id
+        this.row.f_type = row.f_type
+        this.invoice_show_gas = this.row.f_collection_type === '按气量' ? '是' : '否'
+        if (!this.row.f_taxpayer_id) {
+          this.row.f_taxpayer_id = this.row.f_idnumber
+        }
+        if (!this.row.f_paper_name) {
+          this.row.f_paper_name = this.row.f_user_name
+        }
+        if (!this.row.f_address_phone) {
+          this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
+        }
+        this.eticket_msg = true
+      },
+      closeEticket () {
+        this.eticket_msg = false
+        this.disabled = false
+      },
+      getorg (val) {
+        this.f_orgid = this.$login.convertToIn(val)
+        this.f_filialeids = val[0]
+      },
+      cancel () {
+        this.show = false
+        this.info = {}
+      },
+      async open_eTicket () {
+        if (this.selecteds.length > 1) {
+          this.$showAlert('选中条数大于一条，请重新修改！！', 'warning', 2000)
+          return
+        }
+        let HttpReset = new HttpResetClass()
+        let row = await HttpReset.load('POST', 'rs/sql/sale_getUser', {
+          data: {
+            orderitem: 'f_userinfo_code',
+            condition: `f_userinfo_code = '${[...new Set(this.selecteds.map(item => item.f_userinfo_code))][0]}'`
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        this.row = row.data[0]
+        this.invoice_show_gas = this.row.f_collection_type === '按气量' ? '是' : '否'
+        if (!this.row.f_taxpayer_id) {
+          this.row.f_taxpayer_id = this.row.f_idnumber
+        }
+        if (!this.row.f_paper_name) {
+          this.row.f_paper_name = this.row.f_user_name
+        }
+        if (!this.row.f_address_phone) {
+          this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
+        }
+        if (this.selecteds.map(item => item.f_type).toString() === '其他收费') {
+          this.disabled = true
+        }
+
+        this.eticket_msg = true
+      },
+      confirm () {
+        // this.row.f_print = this.invoice_is_pax
+        this.row.invoice_is_pax = this.invoice_is_pax
+        this.eticket_msg = false
+        this.disabled = false
+        this.eticket_show = true
+        this.$refs.eticketbill.openETicket(this.row.id, this.row, this.row.f_type, this.row.f_paper_type, false, this.invoice_is_pax)
+      },
+      eticket_toggle () {
+        this.eticket_show = false
+        this.search()
+      },
+      async selfSearch (args) {
+        if (!this.f_orgid) {
+          this.getorg([this.$login.f.orgid])
+        }
+        const base = (args.condition && String(args.condition).trim()) ? args.condition : '1=1'
+        args.condition = ` f_orgid='${this.f_filialeids}' and ${base}`
+
+        await this.model.search(args.condition, this.model)
+        this.addOrRemove(true)
+      },
+      search () {
+        this.$refs.paged.$refs.cri.search()
+        this.$dispatch('refresh')
+      },
+      addOrRemove (is) {
+        this.selecteds = []
+        if (!is) { // 添加本页所有数据到ids中
+          this.model.rows.forEach((row) => {
+            this.selecteds.push(row)
+          })
+          this.selectAll = true
+        } else { // 从ids中取消所有的数据
+          this.selecteds = []
+          this.selectAll = false
+        }
+        console.log('selectdde', this.selecteds)
+      }
+    },
+    computed: {
+      chargetypes () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费类型')]
+      }
+    },
+    watch: {
+      selecteds () {
+        console.log('框框的长度', this.selecteds.length)
+      }
+    }
+  }
+</script>

package/src/filiale/jingwei/EticketRecordList.vue

@@ -0,0 +1,432 @@
+<template>
+  <div class="auto basic-main" style="height:95%">
+    <criteria-paged :model="model" v-ref:paged @sort="sort">
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">客户编号</label>
+              <input type="text" class="form-control" v-model="model.f_userinfo_code" style="width:60%"
+                     condition="f_userinfo_code = '{}' " placeholder="客户编号"
+              >
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">用户姓名</label>
+              <input type="text" class="form-control" v-model="model.f_user_name" style="width:60%"
+                     condition="f_user_name = '{}'" placeholder="用户姓名"
+              >
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">客户地址</label>
+              <input type="text" class="form-control" v-model="model.f_buy_address_phone" style="width:60%"
+                     condition="f_buy_address_phone like '%{}%'" placeholder="客户地址"
+              >
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">票据状态</label>
+              <v-select id="f_bill_state"
+                        style="width:60%"
+                        v-model="model.f_bill_state"
+                        placeholder='票据状态'
+                        condition="f_bill_state ='{}'"
+                        :value.sync="model.f_bill_state"
+                        :options='$parent.$parent.eticktypes'
+                        :search="false"
+                        close-on-select clear-button>
+              </v-select>
+            </div>
+            <div style="float: right">
+              <button class="button_search" @click="search()">查 询</button>
+              <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+              <export-excel :data="$parent.$parent.getCondition"
+                            :field="$parent.$parent.fields"
+                            sqlurl="rs/logic/saleExport" sql-name="eticket_query"
+                            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-2">
+              <label class="font_normal_body">开票日期</label>
+              <datepicker id="f_operate_datestarthate" placeholder="开始日期"
+                          v-model="model.f_operate_datestarthate"
+                          :value.sync="model.f_operate_datestarthate"
+                          format="yyyy-MM-dd"
+                          condition="f_operate_date >= '{} 00:00:00'"
+                          style="width:60%">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
+              <datepicker id="f_operate_dateendDate" placeholder="结束日期"
+                          v-model="model.f_operate_dateendDate"
+                          :value.sync="model.f_operate_dateendDate"
+                          format="yyyy-MM-dd"
+                          condition=" f_operate_date <= '{} 23:59:59'"
+                          style="width:60%">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
+              <label class="font_normal_body">发票金额</label>
+              <div class="row">
+                <input type="text" style="width:27%" class="input_search" v-model="model.f_collection_small"
+                       condition="f_total_money >= {} " placeholder="">
+                <label class="font_normal_body"> ≤ x ≤ </label>
+                <input type="text" style="width:27%" class="input_search" v-model="model.f_collection_big"
+                       condition="f_total_money <= {} " placeholder="">
+              </div>
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">开票人&nbsp;&nbsp;</label>
+              <input type="text" class="form-control" v-model="model.f_operator" style="width:60%"
+                     condition="f_operator = '{}' " placeholder="开票人"
+              >
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">收款人&nbsp;&nbsp;</label>
+              <input type="text" class="form-control" v-model="model.sell_operator" style="width:60%"
+                     condition="(s.sell_operator = '{}' or other.sell_operator  = '{}') " placeholder="收款人"
+              >
+            </div>
+            <div  class="col-sm-2 form-group">
+              <label class="font_normal_body">用户类型</label>
+              <v-select :value.sync="model.f_user_type"
+                        :options='$parent.$parent.usertypes'
+                        placeholder='请选择' v-model="model.f_user_type"
+                        condition="(s.f_user_type = '{}' or uf.f_user_type = '{}') "
+                        close-on-select></v-select>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">发票号码&nbsp;&nbsp;</label>
+              <input type="text" class="form-control" v-model="model.f_bill_number" style="width:60%"
+                     condition="f_bill_number = '{}'" placeholder="发票号码"
+              >
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">发票类型</label>
+              <v-select id="f_invoice_category"
+                        style="width:60%"
+                        v-model="model.f_invoice_category"
+                        placeholder='票据状态'
+                        condition="f_invoice_category ='{}'"
+                        :value.sync="model.f_invoice_category"
+                        :options='$parent.$parent.eticketcategory'
+                        :search="false"
+                        close-on-select clear-button>
+              </v-select>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>
+              <nobr>客户编号</nobr>
+            </th>
+            <th>
+              <nobr>客户姓名</nobr>
+            </th>
+            <th>
+              <nobr>客户地址电话</nobr>
+            </th>
+            <th>
+              <nobr>用户类型</nobr>
+            </th>
+            <th>
+              <data-order field="f_total_money" name="实收金额"
+                          :order.sync="$parent.$parent.$parent.orderFields.f_collection"></data-order>
+            </th>
+            <th>
+              <data-order field="f_total_money" name="开票金额"
+                          :order.sync="$parent.$parent.$parent.orderFields.f_total_money"></data-order>
+            </th>
+            <th>
+              <nobr>不含税金额</nobr>
+            </th>
+            <th>
+              <nobr>发票种类</nobr>
+            </th>
+            <th>
+              <nobr>发票类型</nobr>
+            </th>
+            <th>
+              <nobr>发票代码</nobr>
+            </th>
+            <th>
+              <nobr>发票流水号</nobr>
+            </th>
+            <th>
+              <nobr>发票号码</nobr>
+            </th>
+            <th>
+              <nobr>发票状态</nobr>
+            </th>
+            <th>
+              <nobr>失败原因</nobr>
+            </th>
+            <th>
+              <nobr>业务类型</nobr>
+            </th>
+            <th>
+              <nobr>开票描述</nobr>
+            </th>
+            <th>
+              <nobr>收费时间</nobr>
+            </th>
+            <th>
+              <nobr>开票时间</nobr>
+            </th>
+            <th>
+              <nobr>开票人</nobr>
+            </th>
+            <th>
+              <nobr>收款人</nobr>
+            </th>
+            <th>
+              <nobr>查看发票</nobr>
+            </th>
+            <th>
+              <nobr>操作</nobr>
+            </th>
+          </tr>
+        </template>
+        <template partial='body' :model="model">
+          <tr>
+            <th style="text-align:center">{{ row.f_userinfo_code }}</th>
+            <th style="text-align:center">{{ row.f_user_name }}</th>
+            <th style="text-align:center">{{ row.f_buy_address_phone }}</th>
+            <th style="text-align:center">{{ row.f_user_type }}</th>
+            <th style="text-align:center">{{ row.f_collection }}</th>
+            <th style="text-align:center">{{ row.f_total_money }}</th>
+            <th style="text-align:center">{{ row.f_tax_money }}</th>
+            <th style="text-align:center">{{ row.f_invoice_category }}</th>
+            <th style="text-align:center">{{ row.f_invoice_type === '0' ? '蓝票' : '红票'}}</th>
+            <th style="text-align:center">{{ row.f_bill_code }}</th>
+            <th style="text-align:center">{{ row.f_fpqqlsh }}</th>
+            <th style="text-align:center">{{ row.f_bill_number }}</th>
+            <th style="text-align:center">{{ row.f_bill_state }}</th>
+            <th style="text-align:center">{{ row.f_remessage }}</th>
+            <th style="text-align:center">{{ row.f_charge_type }}</th>
+            <th style="text-align:center">{{ row.f_sign_result }}</th>
+            <th style="text-align:center">{{ row.sell_operate_date }}</th>
+            <th style="text-align:center">{{ row.f_operate_date }}</th>
+            <th style="text-align:center">{{ row.f_operator }}</th>
+            <th style="text-align:center">{{ row.sell_operator }}</th>
+            <th style="text-align:center">
+              <button class="btn btn-link" v-if="row.f_bill_url"
+                      @click="$parent.$parent.$parent.watch_ch(row.f_bill_url)">
+                查看发票
+              </button>
+            </th>
+            <th style="text-align:center">
+              <template v-if="row.f_invoice_source !== '外部录入'">
+                <button class="btn btn-link" v-if="row.f_bill_state==='开票成功' && row.f_invoice_type === '0'"
+                        @click="$parent.$parent.$parent.fp_ch(row)">发票冲红
+                </button>
+                <button class="btn btn-link" v-if="row.f_bill_state==='待开票'"
+                        @click="$parent.$parent.$parent.kp(row)">开票
+                </button>
+                <button class="btn btn-link" v-if="row.f_bill_state==='开票失败'"
+                        @click="$parent.$parent.$parent.Rekp(row)">重新开票
+                </button>
+                <!--                <button class="btn btn-link" v-if="['查询失败','等待查询'].includes(row.f_bill_state)"-->
+                <!--                        @click="$parent.$parent.$parent.fp_search(row)">电票查询-->
+                <!--                </button>-->
+              </template>
+            </th>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+  <modal v-if="show" :show.sync="show" v-ref:modal backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      <h4 class="modal-title">撤销原因</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <validator name='v'>
+        <form class="form-horizontal select-overspread">
+          <div class="form-group" :class="[$v.f_cancel_reason.required ? 'has-error' : 'has-success']">
+            <label class=" col-sm-3 control-label">冲红备注:</label>
+            <div class="col-sm-8">
+                    <textarea class="form-control" v-model="bz" rows="3"
+                              placeholder="请填写冲红备注" v-validate:bz='{required: true}'></textarea>
+            </div>
+          </div>
+        </form>
+      </validator>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button v-show="show" type="button" class="button_search" @click='confirm()' :disabled="!$v.valid ">确认</button>
+      <button v-show="show" type="button" class="button_clear" @click='close'>取消</button>
+    </footer>
+  </modal>
+  <ticket-print :show="eticket_show" @toggle="eticket_toggle" v-ref:eticketbill></ticket-print>
+</template>
+<script>
+
+import {PagedList} from 'vue-client'
+
+export default {
+  title: '发票管理',
+  data () {
+    return {
+      model: new PagedList('rs/sql/eticket_query', 20, {orderitem: this.orderitem ? '"' + this.orderitem + ' "' : `'f_operate_date desc'`}),
+      criteriaShow: false,
+      eticket_show: false,
+      orgCondtionStr: '',
+      showsum_show: false,
+      invoice_types: this.$appdata.getParam('发票种类'),
+      eticktypes: [{label: '开票成功', value: '开票成功'}, {label: '等待查询', value: '等待查询'}, {
+        label: '开票失败',
+        value: '开票失败'
+      }, {
+        label: '冲红失败',
+        value: '冲红失败'
+      }, {label: '冲红', value: '冲红'}, {label: '撤销', value: '撤销'}],
+      eticketcategory: [{label: '数电普票', value: '数电普票'}, {label: '数电专票', value: '数电专票'},{label: '电子发票', value: '电子发票'},
+        {label: '普通收据', value: '普通收据'}, {label: '专用发票', value: '专用发票'}],
+      show: false,
+      bz: '',
+      row: {},
+      orderFields: {
+        f_operate_date: 'desc',
+        f_collection: 'no',
+        f_total_money: 'no'
+      },
+      // 排序
+      orderitem: ' f_operate_date desc ',
+      fields: {
+        'f_userinfo_code': '客户编号',
+        'f_user_name': '客户姓名',
+        'f_buy_address_phone': '用户地址',
+        'f_user_type': '用户类型',
+        'f_collection': '实收金额',
+        'f_total_money': '开票金额',
+        'f_tax_money': '不含税金额',
+        'f_invoice_category': '发票种类',
+        'f_invoice_type': '发票类型',
+        'f_bill_code': '发票代码',
+        'f_fpqqlsh': '发票流水号',
+        'f_bill_number': '发票号码',
+        'f_bill_state': '发票状态',
+        'f_remessage': '失败原因',
+        'f_charge_type': '业务类型',
+        'sell_operate_date': '收费时间',
+        'f_operate_date': '开票时间',
+        'f_operator': '开票人',
+        'sell_operator': '收款人'
+      },
+      install_show: false
+    }
+  },
+  ready () {
+  },
+  methods: {
+    async Rekp (row) {
+      console.log('重开参数' + JSON.stringify(row))
+      this.eticket_show = true
+      row.f_paper_name = row.f_user_name
+      row.f_email = row.f_mail_push
+      row.f_taxpayer_id = row.f_pay_id
+      row.f_address_phone = row.f_buy_address_phone
+      row.f_paper_accoun = row.f_buy_openbank
+      await this.$refs.eticketbill.openETicket(row.f_sell_id, row, row.f_charge_type, row.f_invoice_category, true)
+    },
+    search () {
+      this.$refs.paged.$refs.cri.search()
+    },
+    clear () {
+      this.$refs.paged.$refs.cri.model = {}
+    },
+    selfSearch (args) {
+      this.model.search(args.condition, args.model)
+    },
+    sort (field, rule) {
+      // 将所有排序方式设为不排序，实现相互排斥
+      for (let key in this.orderFields) {
+        if (key === field) {
+          this.orderFields[key] = rule
+        } else {
+          this.orderFields[key] = 'no'
+        }
+      }
+      // 如果新规则不排序，还原为默认排序
+      if (rule === 'no') {
+        this.model.paramSource.orderitem = `'${this.orderitem}'`
+      } else {
+        this.model.paramSource.orderitem = `'${field} ${rule}'`
+      }
+      this.search()
+    },
+    async confirm () {
+      this.eticket_show = true
+      await this.$refs.eticketbill.rushRedInvoice({id: this.row.f_sell_id, eticket_id: this.row.id, bz: this.bz})
+    },
+    async fp_search (row) {
+      this.eticket_show = true
+      await this.$refs.eticketbill.fp_search(row, row.id)
+    },
+    watch_ch (src) {
+      this.eticket_show = true
+      this.$refs.eticketbill.watch_ch(src)
+    },
+    fp_ch (row) {
+      this.row = row
+      this.show = true
+      this.bz = `对应正数发票代码:${row.f_bill_code}，号码:${row.f_bill_number}。`
+    },
+    close () {
+      this.show = false
+      this.install_show = false
+    },
+    kp (row) {
+      this.eticket_show = true
+      this.$refs.eticketbill.openETicket(row.f_sell_id, row, row.f_charge_type)
+    },
+    eticket_toggle () {
+      this.eticket_show = false
+      this.show = false
+      this.row = {}
+      this.bz = ''
+    }
+  },
+  computed: {
+    usertypes () {
+      return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+    },
+    getCondition () {
+      return {
+        condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+        orderitem: this.orderitem ? `${this.orderitem}` :  " f_operate_date desc"
+      }
+    }
+  },
+  events: {
+    'search' () {
+      this.search()
+    }
+  },
+  watch: {}
+}
+</script>
+<style scoped>
+th {
+  text-align: center;
+  padding: 2px;
+}
+
+td {
+  text-align: center;
+  padding: 2px;
+}
+</style>

package/src/filiale/jingwei/sale.js

@@ -17,5 +17,9 @@ export default function () {
   // 当前选择用户的表具基本信息
   Vue.component('user-meterinfodetail', (resolve) => { require(['./meterinfodetail'], resolve) })
   // 电子发票开票
-  Vue.component('e-ticket-open-card-query-v4', (resolve) => { require(['./EticketManage'], resolve) })
+  Vue.component('e-ticket-manage-query-v4', (resolve) => { require(['./EticketManage'], resolve) })
+  // 电子发票记录查看
+  Vue.component('e-ticket-record-list-query-v4', (resolve) => { require(['./EticketRecordList'], resolve) })
+  // 收费开票
+  Vue.component('cust-query-eticket-query-v4', (resolve) => { require(['./CustQueryEticket'], resolve) })
 }

package/src/filiale/qianneng/ChangeMeter.vue

@@ -716,7 +716,8 @@ export default {
               f_meterbase: this.model.f_using_base_old,
               f_meter_brand: this.row.f_meter_brand,
               f_meter_classify: this.row.f_meter_type,
-              f_price_id: this.row.f_price_id
+              f_price_id: this.row.f_price_id,
+              version: this.row.version
             }
             this.$resetpost(url, {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
               console.log('成功')

package/src/filiale/tongchuan/FileUserFiles.vue

@@ -135,7 +135,7 @@
                   </div>
                   <div  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                         class="form-group">
-                    <label class="font_normal_body">开户时间</label>
+                    <label class="font_normal_body">户档案开户时间</label>
                     <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
                                 class="datepicker"
                                 condition="f_open_date >= '{} 00:00:00' "
@@ -155,6 +155,28 @@
                                 v-model="model.f_end_date"
                     ></datepicker>
                   </div>
+                  <div  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                        class="form-group">
+                    <label class="font_normal_body">表档案开户时间</label>
+                    <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date_uf"
+                                class="datepicker"
+                                condition="f_open_date_uf >= '{} 00:00:00' "
+                                placeholder="起始时间"
+                                style="width:60%"
+                                v-model="model.f_start_date_uf"
+                    ></datepicker>
+                  </div>
+                  <div  :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                        class="form-group" >
+                    <label class="font_normal_body" >&emsp;&ensp;至&emsp;&ensp;</label>
+                    <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date_uf"
+                                class="datepicker"
+                                condition="f_open_date_uf <= '{} 23:59:59' "
+                                placeholder="结束时间"
+                                style="width:60%"
+                                v-model="model.f_end_date_uf"
+                    ></datepicker>
+                  </div>
                   <div
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                     class="form-group">
@@ -418,7 +440,10 @@
                     <nobr>发卡状态</nobr>
                   </th>
                   <th v-if="!$parent.$parent.$parent.createFile">
-                    <nobr>开户时间</nobr>
+                    <nobr>户档案开户时间</nobr>
+                  </th>
+                  <th v-if="!$parent.$parent.$parent.createFile">
+                    <nobr>表档案开户时间</nobr>
                   </th>
                   <th v-if="!$parent.$parent.$parent.createFile">
                     <nobr>建档人</nobr>
@@ -480,6 +505,7 @@
                 <td style="text-align: center;">{{row.f_price_name}}</td>
                 <td style="text-align: center;">{{row.f_whether_hairpin}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_open_date}}</td>
+                <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_open_date_uf}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_createfile_person}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_userfiles_address}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.createFile">{{row.f_feed_method}}</td>

package/src/filiale/tongchuan/MeterinfoTest.vue

@@ -179,6 +179,7 @@
             <datepicker style="width:60%" placeholder="通气日期"
                         v-model="row.f_gas_date"
                         v-ref:f_gas_date
+                        :disabled ="isedit"
                         :value.sync="row.f_gas_date"
                         :format="'yyyy-MM-dd HH:mm:ss'"
                         :show-reset-button="reset"
@@ -471,7 +472,7 @@ let meterBookGen = function * (self) {
         finalDate: ''
       }
     },
-    props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id'],
+    props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id', 'isedit'],
     ready () {
       console.log('看看meter里面的数据', this.meter, this.row)
       console.log('--------------====================', this.meter.f_aroundmeter, this.row.f_aroundmeter)

package/src/filiale/tongchuan/UserGeneralInfoTest.vue

@@ -17,7 +17,7 @@
 
       <div style="height: auto;width: 100%">
         <file-user-meter-info :meterinfo="data.meterinfo" :f_filialeid="f_filialeid" :metervalid.sync="meterInfo"
-                         :f_userinfo_id="data.baseinfo.base.f_userinfo_id" v-ref:meter></file-user-meter-info>
+                         :f_userinfo_id="data.baseinfo.base.f_userinfo_id" :isedit="isedit" v-ref:meter></file-user-meter-info>
       </div>
 
       <div style="height: auto;width: 100%">

package/src/filiale/tongchuan/UserMeterInfoTest.vue

@@ -9,7 +9,7 @@
         <button class="button_search" style="width: max-content" @click="showDevices($index, row)">用气设备信息</button>
       </div>
       <file-meter-info :meter="row" :f_filialeid="f_filialeid" :usertype="usertype" :gasproperties="gasproperties" @self-valid='valida'
-                  @delete-meter="deleteMeter($index)" :f_userinfo_id="f_userinfo_id"></file-meter-info>
+                  @delete-meter="deleteMeter($index)" :f_userinfo_id="f_userinfo_id" :isedit="isedit"></file-meter-info>
 
     </div>
     <div class="panel panel-default auto text-center" @click="addMeter()" style="cursor: pointer;">
@@ -46,7 +46,8 @@ export default {
         twoWay: true
       },
       f_filialeid: {},
-      f_userinfo_id: {}
+      f_userinfo_id: {},
+      isedit: ''
     },
     ready () {
       console.log('表具信息，，，，', this.meterinfo)

package/src/main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
-import FilialeSale from './filiale/qingtongxia/sale'
+import FilialeSale from './filiale/shiquan/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Tue Mar 24 09:35:09 CST 2026
-gradle.version=5.2.1

package/kdn

@@ -1,44 +0,0 @@
-  TaiYuan
-  V3
-  V3_修复阳春机表查询
-  V3_卡表抄表：使用类型条件筛查项
-  V3_商洛补气记录维护布局调整
-  V3_巴彦卡表收费四舍五入
-  V3_巴彦卡表收费计算公式添加结果
-  V3_巴彦退费问题
-  V3_巴彦问题修改
-  V3_巴彦需求
-  V3_府谷欠费停用
-  V3_府谷欠费停用修改之前的错
-  V3_德信其他欠费需求
-  V3_武安添加表前封号和表后封号
-  V3_泾阳发票管理需求
-  V3_泾阳对账添加商户号
-  V3_泾阳报错
-  V3_泾阳自助机对账
-  V3_清涧
-  V3_清涧批量修改调压箱
-  V3_清零换表写卡问题
-  V3_燎原问题
-  V3_石门增加自助机对账汇总
-  V3_石门评价
-  V3_科莱需求
-  V3_综合收费查询添加查询条件证件号
-  V3_荣创其他收费服务人员改必选
-  V3_荣成报警器年限
-  V3_荣成改错
-  V3_贵州鼎城附件上传问题
-  V3_附件查看图片显示
-* V3toV4
-  aode
-  aodelinshi
-  fanxiangas
-  jincheng
-  ningdu
-  weinan-v3
-  xianyangOracle
-  巩义V3
-  巴彦淖尔
-  府谷正式
-  彩虹V3
-  龙山V3