sale-client 3.6.120 → 3.6.121

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.120",
+  "version": "3.6.121",
   "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/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')

package/src/components/revenue/base/leftview/Userinfo.vue

@@ -86,6 +86,10 @@
           <label class="col-sm-5">旧客户编号</label>
           <span class="col-sm-7">{{ data ? data.f_olduserinfo_code : dafault.f_userinfo_code }}</span>
         </div>
+        <div class="row">
+          <label class="col-sm-5">合同编号</label>
+          <span class="col-sm-7">{{ data ? data.f_contract_id : dafault.f_contract_id }}</span>
+        </div>
         <modal v-if="showselectncuserinfo" :show.sync="showselectncuserinfo" width="40%" title="修正客户电话号码"
                v-ref:modal large backdrop="false">
           <article slot="modal-body" class="modal-body">
@@ -168,7 +172,8 @@ export default {
         f_hand_date: '****年**月**日',
         f_rent_phone: '************',
         f_comments: '**',
-        f_user_state: '****'
+        f_user_state: '****',
+        f_contract_id: '*************'
       },
       config: {
         f_user_name: false,

package/src/main.js

@@ -4,7 +4,7 @@ import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
 // import wenxi from './filiale/rizhao/sale'
-// import FilialeSale from './filiale/yuansheng/sale'
+import FilialeSale from './filiale/qianneng/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'
@@ -16,7 +16,7 @@ all()
 system(false)
 sale()
 // wenxi()
-// FilialeSale()
+FilialeSale()
 address()
 ldap()
 require('system-clients/src/styles/less/bootstrap.less')