sale-client 3.6.197 → 3.6.199

package/package.json

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

package/src/components/charge/business/machine/MachineMeterCenter.vue

@@ -389,7 +389,7 @@ let asyncMachineMeterCenter = async function (self) {
       },
       // 校验发票信息
       checkInvoiceMsg () {
-        if (this.printInvoiceType.indexOf(this.model.f_print[0]) !== -1) {
+        if (this.printInvoiceType.indexOf(this.data.f_print[0]) !== -1) {
           if (!this.row.f_taxpayer_id && this.config.taxforidnumber) {
             this.row.f_taxpayer_id = this.row.f_idnumber
           }

package/src/filiale/qianneng/revenue/common/ic_detail/HandQueryUser.vue

@@ -49,6 +49,14 @@
                           close-on-select
                           condition="f_hand_state = '{}'"></v-select>
               </div>
+              <div class="col-sm-2 form-group" v-if="$parent.$parent.row.f_meter_type == '机表'">
+                <label class="font_normal_body" title="下账状态">下账状态</label>
+                <v-select :value.sync="model.f_accounts_state" v-model='model.f_accounts_state'
+                          style="width:60%"
+                          :options='$parent.$parent.accountsstates' placeholder='下账状态'
+                          close-on-select
+                          condition="f_accounts_state = '{}'"></v-select>
+              </div>
 
               <div style="float: right">
                 <button @click="search()"  class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
@@ -88,8 +96,10 @@
               <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 v-if="$parent.$parent.$parent.row.f_meter_type == '机表'"><nobr>操作</nobr></th>
             </tr>
           </template>
           <template partial='body' partial='list' v-ref:grid>
@@ -114,8 +124,13 @@
               <td style="text-align:center">{{row.f_meter_state}}</td>
               <td style="text-align:center">{{row.f_result_state?row.f_result_state:''}}</td>
               <td style="text-align:center">{{row.f_hand_state}}</td>
+              <td style="text-align:center">{{row.f_accounts_state}}</td>
               <td style="text-align:center">{{row.f_inputtor}}</td>
             <td style="text-align:center">{{row.f_input_person}}</td>
+            <td style="text-align:center" v-if="$parent.$parent.$parent.row.f_meter_type == '机表'">
+              <button @click.stop="$parent.$parent.$parent.report(row)" class="btn btn-link" name="button" type="button"
+                      v-if="row.f_accounts_state==='自动下账' && row.f_hand_state === '有效'">打印扣费单</button>
+            </td>
             </tr>
           </template>
           <template partial='foot'></template>
@@ -155,13 +170,38 @@
         </td>
       </tr>
     </table>
+    <reissue-bill :data="reissue_data" :show.sync="reissue_show" @cancel="reissueOper()" @reissue-success="reissueSucc()" v-if="reissue_show"></reissue-bill>
   </div>
 
 </template>
 
 <script>
   import {HttpResetClass, PagedList} from 'vue-client'
+  import co from "co";
+  let reprintGen = function * (self, row) {
+    try {
+      let reissueData = {}
+      reissueData = Object.assign({}, reissueData, row)
 
+      reissueData.f_bill_type = row.type
+      reissueData.f_bill_style = '普通收据'
+      reissueData.f_operator = self.$login.f.name
+      reissueData.f_operatorid = self.$login.f.id
+      reissueData.f_orgid = self.$login.f.orgid
+      reissueData.f_orgname = self.$login.f.orgs
+      reissueData.f_depid = self.$login.f.depids
+      reissueData.f_depname = self.$login.f.deps
+      reissueData.billUrl = 'rs/report/machine_charging_bill'
+
+      self.reissue_data = reissueData
+      self.reissue_show = true
+    } catch (error) {
+      if (error.status) {
+        self.$warn(`加载数据出错, ${JSON.stringify(error)}`, 'CardList')
+      }
+      throw error
+    }
+  }
   export default {
     title: '抄表',
     data () {
@@ -177,6 +217,8 @@
           f_stair3amount: 0,
           f_stair3fee: 0
         }),
+        reissue_show: false,
+        reissue_data: null,
         show: false,
         lists: [],
         meterstates: this.$appdata.getParam('抄表状态') ? [{
@@ -187,6 +229,7 @@
           label: '全部',
           value: ''
         }, ...this.$appdata.getParam('表单状态')] : [],
+        accountsstates: [{label: '全部', value: ''}, {label: '自动下账', value: '自动下账'}, {label: '缴费清欠', value: '缴费清欠'}],
         // 控制单选
         radio: [],
         // 选中的页
@@ -232,6 +275,18 @@
       }
     },
     methods: {
+      reissueSucc () {
+        this.reissue_show = false
+        this.$dispatch('refresh')
+      },
+      reissueOper () {
+        this.reissue_data = null
+        this.reissue_show = false
+      },
+      report (row) {
+        let reprint = reprintGen(this, row)
+        return co(reprint)
+      },
       // search() {
       //   this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}'`
       //   this.model.search(this.condition, this.model)