manage-client 4.0.96 → 4.1.2

package/build/dev-server.js

@@ -11,17 +11,17 @@ var compiler = webpack(config)
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-var shaoguan = 'http://192.168.50.67:31567/'
-var qtx = 'http://192.168.50.67:31567/'
+var shaoguan = 'http://119.146.1.106:8300/'
+var qtx = 'http://36.103.222.144:6300/'
 // var bendi = 'http://220.194.141.253:8600/'
 // var bendi = 'http://203.57.101.233:9001'
 // var bendi = 'http://172.168.1.11:9001/'
 // var bendi = 'http://203.57.101.233:9001/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://192.168.50.67:31567/'
+var bendi = 'http://192.168.50.67:30785/'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://192.168.50.67:31567/'
+var wode = 'http://192.168.50.67:30785/'
 // 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'
@@ -30,20 +30,38 @@ var proxyTable = {
     target: bendi
   },
   '/dataManage': {
-    target: 'http://192.168.50.67:31567/'
+    target: 'http://203.57.101.233:9001/'
 
   },
   '/api/af-revenue/sql/WeChatPaydetail': {
     pathRewrite: {
       '^/api/af-revenue': '/rs'
     },
-    target: 'http://192.168.50.67:31567/'
+    target: 'http://127.0.0.1:8080/'
   },
   '/api/af-revenue/sql/WeChatPayment': {
     pathRewrite: {
       '^/api/af-revenue': '/rs'
     },
-    target: 'http://192.168.50.67:31567/'
+    target: 'http://127.0.0.1:8080/'
+  },
+  '/api/af-revenue/sql/getGasInspection': {
+    pathRewrite: {
+      '^/api/af-revenue': '/rs'
+    },
+    target: 'http://127.0.0.1:8080/'
+  },
+  '/api/af-revenue/sql/inspectList_sellinggas': {
+    pathRewrite: {
+      '^/api/af-revenue': '/rs'
+    },
+    target: 'http://127.0.0.1:8080/'
+  },
+  '/api/af-revenue/sql/inspectList': {
+    pathRewrite: {
+      '^/api/af-revenue': '/rs'
+    },
+    target: 'http://127.0.0.1:8080/'
   },
   '/api': {
     target: 'http://192.168.50.67:31567/'
@@ -60,7 +78,7 @@ var proxyTable = {
   },
   // 查找资源服务数据
   '/rs/search': {
-    target: 'http://192.168.50.67:31567/'
+    target: 'http://192.168.50.67:30785/'
   },
   // 查找资源服务数据
   '/rs/logic/getLogin': {

package/package.json

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

package/src/components/sale/businessquery/GasInspection.vue

@@ -47,7 +47,19 @@
                         close-on-select >
               </v-select>
             </div>
-
+<!--            &lt;!&ndash;新增通气状态查询条件&ndash;&gt;-->
+<!--            <div class="col-sm-2 form-group">-->
+<!--              <label for="f_gas_date" class="font_normal_body">通气状态&emsp;</label>-->
+<!--              <v-select id="f_gas_date"-->
+<!--                        style="width:60%"-->
+<!--                        v-model="model.f_gas_date"-->
+<!--                        placeholder='通气状态'-->
+<!--                        :value.sync="model.f_gas_date"-->
+<!--                        :options='$parent.$parent.f_gas_date'-->
+<!--                        condition="ventilation_status = '{}'"-->
+<!--                        close-on-select>-->
+<!--              </v-select>-->
+<!--            </div>-->
             <div class="span" style="float:right;">
               <button class="btn button_search" @click="search()">查询</button>
               <button class="btn button_clear" @click="$parent.$parent.clear()">清空</button>
@@ -237,6 +249,7 @@
             <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>
@@ -264,6 +277,7 @@
           <th style="text-align: center;"><nobr>{{row.f_metertitles}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_user_type}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_gasproperties}}</nobr></th>
+<!--          <th style="text-align: center;"><nobr>{{row.ventilation_status}}</nobr></th>-->
           <th style="text-align: center;"><nobr>{{row.f_table_state}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_book_slice_area}}</nobr></th>
@@ -551,6 +565,9 @@
       gasproperties() {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用气性质')]
       },
+      f_gas_date() {
+        return [{label: ' 已通气 ', value: '已通气'}, {label: ' 未通气 ', value: '未通气'} ]
+      },
       f_meter_classify(){
         return [{label: '全部', value: ''}, {label: '卡表', value: '卡表'},{label: '机表', value: '机表'},{label: '网表', value: '物联网表'} ]
         // return [{label: '卡表', value: '卡表'}]

package/src/components/sale/businessquery/InspectListGas.vue

@@ -49,6 +49,19 @@
                             close-on-select >
                   </v-select>
                 </div>
+                <!--新增通气状态查询条件-->
+<!--                <div class="col-sm-2">-->
+<!--                  <label for="f_gas_date" class="font_normal_body">通气状态&emsp;</label>-->
+<!--                  <v-select id="f_gas_date"-->
+<!--                            style="width:60%"-->
+<!--                            v-model="model.f_gas_date"-->
+<!--                            placeholder='通气状态'-->
+<!--                            :value.sync="model.f_gas_date"-->
+<!--                            :options='$parent.$parent.f_gas_date'-->
+<!--                            condition="ss.ventilation_status = '{}'"-->
+<!--                            close-on-select>-->
+<!--                  </v-select>-->
+<!--                </div>-->
                 <div class="span" style="float:right;">
                   <button class="btn button_search" @click="search()">查询</button>
                   <button class="btn button_clear" @click="$parent.$parent.clear()">清空</button>
@@ -217,6 +230,7 @@
                 <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>
@@ -247,6 +261,7 @@
               <th style="text-align: center;"><nobr>{{row.f_address}}</nobr></th>
               <th style="text-align: center;"><nobr>{{row.f_user_type}}</nobr></th>
               <th style="text-align: center;"><nobr>{{row.f_gasproperties}}</nobr></th>
+<!--              <th style="text-align: center;"><nobr>{{row.ventilation_status}}</nobr></th>-->
               <th style="text-align: center;"><nobr>{{row.f_table_state}}</nobr></th>
               <th style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></th>
               <th style="text-align: center;"><nobr>{{row.f_price_name}}</nobr></th>
@@ -534,6 +549,9 @@
       contain_newfiles(){
         return [{label: '是', value: '是'},{label: '否', value: '否'} ]
       },
+      f_gas_date() {
+        return [{label: ' 已通气 ', value: '已通气'}, {label: ' 未通气 ', value: '未通气'} ]
+      },
       getCondition () {
         let result = {
           condition: '',