sale-client 3.6.566 → 3.6.568

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Wed Jun 25 17:54:33 CST 2025
+#Mon Apr 14 10:14:01 CST 2025
 gradle.version=5.2.1

package/package.json

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

package/src/filiale/bayan/CardMeterCenter.vue

@@ -245,6 +245,11 @@
    *卡表收费组件
    */
 
+  // 输入金额，换算气量
+  function stringRound(num, decimals = 2) {
+    const strValue = num + 'e' + decimals
+    return Math.round(Number(strValue)) / Math.pow(10, decimals)
+  }
     // 输入金额，换算气量
   let preamountGen = async function (self) {
     let calFee = ((self.model.f_preamount - 0)).toFixed(self.row.f_fee_decimal || 2)
@@ -803,6 +808,7 @@
       calText (val) {
         let str = ''
         let num = 0
+        let total = 0
         val.forEach((item) => {
           if (item.f_gas > 0) {
             num = num + 1
@@ -812,8 +818,10 @@
           } else {
             str = str + item.f_price + ' x ' + Math.floor(item.f_gas) + '+'
           }
+          total += item.f_price * item.f_gas
         })
         str = str.slice(0, str.length - 1)
+        str += ` = ${total}`
         this.calculatedetail = str
         if (num > 1) {
           if (this.$login.r.find(item => item == '阶梯提示无按钮')) {

package/src/filiale/bayan/ChargeList.vue

@@ -129,15 +129,7 @@
                           condition="i.f_user_level = '{}'"
                           close-on-select style="width: 60%"></v-select>
               </div>
-              <div class="form-group col-sm-3" >
-                <label class="font_normal_body">组织机构</label>
-                <res-select :initresid='$parent.$parent.curorgid'
-                            @res-select="$parent.$parent.getorg"
-                            class="select select_list"
-                            restype='organization'
-                            style="width: 60%">
-                </res-select>
-              </div>
+
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">卡&emsp;&emsp;号</label>
                 <input type="text" class="input_search" style="width:60%" v-model="model.f_card_id" placeholder='卡号'
@@ -852,9 +844,7 @@ let cardBtnGen = async function (self, val) {
         if (!this.f_orgid) {
           this.getorg([this.$login.f.orgid])
         }
-        if (this.f_orgid) {
-          args.condition = `u.f_filialeid in ${this.f_orgid} and ${args.condition}`
-        }
+
         this.excelCondition = args.condition
         args.condition = `${args.condition}`
         if (this.defbtn === '发卡售气') {

package/src/filiale/bayan/ChargeManage.vue

@@ -106,7 +106,7 @@ export default {
                     // 获取用户信息
                     getUser = await this.$resetpost('rs/sql/sale_getUser', {
                       data: {
-                        condition: `u.f_filialeid in ${forgid}  and gb.f_meter_type in ('机表','物联网表') and i.f_userinfo_code='${res.data.CardID}'`,
+                        condition: `gb.f_meter_type in ('机表','物联网表') and i.f_userinfo_code='${res.data.CardID}'`,
                         orderitem: `f_userinfo_id`
                       }
                     }, {resolveMsg: null, rejectMsg: '读卡失败'})