sale-client 3.6.120 → 3.6.122

package/package.json

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

package/src/components/FilesManage/FileUserFiles.vue

@@ -37,6 +37,15 @@
                            placeholder='客户姓名'
                            style="width:60%" type="text" v-model="model.f_user_name">
                   </div>
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group">
+                    <label class="font_normal_body">合同编号</label>
+                    <input class="input_search" condition="f_contract_id = '{}'"
+                           v-model="model.f_contract_id"
+                           placeholder='合同编号'
+                           style="width:60%" type="text" >
+                  </div>
                   <div
                           :class="{'col-sm-3':$parent.$parent.clientWidth>1600||!$parent.$parent.createFile,'col-sm-4':$parent.$parent.clientWidth<1600&&$parent.$parent.createFile}"
                           class="form-group button-range">
@@ -308,6 +317,9 @@
                   <th>
                     <nobr>客户名称</nobr>
                   </th>
+                  <th>
+                    <nobr>合同编号</nobr>
+                  </th>
                   <th>
                     <nobr>表号</nobr>
                   </th>
@@ -362,6 +374,7 @@
                 <td style="text-align: center;">
                   <span @click="$parent.$parent.$parent.dealmsg(row)"><a><b>{{row.f_user_name}}</b></a></span>
                 </td>
+                <td style="text-align: center;">{{row.f_contract_id}}</td>
                 <td style="text-align: center;">{{row.f_meternumber}}</td>
                 <td style="text-align: center;">{{row.f_card_id}}</td>
                 <td style="text-align: center;">{{row.f_user_phone}}</td>

package/src/components/FilesManage/UserDeviceInfoTest.vue

@@ -170,12 +170,19 @@
                   <datepicker placeholder="连接管安装日期" style="width: 60%"
                               v-model="row.f_pipeinstall_date"
                               :value.sync="row.f_pipeinstall_date"
+                              :onchange="ljgexpireDate($index)"
                               :format="'yyyy-MM-dd'">
                   </datepicker>
                 </div>
               </div>
               <div class="row auto" style="margin-left: 10px;">
                 <div class="col-sm-6 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">使用年限</label>
+                  <input type="number" class="input_search" style="width: 60%" v-model="row.f_service_liferg"
+                         :value.sync="row.f_service_liferg"
+                         :onchange="ljgexpireDate($index)">
+                </div>
+                <div class="col-sm-6 form-group" style="padding-right: 5px;" v-if="ljgDevicesinfoShow">
                   <label class="font_normal_body" title="连接管到期日期">到期日期</label>
                   <datepicker placeholder="连接管到期日期" style="width: 60%"
                               v-model="row.f_pipeexpire_date"
@@ -282,7 +289,8 @@ export default {
       f_make_date: '',
       f_expire_date: '',
       f_service_life: 0,
-      devicesinfoShow: true
+      devicesinfoShow: true,
+      ljgDevicesinfoShow: true
     }
   },
   props: {
@@ -373,6 +381,22 @@ export default {
         })
       }
     },
+    ljgexpireDate (index) {
+      if (this.devicesinfo[index].f_pipeinstall_date === '' || this.devicesinfo[index].f_pipeinstall_date === undefined || this.devicesinfo[index].f_service_liferg === 0 || this.devicesinfo[index].f_service_liferg === undefined) {
+
+      } else {
+        var b = new Date(this.devicesinfo[index].f_pipeinstall_date)
+        var year = (b.getFullYear() - 0) + (this.devicesinfo[index].f_service_liferg - 0)
+        var month = (b.getMonth() - 0) + 1
+        var day = b.getDate()
+        // this.$set(this.devicesinfo, index, {f_expire_date: year + '-' + (month < 10 ? '0' + month : month) + '-' + (day < 10 ? '0' + day : day)})
+        this.devicesinfo[index].f_pipeexpire_date = year + '-' + (month < 10 ? '0' + month : month) + '-' + (day < 10 ? '0' + day : day)
+        this.ljgDevicesinfoShow = false
+        this.$nextTick(() => {
+          this.ljgDevicesinfoShow = true
+        })
+      }
+    },
     async brandChange (index) {
       console.log('this.devicesinfo[index].f_brand', this.devicesinfo[index].f_brand)
       this.devicesModel = []

package/src/components/charge/business/refund_copy/RefundManage.vue

@@ -1,19 +1,19 @@
 <template>
   <div class="auto">
-    <iot-refund v-if="row.f_meter_type === '物联网表'" :data="row"></iot-refund>
-    <machine-Refund v-if="row.f_meter_type !== '物联网表'" :data="row"></machine-Refund>
+    <iot-refund-copy v-if="row.f_meter_type === '物联网表'" :data="row"></iot-refund-copy>
+    <machine-refund-copy v-if="row.f_meter_type !== '物联网表'" :data="row"></machine-refund-copy>
   </div>
 
 </template>
 <script>
-  import IotRefund from './IOTRefund'
-  import machineRefund from './machineRefund'
+  import IotRefundCopy from './IOTRefund'
+  import machineRefundCopy from './machineRefund'
 
   export default {
     title: '退费管理',
     components: {
-      IotRefund,
-      machineRefund
+      IotRefundCopy,
+      machineRefundCopy
     },
     data () {
       return {

package/src/components/chargeBatch/BatchCharge.vue

@@ -92,10 +92,24 @@
       <payment-code v-ref:paymentcode :payment="data.f_payment" :row="row" :money="data.f_after_discount"></payment-code>
     </div>
   </div>
+  <modal :show.sync="show" v-ref:modal backdrop="false">
+    <header slot="modal-header" class="modal-header text-center">
+      <h4 class="modal-title">正在批量处理中, 请耐心等待...</h4>
+    </header>
+    <article slot="modal-body">
+      <div class="progress" style="margin: 20px">
+        <div class="progress-bar progress-bar-success progress-bar-striped active" :style="{width: `${percent}%`}">
+          {{ percent }}
+        </div>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+    </footer>
+  </modal>
 </template>
 
 <script>
-import {HttpResetClass} from "vue-client";
+import {HttpResetClass} from 'vue-client'
 
 let asyncMachineMeterCenter = async function (self) {
   await self.$getConfig(self, 'BatchCharge')
@@ -132,7 +146,10 @@ export default {
       // 启用发票管理需要对票号进行验证
       hasValidateBill: false,
       validateOk: false,
-      editCollection: false
+      editCollection: false,
+      // 收费进度
+      show: false,
+      percent: 0
     }
   },
   props: ['data', 'owe', 'civill'],
@@ -269,11 +286,16 @@ export default {
       try {
         await this.$resetpost('rs/logic/batchPayment', {data: param}, {resolveMsg: null, rejectMsg: null}, 1000)
       } catch (e) {}
-      this.$showMessage(`正在批量处理中, 请耐心等待...`, [])
+      // this.$showMessage(`正在批量处理中, 请耐心等待...`, [])
+      this.show = true
       // 启动定时器定时查询处理结果
       this.timer = setInterval(async () => {
         let res = await this.HttpReset.load('POST', 'rs/logic/getBatchOperaPro', {data: {uuid: uuid}}, {resolveMsg: null, rejectMsg: null})
+        if (res.data.percent) {
+          this.percent = res.data.percent
+        }
         if (res.data.msg || res.data.error) {
+          this.show = false
           clearInterval(this.timer)
           this.$closeMessage()
           if (res.data.error) {
@@ -304,7 +326,7 @@ export default {
             this.clean()
           }
         }
-      }, 5000)
+      }, 1500)
     },
     clean () {
       this.$dispatch('success')