sale-client 3.5.151 → 3.5.152

package/package.json

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

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -58,7 +58,7 @@
       <footer slot="modal-footer" class="modal-footer">
       </footer>
     </modal>
-  <high-meter-idcard :show.sync="highmetershow" v-if="highmetershow"  @photo-finish="newPhoto" v-on:confirminfo="confirmIdCard"></high-meter-idcard>
+  <high-meter :show.sync="highmetershow" v-if="highmetershow"  @photo-finish="newPhoto" v-on:confirminfo="confirmIdCard"></high-meter>
 
     <modal :show.sync="filechangeDetailsShow" v-ref:filechangeDetailsShow backdrop="false" class="filechangeDetailsShow">
       <header slot="modal-header" class="modal-header" style="text-align: center">

package/src/components/chargeBatch/RecordCancel.vue

@@ -53,11 +53,24 @@
 </template>
 
 <script>
+  import {HttpResetClass} from "vue-client";
+
   let postGen = async function (self, name) {
     let url = 'rs/logic/' + name
-
+    let res
     // 获取冲正后的记录
-    let res = await self.$CancelService.cancel(url, self.model, self.data)
+    if (name == 'batchPaymentCancel') {
+      // 批量的使用进度条模式
+      self.model.uuid = self.$login.guid()
+      try {
+        await self.$CancelService.cancel(url, self.model, self.data, true)
+      } catch (e) {}
+      self.$showMessage(`正在批量处理中, 请耐心等待...`, [])
+      self.getProgress()
+      return
+    } else {
+      res = await self.$CancelService.cancel(url, self.model, self.data)
+    }
     console.log('冲正后的记录。。', res, self.model)
 
     // 判断需不需要判断冲正发票（发票管理）
@@ -180,13 +193,32 @@
         },
         // 启用发票管理需要对票号进行验证
         hasValidateBill: false,
-        validateOk: false
+        validateOk: false,
+        // 请求对象(批量导入,查询进度使用)
+        HttpReset: new HttpResetClass(),
+        timer: null
       }
     },
     ready () {
       readyGen(this)
     },
     methods: {
+      getProgress () {
+        // 启动定时器定时查询处理结果
+        this.timer = setInterval(async () => {
+          let res = await this.HttpReset.load('POST', 'rs/logic/getBatchOperaPro', {data: {uuid: this.model.uuid}}, {resolveMsg: null, rejectMsg: null})
+          if (res.data.msg || res.data.error) {
+            clearInterval(this.timer)
+            this.$closeMessage()
+            if (res.data.error) {
+              this.$showAlert(`${res.data.error}`, 'danger')
+              return
+            }
+            await this.$showMessage(res.data.msg)
+            this.$dispatch('cancel-success')
+          }
+        }, 5000)
+      },
       confirm () {
         // 整理数据
         let name = this.sortdata()

package/src/filiale/gehua/sale.js

@@ -3,7 +3,7 @@
 const Vue = require("vue");
 let specialComp = {
   // 高拍仪
-  'high-meter-idcard': (resolve) => { require(['./HighMeterIdCard'], resolve) },
+  'high-meter': (resolve) => { require(['./HighMeterIdCard'], resolve) },
   // 物联网表收费
   'iot-meter-center': (resolve) => { require(['./IOTMeterCenter'], resolve) },
   // MISPOS支付

package/src/filiale/shanxian/UserDeviceInfoTest.vue

@@ -51,7 +51,7 @@
                   <datepicker placeholder="备案日期" style="width: 60%"
                               v-model="row.f_filing_date"
                               :value.sync="row.f_filing_date"
-                              :format="'yyyy-MM-dd'">
+                              :format="'yyyy-MM-dd HH:mm:ss'">
                   </datepicker>
                 </div>
               </div>
@@ -84,7 +84,7 @@
                   <datepicker placeholder="安装日期" style="width: 60%"
                               v-model="row.f_input_date"
                               :value.sync="row.f_input_date"
-                              :format="'yyyy-MM-dd'">
+                              :format="'yyyy-MM-dd HH:mm:ss'">
                   </datepicker>
                 </div>
               </div>
@@ -95,7 +95,7 @@
                               v-model="row.f_make_date"
                               :value.sync="row.f_make_date"
                               :onchange="expireDate($index)"
-                              :format="'yyyy-MM-dd'">
+                              :format="'yyyy-MM-dd HH:mm:ss'">
                   </datepicker>
                 </div>
                 <div class="col-sm-6 form-group" style="padding-right: 5px;">
@@ -161,7 +161,7 @@
                   <datepicker placeholder="连接管安装日期" style="width: 60%"
                               v-model="row.f_pipeinstall_date"
                               :value.sync="row.f_pipeinstall_date"
-                              :format="'yyyy-MM-dd'">
+                              :format="'yyyy-MM-dd HH:mm:ss'">
                   </datepicker>
                 </div>
               </div>
@@ -171,7 +171,7 @@
                   <datepicker placeholder="连接管到期日期" style="width: 60%"
                               v-model="row.f_pipeexpire_date"
                               :value.sync="row.f_pipeexpire_date"
-                              :format="'yyyy-MM-dd'">
+                              :format="'yyyy-MM-dd HH:mm:ss'">
                   </datepicker>
                 </div>
                 <div class="col-sm-6 form-group" style="padding-right: 5px;">
@@ -336,8 +336,11 @@ export default {
         var year = (b.getFullYear() - 0) + (this.devicesinfo[index].f_service_life - 0)
         var month = (b.getMonth() - 0) + 1
         var day = b.getDate()
+        let hh = b.getHours()
+        let mm = b.getMinutes()
+        let ss = b.getSeconds()
         // this.$set(this.devicesinfo, index, {f_expire_date: year + '-' + (month < 10 ? '0' + month : month) + '-' + (day < 10 ? '0' + day : day)})
-        this.devicesinfo[index].f_expire_date = year + '-' + (month < 10 ? '0' + month : month) + '-' + (day < 10 ? '0' + day : day)
+        this.devicesinfo[index].f_expire_date = year + '-' + (month < 10 ? '0' + month : month) + '-' + (day < 10 ? '0' + day : day) + ' '+ (hh < 10 ? '0'+hh : hh)+ ':' + (mm < 10 ? '0'+ mm : mm)+ ':' + (ss < 10 ? '0'+ss : ss)
         this.devicesinfoShow = false
         this.$nextTick(() => {
           this.devicesinfoShow = true

package/src/plugins/CancelService.js

@@ -282,11 +282,14 @@ let CancelService = {
   },
 
   // 撤销操作
-  async cancel (url, model, data) {
+  async cancel (url, model, data, batch) {
     if (data.type === '机表收费' || data.type === '物联网收费') {
       return iotchargeCancel(model, data)
     } else {
       data.f_user_id = `${data.f_user_id}`
+      if (batch) {
+        return Vue.resetpost(url, {data: {model: model, recordData: data, f: Vue.$login.f}}, {resolveMsg: null, rejectMsg: null}, 1000)
+      }
       return Vue.resetpost(url, {data: {model: model, recordData: data, f: Vue.$login.f}}, {resolveMsg: '撤销成功', rejectMsg: '撤销失败'})
     }
   }