manage-client 4.1.128 → 4.1.130

package/build/dev-server.js

@@ -6,7 +6,7 @@ const proxyMiddleware = require('http-proxy-middleware')
 const app = express()
 const compiler = webpack(config)
 
-const server = 'http://123.57.3.66:31467/'
+const server = 'http://192.168.50.67:31567/'
 const local = 'http://127.0.0.1:9026/'
 const proxyTable = {
   '/rs/logic/exportfile': {
@@ -17,21 +17,21 @@ const proxyTable = {
   },
   '/api/af-revenue/sql/': {
     pathRewrite: {
-      '^/api/af-revenue': '/singlepage/api/af-revenue/'
+      '^/api/af-revenue': '/'
     },
-    target: server
+    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/'
+      '^/api/af-revenue': '/'
     },
-    target: server
+    target: local
   },
   '/api': {
     target: server

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "4.1.128",
+    "version": "4.1.130",
     "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/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('用气性质')]
       },