sale-client 3.6.466 → 3.6.468

package/package.json

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

package/src/components/revenue/Common/MeterMessage.vue

@@ -37,7 +37,7 @@
               <label for="f_metertitles" class="font_normal_body">新表封号</label>
               <input type="text" class="input_search" style="width:60%" class="input_search"  v-model="metermessage.f_metertitles" placeholder='表封号'>
             </div>
-            <div class="col-sm-4 form-group" :class="[$v.f_meter_base.required ? 'has-error' : '']">
+            <div class="col-sm-4 form-group" :class="[$v.f_meter_base.required ? 'has-error' : '']" title="参数名称：【初始表底数最大值】">
               <label for="f_meter_base" class="font_normal_body">新表底数</label>
               <input type="text" class="input_search" style="width:60%" class="input_search" v-validate:f_meter_base='{required: true }' @blur='meterbase()' v-model="metermessage.f_meter_base" placeholder='表底数' >
             </div>
@@ -61,7 +61,7 @@
         isdecimal: '否',
         imgsrc: '/images/mainicon/biaopan.png',
         imgmeter: '/images/mainicon/addmeter.png',
-
+        f_meter_base_max: this.$appdata.getSingleValue('初始表底数最大值') ? this.$appdata.getSingleValue('初始表底数最大值') : 10000,
         meterType: this.$appdata.getParam('气表类型')
       }
     },
@@ -89,6 +89,10 @@
         } else {
           this.metermessage.f_meter_base = (this.metermessage.f_meter_base - 0).toFixed(0)
         }
+        if (this.metermessage.f_meter_base > this.f_meter_base_max) {
+          this.$showAlert(`新表底数可录入的最大值为: ${this.f_meter_base_max}, 请核实后重新录入!!!`, 'warning', 3000)
+          this.metermessage.f_meter_base = ''
+        }
       },
       getMeterBrands (meterType) {
         let res = []

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

@@ -651,7 +651,7 @@ export default {
       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.$showAlert('换表失败，该表有欠费，请到机表缴费界面进行缴费', 'warning', 3000)
             this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
           } else {
             this.confirm()
@@ -697,6 +697,7 @@ export default {
             }
             this.$resetpost(url, {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
               console.log('成功')
+              this.$showAlert('换表失败，欠费已生成，清欠后请重新执行换表操作！！', 'error', 3)
               if (this.model.metermessage.f_meter_type[0] != '机表') {
                 this.$dispatch('refresh')
               } else {
@@ -892,6 +893,7 @@ export default {
             }
             this.$resetpost(url, {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
               console.log('成功')
+              this.$showAlert('换表失败，欠费已生成，清欠后请重新执行换表操作！！', 'error', 3)
               if (this.row.f_meter_type.includes('物联网表')) {
                 this.$dispatch('refresh')
               } else {

package/src/components/revenue/comprehen/Maintenance/changeMeter/changemeterListMaintain.vue

@@ -52,6 +52,12 @@
                   <input type="text" class="input_search"  style="width: 60%" v-model="model.f_user_name"
                          condition="f_user_name = '{}'" placeholder='客户姓名'>
                 </div>
+                <div :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                     class="form-group">
+                  <label class="font_normal_body">客户电话</label>
+                  <input type="text" class="input_search"  style="width: 60%" v-model="model.f_user_phone"
+                         condition="f_user_phone = '{}'" placeholder='客户电话'>
+                </div>
                 <div :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
                      class="form-group">
                   <label class="font_normal_body">有无附件</label>
@@ -117,6 +123,9 @@
                 <th>
                   <nobr>客户名称</nobr>
                 </th>
+                <th>
+                  <nobr>客户电话</nobr>
+                </th>
                 <th>
                   <nobr>客户地址</nobr>
                 </th>
@@ -179,6 +188,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_phone}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_address}}</nobr>
               </td>
@@ -270,6 +282,7 @@ const myMap = new Map()
         getfield: {
           'f_userinfo_code': '客户编号',
           'f_user_name': '客户名称',
+          'f_user_phone': '客户电话',
           'f_address': '客户地址',
           'f_type': '换表类型',
           'f_changemeter_fee': '换表费',

package/src/components/revenue/comprehen/wechatpay/wechatValidateManage.vue

@@ -159,6 +159,22 @@
         </template>
       </data-grid>
     </criteria-paged>
+    <table class="table-hover">
+      <tr style="position: relative" class="table-bordered">
+        <td
+          style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
+          汇总信息
+        </td>
+        <td
+          style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+          订单金额汇总:&emsp;{{sumsmodel.f_total_fee}}
+        </td>
+        <td
+          style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+          购气金额汇总:&emsp;{{sumsmodel.f_collection}}
+        </td>
+      </tr>
+    </table>
   </div>
   <modal v-if="show" :show.sync="show" >
     <header slot="modal-header" class="modal-header">
@@ -189,19 +205,23 @@
   let readyGen = async function (self) {
     // self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
     // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
 
   export default {
     title: '自助机对账',
     data () {
       return {
-        model: new PagedList('rs/sql/wechatSelling', 20),
+        model: new PagedList('rs/sql/wechatSelling', 20, {}, {f_total_fee: '', f_collection: ''}),
         letter: this.$appdata.getParam('订单状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('订单状态')] : [],
         paystate: this.$appdata.getParam('操作标识') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('操作标识')] : [],
         criteriaShow: false,
         show: false,
         watchComment: '',
         orgCondtionStr: '',
+        getfield: {},
+        // 合计数据
+        sumsmodel: {},
         initres: {
           org: [this.$login.f.orgid]
         },
@@ -278,6 +298,23 @@
       search () {
         this.$refs.paged.$refs.cri.search()
       },
+      // getotherfooter () {
+      //   // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
+      //   // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
+      //   this.other = []
+      //   this.footer = []
+      //   // let exportdata = this.getCondition;
+      //   let otherInData = []
+      //   otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`)
+      //   let footerData = [], exportfield = this.getfield
+      //   footerData.push('合计')
+      //   let self = this
+      //   for (var field in self.sumsmodel) {
+      //     footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`)
+      //   }
+      //   this.footer.push(footerData)
+      //   this.other.push(otherInData)
+      // },
       selfSearch (args) {
         this.model.params.startDate = this.$refs.paged.$refs.cri.model.startDate
         this.model.params.endDate = this.$refs.paged.$refs.cri.model.endDate
@@ -299,5 +336,13 @@
         return this.$login.r ? this.$login.r : []
       }
     }
+    // watch: {
+    //   sumsmodel: {
+    //     handler: function (val) {
+    //       this.getotherfooter()
+    //     },
+    //     deep: true
+    //   }
+    // }
   }
 </script>

package/src/filiale/qianneng/MeterMessage.vue

@@ -8,7 +8,7 @@
               <input type="text" class="input_search" style="width:60%" class="input_search"
                      @blur="meternumberValidate()"  v-model="metermessage.f_meternumber" v-validate:meternumber='{required: true }' placeholder='表号' >
             </div>
-            <div class="col-sm-4 form-group" :class="[$v.f_meter_base.required ? 'has-error' : '']">
+            <div class="col-sm-4 form-group" :class="[$v.f_meter_base.required ? 'has-error' : '']" title="参数名称：【初始表底数最大值】">
               <label for="f_meter_base" class="font_normal_body">新表底数</label>
               <input type="text" class="input_search" style="width:60%" class="input_search" v-validate:f_meter_base='{required: true }' @blur='meterbase()' v-model="metermessage.f_meter_base" placeholder='表底数' >
             </div>
@@ -69,7 +69,7 @@
         isdecimal: '否',
         imgsrc: '/images/mainicon/biaopan.png',
         imgmeter: '/images/mainicon/addmeter.png',
-
+        f_meter_base_max: this.$appdata.getSingleValue('初始表底数最大值') ? this.$appdata.getSingleValue('初始表底数最大值') : 10000,
         meterType: this.$appdata.getParam('气表类型')
       }
     },
@@ -97,6 +97,10 @@
         } else {
           this.metermessage.f_meter_base = (this.metermessage.f_meter_base - 0).toFixed(0)
         }
+        if (this.metermessage.f_meter_base > this.f_meter_base_max) {
+          this.$showAlert(`新表底数可录入的最大值为: ${this.f_meter_base_max}, 请核实后重新录入!!!`, 'warning', 3000)
+          this.metermessage.f_meter_base = ''
+        }
       },
       getMeterBrands (meterType) {
         let res = []

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Wed Nov 20 11:54:44 CST 2024
-gradle.version=5.2.1