manage-client 3.3.78 → 3.3.79

package/build/dev-server.js

@@ -19,9 +19,9 @@ var qtx= 'http://36.103.222.144:6300/'
 // var bendi = 'http://203.57.101.233:8400/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://192.168.50.4:8400'
+var bendi = 'http://121.36.106.17:8400'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://192.168.50.4:8400'
+var wode = 'http://121.36.106.17:8400'
 // 192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'

package/package.json

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

package/src/components/sale/filesquery/RecordInfoQuery.vue

@@ -928,7 +928,7 @@
         isSingleUser: null,
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/compreQuery', 20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc'`},{f_yiguabiao:0,f_weiguabiao:0}),
+        model: new PagedList('rs/sql/compreQuery', 20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc,f_userfiles_id desc'`},{f_yiguabiao:0,f_weiguabiao:0}),
         criteriaShow: false,
         orgCondtionStr:'',
         residentialArea: [],
@@ -944,7 +944,7 @@
         tfoot: '',
         defaultfield: [],
         //排序
-        orderitem: 'f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc',
+        orderitem: 'f_residential_area desc,f_building desc,f_unit desc,f_floor desc,f_room desc,f_userfiles_id desc',
         orderFields: {
           f_operate_date: 'no'
         },
@@ -1141,7 +1141,6 @@
         } else {
           args.condition = `${args.condition}` + this.orgCondtionStr
         }
-        this.conditon2 = args.condition
         console.log("查看条件",this.conditon2)
         if(this.card!=''){
           args.condition +=` and f_card_id='${this.card}'`
@@ -1149,6 +1148,7 @@
         if(this.IdCardInfo!=''){
           args.condition+=` and f_idnumber='${this.IdCardInfo}'`
         }
+        this.conditon2 = args.condition
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
         this.card=''
@@ -1305,7 +1305,7 @@
         if (rule === 'no') {
           this.model.paramSource.orderitem = `'${this.orderitem}'`
         } else {
-          this.model.paramSource.orderitem = `'${field} ${rule}'`
+          this.model.paramSource.orderitem = `'${field} ${rule},f_userfiles_id desc'`
         }
 
         this.search()

package/src/components/sale/report/aode/DayReportList.vue

@@ -56,6 +56,17 @@
               condition="f_operator {} "
               close-on-select></v-select>
             </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">付款方式</label>
+              <v-select id="f_payment"
+                        v-model="model.f_payment"
+                        placeholder='请选择'
+                        condition="f_payment ='{}'"
+                        :value.sync="model.f_payment"
+                        :options='$parent.$parent.payments'
+                        close-on-select clear-button>
+              </v-select>
+            </div>
 
             <div class="button-range" style="float:right;margin-top:10px">
               <button class="button_search button_spacing" @click="search()">查询</button>
@@ -382,6 +393,9 @@
       gasproperties() {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用气性质')]
       },
+      payments() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
+      },
       sellstate() {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('收费状态')]
       }

package/src/filiale/rizhao/UserQuery.vue

@@ -278,11 +278,6 @@
                               :options='$parent.$parent.hairpin' placeholder='请选择'
                               close-on-select></v-select>
                   </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">表号</label>
-                    <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
-                           condition="f_meternumber = '{}' " placeholder="表号">
-                  </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">卡号</label>
                     <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"

package/src/filiale/yuansheng/DayReportList.vue

@@ -66,7 +66,7 @@
                         close-on-select></v-select>
             </div>
             <div :class="$parent.$parent.style">
-              <label class="font_normal_body">小区</label>
+              <label class="font_normal_body">&nbsp;小&nbsp;&nbsp;&nbsp;&nbsp;区&nbsp;</label>
               <input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_residential_area"
                      placeholder='请输入小区'
               >
@@ -83,16 +83,27 @@
               <div style="float: right"  class="button_spacing" :class="{'button_shrink_left':$parent.$parent.criteriaShow,'button_shrink_right':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.show()"></div>
             </div>
             <div :class="$parent.$parent.style">
-              <label class="font_normal_body">表号</label>
+              <label class="font_normal_body">&nbsp;表&nbsp;&nbsp;&nbsp;&nbsp;号&nbsp;</label>
               <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
                      placeholder="表号">
 <!--                   condition="f_meternumber = '{}' " -->
             </div>
             <div :class="$parent.$parent.style">
-              <label class="font_normal_body">地址</label>
+              <label class="font_normal_body">&nbsp;地&nbsp;&nbsp;&nbsp;&nbsp;址&nbsp;</label>
               <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
                      condition="f_address like '%{}%'" placeholder='客户地址'>
             </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">付款方式</label>
+              <v-select id="f_payment"
+                        v-model="model.f_payment"
+                        placeholder='请选择'
+                        condition="f_payment ='{}'"
+                        :value.sync="model.f_payment"
+                        :options='$parent.$parent.payments'
+                        close-on-select clear-button>
+              </v-select>
+            </div>
           </div>
         </div>
       </criteria>
@@ -433,6 +444,9 @@ export default {
     gasproperties() {
       return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用气性质')]
     },
+    payments() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
+    },
     sellstate() {
       return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('收费状态')]
     },

package/src/main.js

@@ -6,8 +6,8 @@ import { all } from 'vue-client'
 import { system } from 'system-clients'
 import { ldap } from 'ldap-clients'
 import saleManage from './saleManage'
-import ShanXianSaleManage from './filiale/WEINAN/sale'
-import ShanXianWebmeterManage from './filiale/WEINAN/reportManage'
+import ShanXianSaleManage from './filiale/shanxian/sale'
+import ShanXianWebmeterManage from './filiale/shanxian/webmeterManage'
 import webmeterManage from './webmeterManage'
 import reportManage from './reportManage'
 import newmanage from './newmanage'
@@ -49,10 +49,10 @@ system(false)
 saleManage()
 ShanXianSaleManage()
 webmeterManage()
+ShanXianWebmeterManage()
 ManageHome()
 newmanage()
 reportManage()
-ShanXianWebmeterManage()
 require('system-clients/src/styles/less/bootstrap.less')
 require('./components/qinhua/Style/qinhuaStyle.less')
 // require('./bootstrap/less/manageStyle/manageChile.less')