sale-client 3.6.501 → 3.6.502

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Wed Jan 22 10:06:39 CST 2025
+#Thu Feb 27 12:01:45 CST 2025
 gradle.version=5.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.501",
+  "version": "3.6.502",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/filiale/yangchun/EticketPrint.vue

@@ -84,14 +84,14 @@ export default {
           eticket_id: retry ? model.id : null,
           invoice_kind: invoice_type,
           f_buy_openbank: model.f_paper_account,
-          f_buy_phone: model.f_buy_phone,
+          f_buy_phone: model.f_user_phone,
           bill_type: model.f_print ? model.f_print : null,
           f_paper_name: model.f_paper_name,
           f_taxpayer_id: model.f_taxpayer_id,
           f_address_phone: model.f_address_phone,
           f_email: model.f_email,
-          f_start_date: model.f_start_date,
-          f_end_date: model.f_end_date,
+          // f_start_date: model.f_start_date,
+          // f_end_date: model.f_end_date,
           f_userinfo_id: model.f_userinfo_id,
           org_id: this.$login.f.orgid,
           bz: model.f_eticket_reason ? model.f_eticket_reason : null,

package/src/filiale/yangchun/EticketV4/CustQueryEticket.vue

@@ -157,6 +157,11 @@
             <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_user_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"

package/src/filiale/yangchun/EticketV4/EticketManage.vue

@@ -15,6 +15,9 @@
     <tabs header="自定义开票" v-if="permission('自定义开票')">
       <cust-query-eticket-query-v4></cust-query-eticket-query-v4>
     </tabs>
+    <tabs header="特殊开票" v-if="permission('特殊开票')">
+      <e-ticket-special-query-v4></e-ticket-special-query-v4>
+    </tabs>
   </tab-button>
 </template>
 

package/src/filiale/yangchun/EticketV4/EticketOpenCard.vue

@@ -154,6 +154,11 @@
             <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_user_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"

package/src/filiale/yangchun/EticketV4/EticketOpenJBPage.vue

@@ -153,6 +153,11 @@
             <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_user_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"

package/src/filiale/yangchun/EticketV4/EticketOpenPage.vue

@@ -139,6 +139,11 @@
             <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_user_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"
@@ -278,8 +283,6 @@ export default {
         }
       }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
       console.log('查询到的记录：', row)
-      this.row.f_start_date = `${this.model.model.f_start_date} 00:00:00`
-      this.row.f_end_date = `${this.model.model.f_end_date} 23:59:59`
       this.$refs.eticketbill.openETicket(row.data.map(item => item.id), this.row, '物联网结算', this.row.f_paper_type, false, this.invoice_is_pax, 't_web_handplan')
     },
     selfSearch (args) {

package/src/filiale/yangchun/EticketV4/SpecialQueryEticket.vue

@@ -0,0 +1,365 @@
+<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 placeholder="开始日期"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :disabled-days-of-Week="[]"
+                          style="width:60%"
+                          class="datepicker"
+              >
+              </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="[]"
+                          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'>
+          <th>
+            <input type="checkbox" @click="$parent.$parent.$parent.addOrRemove($parent.$parent.$parent.selectAll)"
+                   style="width: 22px;height: 22px"    :checked="$parent.$parent.$parent.selectAll">
+          </th>
+          <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">
+            <input type="checkbox" v-model="$parent.$parent.$parent.selecteds" :value="row"
+                   style="width: 22px;height: 22px"    @click="$parent.$parent.$parent.checkbox($index, $event)">
+          </td>
+          <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="开票名称" :disabled="true">
+          </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_user_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/open_eTicket_special_query', 50, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}),
+      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'}]
+    }
+  },
+  ready () {
+    this.$refs.paged.$refs.cri.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+    this.$refs.paged.$refs.cri.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+  },
+  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_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 === 0) {
+        this.$showAlert('请先选择需要开票的记录！！', 'warning', 2000)
+        return
+      }
+      // 获取所有选中的收费类型
+      const chargeType =  this.selecteds.map(item => item.f_type)
+      if (new Set(chargeType).size !== 1) {
+        this.$showAlert('选择的多条记录业务类型不一致！！', 'warning', 2000)
+        return
+      }
+
+      // 获取所有选中用户的用户编号，使用 IN 查询
+      const userInfoCodes = [...new Set(this.selecteds.map(item => item.f_userinfo_code))].join("','");
+
+      // 获取第一条记录的用户信息
+      let HttpReset = new HttpResetClass()
+      let row = await HttpReset.load('POST', 'rs/sql/sale_getUser', {
+        data: {
+          orderitem: 'f_userinfo_code',
+          condition: `f_userinfo_code in ('${userInfoCodes}')`
+        }
+      }, {resolveMsg: null, rejectMsg: '获取用户信息失败!'})
+
+      // 提取所有用户的税号
+      const taxpayerIds = row.data.map(item => item.f_taxpayer_id)
+      // 检查所有税号是否一致
+      if (new Set(taxpayerIds).size !== 1) {
+        this.$showAlert('多条用户税号不一致或该用户不正常！！', 'warning', 2000)
+        return
+      }else if (taxpayerIds[0] === null || taxpayerIds[0] === '') {
+        this.$showAlert('用户税号为空,无法判断是否同一税号！！', 'warning', 2000)
+        return
+      }
+
+      this.row = row.data[0]
+      this.row.f_type = chargeType[0]
+      this.row.id = this.selecteds.map(item => item.id) // 设置为所有选中的ID
+
+      // 设置发票默认信息
+      this.invoice_show_gas = this.row.f_collection_type === '按气量' ? '是' : '否'
+      this.row.f_paper_name = this.row.f_user_name
+      this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
+
+      // 如果税号为空，则使用用户的身份证号（或其他默认值）
+      if (!this.row.f_taxpayer_id) {
+        this.row.f_taxpayer_id = this.row.f_idnumber
+      }
+
+      this.eticket_msg = true
+    },
+    confirm () {
+      console.log('确认开票', this.row)
+      // 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])
+      }
+      args.condition = ` f_orgid='${this.f_filialeids}' and ${args.condition}`
+
+      await this.model.search(args.condition, this.model, {startDate: args.model.startDate, endDate: args.model.endDate})
+      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/yangchun/FilesManage/UserGeneralInfoTest.vue

@@ -439,6 +439,7 @@ export default {
       this.data.baseinfo.base.f_user_name = Util.removerUnnecessary(this.data.baseinfo.base.f_user_name)
       this.data.baseinfo.base.f_user_phone = Util.removerUnnecessary(this.data.baseinfo.base.f_user_phone)
       this.data.baseinfo.base.f_paper_name = Util.removerUnnecessary(this.data.baseinfo.base.f_user_name)
+      this.data.baseinfo.base.f_is_special = this.data.baseinfo.base.f_is_special
       console.log('档案保存之前，再看下。。。', this.data.baseinfo.base.f_paper_name)
       this.data.meterinfo.forEach((item) => {
         item.f_meternumber = Util.removerUnnecessary(item.f_meternumber)

package/src/filiale/yangchun/FilesManage/UserPaperInfoTest.vue

@@ -46,6 +46,15 @@
                  v-model="baseinfo.base.f_email">
         </div>
       </div>
+      <div class="row">
+        <div class="col-sm-4 form-group">
+          <label class="font_normal_body" for="f_is_special">是否特殊用户</label>
+          <v-select :options='isSpecial'
+                    :value-single="true"
+                    :value.sync="baseinfo.base.f_is_special" close-on-select
+                    placeholder='是否特殊用户'></v-select>
+        </div>
+      </div>
 
     </form>
   </div>
@@ -55,7 +64,8 @@ export default {
   title: '基本信息',
   data () {
     return {
-      papertype: this.$appdata.getParam('票据类型') ? [{label: '请选择', value: ''}, ...this.$appdata.getParam('票据类型')] : []
+      papertype: this.$appdata.getParam('票据类型') ? [{label: '请选择', value: ''}, ...this.$appdata.getParam('票据类型')] : [],
+      isSpecial :[{label: '是', value: 1}, {label: '否', value: 2}]
     }
   },
   props: ['baseinfo']

package/src/filiale/yangchun/sale.js

@@ -70,6 +70,7 @@ export default function () {
   Vue.component('e-ticket-open-card-query-v4', (resolve) => { require(['./EticketV4/EticketOpenCard'], resolve) })
   // 自定义开票
   Vue.component('cust-query-eticket-query-v4', (resolve) => { require(['./EticketV4/CustQueryEticket'], resolve) })
+  Vue.component('e-ticket-special-query-v4', (resolve) => { require(['./EticketV4/SpecialQueryEticket'], resolve) })
   // 发票打印
   Vue.component('ticket-print', (resolve) => { require(['./EticketPrint'], resolve) })
   // 发票记录列表