manage-client 3.3.242 → 3.3.244

package/build/dev-server.js

@@ -19,17 +19,13 @@ var qtx= 'http://36.103.222.144:6300/'
 // var bendi = 'http://203.57.101.233:8400/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://192.168.50.4:8400/'
+var bendi = 'http://203.57.101.233:8400/'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://192.168.50.4:8400/'
+var wode = 'http://203.57.101.233: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'
 var proxyTable = {
-  '/api/af-revenue': {
-    pathRewrite: {'/api/af-revenue': '/'},
-    target: 'http://127.0.0.1:9026'
-  },
   '/rs/logic/exportfile': {
     target: bendi
   },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "3.3.242",
+    "version": "3.3.244",
     "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/filiale/kelai/NewAccountQuery.vue

@@ -65,41 +65,41 @@
                                 sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="newAccountQuery" template-name='开户查询导出'
                                 :choose-col="true"></export-excel>
 
-<!--                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>-->
+                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
                 </div>
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">用气性质</label>
-                  <v-select :value.sync="model.f_gasproperties"
-                            v-model="model.f_gasproperties"
-                            :options='$parent.$parent.gaspropertyTypes' placeholder='请选择'
-                            condition=" f_gasproperties = '{}'"
-                            close-on-select></v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">气表品牌</label>
-                  <v-select :value.sync="model.f_meter_brand"
-                            v-model="model.f_meter_brand"
-                            :options='$parent.$parent.meterbrands' placeholder='请选择'
-                            condition="f_meter_brand = '{}'"
-                            close-on-select></v-select>
-                </div>
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">用气性质</label>-->
+<!--                  <v-select :value.sync="model.f_gasproperties"-->
+<!--                            v-model="model.f_gasproperties"-->
+<!--                            :options='$parent.$parent.gaspropertyTypes' placeholder='请选择'-->
+<!--                            condition=" f_gasproperties = '{}'"-->
+<!--                            close-on-select></v-select>-->
+<!--                </div>-->
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">气表品牌</label>-->
+<!--                  <v-select :value.sync="model.f_meter_brand"-->
+<!--                            v-model="model.f_meter_brand"-->
+<!--                            :options='$parent.$parent.meterbrands' placeholder='请选择'-->
+<!--                            condition="f_meter_brand = '{}'"-->
+<!--                            close-on-select></v-select>-->
+<!--                </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_address"
                        condition="f_address like '%{}%'" placeholder='客户地址'>
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_residential_area"
-                         condition="f_residential_area like '%{}%'" placeholder="小区"/>
-                </div>
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>-->
+<!--                  <input type="text" style="width:60%" class="input_search" v-model="model.f_residential_area"-->
+<!--                         condition="f_residential_area like '%{}%'" placeholder="小区"/>-->
+<!--                </div>-->
               </div>
-              <div class="row" v-show="$parent.$parent.criteriaShow">
-                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+<!--              <div class="row" v-show="$parent.$parent.criteriaShow">-->
+<!--                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>-->
 
-              </div>
+<!--              </div>-->
 
             </div>
           </criteria>

package/src/main.js

@@ -6,7 +6,7 @@ import { all } from 'vue-client'
 import { system } from 'system-clients'
 import { ldap } from 'ldap-clients'
 import saleManage from './saleManage'
-import ShanXianSaleManage from './filiale/shexian/sale'
+import ShanXianSaleManage from './filiale/hantou/sale'
 import webmeterManage from './webmeterManage'
 import reportManage from './reportManage'
 import newmanage from './newmanage'

package/.gitattributes

@@ -1,6 +0,0 @@
-#
-# https://help.github.com/articles/dealing-with-line-endings/
-#
-# These are explicitly windows files and should use crlf
-*.bat           text eol=crlf
-