manage-client 3.2.180 → 3.2.182

package/build/dev-server.js

@@ -13,8 +13,8 @@ var compiler = webpack(config)
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
 var shaoguan = 'http://119.146.1.106:8300/'
 var qtx= 'http://36.103.222.144:6300/'
-// var bendi = 'http://192.168.50.4:8400'
- var bendi = 'http://203.57.101.233:9001'
+ var bendi = 'http://220.194.141.253:8600/'
+// var bendi = 'http://203.57.101.233:9001'
 var fuwu = 'http://172.168.1.11:9001/'
 // var fuwu = 'http://203.57.101.233:9001'
 var system = 'http://192.168.50.4:8400'
@@ -31,6 +31,12 @@ var proxyTable = {
   '/rs/sql/BusinessType': {
     target: 'http://localhost:8080/'
   },
+  '/rs/logic/getBatchOperaPro': {
+    target: 'http://localhost:8080/'
+  },
+  '/rs/customExport/areaChargeExportExcel': {
+    target: 'http://localhost:8080/'
+  },
   '/files': {
     target: bendi
   },

package/package.json

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

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

@@ -8,7 +8,7 @@
               <div class="row">
                 <div class="col-sm-2 form-group">
 
-                  <label for="startDate" class="font_normal_body" title="归属日期">开始日期</label>
+                  <label for="startDate" class="font_normal_body color-red" style="color: red;" title="归属日期">开始日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
                               v-model="model.startDate"
                               :value.sync="model.startDate"
@@ -18,7 +18,7 @@
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body" title="归属日期">结束日期</label>
+                  <label for="endDate" class="font_normal_body color-red" style="color: red;" title="归属日期">结束日期</label>
                   <datepicker id="endDate" placeholder="结束日期" style="width:60%"
                               v-model="model.endDate"
                               :value.sync="model.endDate"
@@ -81,7 +81,7 @@
                 </div>
                 <div class="col-sm-2 form-group">
 
-                  <label for="inputstartDate" class="font_normal_body">抄表日期</label>
+                  <label for="inputstartDate" class="font_normal_body color-red"style="color: red;">抄表日期</label>
                   <datepicker id="inputstartDate" placeholder="开始日期" style="width:60%"
                               v-model="model.inputstartDate"
                               :value.sync="model.inputstartDate"
@@ -91,7 +91,7 @@
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label for="inputendDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                  <label for="inputendDate" class="font_normal_body color-red" style="color: red;">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
                   <datepicker id="inputendDate" placeholder="结束日期" style="width:60%"
                               v-model="model.inputendDate"
                               :value.sync="model.inputendDate"
@@ -781,7 +781,9 @@
         console.log('开始时间',this.$refs.paged.$refs.cri.model.startDate)
         if (this.$refs.paged.$refs.cri.model.startDate === '' || this.$refs.paged.$refs.cri.model.endDate === ''){
           this.$showAlert('请先选择开始时间、结束时间，再进行查询操作！', 'warning', 3000)
-        } else {
+        }else if(this.$refs.paged.$refs.cri.model.inputstartDate === '' || this.$refs.paged.$refs.cri.model.inputendDate === ''){
+          this.$showAlert('请先选择抄表开始时间、抄表结束时间，再进行查询操作！', 'warning', 3000)
+        }else {
           //小区查询条件
           let f_orgstr = this.orgCondtionStr
           let str='1=1 '
@@ -937,3 +939,8 @@
     }
   }
 </script>
+<style lang="less">
+.color-red {
+  color: red;
+}
+</style>

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

@@ -173,7 +173,7 @@ export default{
     'f_oughtfee_all': '合计欠费金额','f_oughtfee_col': '实际欠费金额', 'f_cost_type': '缴费方式', 'f_meter_type': '气表类型'
   },
   areaChargeQueryConfig: {
-    'f_residential_area': '小区','f_price': '单价','f_households': '户数','f_gas': '购气方量','f_preamount': '购气应收金额','f_money': '购气实收金额'
+    'f_residential_area': '小区','f_price': '单价','f_gas': '购气方量','f_money': '购气金额'
   },
   arrearsGYConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_meternumber': '表号', 'f_residential_area': '小区名称', 'f_address': '客户地址',