sale-client 4.2.58 → 4.2.60

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Tue Aug 20 11:56:06 CST 2024
+gradle.version=5.2.1

package/build/tmp/jar/MANIFEST.MF

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+

package/package.json

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

package/src/filiale/TaiYuan/meterinfodetail.vue

@@ -124,7 +124,11 @@
         </div>
         <div class="row" v-if="data.f_meter_type.includes('卡表')">
           <label class = "col-sm-5 " style="color: brown">累购写卡金额</label>
-          <span class = "col-sm-7" style="color: brown">{{data?data.f_write_totalfee:dafault.f_total_fee}}</span>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_write_totalfee:dafault.f_total_fee}}
+            <span v-if="data && this.$login.r.includes('收费页面修改累购')" @click.stop="changeMeterWriteFee"
+                  class="glyphicon glyphicon-pencil  click-change"  title="修改累购写卡金额">
+            </span>
+          </span>
         </div>
         <div class="row">
           <label class = "col-sm-5 " >表封号</label>
@@ -225,16 +229,16 @@
             <div class="form-horizontal">
               <div class="row">
                 <div class="col-sm-12 form-group">
-                  <label class="font_normal_body">旧表累购金额</label>
+                  <label class="font_normal_body">原累购金额</label>
                   <input readonly type="text" style="width:80%" class="input_search"
-                         v-model="data.f_total_fee" placeholder='旧表累购金额'>
+                         v-model="data.f_total_fee" placeholder='原累购金额' disabled>
                 </div>
               </div>
               <div class="row">
                 <div class="col-sm-12 form-group">
-                  <label class="font_normal_body">旧表累购金额</label>
+                  <label class="font_normal_body">修改后累购金额</label>
                   <input type="text" style="width:80%" class="input_search" v-model="newMeterFee"
-                         placeholder='旧表累购金额'>
+                         placeholder='修改后累购金额'>
                 </div>
               </div>
             </div>
@@ -244,20 +248,45 @@
             <button type="button" class="button_clear" @click='close'>取消</button>
           </footer>
         </modal>
+        <modal v-if="showSelectUserWriteFee" :show.sync="showSelectUserWriteFee" 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 readonly type="text" style="width:80%" class="input_search"
+                         v-model="data.f_write_totalfee" placeholder='原表累购写卡金额' disabled>
+                </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="newMeterWriteFee"
+                         placeholder='修改后累购写卡金额'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid ' @click="modifyUserFile('累购写卡金额')">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
         <modal v-if="showSelectUserGas" :show.sync="showSelectUserGas" 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>
+                  <label class="font_normal_body">原表累购气量</label>
                   <input readonly type="text" style="width:80%" class="input_search"
-                         v-model="data.f_total_gas" placeholder='旧表累购气量'>
+                         v-model="data.f_total_gas" placeholder='原表累购气量' disabled>
                 </div>
               </div>
               <div class="row">
                 <div class="col-sm-12 form-group">
-                  <label class="font_normal_body">新表累购气量</label>
+                  <label class="font_normal_body">修改后累购气量</label>
                   <input type="text" style="width:80%" class="input_search" v-model="newMeterGas"
                          placeholder='新表累购气量'>
                 </div>
@@ -315,13 +344,14 @@ export default {
         },
         f_arrears_fee: 0,
         model: null,
-        f_arrears_fee: 0,
         showselectncuserfile: false,
         showSelectUserFee: false,
+        showSelectUserWriteFee: false,
         showSelectUserGas: false,
         newmetertitles: '',
         newMeterGas: 0,
-        newMeterFee: 0
+        newMeterFee: 0,
+        newMeterWriteFee: 0
       }
     },
     props: ['data'],
@@ -341,9 +371,9 @@ export default {
           }
         }
         this.list = res.data
-        if (this.data.f_meter_type == '物联网表') {
+        if (this.data.f_meter_type === '物联网表') {
           this.f_arrears_fee = (this.data.f_balance_amount - arrearsFee) > 0 ? 0 : 0 - (this.data.f_balance_amount - arrearsFee)
-        } else if (this.data.f_meter_type == '机表') {
+        } else if (this.data.f_meter_type === '机表') {
           this.f_arrears_fee = (this.data.f_balance - arrearsFee) > 0 ? 0 : 0 - (this.data.f_balance - arrearsFee)
         } else {
           this.f_arrears_fee = (this.data.f_balance - arrearsFee) > 0 ? 0 : 0 - (this.data.f_balance - arrearsFee)
@@ -366,6 +396,10 @@ export default {
         // 修改累购金额
         this.showSelectUserFee = true
       },
+      changeMeterWriteFee () {
+        // 修改累购写卡金额
+        this.showSelectUserWriteFee = true
+      },
       async modifyUserFile (type) {
         let param = {
           f_userinfo_id: this.data.f_userinfo_id,
@@ -378,21 +412,25 @@ export default {
           f_depid: this.$login.f.depids,
           f_depname: this.$login.f.deps
         }
-        if (type == '表封号') {
+        if (type === '表封号') {
           param.new_metertitles = this.newmetertitles
-        } else if (type == '累购气量') {
+        } else if (type === '累购气量') {
           param.new_metergas = this.newMeterGas
-        } else if (type == '累购金额') {
+        } else if (type === '累购金额') {
           param.new_meterfee = this.newMeterFee
+        } else if (type === '累购写卡金额') {
+          param.new_meterwritefee = this.newMeterWriteFee
         }
         await this.$resetpost('/api/af-revenue/logic/changeuserfilesmetertitles', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
         this.data.f_metertitles = this.newmetertitles
-        if (type == '表封号') {
+        if (type === '表封号') {
           this.data.f_metertitles = this.newmetertitles
-        } else if (type == '累购气量') {
+        } else if (type === '累购气量') {
           this.data.f_total_gas = this.newMeterGas
-        } else if (type == '累购金额') {
+        } else if (type === '累购金额') {
           this.data.f_total_fee = this.newMeterFee
+        } else if (type === '累购写卡金额') {
+          this.data.f_write_totalfee = this.newMeterWriteFee
         }
         this.$parent.$parent.close()
         this.$parent.$parent.clean()
@@ -406,6 +444,7 @@ export default {
         this.newmetertitles = 0
         this.newMeterGas = 0
         this.newMeterFee = 0
+        this.newMeterWriteFee = 0
       }
     },
     watch: {

package/src/filiale/fugou/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue

@@ -677,8 +677,9 @@ export default {
         console.log('1239999998', change)
         let hasUnhand = change && change.data && change.data.unhand && change.data.unhand.length > 0
         let hasOwe = change && change.data && change.data.owe && change.data.owe.length > 0
-        if (hasUnhand || hasOwe) {
-          let r = await this.$showMessage('存在相关异常/欠费记录，是否继续换表？', ['confirm', 'cancel'])
+        let hasCardUnread = change && change.data && change.data.cardunread && change.data.cardunread.length > 0
+        if (hasUnhand || hasOwe || hasCardUnread) {
+          let r = await this.$showMessage('存在抄表计划未执行，是否继续换表？', ['confirm', 'cancel'])
           if (r !== 'confirm') { return }
         }
       } catch (e) {

package/src/filiale/jinhong/MachineMeterCenter.vue

@@ -73,13 +73,13 @@
           <div  class="col-sm-3 form-group" v-if="config.hasfindaReail" :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error select-error' : '']">
             <label for="f_collection" class="font_normal_body">燃气收款</label>
             <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="data.f_collection"
-                   v-validate:f_collection='{required: true, dctest: [data.f_totalcost, ">=" ]}'  v-scale = "[data.f_collection, 2]"
+                   v-validate:f_collection='{required: true, dctest: [0, ">=" ]}'  v-scale = "[data.f_collection, 2]"
                    @mousewheel.native.prevent @keyup.enter="confirm()" :disabled="$refs.givechange.promptText != ''">
           </div>
           <div  class="col-sm-4 form-group" v-if="!config.hasfindaReail" :class="[$v.f_collection.required || $v.f_collection.dctest ? 'has-error select-error' : '']">
             <label for="f_collection" class="font_normal_body">燃气收款</label>
             <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="data.f_collection"
-                   v-validate:f_collection='{required: true, dctest: [data.f_totalcost, ">=" ]}'  v-scale = "[data.f_collection, 2]"
+                   v-validate:f_collection='{required: true, dctest: [0, ">=" ]}'  v-scale = "[data.f_collection, 2]"
                    @mousewheel.native.prevent @keyup.enter="confirm()" :disabled="$refs.givechange.promptText != ''">
           </div>
           <div class="col-sm-1 form-group" v-if="config.hasfindaReail">