sale-client 3.4.124 → 3.4.127

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.4.124",
+  "version": "3.4.127",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -88,7 +88,7 @@
     "style-loader": "^0.20.3",
     "system-clients": "3.2.0-2",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.48",
+    "vue-client": "1.24.49",
     "vue-clipboard2": "0.3.1",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",

package/src/components/charge/ChargeList.vue

@@ -98,11 +98,6 @@
                         condition="i.f_user_level = '{}'"
                         close-on-select style="width: 60%"></v-select>
             </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">卡&emsp;&emsp;号</label>
-              <input type="text" class="input_search" style="width:60%" v-model="model.f_card_id" placeholder='卡号'
-                     condition="f_card_id like '%{}%'">
-            </div>
             <div class="form-group col-sm-3" >
               <label class="font_normal_body">组织机构</label>
               <res-select :initresid='$parent.$parent.curorgid'
@@ -112,6 +107,11 @@
                           style="width: 60%">
               </res-select>
             </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">卡&emsp;&emsp;号</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_card_id" placeholder='卡号'
+                     condition="f_card_id like '%{}%'">
+            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">使用类型</label>
               <v-select v-model="model.f_usetype"

package/src/components/charge/business/CardMeterCenter.vue

@@ -263,7 +263,7 @@
       <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_after_discount"></payment-code>
     </div>
   </div>
-  <upload :blodid="blodid" v-if="config.showupload" isremark="true" fusetype="卡表收费"></upload>
+  <upload :blodid="row.f_userinfo_id" v-if="config.showupload" isremark="true" fusetype="卡表收费"></upload>
 </template>
 <script>
   import {HttpResetClass} from 'vue-client'
@@ -362,7 +362,6 @@
       // 加入扫码盒付款码支付流水号
       self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
       let res = await self.$CardService.sellgas(self.model, self.row)
-      console.log('----------------->卡表收费返回id', res)
       let localeSustainMoney = window.localStorage.getItem('sustainMoney')
       if (localeSustainMoney != null) {
         localeSustainMoney = (localeSustainMoney - 0) + (self.model.f_collection - 0)