sale-client 3.5.121 → 3.5.122

package/.babelrc

@@ -1,5 +1,5 @@
-{
-  "presets": ["es2015", "stage-2"],
-  "plugins": ["transform-runtime"],
-  "comments": false
-}
+{
+  "presets": ["es2015", "stage-2"],
+  "plugins": ["transform-runtime"],
+  "comments": false
+}

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Fri Apr 02 10:09:16 CST 2021
+gradle.version=3.5.1

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -0,0 +1 @@
+

package/build/dev-server.js

@@ -10,10 +10,10 @@ var compiler = webpack(config)
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-var bendi = 'http://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400/'
+var bendi = 'http://127.0.0.1:8080', 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://192.168.50.4:8400'
+// var fuwu = 'http://39.99.85.14:8400'
 // var fuwu = 'http://121.36.106.17:8400/'
 // 铜川正式
 //  var fuwu = 'http://61.134.55.234:9999/'
@@ -132,7 +132,7 @@ var proxyTable = {
   '/rs': {
     // target: 'http://192.168.30.63:8081/'
     // target: 'http://121.36.106.17:8400/'
-    target: fuwu
+    target: bendi
   }
 }
 

package/package.json

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

package/src/components/chargeBatch/BatchCharge.vue

@@ -254,7 +254,14 @@ export default {
         }
       }
       for (let row of this.owe.rows) {
-        param.chargeUser.push({f_userinfo_id: row.f_userinfo_id, f_collection: row.f_oughtfee_all})
+        param.chargeUser.push({
+          f_userinfo_id: row.f_userinfo_id,
+          f_collection: row.f_oughtfee_all,
+          f_oughtfee: row.f_oughtfee,
+          f_oughtamount: row.f_oughtamount,
+          min_handplan_id: row.min_handplan_id,
+          max_handplan_id: row.max_handplan_id
+        })
       }
       if (this.civill) {
         param = Object.assign(this.civill, param)

package/src/components/revenue/comprehen/ComprehenOperation/removeTable.vue

@@ -158,6 +158,34 @@ export default {
           return
         }
         this.saveobj()
+      } else {
+        //物联网表拆表
+        this.$showMessage(`将生成抄表记录，是否确认`, ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            let data = {
+              downDate: this.$login.toStandardTimeString(),
+              startDate: this.$login.toStandardDateString(),
+              endDate: this.$login.toStandardDateString(),
+              condition: `f_userfiles_id = '${this.row.f_userfiles_id}'`,
+              f_operator: this.$login.f.name,
+              f_operatorid: this.$login.f.id,
+              f_meternumber: this.row.f_meternumber,
+              f_userinfo_id: this.row.f_userinfo_id,
+              f_userfiles_id: this.row.f_userfiles_id,
+              f_meterbase: this.model.f_using_base_old,
+              f_meter_brand: this.row.f_meter_brand,
+              f_price_id: this.row.f_price_id
+            }
+            //划价
+            this.$resetpost('rs/logic/changeMeterHand', {data: data}, {resolveMsg: null,rejectMsg:null }).then((res) => {
+                console.log('划价成功')
+                //保存拆表记录
+                this.saveobj()
+            })
+          } else {
+            //取消
+          }
+        })
       }
     },
     async saveobj () {