sale-client 3.6.60 → 3.6.61

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [localUrl, serverRul] = ['https://qnjtkf.cn:8400/', 'https://qnjtkf.cn:8400/']
+const [localUrl, serverRul] = [ 'http://127.0.0.1:8080/', 'http://140.249.18.101:8400/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/filiale/haile/handplanReplicationRate.vue

@@ -14,8 +14,7 @@
                               v-model="model.startDate"
                               :value.sync="model.startDate"
                               :format="'yyyy-MM-dd HH:mm:ss'"
-                              :show-reset-button="true"
-                              condition="f_input_date >= '{}'">
+                              :show-reset-button="true">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -24,8 +23,7 @@
                               v-model="model.endDate"
                               :value.sync="model.endDate"
                               :format="'yyyy-MM-dd HH:mm:ss'"
-                              :show-reset-button="true"
-                              condition="f_input_date <= '{}'">
+                              :show-reset-button="true">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -71,13 +69,16 @@
                   <nobr>小区名称</nobr>
                 </th>
                 <th>
-                  <nobr>抄表数</nobr>
+                  <nobr>应抄户数</nobr>
                 </th>
                 <th>
-                  <nobr>实抄表数</nobr>
+                  <nobr>未抄户数</nobr>
                 </th>
                 <th>
-                  <nobr>档案户数</nobr>
+                  <nobr>已抄无用量</nobr>
+                </th>
+                <th>
+                  <nobr>实抄户数</nobr>
                 </th>
                 <th>
                   <nobr>用气量</nobr>
@@ -95,13 +96,19 @@
                 <nobr>{{row.f_residential_area}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.handplannum}}</nobr>
+                <nobr>{{row.f_user_number}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_no_hand}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.ishandplan}}</nobr>
+                <nobr>{{row.f_no_hand}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.peoplenum}}</nobr>
+                <nobr>{{row.f_out_hand}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_hand_num}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_oughtamount}}</nobr>
@@ -158,9 +165,9 @@ export default {
       other: [],
       footer: [],
       data: {},
-      model: new PagedList('rs/sql/salehandplanRate', 20, {}, {
-         f_oughtamount: 0,
-         f_oughtfee: 0,
+      model: new PagedList('rs/sql/salehandplanRate', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'}, {
+        f_oughtamount: 0,
+        f_oughtfee: 0
       }),
       initres: {
         org: [this.$login.f.orgid],
@@ -181,13 +188,14 @@ export default {
         defaultPrint: [],
         excelHeaders: {
           'f_residential_area': '小区名称',
-          'handplannum': '抄表数',
-          'ishandplan': '实抄表数',
-          'peoplenum': '档案户数',
+          'f_user_number': '应抄户数',
+          'f_no_hand': '未抄户数',
+          'f_out_hand': '已抄无用量',
+          'f_hand_num': '实抄户数',
           'f_oughtamount': '用气量',
           'f_oughtfee': '用气金额',
-          'handplansate1':'抄表率'
-          }
+          'handplansate1': '抄表率'
+        }
       },
       inputtores: [{label: '全部', value: ''}],  // 抄表员
       condition: ' 1 = 1'

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import FilialeSale from './filiale/qianneng/sale'
+import FilialeSale from './filiale/haile/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'