sale-client 3.6.269 → 3.6.270

package/.npmignore

@@ -0,0 +1,12 @@
+src/bootstrap
+.idea/
+.DS_Store
+node_modules/
+dist/
+examples/
+gradle/
+npm-debug.log
+selenium-debug.log
+test/unit/coverage
+test/e2e/reports
+lib/**/lib

package/package.json

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

package/src/.npmignore

@@ -0,0 +1 @@
+

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

@@ -3,13 +3,13 @@
     <tabs header="开票记录" v-if="permission('开票记录查询')">
       <e-ticket-record-list-query-v4></e-ticket-record-list-query-v4>
     </tabs>
-    <tabs header="物联网表结算" v-if="permission('物联网表结算开票')">
-      <e-ticket-open-iot-query-v4></e-ticket-open-iot-query-v4>
-    </tabs>
+    <!--<tabs header="物联网表结算" v-if="permission('物联网表结算开票')">-->
+    <!--  <e-ticket-open-iot-query-v4></e-ticket-open-iot-query-v4>-->
+    <!--</tabs>-->
     <tabs header="卡表结算"  v-if="permission('卡表结算开票')">
       <e-ticket-open-card-query-v4></e-ticket-open-card-query-v4>
     </tabs>
-    <tabs header="机表抄表结算" v-if="permission('机表抄表结算开票')">
+    <tabs header="抄表结算" v-if="permission('抄表结算开票')">
       <e-ticket-open-hand-query-v4></e-ticket-open-hand-query-v4>
     </tabs>
     <tabs header="自定义开票" v-if="permission('自定义开票')">

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

@@ -50,7 +50,7 @@
               </div>
               <div style="float: right">
                 <button class="button_search" @click="search()">查 询</button>
-                <!--<button class="button_search" @click="$parent.$parent.open_eTicket()">开票</button>-->
+                <button class="button_search" @click="$parent.$parent.open_eTicket()">开票</button>
               </div>
             </div>
           </div>
@@ -59,10 +59,10 @@
       <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
         <template partial='head'>
           <tr>
-            <!--            <th>-->
-            <!--              <input type="checkbox" @click="$parent.$parent.$parent.addOrRemove($parent.$parent.$parent.selectAll)"-->
-            <!--                     style="width: 22px;height: 22px"    :checked="$parent.$parent.$parent.selectAll">-->
-            <!--            </th>-->
+            <th>
+              <input type="checkbox" @click="$parent.$parent.$parent.addOrRemove($parent.$parent.$parent.selectAll)"
+                     style="width: 22px;height: 22px"    :checked="$parent.$parent.$parent.selectAll">
+            </th>
             <th>客户编号</th>
             <th>客户姓名</th>
             <th>客户地址</th>
@@ -78,10 +78,10 @@
         </template>
         <template partial='body' :model="model">
           <tr>
-            <!--            <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">
+              <input type="checkbox" v-model="$parent.$parent.$parent.selecteds" :value="row"
+                     style="width: 22px;height: 22px"    @click="$parent.$parent.$parent.checkbox($index, $event)">
+            </td>
             <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_address }}</th>
@@ -93,7 +93,8 @@
             <th style="text-align:center">{{ row.is_bill }}</th>
             <th style="text-align:center">{{ row.f_hand_date }}</th>
             <th>
-              <button class="btn btn-link" @click="$parent.$parent.$parent.kp(row)">开具发票</button>
+              <button class="btn btn-link" @click="$parent.$parent.$parent.kp(row)">开具发票
+              </button>
             </th>
           </tr>
         </template>
@@ -113,7 +114,7 @@
             <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' : '']">
+          <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='请选择'
@@ -125,7 +126,7 @@
                       :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' : '']">
+          <div class="col-sm-6 form-group form-input-group" :class="[!row.f_paper_type ? 'has-error' : '']">
             <label class="control-label">发票种类:</label>
             <v-select v-model="row.f_paper_type"
                       placeholder='请选择'
@@ -167,8 +168,8 @@
     </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'>确认开票
+              :disabled="!(row.f_paper_name&&row.f_address_phone)"
+              @click='confirm'>确认收费
       </button>
     </footer>
   </modal>
@@ -177,7 +178,6 @@
 <script>
 import {HttpResetClass, PagedList} from 'vue-client'
 import * as Util from '../../../../../Util'
-
 let asyncReadyGen = async function (self) {
   self.$refs.paged.$refs.cri.model.f_start_date = Util.toStandardDateString()
   self.$refs.paged.$refs.cri.model.f_end_date = Util.toStandardDateString()
@@ -185,7 +185,7 @@ let asyncReadyGen = async function (self) {
 }
 export default {
   title: '发票管理',
-  data() {
+  data () {
     return {
       model: new PagedList('rs/sql/open_eticket_JBquery', 20,
         {}),
@@ -218,15 +218,15 @@ export default {
       mid: [{label: '全部', value: ''}, {label: '是', value: ' > 0 '}, {label: '否', value: ' is null'}]
     }
   },
-  ready() {
-    this.$refs.paged.$refs.cri.model.mid = [' is null']
+  ready () {
+    this.$refs.paged.$refs.cri.model.mid=[' is null']
     asyncReadyGen(this)
   },
   methods: {
-    search() {
+    search () {
       this.$refs.paged.$refs.cri.search()
     },
-    async kp(row) {
+    async kp (row) {
       let HttpReset = new HttpResetClass()
       let _row = await HttpReset.load('POST', 'rs/sql/sale_getUser', {
         data: {
@@ -236,6 +236,7 @@ export default {
       }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
       this.row = _row.data[0]
       this.row.id = row.id
+      this.selecteds = [{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
@@ -251,7 +252,7 @@ export default {
       }
       this.eticket_msg = true
     },
-    async open_eTicket() {
+    async open_eTicket () {
       if ([...new Set(this.selecteds.map(item => item.f_userinfo_code))].length > 1) {
         this.$showAlert('所选择用户不是同一用户！！', 'warning', 2000)
         return
@@ -263,7 +264,7 @@ export default {
         //
         //     }
         //   })
-        return this.$showAlert('已结算的记录不能再次结算开票', 'warning', 3000)
+        return this.$showAlert('已结算的记录不能再次结算开票','warning',3000)
       }
       let HttpReset = new HttpResetClass()
       let row = await HttpReset.load('POST', 'rs/sql/sale_getUser', {
@@ -283,27 +284,28 @@ export default {
       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) {
+      if(!this.row.f_email){
         this.row.f_email = this.row.f_email
       }
       this.eticket_msg = true
     },
-    confirm() {
+    confirm () {
       this.eticket_msg = false
       this.eticket_show = true
-      this.$refs.eticketbill.openETicket(this.row.id, this.row, '机表结算')
+      console.log('>>> 抄表结算开票')
+      this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row, this.invoice_show_gas, this.invoice_is_pax, '机表结算')
     },
-    selfSearch(args) {
+    selfSearch (args) {
       this.selecteds = []
       // let f_orgstr = this.orgCondtionStr
       // args.condition = `${args.condition} ` + f_orgstr
       this.model.search(args.condition, args.model)
     },
-    eticket_toggle() {
+    eticket_toggle () {
       this.eticket_show = false
       this.search()
     },
-    addOrRemove(is) {
+    addOrRemove (is) {
       this.selecteds = []
       if (!is) { // 添加本页所有数据到ids中
         this.model.rows.forEach((row) => {
@@ -319,7 +321,7 @@ export default {
         this.selectAll = false
       }
     },
-    checkbox(val, event) {
+    checkbox (val, event) {
       // this.selecteds = []
       if (event.target.checked === true) {
         // for (let i = 0; i <= val; i++) {
@@ -334,18 +336,18 @@ export default {
     }
   },
   computed: {
-    getPayee() {
+    getPayee () {
       return this.$GetSaleParam.getPayee()
     },
-    getReviewer() {
+    getReviewer () {
       return this.$GetSaleParam.getReviewer()
     },
-    getDrawer() {
+    getDrawer () {
       return this.$GetSaleParam.getDrawer()
     }
   },
   events: {
-    'search'() {
+    'search' () {
       this.search()
     }
   },

package/src/filiale/meihekou/ChargeList.vue

@@ -154,26 +154,36 @@
             <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'>
-          <td :class="{'bg-danger' : row.f_table_state === '停用' }" style="text-align: center;">{{$index + 1}}</td>
-          <td :class="{'bg-danger' : row.f_table_state === '停用' }">
+          <td :class="{'bg-danger' : row.f_table_state === '停用' || row.f_user_state === '销户' }" style="text-align: center;">{{$index + 1}}</td>
+          <td :class="{'bg-danger' : row.f_table_state === '停用' || row.f_user_state === '销户' }">
             <nobr>
               <span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
             </nobr>
           </td>
-          <td style="white-space: nowrap;" :class="{'bg-danger' : row.f_table_state === '停用' }">{{row.f_user_name}}&nbsp;&nbsp;{{row.f_user_phone}}&nbsp;&nbsp;{{row.f_address}}</td>
-          <td style="white-space: nowrap;" :class="{'bg-danger' : row.f_table_state === '停用' }">{{row.f_user_id}}&nbsp;&nbsp;{{row.f_gasproperties}}&nbsp;&nbsp;{{row.f_meter_brand}}
-            &nbsp;&nbsp;{{row.f_meter_style}}&nbsp;&nbsp;{{row.f_price_type}}&nbsp;&nbsp;{{row.f_price_name}}
+          <td style="white-space: nowrap;" :class="{'bg-danger' : row.f_table_state === '停用' || row.f_user_state === '销户' }">{{row.f_user_name}}&nbsp;&nbsp;{{row.f_user_phone}}&nbsp;&nbsp;{{row.f_address}}</td>
+          <td style="white-space: nowrap;" :class="{'bg-danger' : row.f_table_state === '停用' || row.f_user_state === '销户' }">{{row.f_user_id}}&nbsp;&nbsp;{{row.f_gasproperties}}
+            &nbsp;&nbsp;{{row.f_meter_style}}&nbsp;&nbsp;{{row.f_price_type}}
           </td>
-          <td style="white-space: nowrap;" :class="{'bg-danger' : row.f_table_state === '停用' }"
-              style="text-align: center;">{{row.f_meter_type}}&nbsp;&nbsp;({{row.f_meter_type.includes('物联网表') ?
-            row.f_table_state : row.f_whether_hairpin }})
+          <td style="white-space: nowrap;" :class="{'bg-danger' : row.f_table_state === '停用' || row.f_user_state === '销户' }">{{row.f_meter_brand}}
+          </td>
+          <td style="white-space: nowrap;" :class="{'bg-danger' : row.f_table_state === '停用' || row.f_user_state === '销户' }">{{row.f_price_name}}
+          </td>
+          <td style="white-space: nowrap;" :class="{'bg-danger' : row.f_table_state === '停用' || row.f_user_state === '销户' }"
+              style="text-align: center;">{{row.f_meter_type}}
+          </td>
+          <td style="white-space: nowrap;" :class="{'bg-danger' : row.f_table_state === '停用' || row.f_user_state === '销户' }">{{row.f_meter_type.includes('物联网表') ?
+            row.f_table_state : row.f_whether_hairpin }}
+          </td>
+          <td style="white-space: nowrap;" :class="{'bg-danger' : row.f_table_state === '停用' || row.f_user_state === '销户' }">{{row.f_user_state}}
           </td>
-
         </template>
       </data-grid>
       <!--<meter-charge-record-query partial='list' v-if="$parent.row"  :searchdata="$parent.row"></meter-charge-record-query>-->

package/src/filiale/meihekou/HandManager.vue

@@ -899,6 +899,10 @@
                     this.$showAlert(res.data.length === 0 ? '没有查询到用户' : '查询到多条用户信息', 'warning', 3000)
                     return
                   }
+                  if (!(res.data[0].f_meter_classify === '机表')) {
+                    this.$showAlert('只能进行机表抄表', 'warning', 3000)
+                    return
+                  }
                   if (res.data[0].f_meter_state === '未抄表') {
                     this.$showAlert('用户有已下发未抄表的记录', 'warning', 3000)
                   }