sale-client 3.6.42 → 3.6.43

package/build/dev-server.js

@@ -17,6 +17,9 @@ var devConfig = {
       children: false // 不输出子模块构建信息
     },
     proxy: {
+      '/rs/logic/testlogic': {
+        target: 'http://127.0.0.1:8080/'
+      },
       '/rs/file': {
         target: serverRul
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.42",
+  "version": "3.6.43",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -89,9 +89,9 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.2.61",
+    "system-clients": "3.0.59-jingwei",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.86",
+    "vue-client": "1.24.72",
     "vue-clipboard2": "0.3.1",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",

package/src/components/chargeNew/SendBook.vue

@@ -1,87 +1,107 @@
-<template>
-  <div class="auto">
-    <validator name='v'>
-      <form novalidate class="form-horizontal">
-        <div class="row" style="margin-top:10px;">
-          <div class="col-sm-4 form-group" :class="[$v.f_book_no.required ? 'has-error' : '']">
-            <label class=" font_normal_body">折&emsp;&emsp;号</label>
-            <input style="width:60%" v-validate:f_book_no='{required: true }' type="text" v-model="model.f_book_no">
-          </div>
-        </div>
-      </form>
-      <book-bill :show="print" :url="'rs/report/book_bill'" :data='bookData' @toggle="close" @printok="printok"  v-ref:bookbill></book-bill>
-      <div style="text-align:right;height:auto;margin-top:30px;margin-right:50px;">
-        <button class="button_search btn-gn" @click="confirm()"  :disabled='!$v.valid'>确认</button>
-        <button class="button_clear btn-gn" @click="clean()" >取消</button>
-      </div>
-    </validator>
-  </div>
-  <upload :blodid="row.f_userinfo_id" isremark="true" fusetype="发折"></upload>
-</template>
-<script>
-  /**
-   *综合业务
-   *发折组件
-   */
-
-  export default {
-    title: '补卡管理',
-    data () {
-      return {
-        model: {
-          f_book_no: ''
-        },
-        print: false,
-        bookData: {}
-      }
-    },
-    props: ['row', 'cardData'],
-    methods: {
-      confirm () {
-        this.$dispatch('no-button')
-        this.bookData = {
-          f_userinfo_id: this.row.f_userinfo_id,
-          f_book_no: this.model.f_book_no,
-          f_zzhh: -1,
-          content: {
-            f_userinfo_code: `'${this.row.f_userinfo_code}'`,
-            f_user_name: `'${this.row.f_user_type == '民用' ? this.row.f_user_name : ''}'`,
-            f_unit_name: `'${this.row.f_user_type == '非民用' ? this.row.f_user_name : ''}'`,
-            f_address: `'${this.row.f_address}'`,
-            f_meter_style: `'${this.row.f_meter_style}'`,
-            f_meter_brand: `'${this.row.f_meter_brand}'`,
-            f_meternumber: `'${this.row.f_meternumber}'`,
-            f_idnumber: `'${this.row.f_idnumber}'`,
-            f_aroundmeter: `'${this.row.f_aroundmeter}'`,
-            f_user_phone: `'${this.row.f_user_phone}'`,
-            f_meter_base: `'${this.row.f_meter_base}'`,
-            f_operate_date: `'${this.$login.toStandardDateString()}'`
-          }
-        }
-        this.print = true
-      },
-      clean () {
-        this.$dispatch('refresh')
-      },
-      close () {
-        this.print = false
-        this.clean()
-      },
-      async printok () {
-        let data = {
-          f_userinfo_id: this.row.f_userinfo_id,
-          f_book_no: this.model.f_book_no,
-          f_send_date: this.$login.toStandardTimeString(),
-          f_operator: this.$login.f.name,
-          f_operatorid: this.$login.f.id,
-          f_orgid: this.$login.f.orgid,
-          f_orgname: this.$login.f.orgs,
-          f_depid: this.$login.f.depids,
-          f_depname: this.$login.f.deps
-        }
-        await this.$resetpost('rs/entity/t_send_book', data, {resolveMsg: null, rejectMsg: null})
-        this.$dispatch('success')
-      }
-    }
-  }
-</script>
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form novalidate class="form-horizontal">
+        <div class="row" style="margin-top:10px;">
+          <div class="col-sm-4 form-group" :class="[$v.f_book_no.required ? 'has-error' : '']">
+            <label class=" font_normal_body">折&emsp;&emsp;号</label>
+            <input style="width:60%" v-validate:f_book_no='{required: true }' type="text" v-model="model.f_book_no">
+          </div>
+        </div>
+      </form>
+      <book-bill :show="print" :url="'rs/report/book_bill'" :data='bookData' @toggle="close" @printok="printok"  v-ref:bookbill></book-bill>
+      <div style="text-align:right;height:auto;margin-top:30px;margin-right:50px;">
+        <button class="button_search btn-gn" @click="confirm()"  :disabled='!$v.valid'>确认</button>
+        <button class="button_clear btn-gn" @click="clean()" >取消</button>
+      </div>
+    </validator>
+  </div>
+  <upload :blodid="row.f_userinfo_id" isremark="true" fusetype="发折"></upload>
+</template>
+<script>
+  export default {
+    title: '补卡管理',
+    data () {
+      return {
+        model: {
+          f_book_no: ''
+        },
+        config: {
+          sendCTCard: false
+        },
+        print: false,
+        bookData: {}
+      }
+    },
+    props: ['row', 'cardData'],
+    ready () {
+      this.$getConfig(this, 'SendBook')
+    },
+    methods: {
+      async confirm () {
+           if (this.config.sendCTCard && this.$appdata.getSingleValue('磁条卡读卡间隔')) {
+            this.$showAlert('请刷折', 'warning', 50000)
+             // 如果配置了参数 则发送发折时写磁条卡请求
+            try {
+              let params = {
+                kh: this.row.f_userinfo_code
+              }
+              let cardRes = await this.$resetpost('http://127.0.0.1:8003/WriteCard_HEC', params, {
+                resolveMsg: null,
+                rejectMsg: '开户发折服务错误'
+              })
+              if (cardRes.data.Err || cardRes.data.Exception) {
+                throw new Error(`卡服务错误：${cardRes.data.Err}${cardRes.data.Exception}，请联系开发人员处理！！`)
+              }
+              await this.$closeAlert()
+            } catch (e) {
+              await this.$closeAlert()
+            }
+        }
+        await this.$dispatch('no-button')
+        this.bookData = {
+          f_userinfo_id: this.row.f_userinfo_id,
+          f_book_no: this.model.f_book_no,
+          f_zzhh: -1,
+          content: {
+            f_userinfo_code: `'${this.row.f_userinfo_code}'`,
+            f_user_name: `'${this.row.f_user_type == '民用' ? this.row.f_user_name : ''}'`,
+            f_unit_name: `'${this.row.f_user_type == '非民用' ? this.row.f_user_name : ''}'`,
+            f_address: `'${this.row.f_address}'`,
+            f_meter_style: `'${this.row.f_meter_style}'`,
+            f_meter_brand: `'${this.row.f_meter_brand}'`,
+            f_meternumber: `'${this.row.f_meternumber}'`,
+            f_idnumber: `'${this.row.f_idnumber}'`,
+            f_aroundmeter: `'${this.row.f_aroundmeter}'`,
+            f_user_phone: `'${this.row.f_user_phone}'`,
+            f_meter_base: `'${this.row.f_meter_base}'`,
+            f_operate_date: `'${this.$login.toStandardDateString()}'`
+          }
+        }
+        this.print = true
+      },
+      clean () {
+        this.$dispatch('refresh')
+      },
+      close () {
+        this.print = false
+        this.clean()
+      },
+      async printok () {
+        let data = {
+          f_userinfo_id: this.row.f_userinfo_id,
+          f_book_no: this.model.f_book_no,
+          f_send_date: this.$login.toStandardTimeString(),
+          f_operator: this.$login.f.name,
+          f_operatorid: this.$login.f.id,
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.orgs,
+          f_depid: this.$login.f.depids,
+          f_depname: this.$login.f.deps
+        }
+        await this.$resetpost('rs/entity/t_send_book', data, {resolveMsg: null, rejectMsg: null})
+        this.$dispatch('success')
+      }
+    }
+  }
+</script>

package/src/components/common/userinfo_detail/UserBaseInfoNew.vue

@@ -155,7 +155,7 @@
     </div>
     <div class="auto" style="float: right;">
       <button class="button_clear " @click="cancelmain()" >返回</button>
-      <button class="button_search" type="button" @click="goChargeManage">去收费</button>
+      <button class="button_search" v-show="buttonshow" type="button" @click="goChargeManage">去收费</button>
       <button v-if="row.f_meter_brand.includes('西美')&&row.f_meter_type.includes('物联网表')"
               class="button_search" type="button" @click="clearBarrier">清除障碍</button>
       <button v-if="row.f_meter_type.includes('物联网表')"
@@ -252,7 +252,16 @@
   import Vue from 'vue'
   export default {
     title: '基本信息',
-    props: ['row'],
+    props: {
+      row: {
+        type: Object,
+        default: undefined
+      },
+      buttonshow: {
+        type: Boolean,
+        default: true
+      }
+    },
     data () {
       return {
         criteriaShow: false,

package/src/components/common/userinfo_detail/UserInfoDetailManageNew.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="binary flex" >
     <div class="row binary-left flex" style="width:99%;height:98%;margin-bottom:0px">
-      <div class="auto"><user-base-info-new :row="row"  @cancel-main="cancel" @cancel-re="cancelRe"></user-base-info-new></div>
+      <div class="auto"><user-base-info-new :row="row" :buttonshow="buttonshow"  @cancel-main="cancel" @cancel-re="cancelRe"></user-base-info-new></div>
       <saletabbut  v-if="row" v-ref:list style="height:72%;margin-top: 1%;overflow-y: scroll">
         <saletab header="流水查询" v-if="permission('流水查询')">
           <record-query-user :row="row"></record-query-user>
@@ -117,7 +117,7 @@ import ChangeRecord from './ic_detail/ChangeRecord'
   import DeveiceRecord from './ic_detail/DeveiceRecord'
 export default {
     title: '用户详细信息',
-    props: ['f_userfiles_id', 'f_userinfo_id', 'f_userinfo_code', 'parentname'],
+    props: ['f_userfiles_id', 'f_userinfo_id', 'f_userinfo_code', 'parentname', 'buttonshow'],
     components: {
       PriceAdjustmentQueryUser,
       PriceChangeQueryUser,

package/src/components/revenue/comprehen/Bill/EticketV4/CustQueryEticket.vue

@@ -0,0 +1,314 @@
+<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="[]"
+                          condition="f_operate_date >='{}'"
+                          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="[]"
+                          condition="f_operate_date <='{}'"
+                          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="closeEticket"><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">开票名称:</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">
+            <nobr class="col-sm-4"><label class="control-label">是否征税:</label></nobr>
+            <v-select v-model="invoice_is_pax"
+                      placeholder='请选择'
+                      :value.sync="invoice_is_pax"
+                      close-on-select
+                      :width="60"
+                      :disabled="disabled"
+                      :value-single="true"
+                      :search="false"
+                      :options='is_pax' clear-button>
+            </v-select>
+          </div>
+          <div class="col-sm-12 form-group form-input-group">
+            <label class="control-label">开户行及账号:</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" :class="[!row.f_taxpayer_id ? 'has-error' : '']">
+            <label class="control-label">纳税人识别号:</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">开票地址电话:</label>
+            <input class="form-control col-sm-2"
+                   v-model="row.f_address_phone" placeholder="开票地址">
+          </div>
+        </div>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn button_search"
+              :disabled="!(row.f_taxpayer_id&&row.f_paper_name&&row.f_address_phone)"
+              @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_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,
+        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.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.row.f_email) {
+          this.row.f_email = this.row.f_email
+        }
+        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.eticket_msg = false
+        this.disabled = false
+        this.eticket_show = true
+        if (this.selecteds.map(item => item.f_type).toString() == '其他收费' || this.selecteds.map(item => item.f_type).toString() == '卡表收费' || this.selecteds.map(item => item.f_type).toString() == '发卡售气') {
+          this.invoice_show_gas = '是'
+        }
+        this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row, this.invoice_show_gas, this.invoice_is_pax, this.selecteds.map(item => item.f_type).toString())
+      },
+      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)
+        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/components/revenue/comprehen/Bill/EticketV4/EticketManage.vue

@@ -12,6 +12,9 @@
     <tabs header="抄表结算">
       <e-ticket-open-hand-query-v4></e-ticket-open-hand-query-v4>
     </tabs>
+    <tabs header="自定义开票">
+      <cust-query-eticket-query-v4></cust-query-eticket-query-v4>
+    </tabs>
   </tab-button>
 </template>