manage-client 3.3.243 → 3.3.245

package/build/dev-server.js

@@ -16,12 +16,12 @@ 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:8400/'
+// var bendi = 'http://192.168.50.4:8400/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://203.57.101.233:8400/'
+var bendi = 'http://192.168.50.4:8400/'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://203.57.101.233:8400/'
+var wode = 'http://192.168.50.4: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.243",
+    "version": "3.3.245",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {

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

@@ -314,6 +314,15 @@
                 <th>
                   <nobr>公司</nobr>
                 </th>
+                <th>
+                  <nobr>抵扣单价</nobr>
+                </th>
+                <th>
+                  <nobr>本次抵扣金额</nobr>
+                </th>
+                <th>
+                  <nobr>剩余抵扣金额</nobr>
+                </th>
               </tr>
             </template>
             <template partial='body'>
@@ -437,6 +446,15 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_orgname}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{ row.f_gas_type }}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{ row.f_current_deduct_amount }}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{ row.f_remaining_deduct_amount }}</nobr>
+              </td>
             </template>
             <template partial='foot'></template>
           </data-grid>
@@ -913,7 +931,7 @@
           'f_balance': '上期余额', 'f_curbalance': '本期余额', 'f_hand_date': '抄表日期','f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
           'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司',
           'f_stair1amount': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费','f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费',
-          'f_stair3amount': '三阶气量','f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'belongmonth': '所属年月'
+          'f_stair3amount': '三阶气量','f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'belongmonth': '所属年月','f_current_deduct_amount':'本次抵扣金额','f_remaining_deduct_amount':'剩余抵扣金额'
         }
       },
       getBankfield(){

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

@@ -18,13 +18,13 @@
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户编号</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_userinfo_code" placeholder='客户编号'
-                         condition="ss.f_userinfo_code like '%{}%'" v-next-el='f_userinfo_code' v-el:meternumber
+                         condition="ss.f_userinfo_code = '{}'" v-next-el='f_userinfo_code' v-el:meternumber
                   >
                 </div>
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户名称</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_username" placeholder='客户名称'
-                         condition="ss.f_user_name like '%{}%'" v-next-el='userid' v-el:username>
+                         condition="ss.f_user_name = '{}'" v-next-el='userid' v-el:username>
                 </div>
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户地址</label>
@@ -49,18 +49,18 @@
                 <div class="col-sm-2">
                   <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_user_phone" placeholder='电话'
-                         condition="ss.f_user_phone like '%{}%'" v-next-el='f_user_phone' v-el:f_user_phone
+                         condition="ss.f_user_phone = '{}'" v-next-el='f_user_phone' v-el:f_user_phone
                   >
                 </div>
                 <div class="col-sm-2">
                   <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='小区'
-                         condition="ss.f_residential_area like '%{}%'" v-next-el='f_residential_area' v-el:f_residential_area>
+                         condition="ss.f_residential_area = '{}'" v-next-el='f_residential_area' v-el:f_residential_area>
                 </div>
                 <div class="col-sm-2">
                   <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_meternumber" placeholder='表号'
-                         condition="ss.f_meternumber like '%{}%'" v-next-el='meternumber' v-el:meternumber
+                         condition="ss.f_meternumber = '{}'" v-next-el='meternumber' v-el:meternumber
                   >
                 </div>
                 <div class="col-sm-2">

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

@@ -18,13 +18,13 @@
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户编号</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_userinfo_code" placeholder='客户编号'
-                         condition="ss.f_userinfo_code like '%{}%'" v-next-el='f_userinfo_code' v-el:meternumber
+                         condition="ss.f_userinfo_code = '{}'" v-next-el='f_userinfo_code' v-el:meternumber
                   >
                 </div>
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户名称</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_username" placeholder='客户名称'
-                         condition="ss.f_user_name like '%{}%'" v-next-el='userid' v-el:username>
+                         condition="ss.f_user_name = '{}'" v-next-el='userid' v-el:username>
                 </div>
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户地址</label>
@@ -49,7 +49,7 @@
                 <div class="col-sm-2">
                   <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_user_phone" placeholder='电话'
-                         condition="ss.f_user_phone like '%{}%'" v-next-el='f_user_phone' v-el:f_user_phone
+                         condition="ss.f_user_phone = '{}'" v-next-el='f_user_phone' v-el:f_user_phone
                   >
                 </div>
                 <div class="col-sm-2">
@@ -60,7 +60,7 @@
                 <div class="col-sm-2">
                   <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_meternumber" placeholder='表号'
-                         condition="ss.f_meternumber like '%{}%'" v-next-el='meternumber' v-el:meternumber
+                         condition="ss.f_meternumber = '{}'" v-next-el='meternumber' v-el:meternumber
                   >
                 </div>
                 <div class="col-sm-2">

package/src/components/webmeter/handplan/NewWebMeterHandPlan.vue

@@ -49,7 +49,7 @@
         <div class="row" v-show="$parent.$parent.criteriaShow">
           <div class="col-sm-2 form-group">
             <label class="font_normal_body">用气地址</label>
-            <input style="width:60%" class="input_search" condition="u.f_address like '%{}%'" placeholder='用气地址'
+            <input style="width:60%" class="input_search" condition="a.f_address like '%{}%'" placeholder='用气地址'
                    type="text"
                    v-model="model.f_address"
             >

package/src/components/webmeter/newwebmeter/NewException/TotalExceptionByMeter.vue

@@ -367,7 +367,7 @@
           user:[]
         },
         condition: '1=1',
-        org:[this.$login.f.orgid],
+        org:`u.${[this.$login.f.orgid]}`,
         orgCondtionStr: ` and u.f_orgid = ${this.$login.f.orgid}`
       }
     },

package/src/filiale/fugou/RecordInfoQuery.vue

@@ -205,6 +205,11 @@
                                   condition="f_hand_date <= '{} 23:59:59'">
                       </datepicker>
                     </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_building"
+                            condition="f_community like '%{}%'" placeholder='片区/行政村'>
+                  </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">小&emsp;&emsp;区</label>
                     <v-select :value.sync="model.f_residential_area"