npm - sale-client - Versions diffs - 3.6.102 → 3.6.104 - Mend

sale-client 3.6.102 → 3.6.104

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/build/dev-server.js CHANGED Viewed

@@ -1,5 +1,5 @@
 var path = require('path')
-const [serverRul, localUrl ] = ['http://121.36.106.17:8400/', 'http://121.36.106.17:8400/']
+const [serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://127.0.0.1:8080/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/index.html CHANGED Viewed

@@ -17,34 +17,6 @@
     <script src="https://webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>
   </head>
   <body id="bodymain" class="themeOne">
-    <!-- <widget></widget> -->
     <app></app>
-    <!-- built files will be auto injected -->
   </body>
-    <script>
-        window.onload = function () {
-            var baseUrlName = '客服营收管理系统';
-            var nameUrl = '';
-            switch (window.location.pathname) {
-                case '/jicheng':
-                    nameUrl = "积成";
-                    break;
-                case '/zhonghaiyou':
-                    nameUrl = "中海油";
-                    break;
-                case '/jincheng':
-                    nameUrl = "晋城";
-                    break;
-                case '/haili':
-                    nameUrl = "海力";
-                    break;
-                case '/paipu':
-                    nameUrl = "派普";
-                    break;
-                default:
-                    break;
-            }
-            document.getElementsByTagName("title")[0].innerText = nameUrl+baseUrlName;
-        }
-    </script>
 </html>

package/package.json CHANGED Viewed

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

package/src/components/UserFiles/AdjustableBox/AddBox.vue CHANGED Viewed

@@ -17,7 +17,7 @@
           </div>
           <div class="col-sm-4"  :class="[$v.f_adjustable_address.required ? 'has-error' : '']">
-            <label for="f_area" class="font_normal_body"><span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>&nbsp;&nbsp;地址&nbsp;&nbsp;</label>
+            <label for="f_area" class="font_normal_body"><span  v-if="mapShow" class="glyphicon glyphicon-map-marker" @click="openModal" ></span>&nbsp;&nbsp;地址&nbsp;&nbsp;</label>
             <input type="text" v-model="model.f_adjustable_address" v-validate:f_adjustable_address='{required: true }'
             class="input_search" style="width:60%" placeholder="地址" v-el:type v-next-el="street" >
           </div>
@@ -174,7 +174,8 @@ export default {
       havename: false,
       changedate: true,
       adjustabletype: this.$appdata.getParam('装置类型'),
-      manufacturer: this.$appdata.getParam('生产厂家')
+      manufacturer: this.$appdata.getParam('生产厂家'),
+      mapShow: true
     }
   },
   props: ['data', 'f_filialeid'],
@@ -184,6 +185,11 @@ export default {
     }
   },
   ready () {
+    try {
+      var map = new AMap.Map('container')
+    } catch (e) {
+      this.mapShow = false
+    }
     console.log(this.$login.toStandardTimeString())
     this.datatomodel()
   },

package/src/components/charge/business/IOTMeterCenter.vue CHANGED Viewed

@@ -1,6 +1,11 @@
 <template>
   <div class="flex-row">
     <div class="span" style="overflow-y: auto;">
+      <div  class="auto" style="height: auto; overflow: auto" v-if="owes.length">
+        <div v-for="owe of owes" >
+          <owe-list :row='owe' :floor="config.floor" :charge="true"></owe-list>
+        </div>
+      </div>
       <validator name='v'>
         <form novalidate class="form-horizontal">
           <div class="row">
@@ -179,6 +184,7 @@
         <div style="text-align:right; height: 25%">
           <strong style="color:red;margin-right: 5px">{{ $refs.givechange.promptText }}</strong>
           <strong style="font-size: large" v-if="!config.notShowFormula">计算公式:{{calculatedetail ? calculatedetail : ' 暂无'}}</strong><br/>
+          <strong style="font-size: large" v-if="alldue_fee>0">旧表机表欠费：{{alldue_fee}} 元</strong><br/>
           <payment-code-button :clickable="!$v.valid || validateOk || !islegal || clickConfirm"
                                :payment.sync="model.f_payment" :payment-data="paytype"
                                @confirm-payment="confirm()">
@@ -203,6 +209,7 @@
 </template>
 <script>
+  import OweList from './machine/OweList'
   /**
    *综合业务
    *卡表收费组件
@@ -249,7 +256,7 @@
     self.model.chargeprice = getGas.data.chargeprice
     Object.assign(self.model, self.model, getGas.data)
-    self.model.f_totalcost = ((self.model.f_totalcost - 0) - (self.dymoney - 0)).toFixed(self.row.f_fee_decimal || 4)
+    self.model.f_totalcost = ((self.model.f_totalcost - 0) - (self.dymoney - 0) + (self.alldue_fee - 0)).toFixed(self.row.f_fee_decimal || 4)
     if (self.config.floor) {
       self.model.f_totalcost = Math.ceil(self.model.f_totalcost)
     }
@@ -274,6 +281,7 @@
       let getAmount = await self.$CommonService.gasCalculate(self.model, self.model.f_pregas)
       self.model.f_preamount = getAmount.data.chargenum
       self.model.f_totalcost = (self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(self.row.f_fee_decimal || 4)
+      self.model.f_totalcost = ((self.model.f_totalcost - 0) + (self.alldue_fee - 0)).toFixed(self.row.f_fee_decimal || 4)
       Object.assign(self.model, self.model, getAmount.data)
       self.model.chargeprice = getAmount.data.chargeprice
       if (self.config.floor) {
@@ -301,6 +309,7 @@
       let param = Object.assign({}, {}, self.model)
       param.f_payment = self.model.f_payment.toString()
+      param.alldue_fee = self.alldue_fee
       param.f_print = self.model.f_print.toString()
       param.f_serial_number = self.model.f_serial_number ? self.model.f_serial_number : ''
       // 加入扫码盒付款码支付流水号
@@ -369,7 +378,7 @@
   }
   let asyncCardMeterCenter = async function (self) {
     await self.$getConfig(self, 'IOTMeterCenter')
-    console.log('卡表收费config', self.config)
+    await self.$getConfig(self, 'ChangeMeter')
     // 添加 “系统余额透支” 付款方式
     let i = -1
@@ -428,6 +437,23 @@
         }
       }
     }
+    if (self.config.hasArrearsChange) {
+      let http = new HttpResetClass()
+      let res = await http.load('POST', 'rs/logic/sale_getOwe', {data: {f_userinfo_id: self.row.f_userinfo_id}}, {resolveMsg: null, rejectMsg: '获取欠费出错！！'})
+      let owes = []
+      for (let i = 0; i < res.data.length; i++) {
+        for (let j = 0; j < res.data[i].rows.length; j++) {
+          owes.push(res.data[i].rows[j])
+        }
+      }
+      console.log('获取到的欠费记录', owes)
+      self.alldue_fee = owes.reduce((total, item) => {
+        return total + (item.f_oughtfee + item.overdue - item.f_debt_money)
+      }, 0)
+      console.log('总欠费金额为', self.alldue_fee)
+      self.owes = res.data
+    }
   }
   export default {
     title: '物联网收费',
@@ -445,6 +471,7 @@
           billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
           printType: '普通收据', // 收据/电子票/专用发票/国税发票
           payment: '',
+          hasArrearsChange: true, // 是否可以有欠费换表 收费时用来判断是否查询旧表欠费
           overdraftBalance: false // 是否支持系统余额透支
         },
         model: {
@@ -473,7 +500,8 @@
         // 启用发票管理需要对票号进行验证
         hasValidateBill: false,
         validateOk: false,
+        alldue_fee: 0, // 欠费金额
+        owes: [], // 欠费未交记录
         print: false,
         billData: {
           url: 'rs/report/iot_bill',
@@ -499,6 +527,7 @@
         dymoney: 0
       }
     },
+    components: {OweList},
     props: ['row'],
     mounted () {
       this.$refs.email.focus()
@@ -764,7 +793,7 @@
           return this.row.f_balance
         }
         if (this.model.f_preamount) {
-          return ((this.model.f_collection - 0) - (this.model.f_preamount - 0) + (this.row.f_balance - 0)).toFixed(2) - 0
+          return ((this.model.f_collection - 0) - (this.model.f_preamount - 0) + (this.row.f_balance - 0) - this.alldue_fee).toFixed(2) - 0
         } else {
           return 0
         }

package/src/components/charge/business/OtherCharge.vue CHANGED Viewed

@@ -122,7 +122,7 @@
                                :payment.sync="model.f_payment" :payment-data="paytype"
                                @confirm-payment="confirm()">
           </payment-code-button>
-          <button class="button_search btn-gn" @click="confirm()" :disabled='!$v.valid || validateOk'>确认</button>
+          <button class="button_search btn-gn" @click="confirm()" :disabled='!$v.valid || validateOk || !model.f_collection'>确认</button>
           <button class="button_clear btn-gn" @click="clean()">取消</button>
         </div>
       </validator>

package/src/components/charge/business/OtherChargeNew.vue CHANGED Viewed

@@ -162,9 +162,9 @@
                                @confirm-payment="confirm()">
           </payment-code-button>
           <button class="button_search btn-gn" v-if="authArr.includes('其它欠费生成')" @click="createQianfei()"
-                  :disabled=' validflag || validateOk'>生成欠费
+                  :disabled=' validflag || validateOk || !model.f_collection'>生成欠费
           </button>
-          <button class="button_search btn-gn" @click="checkInvoiceMsg()" :disabled='validflag || validateOk || chargetypecheckflag'>确认
+          <button class="button_search btn-gn" @click="checkInvoiceMsg()" :disabled='validflag || validateOk || chargetypecheckflag || !model.f_collection'>确认
           </button>
           <button class="button_clear btn-gn" @click="clean()">取消</button>
         </div>

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

@@ -55,7 +55,10 @@
         </div>
         <div class="row" :class="[config.f_comments ? 'highlight' : '']">
           <label class="col-sm-5">备注信息</label>
-          <span class="col-sm-7">{{ data ? data.f_comments : dafault.f_comments }}</span>
+          <span class="col-sm-7">{{ data ? data.f_comments : dafault.f_comments }}
+            <span v-if="data" @click.stop="change_reason"
+                  class="glyphicon glyphicon-pencil  clickchange" title="修改备注信息"></span>
+          </span>
         </div>
         <div class="row" :class="[config.f_address ? 'highlight' : '']">
           <label class="col-sm-5">客户地址</label>
@@ -108,6 +111,32 @@
             <button type="button" class="button_clear" @click='close'>取消</button>
           </footer>
         </modal>
+        <modal v-if="reason_show" :show.sync="reason_show" width="40%" title="修改备注信息"
+               v-ref:modal large backdrop="false">
+          <article slot="modal-body" class="modal-body">
+            <div class="form-horizontal">
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">旧备注信息</label>
+                  <input disabled readonly type="text" style="width:80%" class="input_search"
+                         v-model="data.f_comments" placeholder='旧备注信息'>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">新备注信息</label>
+                  <input type="text" style="width:80%" class="input_search" v-model="new_reason"
+                         placeholder='新备注信息'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid ' @click="modifyUserSpecialReson">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
       </div>
     </div>
   </partial-view>
@@ -119,12 +148,12 @@
  */
 export default {
-  ready() {
+  ready () {
     console.log('看看userinfo里面接收的data数据：', this.data)
     this.$getConfig(this, 'getUserInfo')
   },
   title: '客户基本信息',
-  data() {
+  data () {
     return {
       dafault: {
         f_user_name: '***',
@@ -156,22 +185,48 @@ export default {
       },
       model: null,
       showselectncuserinfo: false,
-      newuserphone: ''
+      newuserphone: '',
+      reason_show: false,
+      new_reason: ''
     }
   },
   props: ['data', 'warninginfo'],
   methods: {
-    dealmsg(val) {
+    async modifyUserSpecialReson () {
+      let param = {
+        new_reason: this.new_reason,
+        f_userinfo_id: this.data.f_userinfo_id,
+        f_user_id: this.data.f_user_id,
+        f_operator: this.$login.f.name,
+        f_operatorid: this.$login.f.id,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps
+      }
+      await this.$resetpost('/rs/logic/changeuserinfo', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
+      this.data.f_comments = this.new_reason
+      this.$parent.$parent.close()
+      this.$parent.$parent.clean()
+      this.$parent.$parent.$refs.list.searchNoData()
+      this.close()
+    },
+    change_reason () {
+      // 修正客户电话
+      this.reason_show = true
+      this.new_reason = ''
+    },
+    dealmsg (val) {
       if (val.f_userinfo_code !== '********') {
         this.$dispatch('deal-msg', val)
       }
     },
-    changeuserphone() {
+    changeuserphone () {
       // 修正客户电话
       this.showselectncuserinfo = true
       this.newuserphone = ''
     },
-    async modifyUser() {
+    async modifyUser () {
       let param = {
         new_userphone: this.newuserphone,
         f_userinfo_id: this.data.f_userinfo_id,
@@ -190,13 +245,15 @@ export default {
       this.$parent.$parent.$refs.list.searchNoData()
       this.close()
     },
-    close() {
+    close () {
       this.showselectncuserinfo = false
+      this.reason_show = false
       this.newuserphone = ''
+      this.new_reason = ''
     }
   },
   watch: {
-    'data'(val) {
+    'data' (val) {
     }
   }
 }

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue CHANGED Viewed

@@ -17,10 +17,10 @@
                       close-on-select clear-button>
             </v-select>
           </div>
-          <div class="col-sm-4 form-group" v-if="row.f_collection_type == '按金额'">
-            <label for="f_change_operator" class=" font_normal_body">旧表金额</label>
-            <input class="input_search" style="width:60%" type="text" v-model="model.f_using_fee_old"
-                   placeholder="旧表金额" @blur="feeOldChange()">
+          <div class="col-sm-4 form-group">
+            <label for="f_change_operator" class=" font_normal_body">换&ensp;表&ensp;人</label>
+            <input class="input_search" style="width:60%" type="text" v-model="model.f_change_operator"
+                   placeholder="换表人">
           </div>
           <div class="col-sm-4 form-group"
@@ -236,11 +236,6 @@
                       :options='opentype'
                       close-on-select clear-button></v-select>
           </div>
-          <div class="col-sm-4 form-group">
-            <label for="f_change_operator" class=" font_normal_body">换&ensp;表&ensp;人</label>
-            <input class="input_search" style="width:60%" type="text" v-model="model.f_change_operator"
-                   placeholder="换表人">
-          </div>
         </div>
         <div class="row auto">
           <div class="col-sm-12"
@@ -611,10 +606,8 @@ export default {
       this.addTaskModalShow = true
     },
     async confirmbefore () {
-      if (this.model.metermessage.f_meter_type[0] != '机表') {
-        console.log('进来了')
-        if (this.books.data.length > 0) {
-          console.log('进来了2')
+      if (this.model.metermessage.f_meter_type[0] !== '机表') {
+        if (!this.config.hasArrearsChange && this.books.data && this.books.data.length > 0) {
           if (this.books.data[0].f_whether_pay === '否') {
             this.$showAlert('该表有欠费，请到机表缴费界面进行缴费', 'warning', 3000)
             this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
@@ -695,6 +688,7 @@ export default {
         this.model.f_depname = this.$login.f.deps
         this.model.f_zoneid = this.$login.f.zoneid
         this.model.f_zones = this.$login.f.zones
+        this.model.alldue_fee = this.alldue_fee
         let data = {
           model: this.model,
           f_meter_book: this.newinfo.f_meter_book[0],
@@ -986,21 +980,39 @@ export default {
     async validateOwe () {
       let http = new HttpResetClass()
-      let books = await http.load('POST', 'rs/sql/singleTable_OrderBy', {
-        data: {
-          items: 'f_whether_pay',
-          tablename: 't_handplan',
-          condition: ` f_user_id  = '${this.row.f_user_id}' and f_oughtfee > 0 and  f_hand_state = '有效' and f_meter_state='已抄表' `,
-          orderitem: ' id desc'
+      // 有欠费是否能换表  如果能则需要获取到欠费金额
+      if (this.config.hasArrearsChange) {
+        let res = await http.load('POST', 'rs/logic/sale_getOwe', {data: {f_userinfo_id: this.row.f_userinfo_id}}, {resolveMsg: null, rejectMsg: '获取欠费出错！！'})
+        let owes = []
+        for (let i = 0; i < res.data.length; i++) {
+          for (let j = 0; j < res.data[i].rows.length; j++) {
+            owes.push(res.data[i].rows[j])
+          }
+        }
+        console.log('获取到的欠费记录', owes)
+        this.alldue_fee = owes.reduce((total, item) => {
+          return total + (item.f_oughtfee + item.overdue - item.f_debt_money)
+        }, 0)
+        console.log('总欠费金额为', this.alldue_fee)
+        this.books = owes
+      } else {
+        // 如果 不能 则只需要获取到记录数，采用相对节省资源的查询
+        let books = await http.load('POST', 'rs/sql/singleTable_OrderBy', {
+            data: {
+              items: 'f_whether_pay',
+              tablename: 't_handplan',
+              condition: ` f_user_id  = '${this.row.f_user_id}' and f_oughtfee > 0 and  f_hand_state = '有效' and f_meter_state='已抄表' `,
+              orderitem: ' id desc'
+            }
+          }, {resolveMsg: null, rejectMsg: null}
+        )
+        console.log('获取到的欠费记录', books)
+        this.books = books
+        // 如果是机表验证是否有欠费
+        if ((this.row.f_balance - 0) < 0) {
+          this.$showAlert('该表有欠费，请到机表缴费界面进行缴费', 'warning', 3000)
+          this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
         }
-      }, {resolveMsg: null, rejectMsg: null}
-      )
-      console.log('获取到的欠费记录', books)
-      this.books = books
-      // 如果是机表验证是否有欠费
-      if ((this.row.f_balance - 0) < 0) {
-        this.$showAlert('该表有欠费，请到机表缴费界面进行缴费', 'warning', 3000)
-        this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
       }
     }
   },

package/src/components/revenue/machineHandManage/machineHand.vue CHANGED Viewed

@@ -1474,7 +1474,7 @@
             row.state = '失败'
             Vue.set(row, 'error', '底数不能小于0')
             this.speckText('底数不能小于0，请注意!')
-          } else if (row.f_tablebase.toString().split('.')[1].length > 3) {
+          } else if (this.danhu.f_tablebase.toString().split('.').length > 1 && this.danhu.f_tablebase.toString().split('.')[1].length > 3) {
             row.state = '失败'
             Vue.set(row, 'error', '底数最多只能输入小数点后3位')
             this.speckText('底数最多只能输入小数点后3位，请注意!')

package/src/filiale/fugu/business/CardMeterCenter.vue CHANGED Viewed

@@ -111,7 +111,7 @@
               <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
                      v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'
                      v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
-                     v-scale="[model.f_totalcost, row.f_fee_decimal||4]" :disabled="true"/>
+                     v-scale="[model.f_totalcost, row.f_fee_decimal||4]" :readonly="true"/>
             </div>
             <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气' && row.f_meter_type.includes('卡表') && config.calculatePreByCollection">
               <label for="f_collection" class=" font_normal_body">*收&emsp;&emsp;款</label>
@@ -119,19 +119,19 @@
                      v-validate:f_collection='{required: true }'
                      @blur="calculatePreByCollection()"
                      v-el:fcollection
-                     @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"/>
+                     @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" :readonly="true"/>
             </div>
             <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment=='赠气' && row.f_meter_type.includes('卡表')">
               <label for="f_collection" class=" font_normal_body"><font size="4px" style="font-weight:bold">*收&emsp;款</font></label>
               <input id="f_collection" class="input_search" style="width:60%;font-size: 18px;font-weight:bold;" type="number" v-model="model.f_collection"
                      @blur="config.calculatePreByCollection && calculatePreByCollection()"
-                     v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, row.f_fee_decimal||4]" :disabled="true">
+                     v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, row.f_fee_decimal||4]" :readonly="true">
             </div>
             <div class="col-sm-3" v-if="row.f_collection_type === '按金额' && row.f_meter_type.includes('卡表')">
               <label for="f_collection" class=" font_normal_body"><font size="4px" style="font-weight:bold">*收&emsp;款</font></label>
               <input id="f_collection" class="input_search" style="width:50%;font-size: 18px;font-weight:bold;" type="number" v-model="model.f_collection"
                      @blur="config.calculatePreByCollection && calculatePreByCollection()"
-                     v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_collection, row.f_fee_decimal||4]" :disabled="true">
+                     v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_collection, row.f_fee_decimal||4]" :readonly="true">
             </div>
             <div class="col-sm-4" v-if="!row.f_meter_type.includes('卡表')">
               <label for="f_collection" class=" font_normal_body"><font size="4px"
@@ -141,7 +141,7 @@
                      v-el:fcollection
                      @blur="config.calculatePreByCollection && calculatePreByCollection()"
                      @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
-                     v-scale="[model.f_collection, row.f_fee_decimal||4]" :disabled="true">
+                     v-scale="[model.f_collection, row.f_fee_decimal||4]" :readonly="true">
             </div>
 <!--            <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气' && row.f_meter_type.includes('卡表') && !config.calculatePreByCollection"-->