manage-client 4.0.74 → 4.0.75

package/src/filiale/bayan/sale.js

@@ -1,19 +1,19 @@
-// 分公司特殊组件页面注册
-import Vue from 'vue'
-
-export default function () {
-  Vue.component('charge-query', (resolve) => { require(['./ChargeQuery'], resolve) })
-  // 打印
-  Vue.component('print-table', (resolve) => { require(['./PrintTableManage'], resolve) })
-  // 其他收费查询
-  Vue.component('other-charge-query', (resolve) => {
-    require(['./OtherChargeQuery'], resolve)
-  })
-  // 综合档案信息查询
-  Vue.component('record-info-query', (resolve) => {
-    require(['./RecordInfoQuery'], resolve)
-  })
-  Vue.component('wechat-bind', (resolve) => {
-    require(['./businessquery/weChatBind'], resolve)
-  })
-}
+// 分公司特殊组件页面注册
+import Vue from 'vue'
+
+export default function () {
+  Vue.component('charge-query', (resolve) => { require(['./ChargeQuery'], resolve) })
+  // 打印
+  Vue.component('print-table', (resolve) => { require(['./PrintTableManage'], resolve) })
+  // 其他收费查询
+  Vue.component('other-charge-query', (resolve) => {
+    require(['./OtherChargeQuery'], resolve)
+  })
+  // 综合档案信息查询
+  Vue.component('record-info-query', (resolve) => {
+    require(['./RecordInfoQuery'], resolve)
+  })
+  Vue.component('wechat-bind', (resolve) => {
+    require(['./businessquery/weChatBind'], resolve)
+  })
+}

package/src/filiale/tongchuan/ManageHandInputtor.vue

@@ -157,7 +157,7 @@
         operatorname: '',
         f_inputtor:[],
         f_user_type:'',
-        orgCondtionStr: '1=1',
+        orgCondtionStr: '',
         model: new DataModel('api/af-revenue/report/gethandinputtor', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
           f_orgid: 'this.model.f_orgid'}),
         reportStr: null,

package/src/filiale/wuhai/UserGasList.vue

@@ -89,7 +89,7 @@
 
                   :value.sync="model.f_meter_brand"
                   close-on-select
-                  condition="f_meter_brand='{}'"
+                  condition="gb.f_meter_brand='{}'"
                   placeholder='气表品牌'
                   style="width:60%"
                   v-model="model.f_meter_brand">

package/src/filiale/yangchun/HandplanQuery.vue

@@ -919,7 +919,7 @@ export default {
         defaultPrint: ['f_userinfo_code', 'f_address', 'f_user_name', 'f_meternumber']
       },
       batchmoneyShow: false,
-      totalsplitTypes: [{label: '全部', value: ''}, {label: '总表', value: '总表'}, {label: '分表', value: '分表'}],
+      totalsplitTypes: [{label: '全部', value: ''}, {label: '总表', value: '总表'}, {label: '分表', value: '分表'}, {label: '独立', value: '独立'}],
       prices: [],
       bgl: [{label: '全部', value: ''}, {label: '有', value: '1'}, {label: '无', value: '0'}],
       meterbooks: [{label: '全部', value: ''}],  //抄表册

package/src/filiale/yangchun/WebHandplanQuery.vue

@@ -207,6 +207,17 @@
                             condition="f_usetype = '{}'">
                   </v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">总&ensp;分&ensp;表</label>
+                  <v-select :value.sync="model.f_totalsplit_type"
+                            v-model="model.f_totalsplit_type"
+                            :options='$parent.$parent.totalsplitTypes'
+                            placeholder='总分表'
+                            style="width:60%"
+                            close-on-select
+                            condition="f_totalsplit_type = '{}'">
+                  </v-select>
+                </div>
               </div>
             </div>
           </criteria>
@@ -534,6 +545,7 @@
           f_oughtamount: 0,
           f_oughtfee: 0
         }),
+        totalsplitTypes: [{label: '全部', value: ''}, {label: '总表', value: '总表'}, {label: '分表', value: '分表'}, {label: '独立', value: '独立'}],
         initres: {
           org:[this.$login.f.orgid],
           dep:[],

package/src/main.js

@@ -1,70 +1,70 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-
-// import { sale } from 'sale-client'
-import { system } from 'system-clients'
-import { ldap } from 'ldap-clients'
-import saleManage from './saleManage'
-import ShanXianSaleManage from './filiale/bayan/sale'
-import ShanXianwebSaleManage from './filiale/yangchun/webmeterManage'
-import webmeterManage from './webmeterManage'
-import reportManage from './reportManage'
-import newmanage from './newmanage'
-import ManageHome from './ManageHome'
-import echarts from 'echarts'
-import AMap from 'vue-amap'
-
-Vue.config.silent = true
-// Vue.mmType = 'AES'
-
-Vue.use(AMap)
-
-// 初始化vue-amap
-AMap.initAMapApiLoader({
-  // 高德key
-  key: '3cec9ae8e2349207f7ac29279e3f4abe',
-  // 插件集合 （插件按需引入）
-  plugin: [
-    'AMap.Autocomplete', // 输入提示插件
-    'AMap.PlaceSearch', // POI搜索插件
-    'AMap.Scale', // 右下角缩略图插件 比例尺
-    'AMap.OverView', // 地图鹰眼插件
-    'AMap.ToolBar', // 地图工具条0
-    'AMap.MapType', // 类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
-    'AMap.PolyEditor', // 编辑 折线多，边形
-    'AMap.CircleEditor', // 圆形编辑器插件
-    'AMap.Geolocation' // 定位控件，用来获取和展示用户主机所在的经纬度位置
-  ],
-  uiVersion: '1.0'
-})
-/** **************************通用组件******************************/
-
-Vue.prototype.$echarts = echarts
-all()
-// sale()
-ldap()
-system(false)
-
-saleManage()
-webmeterManage()
-ManageHome()
-newmanage()
-ShanXianwebSaleManage()
-reportManage()
-ShanXianSaleManage()
-require('system-clients/src/styles/less/bootstrap.less')
-require('./components/qinhua/Style/qinhuaStyle.less')
-// require('./bootstrap/less/manageStyle/manageChile.less')
-// require('./bootstrap/less/manageStyle/safeStyle.less')
-
-// 大屏展示要放开的样式
-// require('system-clients/src/styles/less/manageStyle/manageChile.less')
-// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
-// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
-
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+
+// import { sale } from 'sale-client'
+import { system } from 'system-clients'
+import { ldap } from 'ldap-clients'
+import saleManage from './saleManage'
+import ShanXianSaleManage from './filiale/yangchun/sale'
+import ShanXianwebSaleManage from './filiale/yangchun/webmeterManage'
+import webmeterManage from './webmeterManage'
+import reportManage from './reportManage'
+import newmanage from './newmanage'
+import ManageHome from './ManageHome'
+import echarts from 'echarts'
+import AMap from 'vue-amap'
+
+Vue.config.silent = true
+// Vue.mmType = 'AES'
+
+Vue.use(AMap)
+
+// 初始化vue-amap
+AMap.initAMapApiLoader({
+  // 高德key
+  key: '3cec9ae8e2349207f7ac29279e3f4abe',
+  // 插件集合 （插件按需引入）
+  plugin: [
+    'AMap.Autocomplete', // 输入提示插件
+    'AMap.PlaceSearch', // POI搜索插件
+    'AMap.Scale', // 右下角缩略图插件 比例尺
+    'AMap.OverView', // 地图鹰眼插件
+    'AMap.ToolBar', // 地图工具条0
+    'AMap.MapType', // 类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
+    'AMap.PolyEditor', // 编辑 折线多，边形
+    'AMap.CircleEditor', // 圆形编辑器插件
+    'AMap.Geolocation' // 定位控件，用来获取和展示用户主机所在的经纬度位置
+  ],
+  uiVersion: '1.0'
+})
+/** **************************通用组件******************************/
+
+Vue.prototype.$echarts = echarts
+all()
+// sale()
+ldap()
+system(false)
+
+saleManage()
+webmeterManage()
+ManageHome()
+newmanage()
+ShanXianwebSaleManage()
+reportManage()
+ShanXianSaleManage()
+require('system-clients/src/styles/less/bootstrap.less')
+require('./components/qinhua/Style/qinhuaStyle.less')
+// require('./bootstrap/less/manageStyle/manageChile.less')
+// require('./bootstrap/less/manageStyle/safeStyle.less')
+
+// 大屏展示要放开的样式
+// require('system-clients/src/styles/less/manageStyle/manageChile.less')
+// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
+// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
+
+new Vue({
+  el: 'body',
+  components: { App }
+})
+