sale-client 3.4.131 → 3.4.134

package/build/dev-server.js

@@ -10,9 +10,9 @@ 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:8080/',bendi1 = 'http://119.146.1.106:8300/'
+var bendi = 'http://121.36.106.17:8400/',bendi1 = 'http://121.36.106.17:8400/'
 // 公司测试服务
-var fuwu = 'http://192.168.50.4:8400/'
+var fuwu = 'http://121.36.106.17:8400/'
 //铜川正式
 //  var fuwu = 'http://61.134.55.234:9999/'
 //铜川测试
@@ -88,14 +88,14 @@ var proxyTable = {
     target: fuwu
   },
   '/rs/report': {
-    target: 'http://127.0.0.1:8079'
+    target: 'http://121.36.106.17:8400/'
   },
   '/rs/vue': {
     target: fuwu
   },
   '/rs': {
     // target: 'http://192.168.30.63:8081/'
-    target: 'http://127.0.0.1:8078'
+    target: 'http://121.36.106.17:8400/'
     // target:fuwu
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.4.131",
+  "version": "3.4.134",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/charge/bzjcancel.vue

@@ -3,8 +3,10 @@
     <validator name='v'>
       <form novalidate class="form-horizontal">
         <div class="row">
-          <div class="col-sm-4 form-group">
+          <div class="col-sm-4 form-group"
+               :class="[$v.f_type.required ? 'has-error' : 'has-success']">
             <label for="f_type" class="font_normal_body ">操作类型</label>
+            <input v-show="false" class="input_search" style="width:60%" v-model="model.f_type" v-validate:f_type='{required: true}'>
             <v-select id="f_paytype"
                       v-model="model.f_type"
                       placeholder='操作类型'
@@ -12,6 +14,7 @@
                       :options='ftype'
                       condition="f_table_state = '{}'"
                       style="width: 60%"
+                      value-single
                       close-on-select></v-select>
           </div>
           <div class="col-sm-4 form-group"
@@ -34,6 +37,18 @@
             </v-select>
           </div>
         </div>
+        <div class="row" style="margin-top:10px;" v-if="model.f_type == '卡表退费'">
+          <div class="col-sm-4 form-group" :class="[$v.f_pregas.required || $v.f_pregas.dctest ? 'has-error' : 'has-success']">
+            <label for="f_pregas" class="font_normal_body">退费气量</label>
+            <input  class="input_search" style="width:60%" type="number"
+                    v-validate:f_pregas='{required: true, dctest: [0, ">" ]}' v-model="model.f_pregas" v-scale = "[model.f_pregas, 4]">
+          </div>
+          <div class="col-sm-4 form-group">
+            <label for="f_pregas" class="font_normal_body">单&emsp;&emsp;价</label>
+            <input  class="input_search" style="width:60%" type="number" v-model="model.f_price" v-scale = "[model.f_price, 4]">
+          </div>
+        </div>
+
         <div class="row">
           <div class="col-sm-8">
             <label for="f_paper_account" class="font_normal_body ">&nbsp;&nbsp;&nbsp;备注&nbsp;&nbsp;&nbsp;</label>
@@ -100,7 +115,9 @@
       return {
         model: {
           f_refund_fee: '',
-          f_comments: ''
+          f_comments: '',
+          f_price: 0,
+          f_pregas: 0
         },
         dis: false,
         blodid: '',
@@ -130,19 +147,42 @@
     },
     props: ['row'],
     ready () {
-
     },
     watch: {
-      'model.f_type[0]' (val) {
+      async 'model.f_type' (val) {
         if (val == '退保证金') {
           this.getEarnestMoney()
         } else {
           this.dis = false
           this.model.f_refund_fee = 0
+          if (val == '卡表退费') {
+            // 获取单价（阶梯使用一阶， 固定直接是固定）
+            let data = {
+              f_userfiles_id: this.row.f_userfiles_id,
+              isGasValue: 0,
+              value: 0
+            }
+            let res = await this.$CommonService.feeCalculate(data, 0)
+            if (this.row.f_price_type == '固定气价') {
+              this.model.f_price = res.data.chargeprice[0].f_price - 0
+            } else if (this.row.f_price_type == '阶梯气价') {
+              this.model.f_price = res.data.f_stair1price - 0
+            }
+            this.dis = true
+          }
         }
+      },
+      'model.f_pregas' () {
+        this.calPreamount()
+      },
+      'model.f_price' () {
+        this.calPreamount()
       }
     },
     methods: {
+      calPreamount () {
+        this.model.f_refund_fee = ((this.model.f_pregas - 0) * (this.model.f_price - 0)).toFixed(4)
+      },
       // 退保证金操作
       async returnOperate (row) {
         let rrr = await this.$showMessage('确认退此笔保证金吗?', ['confirm', 'cancel'])
@@ -205,8 +245,8 @@
           this.$showAlert('退费金额不能小于0', 'warning', 1500)
           return
         }
-        if (this.model.f_type[0] != '退保证金') {
-          if (this.model.f_type[0] == '退押金' && this.row.f_jayin && this.row.f_jayin == '1') {
+        if (this.model.f_type != '退保证金') {
+          if (this.model.f_type == '退押金' && this.row.f_jayin && this.row.f_jayin == '1') {
             this.$showAlert('此用户已退过押金', 'warning', 1500)
             return
           }
@@ -214,7 +254,7 @@
             f_user_id: this.row.f_user_id,
             f_userfiles_id: this.row.f_userfiles_id,
             f_payment: this.model.f_payment[0],
-            f_operat_type: this.model.f_type[0],
+            f_operat_type: this.model.f_type,
             version: this.row.version,
             f_comments: this.model.f_comments,
             f_collection: this.model.f_refund_fee,
@@ -231,10 +271,18 @@
               f_depname: this.$login.f.deps
             }
           }
-          let res = await this.$resetpost('rs/logic/yajincancel', {data: param}, {
-            warnMsg: `确定要进行${this.model.f_type[0]}操作吗？`,
-            resolveMsg: `${this.model.f_type[0]}操作成功！！`,
-            rejectMsg: `${this.model.f_type[0]}操作失败！！请重试！！`
+          let url = ''
+          if (this.model.f_type == '卡表退费') {
+            param.f_pregas = this.model.f_pregas
+            param.f_price = this.model.f_price
+            url = 'rs/logic/cardTableRefund'
+          } else {
+            url = 'rs/logic/yajincancel'
+          }
+          await this.$resetpost(url, {data: param}, {
+            warnMsg: `确定要进行${this.model.f_type}操作吗？`,
+            resolveMsg: `${this.model.f_type}操作成功！！`,
+            rejectMsg: `${this.model.f_type}操作失败！！请重试！！`
           })
           this.$dispatch('success')
         }

package/src/components/chargeBatch/CardList.vue

@@ -48,6 +48,7 @@
                 <div class="row">
                   <!--<strong :title="row.f_userinfo_code" class="col-sm-4" show-overflow-tooltip="true">{{row.f_userinfo_code.length>9?''+row.f_userinfo_code.substring(0,9)+'...':row.f_userinfo_code}}</strong>-->
                   <span class="col-sm-6">{{$parent.$parent.$parent.dateDes(row.f_operate_date)}}</span>
+<!--                  <span class="col-sm-6 font_normal_body" title="参数名称：付款方式">收款方式:</span>-->
                   <span class="col-sm-6">{{row.type}}</span>
                 </div>
               </div>
@@ -236,6 +237,7 @@
         operationtypes: [{label: '批量收费', value: '批量收费'}, {label: '团体收费', value: '团体收费'}],
         cancel_show: false,
         cancel_data: null,
+        paytype: this.$appdata.getParam('付款方式'),
 
         reissue_show: false,
         reissue_data: null,

package/src/components/meterBook/MeterManger.vue

@@ -1,61 +1,61 @@
-<template>
-  <div id="unit" class="flex-row">
-    <div :class="{'basic-main':!meterShow,'binary-left':meterShow}">
-      <meter-list @select-changed="selected" v-ref:arealist   :style="style" :f_filialeids.sync="f_filialeids" :refresh="refresh"></meter-list>
-    </div>
-    <div v-if="meterShow" style="width: 60%" class="binary-right">
-      <div class="flex">
-        <meter-msg v-ref:addareamsg :bookinfo="bookinfo"></meter-msg>
-      </div>
-    </div>
-    <div v-if="addShow" style="width: 60%" class="binary-right">
-      <div class="flex">
-        <add-meter-book v-ref:addareamsg :changeinfo="changeinfo" :dowhat="dowhat"></add-meter-book>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-  export default {
-    title: '表册管理',
-    components: {
-    },
-    data () {
-      return {
-        // 分公司id串
-        width: '100%',
-        f_filialeids: this.$login.f.f_orgids,
-        meterShow: false,
-        addShow: false,
-        bookinfo: {},
-        style: 'col-sm-2 ',
-        changeinfo: {},
-        dowhat: '',
-        refresh: 1
-      }
-    },
-    ready () {
-
-    },
-    props: {
-
-    },
-    methods: {
-      selected (obj) {
-        this.style = 'col-sm-3 '
-        this.bookinfo = obj.val
-        this.dowhat = 'add'
-        this.meterShow = true
-        this.addShow = false
-      },
-      refresh () {
-        this.meterShow = false
-      }
-    },
-    events: {
-
-    }
-  }
-</script>
-
+<template>
+  <div id="unit" class="flex-row">
+    <div :class="{'basic-main':!meterShow,'binary-left':meterShow}">
+      <meter-list @select-changed="selected" v-ref:arealist   :style="style" :f_filialeids.sync="f_filialeids" :refresh="refresh"></meter-list>
+    </div>
+    <div v-if="meterShow" style="width: 60%" class="binary-right">
+      <div class="flex">
+        <meter-msg v-ref:addareamsg :bookinfo="bookinfo"></meter-msg>
+      </div>
+    </div>
+    <div v-if="addShow" style="width: 60%" class="binary-right">
+      <div class="flex">
+        <add-meter-book v-ref:addareamsg :changeinfo="changeinfo" :dowhat="dowhat"></add-meter-book>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    title: '表册管理',
+    components: {
+    },
+    data () {
+      return {
+        // 分公司id串
+        width: '100%',
+        f_filialeids: this.$login.f.f_orgids,
+        meterShow: false,
+        addShow: false,
+        bookinfo: {},
+        style: 'col-sm-2 ',
+        changeinfo: {},
+        dowhat: '',
+        refresh: 1
+      }
+    },
+    ready () {
+
+    },
+    props: {
+
+    },
+    methods: {
+      selected (obj) {
+        this.style = 'col-sm-3 '
+        this.bookinfo = obj.val
+        this.dowhat = 'add'
+        this.meterShow = true
+        this.addShow = false
+      },
+      refresh () {
+        this.meterShow = false
+      }
+    },
+    events: {
+
+    }
+  }
+</script>
+

package/src/components/revenue/HandManager/CardHand.vue

@@ -51,13 +51,6 @@
                             :show-reset-button="true">
                 </datepicker>
               </div>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">小区域</label>
-                <v-select :value.sync="model.f_small_area" v-model="model.f_small_area"
-                          :options='$parent.$parent.smallareas' placeholder='小区域'
-                          close-on-select :search='true'
-                          condition="f_small_area = '{}'"></v-select>
-              </div>
               <!--<div class="form-group">-->
               <!--<input style="width:60%" type="text" class="form-control" v-model="model.f_user_id"-->
               <!--condition="f_user_id='{}'" placeholder='表编号'-->
@@ -83,6 +76,13 @@
               </div>
             </div>
             <div class="row" v-show="$parent.$parent.criteriaShow">
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">&emsp;小区域</label>
+                <v-select :value.sync="model.f_small_area" v-model="model.f_small_area"
+                          :options='$parent.$parent.smallareas' placeholder='小区域'
+                          close-on-select :search='true'
+                          condition="f_small_area = '{}'"></v-select>
+              </div>
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">用户姓名</label>
                 <input style="width:60%" type="text" class="form-control" v-model="model.f_user_name" placeholder='用户姓名'