manage-client 3.2.178 → 3.2.179

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.178",
+  "version": "3.2.179",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/sale/businessquery/ArrearsQuery.vue

@@ -535,8 +535,11 @@
     self.getinputtores();
     //加载抄表册
     self.initmeterbook();
-    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStartAndEndDateString()[0] + ' 00:00:00'
     self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+
+    self.$refs.paged.$refs.cri.model.inputstartDate = self.$login.toStartAndEndDateString()[0]  + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.inputendDate = self.$login.toStandardDateString() + ' 23:59:59'
     // self.$refs.paged.$refs.cri.search()
     self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
     await self.$MagLoadParams.loadParam()
@@ -563,7 +566,7 @@
           dep:[],
           user:[]
         },
-        model: new PagedList('rs/sql/arrearsQuery', 20, {startDate: 'this.model.inputstartDate', endDate: 'this.model.inputendDate',startDate1: 'this.model.startDate1', endDate1: 'this.model.endDate1'}, {
+        model: new PagedList('rs/sql/arrearsQuery', 20, {startDate: 'this.model.inputstartDate', endDate: 'this.model.inputendDate',startDate1: 'this.model.startDate', endDate1: 'this.model.endDate'}, {
           f_oughtamount: 0,
           f_oughtfee: 0,
           f_debt_money: 0,
@@ -913,8 +916,8 @@
         return {
           startDate: this.$refs.paged.$refs.cri.model.inputstartDate,
           endDate: this.$refs.paged.$refs.cri.model.inputendDate,
-          startDate1: this.$refs.paged.$refs.cri.model.startDate1,
-          endDate1: this.$refs.paged.$refs.cri.model.endDate1,
+          startDate1: this.$refs.paged.$refs.cri.model.startDate,
+          endDate1: this.$refs.paged.$refs.cri.model.endDate,
           condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
           condValue: `${this.model.condValue}`
         }

package/src/filiale/meihekou/HandplanQuery.vue

@@ -561,7 +561,7 @@
                 <nobr>{{row.f_inputtor}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_input_person}}</nobr>
+                <nobr>{{row.f_meter_classify == '物联网表' && row.f_input_person == null ? "抄表系统":row.f_input_person}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_whether_pay}}</nobr>
@@ -574,7 +574,7 @@
                 <nobr>{{row.f_hand_state}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_operator}}</nobr>
+                <nobr>{{row.f_meter_classify == '物联网表' &&  row.f_operator == null?"抄表系统":row.f_operator}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_depname}}</nobr>

package/src/filiale/meihekou/YingShouMingXi.vue

@@ -102,6 +102,16 @@
                                           condition="f_inputtor in {}"
                                           close-on-select></v-select>
                               </div>
+                              <div class="col-sm-2 form-group">
+                                <label class="font_normal_body">收费类型</label>
+                                <v-select v-model="model.f_type"
+                                          multiple
+                                          placeholder='请选择'
+                                          condition="f_type in {}"
+                                          :value.sync="model.f_type"
+                                          :options='$parent.$parent.chargetype'
+                                          close-on-select clear-button></v-select>
+                              </div>
                             </div>
                         </div>
                     </criteria>
@@ -114,6 +124,7 @@
                                 <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><nobr>录入时间</nobr></th>
@@ -151,9 +162,13 @@
                             <td style="text-align: center;">
                               <nobr>{{row.f_gasproperties}}</nobr>
                             </td>
+
                             <td style="text-align: center;">
                               <nobr>{{row.f_meter_classify}}</nobr>
                             </td>
+                            <td style="text-align: center;">
+                              <nobr>{{row.f_type}}</nobr>
+                            </td>
                             <td style="text-align: center;">
                               <nobr>{{row.f_operator}}</nobr>
                             </td>
@@ -497,9 +512,12 @@ import {HttpResetClass, PagedList} from 'vue-client'
             getfield() {
                 return exportConfig.ysConfig
             },
-            usertypes() {
-                return [{label: ' 全部  ', value: ''}, ...this.$appdata.getParam('用户类型')]
-            },
+          usertypes() {
+              return [{label: ' 全部  ', value: ''}, ...this.$appdata.getParam('用户类型')]
+          },
+          chargetype() {
+              return [{label: ' 全部  ', value: ''}, ...this.$appdata.getParam('收费类型')]
+          },
           metertypes() {
             return [{label: ' 全部  ', value: ''}, ...this.$appdata.getParam('气表类型')]
           },