apply-clients 3.4.85 → 3.4.88

package/src/filiale/hongda/pc/printChargepc.vue

@@ -37,7 +37,9 @@
     }
   </style>
   <div style="margin-bottom: 20px">
-    <span style="font-size: 20px">开户费预览</span>
+    <span  v-if="selectdata.defname!='营业厅缴费'" style="font-size: 20px">开户费预览</span>
+    <span  v-if="selectdata.defname==='营业厅缴费'&& selectdata.f_apply_type === '散户报建'&& charge.f_payment_term === '材料费' " style="font-size: 20px">新装费预览</span>
+    <span  v-if="selectdata.defname==='营业厅缴费'&& selectdata.f_apply_type === '改装报建'&& charge.f_payment_term === '材料费' " style="font-size: 20px">改装费预览</span>
   </div>
   <div id="printCharge">
     <table border="1" width="100%">
@@ -67,7 +69,7 @@
         <td colspan="2">收费明细</td>
         <td v-if="selectdata.defname!='营业厅缴费'" colspan="2">新装开户费</td>
         <td v-if="selectdata.defname==='营业厅缴费'&& selectdata.f_apply_type === '散户报建'&& charge.f_payment_term === '材料费' " colspan="2">新装材料费</td>
-        <td v-if="selectdata.defname==='营业厅缴费'&& selectdata.f_apply_type === '改装报建'&& charge.f_payment_term === '材料费' " colspan="2">新装材料费</td>
+        <td v-if="selectdata.defname==='营业厅缴费'&& selectdata.f_apply_type === '改装报建'&& charge.f_payment_term === '材料费' " colspan="2">改装材料费</td>
         <td >{{ charge.f_charge_money }}</td>
         <td colspan="4"></td>
       </tr>
@@ -108,10 +110,9 @@
   import {HttpResetClass} from 'vue-client'
   export default {
     title: '打印收费票据',
-    props: ['selectdata', 'charge','billnum'],
+    props: ['selectdata', 'charge', 'billnum'],
     data () {
       return {
-        billnum: ''
       }
     },
     ready () {

package/src/filiale/hongda/pc/printactivatecard.vue

@@ -74,9 +74,9 @@
       </tr>
       <tr>
         <td >表号</td>
-        <td ></td>
+        <td >{{userfiles.f_meternumber}}</td>
         <td >表底数</td>
-        <td ></td>
+        <td >{{userfiles.f_meter_base}}</td>
         <td >开通人</td>
         <td ></td>
         <td >协议号</td>
@@ -103,9 +103,9 @@
       </tr>
     </table>
   </div>
-  <div style="margin-top: 20px">
+<!--  <div style="margin-top: 20px">
     <span :style="billnum.isOk?'color: blue;font-weight: bold':'color: red;font-weight: bold'">{{billnum.msg}}</span>
-  </div>
+  </div>-->
   <print-element v-show="false" v-ref:print id='printCharge' styleid='printChargeStyle'
                  top='20' left='30' width='100%' height='100%'>
   </print-element>
@@ -119,15 +119,28 @@ import {toStandardDateString, toStandardTimeString, toStartAndEndDateString} fro
     props: ['selectdata','billnum'],
     data () {
       return {
-        billnum: ''
+        userfiles: {}
       }
     },
     ready () {
+      this.getuserfiles()
     },
     methods: {
       // 获取当前时间 格式 2023-07-09 23:59:59
       getdate () {
         return toStandardDateString()
+      },
+      getuserfiles () {
+        let http = new HttpResetClass()
+        let data = {
+          condition: `f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
+        }
+        http.load('POST', 'rs/logic/getUserinfoAndUserfiles', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: null
+        }).then(res => {
+          this.userfiles = res.data.userfiles[0]
+        })
       }
     },
     computed: {

package/src/filiale/hongda/pc/printinstall.vue

@@ -68,9 +68,9 @@
       </tr>
     </table>
   </div>
-  <div style="margin-top: 20px">
+<!--  <div style="margin-top: 20px">
     <span :style="billnum.isOk?'color: blue;font-weight: bold':'color: red;font-weight: bold'">{{billnum.msg}}</span>
-  </div>
+  </div>-->
   <print-element v-show="false" v-ref:print id='printCharge' styleid='printChargeStyle'
                  top='20' left='30' width='100%' height='100%'>
   </print-element>

package/src/filiale/hongda/pc.js

@@ -8,6 +8,7 @@ let specialComp = {
   'apply-charge-management': (resolve) => { require(['./pc/chargeManagement'], resolve) },
   'apply-print-activatecard': (resolve) => { require(['./pc/printactivatecard'], resolve) },
   'apply-print-install': (resolve) => { require(['./pc/printinstall'], resolve) },
-  'add-material-science': (resolve) => { require(['./pc/addMaterialScience'], resolve) }
+  'add-material-science': (resolve) => { require(['./pc/addMaterialScience'], resolve) },
+  'apply-charge-list': (resolve) => { require(['./pc/ApplyChargeList'], resolve) }
 }
 exports.specialComp = specialComp