sale-client 3.6.307 → 3.6.308

package/package.json

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

package/src/components/FilesManage/MeterinfoTest.vue

@@ -165,6 +165,16 @@
                       v-ref:measure>
             </v-select>
           </div>
+          <div class="col-sm-4 form-group" :class="[$m.f_usetype.required ? 'has-error' : '']"
+               v-show="(formconfig && formconfig.f_usetype && formconfig.f_usetype.required) || !onlyshowmust"
+               v-if="getConfigShowItem('f_usetype')">
+            <label for="f_usetype" class="font_normal_body" title="参数:使用类型">&ensp;{{getConfigLabelName('f_usetype','使用类型')}}</label>
+            <input type="text" v-model="row.f_usetype" v-show="false"
+                   v-validate:f_usetype=getConfigValidate("f_usetype",false)>
+            <v-select :value.sync="row.f_usetype" v-model="row.f_usetype"
+                      :options='usetype' placeholder='使用类型'
+                      close-on-select></v-select>
+          </div>
         </div>
         <div>
           <a style="font-size: 16px;font-weight: 500;">气价信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
@@ -421,17 +431,7 @@
                       close-on-select
                       condition="f_inputtor like '%{}%'" v-el:cc></v-select>
           </div>
-          <div class="col-sm-4 form-group" :class="[$m.f_usetype.required ? 'has-error' : '']"
-               v-show="(formconfig && formconfig.f_usetype && formconfig.f_usetype.required) || !onlyshowmust"
-               v-if="getConfigShowItem('f_usetype')">
-            <label for="f_usetype" class="font_normal_body" title="参数:使用类型">&ensp;{{getConfigLabelName('f_usetype','使用类型')}}</label>
-            <input type="text" v-model="row.f_usetype" v-show="false"
-                   v-validate:f_usetype=getConfigValidate("f_usetype",false)>
-            <v-select :value.sync="row.f_usetype" v-model="row.f_usetype"
-                      :options='usetype' placeholder='使用类型'
-                      close-on-select></v-select>
-          </div>
-          <div class="col-sm-4 form-group" :class="[$m.f_usetype.required ? 'has-error' : '']"
+          <div class="col-sm-4 form-group" :class="[$m.f_usestate.required ? 'has-error' : '']"
                v-show="(formconfig && formconfig.f_usestate && formconfig.f_usestate.required) || !onlyshowmust"
                v-if="getConfigShowItem('f_usestate')">
             <label for="f_position" class="font_normal_body" title="参数:使用状态">&ensp;{{getConfigLabelName('f_usestate','使用状态')}}</label>
@@ -442,8 +442,8 @@
                       close-on-select></v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.f_limit_sms.required ? 'has-error' : '']"
-               v-show="(formconfig && formconfig.f_usetype && formconfig.f_usetype.required) || !onlyshowmust"
-               v-if="getConfigShowItem('f_usetype')">
+               v-show="(formconfig && formconfig.f_limit_sms && formconfig.f_limit_sms.required) || !onlyshowmust"
+               v-if="getConfigShowItem('f_limit_sms')">
             <label for="f_limit_sms" class="font_normal_body">&ensp;{{getConfigLabelName('f_limit_sms','短信限定')}}</label>
             <input type="text" class="input_search" style="width:60%" v-model="row.f_limit_sms"
                    v-validate:f_limit_sms=getConfigValidate("f_limit_sms",false)

package/src/components/common/userinfo_detail/ic_detail/WebHandQueryUser.vue

@@ -79,12 +79,12 @@
               <th><nobr>用气金额 </nobr></th>
               <th><nobr>本期余额</nobr></th>
               <th v-if="!row.f_meter_type.includes('物联网表')"><nobr>是否缴费 </nobr></th>
-              <th><nobr>一阶单价 </nobr></th>
-              <th><nobr>一阶气量 </nobr></th>
-              <th><nobr>二阶单价 </nobr></th>
-              <th><nobr>二阶气量 </nobr></th>
-              <th><nobr>三阶单价 </nobr></th>
-              <th><nobr>三阶气量 </nobr></th>
+              <th v-if="!f_calculation.includes('表端结算')"><nobr>一阶单价 </nobr></th>
+              <th v-if="!f_calculation.includes('表端结算')"><nobr>一阶气量 </nobr></th>
+              <th v-if="!f_calculation.includes('表端结算')"><nobr>二阶单价 </nobr></th>
+              <th v-if="!f_calculation.includes('表端结算')"><nobr>二阶气量 </nobr></th>
+              <th v-if="!f_calculation.includes('表端结算')"><nobr>三阶单价 </nobr></th>
+              <th v-if="!f_calculation.includes('表端结算')"><nobr>三阶气量 </nobr></th>
               <th><nobr>抄表状态 </nobr></th>
               <th><nobr>抄表结果状态 </nobr></th>
               <th><nobr>表单状态 </nobr></th>
@@ -105,12 +105,12 @@
               <td style="text-align:center">{{row.f_oughtfee}}</td>
             <td style="text-align:center">{{row.f_curbalance}}</td>
               <td style="text-align:center" v-if="!row.f_meter_type.includes('物联网表')">{{row.f_whether_pay}}</td>
-              <td style="text-align:center">{{row.f_stair1price}}</td>
-              <td style="text-align:center">{{row.f_stairamount1}}</td>
-              <td style="text-align:center">{{row.f_stair2price}}</td>
-              <td style="text-align:center">{{row.f_stair2amount}}</td>
-              <td style="text-align:center">{{row.f_stair3price}}</td>
-              <td style="text-align:center">{{row.f_stair3amount}}</td>
+              <td style="text-align:center" v-if="!f_calculation.includes('表端结算')">{{row.f_stair1price}}</td>
+              <td style="text-align:center" v-if="!f_calculation.includes('表端结算')">{{row.f_stairamount1}}</td>
+              <td style="text-align:center" v-if="!f_calculation.includes('表端结算')">{{row.f_stair2price}}</td>
+              <td style="text-align:center" v-if="!f_calculation.includes('表端结算')">{{row.f_stair2amount}}</td>
+              <td style="text-align:center" v-if="!f_calculation.includes('表端结算')">{{row.f_stair3price}}</td>
+              <td style="text-align:center" v-if="!f_calculation.includes('表端结算')">{{row.f_stair3amount}}</td>
               <td style="text-align:center">{{row.f_meter_state}}</td>
               <td style="text-align:center">{{row.f_result_state?row.f_result_state:''}}</td>
               <td style="text-align:center">{{row.f_hand_state}}</td>
@@ -135,22 +135,22 @@
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
           用气金额合计:&emsp;{{model.sums.f_oughtfee}}
         </td>
-        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
           一阶用气量合计:&emsp;{{model.sums.f_stairamount1}}
         </td>
-        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
           一阶用气金额合计:&emsp;{{model.sums.f_stair1fee}}
         </td>
-        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
           二阶用气量合计:&emsp;{{model.sums.f_stair2amount}}
         </td>
-        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
           二阶用气金额合计:&emsp;{{model.sums.f_stair2fee}}
         </td>
-        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
           三阶用气量合计:&emsp;{{model.sums.f_stair3amount}}
         </td>
-        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+        <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px" v-if="!f_calculation.includes('表端结算')">
           三阶用气金额合计:&emsp;{{model.sums.f_stair3fee}}
         </td>
       </tr>
@@ -178,6 +178,7 @@
           f_stair3fee: 0
         }),
         show: false,
+        f_calculation: '',
         lists: [],
         meterstates: this.$appdata.getParam('抄表状态') ? [{
           label: '全部',
@@ -232,6 +233,7 @@
     props: ['row'],
     ready () {
       this.$refs.paged.$refs.criteria.model.f_hand_state = ['有效']
+      this.f_calculation = this.row.f_calculation
       this.$refs.paged.$refs.criteria.search()
       // this.sumgasandmoney= this.$refs.paged.$refs.grid.model.sums
       for (let i in this.all) {

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

@@ -72,13 +72,14 @@ export default {
      * @param retry
      * @returns {Promise<void>}  如果查到返回url
      */
-    async openETicket (id, model, f_charge_type, invoice_type, retry, is_tax) {
+    async openETicket (id, model, f_charge_type, invoice_type, retry, is_tax, handplanTableName) {
       console.log('>>> f_invoice_type', invoice_type)
       try {
         let result = await axios.post('/invoice/rs/logic/getInvoice', Object.assign({
           id,
           f_charge_type,
           retry,
+          handplanTableName,
           isTax: is_tax === '不征税' ? 0 : 1,
           eticket_id: retry ? model.id : null,
           invoice_kind: invoice_type,

package/src/filiale/liaoyuan/CardList.vue

@@ -327,6 +327,12 @@
             this.$showMessage(res.data.msg)
             return
           }
+          if ((row.type === '卡表收费' || row.type === '物联网收费' || row.type === '机表收费') && row.f_operator === '微信公众号') {
+            if (!this.authArr.includes('微信缴费撤销')) {
+              this.$showAlert('当前用户没有【微信缴费撤销】权限，请联系管理员获取此权限后再进行该操作！', 'warning', 3000)
+              return
+            }
+          }
           if (row.type === '卡表收费') {
             if (!this.authArr.includes('无卡收费撤销权限')) {
               this.$showAlert('当前用户没有【无卡收费撤销权限】，请联系管理员获取此权限后再进行该操作！', 'warning', 3000)

package/src/filiale/yangchun/CardMeterCenter.vue

@@ -28,14 +28,14 @@
               <input class="input_search" style="width:60%" type="number" v-el:fpregas
                      @keyup.enter="pregas('enter')"    @blur="pregas()" v-model="model.f_pregas" placeholder="预购气量"
                      v-scale="[model.f_pregas, row.f_gas_decimal||4 ]"
-                     v-next-el='fcollection' :disabled="config.calculatePreByCollection"/>
+                     v-next-el='fcollection' :disabled="true"/>
             </div>
             <div class="col-sm-4"
                  :class="[$v.f_preamount.required || $v.f_preamount.dctest || model.f_preamount === 0 ? 'has-error' : 'has-success']">
               <label for="f_pregas" class=" font_normal_body">*预购金额</label>
               <input class="input_search" style="width:60%" type="number"
                      @blur="preamount()" v-model="model.f_preamount"
-                     :disabled="config.calculatePreByCollection"
+                     :disabled="true"
                      v-scale="[model.f_preamount, row.f_fee_decimal||4 ]"
                      v-validate:f_preamount='{required: true, dctest: [maxmoney, "<=" ]}' placeholder="预购金额">
             </div><!--
@@ -101,9 +101,10 @@
                  :class="[$v.f_collection.required  || $v.f_collection.dctest ? 'has-error' : 'has-success']">
               <label for="f_collection" class=" font_normal_body">*收&emsp;&emsp;款</label>
               <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-validate:f_collection='{required: true, dctest: [(model.f_collection - 0), ">=" ] }'
+                     @blur="calculatePreByCollection()"
                      v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
-                     v-scale="[model.f_totalcost, row.f_fee_decimal||4]" :disabled="$refs.givechange.promptText != ''"/>
+                     v-scale="[model.f_collection, row.f_fee_decimal||4]" :disabled="$refs.givechange.promptText != ''"/>
             </div>
             <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气' && row.f_meter_type.includes('卡表') && config.calculatePreByCollection"
                  :class="[$v.f_collection.required ? 'has-error' : 'has-success']">
@@ -118,13 +119,13 @@
                  :class="[$v.f_collection.required  || $v.f_collection.dctest ? 'has-error' : 'has-success']">
               <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="$refs.givechange.promptText != ''">
+                     @blur="calculatePreByCollection()"
+                     v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_collection, row.f_fee_decimal||4]" :disabled="$refs.givechange.promptText != ''">
             </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()"
+                     @blur="calculatePreByCollection()"
                      v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_collection, row.f_fee_decimal||4]" :disabled="$refs.givechange.promptText != ''">
             </div>
             <div class="col-sm-4" v-if="!row.f_meter_type.includes('卡表')">
@@ -243,7 +244,6 @@
 </template>
 <script>
   import {HttpResetClass} from 'vue-client'
-  import XML from '../../plugins/ObjTree'
   /**
    *综合业务
    *卡表收费组件
@@ -675,8 +675,9 @@
       // 根据收款金额计算划价信息
       // 需要配置 calculatePreByCollection = true
       async calculatePreByCollection () {
+        console.log('调用了')
         try {
-          this.model.f_collection = (this.model.f_collection - 0)
+          // this.model.f_collection = (this.model.f_collection - 0)
           let calFee = ((this.model.f_collection - 0) + (this.row.f_balance)).toFixed(4)
           // 通过收款进行划价
           let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
@@ -684,7 +685,7 @@
           let dymoney2 = await this.$CommonService.gasCalculate(this.model, this.model.f_pregas)
           this.model.chargeprice = dymoney2.data.chargeprice
           Object.assign(this.model, this.model, dymoney2.data)
-          this.model.f_totalcost = dymoney2.data.chargenum
+          this.model.f_totalcost = ((this.row.f_balance - 0) > (dymoney2.data.chargenum - 0) ? 0 : ((dymoney2.data.chargenum - 0) - (this.row.f_balance - 0)).toFixed(this.row.f_fee_decimal || 4))
           this.model.f_preamount = dymoney2.data.chargenum
           this.calText(dymoney2.data.chargeprice)
         } catch (error) {
@@ -868,6 +869,7 @@
           }
           this.privilegeCalculate()
         }
+        console.log(this.model.f_collection)
       },
       // 优惠计算
       async privilegeCalculate () {

package/src/filiale/yangchun/EticketV4/EticketOpenPage.vue

@@ -278,7 +278,7 @@ export default {
     confirm () {
       this.eticket_msg = false
       this.eticket_show = true
-      this.$refs.eticketbill.openETicket(this.selecteds.length === 0 ? this.row.id : this.selecteds.map(item => item.id), this.row, '物联网收费', this.row.f_paper_type, false, this.invoice_is_pax)
+      this.$refs.eticketbill.openETicket(this.selecteds.length === 0 ? this.row.id : this.selecteds.map(item => item.id), this.row, '物联网结算', this.row.f_paper_type, false, this.invoice_is_pax, 't_web_handplan')
     },
     selfSearch (args) {
       this.selecteds = []