manage-client 4.1.128 → 4.1.131

package/build/dev-server.js

@@ -6,8 +6,8 @@ const proxyMiddleware = require('http-proxy-middleware')
 const app = express()
 const compiler = webpack(config)
 
-const server = 'http://123.57.3.66:31467/'
-const local = 'http://127.0.0.1:9026/'
+const server = 'http://121.36.106.17:31467/'
+const local = 'http://121.36.106.17:31467/'
 const proxyTable = {
   '/rs/logic/exportfile': {
     target: server
@@ -16,22 +16,22 @@ const proxyTable = {
     target: server
   },
   '/api/af-revenue/sql/': {
-    pathRewrite: {
-      '^/api/af-revenue': '/singlepage/api/af-revenue/'
-    },
-    target: server
+    // pathRewrite: {
+    //   '^/api/af-revenue': '/'
+    // },
+    target: local
+  },
+  '/api/af-revenue/report/': {
+    // pathRewrite: {
+    //   '^/api/af-revenue': '/'
+    // },
+    target: local
   },
-  // '/api/af-revenue/report/': {
-  //   pathRewrite: {
-  //     '^/api/af-revenue': '/'
-  //   },
-  //   target: local
-  // },
   '/api/af-revenue/logic': {
-    pathRewrite: {
-      '^/api/af-revenue': '/singlepage/api/af-revenue/'
-    },
-    target: server
+    // pathRewrite: {
+    //   '^/api/af-revenue': '/'
+    // },
+    target: local
   },
   '/api': {
     target: server

package/package.json

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

package/src/components/SellReport/hongya/HyContrastBill.vue

@@ -153,6 +153,8 @@ export default {
   ready () {
     this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
     this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+    this.$refs.paged.$refs.criteria.model.startDate1 = this.$login.toStandardDateString() + ' 00:00:00'
+    this.$refs.paged.$refs.criteria.model.endDate1 = this.$login.toStandardDateString() + ' 23:59:59'
   },
   methods: {
     searchData () {

package/src/components/sale/config/exportConfig.js

@@ -1981,6 +1981,8 @@ export default {
     'f_curbalance': '期末余额',
     'f_gas_state': '用气状态',
     'f_changetable_state': '是否换表',
+    'f_valve_state': '阀门状态',
+    'f_network_valve': '阀控状态',
     'f_first_input_date': '首次抄表时间',
     'f_input_date': '最后通讯日期'
   },

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

@@ -1197,7 +1197,7 @@
       },
       userTypeChange () {
         this.gasproperties=[]
-        if(this.$refs.paged.$refs.cri.model.f_user_type !== null) {
+        if(this.$refs.paged.$refs.cri.model !== null && this.$refs.paged.$refs.cri.model.f_user_type !== null && this.$refs.paged.$refs.cri.model.f_user_type !== undefined) {
           this.$refs.paged.$refs.cri.model.f_gasproperties=''
           this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
           // this.gasproperties.push({label: '全部', value: ''})

package/src/components/webmeter/gasStatistics/NewGasStatistics.vue

@@ -182,6 +182,20 @@
                             condition="f_gasproperties = '{}'"
                             close-on-select></v-select>
                 </div>
+                <div class="col-sm-2 form-group" title="参数名称：【阀门状态查询用】">
+                  <label class="font_normal_body">阀门状态</label>
+                  <v-select :value.sync="model.f_valve_state" v-model="model.f_valve_state"
+                            :options='$parent.$parent.valvestate' placeholder='请选择'
+                            condition="f_valve_state = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group" title="参数名称：【阀控状态查询用】">
+                  <label class="font_normal_body">阀控状态</label>
+                  <v-select :value.sync="model.f_network_valve" v-model="model.f_network_valve"
+                            :options='$parent.$parent.networkvalve' placeholder='请选择'
+                            condition="f_network_valve = '{}'"
+                            close-on-select></v-select>
+                </div>
               </div>
             </div>
           </criteria>
@@ -213,8 +227,14 @@
                 <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>
+
+
               </tr>
             </template>
             <template partial='body' partial='list'>
@@ -233,7 +253,6 @@
                 <th style="text-align:center"><nobr>{{row.f_meter_title}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_price_name}}</nobr></th>
 
-
                 <th style="text-align:center"><nobr>{{row.f_gasproperties}}</nobr></th>
 
 
@@ -247,6 +266,10 @@
                 <th style="text-align:center"><nobr>{{row.f_curbalance}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_gas_state}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_changetable_state}}</nobr></th>
+
+                <th style="text-align:center"><nobr>{{row.f_valve_state}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_network_valve}}</nobr></th>
+
                 <th style="text-align:center"><nobr>{{row.f_first_input_date}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_input_date}}</nobr></th>
               </tr>
@@ -499,6 +522,12 @@
       usertypes() {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
       },
+      valvestate() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('阀门状态查询用')]
+      },
+      networkvalve() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('阀控状态查询用')]
+      },
       gasproperties() {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用气性质')]
       },

package/src/filiale/hantou/RecordInfoQuery.vue

@@ -1224,12 +1224,9 @@ export default {
     },
     userTypeChange () {
       this.gasproperties=[]
-      if (this.$refs.paged.$refs.cri.model.f_user_type !== null ) {
-        if(this.$refs.paged.$refs.cri.model.f_user_type[0] !==null && this.$refs.paged.$refs.cri.model.f_user_type[0] !=='') {
-          this.$refs.paged.$refs.cri.model.f_gasproperties=''
-          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
-          // this.gasproperties.push({label: '全部', value: ''})
-        }
+      if(this.$refs.paged.$refs.cri.model !== null && this.$refs.paged.$refs.cri.model.f_user_type !== null && this.$refs.paged.$refs.cri.model.f_user_type !== undefined) {
+        this.$refs.paged.$refs.cri.model.f_gasproperties=''
+        this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
       }
       else{
         this.gasproperties = [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]

package/src/filiale/qingjian/RecordInfoQuery.vue

@@ -627,6 +627,7 @@
                   <th><nobr>单元</nobr></th>
                   <th><nobr>楼层</nobr></th>
                   <th><nobr>门牌号</nobr></th>
+                  <th><nobr>房屋类型</nobr></th>
                   <!--                  <th>-->
                   <!--                    <data-order field="f_userinfo_code" name="客户地址"-->
                   <!--                                :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>-->
@@ -801,6 +802,7 @@
                 <td style="text-align: center;"><nobr>{{row.f_floor}}</nobr></td>
 <!--                <td style="text-align: center;"><nobr>{{row.f_address}}</nobr></td>-->
                 <td style="text-align: center;"><nobr>{{row.f_room}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_house_type}}</nobr></td>
 <!--                <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>-->
                 <td style="text-align: center;"><nobr>{{row.f_book_slice_area}}</nobr></td>
 <!--                <td style="text-align: center;"><nobr>{{row.f_gas_date}}</nobr></td>-->

package/src/filiale/qingjian/exportConfig.js

@@ -604,6 +604,7 @@ export default {
     'f_unit': '单元',
     'f_floor': '楼层',
     'f_room': '门牌号',
+    'f_house_type': '房屋类型',
     'f_address': '详细地址',
     'f_area': '区域',
     'f_adjustable_name': '调压箱',

package/src/filiale/tongchuan/config/exportConfig.js

@@ -4,8 +4,8 @@ export default{
   userConfig: { 'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_user_phone': '客户电话',
     'f_idnumber': '身份证号', 'f_balance': '账户余额', 'f_address': '客户地址', 'f_residential_area': '小区',
     'f_building': '楼栋', 'f_unit': '单元', 'f_floor': '楼层', 'f_room': '门牌号',
-    'f_user_state': '客户状态', 'f_createfile_date': '建档日期', 'f_createfile_person': '建档人', 'f_comments': '备注'
-    ,'f_bank_accopen': '银行户名', 'f_bank_name': '银行名称', 'f_bank_account': '银行账号', 'f_inputtor': '抄表员',
+    'f_user_state': '客户状态', 'f_createfile_date': '建档日期', 'f_open_date': '开户日期', 'f_createfile_person': '建档人', 'f_comments': '备注',
+    'f_bank_accopen': '银行户名', 'f_bank_name': '银行名称', 'f_bank_account': '银行账号', 'f_inputtor': '抄表员',
     'f_bank_idnumber': '银行身份证号', 'f_bank_pay_number': '缴费编号', 'f_gas_date': '点火时间', 'isbgl': '是否壁挂炉',
     'f_is_mgq': '是否煤改气', 'f_is_empty': '是否空房', 'f_is_vacant': '是否空置户', 'f_is_alone': '是否孤寡老人'
   },

package/src/filiale/xinjiangdexin/RecordInfoQuery.vue

@@ -1221,7 +1221,7 @@
       },
       userTypeChange () {
         this.gasproperties=[]
-        if(this.$refs.paged.$refs.cri.model !== null) {
+        if(this.$refs.paged.$refs.cri.model !== null && this.$refs.paged.$refs.cri.model.f_user_type !== null && this.$refs.paged.$refs.cri.model.f_user_type !== undefined) {
           this.$refs.paged.$refs.cri.model.f_gasproperties=''
           this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0] || '')
           // this.gasproperties.push({label: '全部', value: ''})

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/qingjian/sale'
-import ShanXianwebSaleManage from './filiale/qingjian/webmeterManage'
+import ShanXianSaleManage from './filiale/hantou/sale'
+ // import ShanXianwebSaleManage from './filiale/rongcheng/webmeterManage'
 import webmeterManage from './webmeterManage'
 import reportManage from './reportManage'
 import newmanage from './newmanage'
@@ -51,7 +51,6 @@ ManageHome()
 newmanage()
 ShanXianSaleManage()
 reportManage()
-ShanXianwebSaleManage()
 // ShanXianSaleManage()
 require('system-clients/src/styles/less/bootstrap.less')
 require('./components/qinhua/Style/qinhuaStyle.less')