sale-client 4.2.5 → 4.2.6

package/package.json

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

package/src/filiale/jinhong/HandplanQuery.vue

@@ -250,6 +250,14 @@
                             close-on-select
                             condition="f_meter_book_num in {}"></v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">抄表册编号</label>
+                  <v-select :value.sync="model.f_book_code" v-model="model.f_book_code"
+                            :options='$parent.$parent.bookcodes' placeholder='抄表册编号'
+                            style="width:60%"
+                            :multiple="true"
+                            condition="f_book_code in {}"></v-select>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label for="belongmonth" class="font_normal_body">所属年月</label>
                   <datepicker placeholder="所属年月" style="width:60%"
@@ -328,6 +336,9 @@
                 <th>
                   <nobr>表册片区</nobr>
                 </th>
+                <th>
+                  <nobr>抄表册编号</nobr>
+                </th>
                 <th>
                   <nobr>客户地址</nobr>
                 </th>
@@ -483,6 +494,9 @@
               <td style="text-align: center;">
                 <nobr>{{ row.f_book_slice_area }}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{ row.f_book_code }}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{ row.f_address }}</nobr>
               </td>
@@ -750,6 +764,7 @@ let readySomething = async function (self) {
 
   await self.$LoadParams.loadMeterBook(self.f_filialeid)
   self.loadMeterBooks()
+  self.loadBookCodes()
   // await self.$LoadParams.loadMeterBook(self.f_filialeid)
   // self.loadMeterBooks()
   self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
@@ -809,6 +824,7 @@ export default {
       inputtouPerson: [],
       priceNames: [],
       meterbrands: [],
+      bookcodes: [],
       printshow: false,
       f_filialeid: this.$login.f.f_orgid,
       all: false,
@@ -851,6 +867,7 @@ export default {
           'f_sellinggas_operate_date': '收费时间',
           'f_inputtor': '抄表员',
           'f_book_slice_area': '表册片区',
+          'f_book_code': '抄表册编号',
           'f_hand_date': '下发日期',
           'f_input_date': '录入日期',
           'f_meter_state': '抄表状态',
@@ -935,6 +952,9 @@ export default {
     loadMeterBooks () {
       this.meterbooks = [...this.meterbooks, ...this.$GetSaleParam.getMeterBooks()]
     },
+    loadBookCodes () {
+      this.bookcodes = this.$GetSaleParam.getBookCodes()
+    },
     getuuid () {
       let uuidA = ''
       var s = []

package/src/filiale/jinhong/machineDown.vue

@@ -147,6 +147,19 @@
                           :multiple="true"
                           condition="f_meter_book_num in {}"></v-select>
               </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">抄表册编号</label>
+                <v-select :value.sync="model.f_book_code" v-model="model.f_book_code"
+                          :options='$parent.$parent.bookcodes' placeholder='抄表册编号'
+                          style="width:60%"
+                          :multiple="true"
+                          condition="f_book_code in {}"></v-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">周&ensp;&ensp;&ensp;&ensp;期</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_period"
+                       condition="f_period = '{}'" placeholder='周期'>
+              </div>
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">调压箱名</label>
                 <v-select :value.sync="model.f_adjustable_name" v-model="model.f_adjustable_name"
@@ -238,14 +251,18 @@
               <th>
                 <nobr>上期底数</nobr>
               </th>
-
               <!--              <th>抄表册</th>-->
               <th>
                 <nobr>
                   <data-order field="f_book_name" name="抄表册"
                               :order.sync="$parent.$parent.$parent.orderFields.f_book_name"></data-order>
                 </nobr>
-
+              </th>
+              <th>
+                <nobr>抄表册编号</nobr>
+              </th>
+              <th>
+                <nobr>周期</nobr>
               </th>
               <th>
                 <nobr>操作</nobr>
@@ -277,6 +294,8 @@
             <td style="text-align: center;">{{row.f_meternumber}}</td>
             <td style="text-align: center;">{{row.f_meter_base}}</td>
             <td style="text-align: center;">{{row.f_book_name}}</td>
+            <td style="text-align: center;">{{row.f_book_code}}</td>
+            <td style="text-align: center;">{{row.f_period}}</td>
             <td style="text-align: center;"><nobr>
               <!--              <button type="button" name="button" class="button_search button_spacing width-60"-->
               <!--                      v-if="$parent.$parent.$parent.config.customCal && row.f_meter_state === '已抄表' && row.states === 1 && row.f_oper_state === '正常' &&  row.f_whether_pay === '否'"-->
@@ -438,8 +457,10 @@
 
   let readyGen = async function (self) {
     await self.$getConfig(self, 'HandManager')
+    await self.$LoadParams.loadParam(self.f_filialeid)
     await self.$LoadParams.loadMeterBook(self.f_filialeid)
     self.loadMeterBooks()
+    self.loadBookCodes()
     self.getfield = self.config.excelHeaders
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
     self.reflash()
@@ -561,6 +582,8 @@
             'f_oughtamount': '应交气量',
             'f_whether_pay': '是否缴费',
             'f_book_name': '抄表册',
+            'f_book_code': '抄表册编号',
+            'f_period': '周期',
             'f_meter_classify': '气表分类',
             'f_price_type': '气价类型',
             'f_price_name': '气价名称',
@@ -621,6 +644,7 @@
         splitdata: '',
         f_filialeid: this.$login.f.orgid,
         meterbooks: [],
+        bookcodes: [],
         upshow: false,
         inputid: 0,
         showfiles: false,
@@ -733,7 +757,9 @@
       loadMeterBooks () {
         this.meterbooks = this.$GetSaleParam.getMeterBooks()
       },
-
+      loadBookCodes () {
+        this.bookcodes = this.$GetSaleParam.getBookCodes()
+      },
       fileterprice (row) {
         this.splitdata = row
         this.priceSplit = true
@@ -1098,7 +1124,9 @@
           'f_balance': '上期结余',
           'f_meternumber': '表号',
           'f_meter_base': '上期底数',
-          'f_book_name': '抄表册'
+          'f_book_name': '抄表册',
+          'f_book_code': '抄表册编号',
+          'f_period': '周期'
         }
       },
       getCondition () {