sale-client 3.5.79 → 3.5.81

package/build/dev-server.js

@@ -12,7 +12,7 @@ var compiler = webpack(config)
 // https://github.com/chimurai/http-proxy-middleware
 var bendi = 'http://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400/'
 // 公司测试服务
-var fuwu = '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/'

package/package.json

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

package/src/filiale/qianneng/revenue/machineHandManage/machineDown.vue

@@ -912,7 +912,7 @@
       //   console.log('获取新的条件。', this.condition)
       //   this.confirmDownHand()
       // },
-      confirmDownHand () {
+      async confirmDownHand() {
         console.log('下发数据。。', this.downModel)
         let data = {
           downDate: this.downModel.downDate,
@@ -928,7 +928,7 @@
         let jobParam = {
           f_operatorid: this.$login.f.id,
           total: 0,
-          operator: this.$login.f.orgs +":"+ this.$login.f.deps +":"+  Vue.$login.f.name,
+          operator: this.$login.f.orgs + ":" + this.$login.f.deps + ":" + Vue.$login.f.name,
           jobType: "计划下发"
         }
         let param = {
@@ -936,16 +936,16 @@
           jobParam: jobParam
         }
         console.log('下发参数：', param)
-        // rs/business/batchRun/
-        this.$resetpost('rs/business/batchRunNew/BatchmachineDownHand/machineDownHand', {data: param}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-          // 将缓存的未抄表ID数组置空
-          // this.unhandplan = []
+          // rs/business/batchRun/
+          let res = await this.$resetpost('rs/business/batchRunNew/BatchmachineDownHand/machineDownHand', {data: param}, {
+            resolveMsg: null,
+            rejectMsg: null
+          },60000*3)
           this.initModal()
           this.search()
-          this.$showAlert(`全部下发,总计下发${res.data}户`, 'success', 2000)
-        }).catch((error) => {
-          this.$showAlert(`下发失败,请注意查看，失败原因：${error}`, 'danger', 0)
-        })
+          if (res.data){
+            this.$showAlert(`全部下发,总计下发${res.data.successnum}户`, 'success', 2000)
+          }
       },
       // 关闭下发计划得弹出框
       close () {

package/src/filiale/zhongyi/MeterReadAudit.vue

@@ -16,7 +16,7 @@
                         :value.sync="model.f_hand_state"
                         :options='$parent.$parent.states'
                         close-on-select
-                        condition= "f_hand_state = {}"
+                        condition=" {} "
                         @change="$parent.$parent.search">
               </v-select>
             </div>
@@ -201,7 +201,10 @@
         pushdata: {openid: '', cause: ''},
         row: null,
         model: new PagedList('rs/sql/meterReadAudit', 20),
-        states: [{label: '待审核', value: `'待审核'`}, {label: '未通过', value: `'无效'`}, {label: '已通过', value: `'有效'`}],
+        states: [{label: '待审核', value: ` f_meter_state = '待审核' and f_hand_state ='有效'`}, {
+          label: '未通过',
+          value: ` f_hand_state = '无效'`
+        }, {label: '已通过', value: `f_meter_state = '已抄表' and f_hand_state ='有效'`}],
         meterbooks: [{label: '全部', value: ''}]
       }
     },

package/src/filiale/zhongyi/sale.js

@@ -1,5 +1,4 @@
 // 分公司特殊组件页面注册
-const Vue = require('vue')
 let specialComp = {
   // 表具单个信息
   'file-meter-info': (resolve) => { require(['./MeterinfoTest'], resolve) },
@@ -25,6 +24,5 @@ let specialComp = {
   'change-meter': (resolve) => { require(['./ChangeMeter'], resolve) },
   // 自报表数审核
   'meter-read-audit': (resolve) => { require(['./MeterReadAudit'], resolve) }
-
 }
 exports.specialComp = specialComp

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Mon Oct 31 20:38:03 CST 2022
-gradle.version=5.2.1