npm - sale-client - Versions diffs - 3.6.396-preview → 3.6.397-preview - Mend

sale-client 3.6.396-preview → 3.6.397-preview

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/package.json +1 -1
package/src/filiale/fugou/components/revenue/comprehen/ComprehenOperation/MeterDisable/DisableManage.vue +106 -106
package/src/filiale/xihu/IOTMeterCenter.vue +2 -2
package/src/filiale/xihu/NoCardMeterCenter.vue +10 -10
package/src/filiale/xihu/ShowCardSellGas.vue +2 -2
package/src/main.js +1 -1

package/package.json CHANGED Viewed

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

package/src/filiale/fugou/components/revenue/comprehen/ComprehenOperation/MeterDisable/DisableManage.vue CHANGED Viewed

@@ -1,106 +1,106 @@
-<template>
-  <div class="auto">
-    <validator name='v'>
-      <form class="form-horizontal">
-        <div class="row">
-          <div class="col-sm-4 form-group">
-            <label for="f_reason" class="font_normal_body">停用原因</label>
-            <v-select v-model="model.f_reason"
-                      placeholder='停用原因'
-                      :value.sync="model.f_reason"
-                      :options='reason'
-                      v-ref:reason
-                      close-on-select ></v-select>
-          </div>
-        </div>
-        <div class="row" style="margin-top:1px;">
-          <div class="col-sm-8 form-group"  :class="[$v.f_othereason.required ? 'has-error' : 'has-success']">
-            <label for="f_reason" class="font_normal_body">备&emsp;&emsp;注</label>
-            <input class="input_search" style="width:80%" v-model="model.f_othereason"  placeholder="备注"
-                   v-validate:f_othereason='{required: true }'/>
-          </div>
-        </div>
-      </form>
-      <div style="text-align:right;">
-        <button class="button_search button_spacing" @click="confirm()"  :disabled='!$v.valid'>确认</button>
-        <button class="button_clear" @click="clean()" >取消</button>
-      </div>
-    </validator>
-  </div>
-  <upload :blodid="blodid" v-if="false" isremark="true" fusetype="表具停用"></upload>
-</template>
-<script>
-import Vue from 'vue'
-/**
- *综合业务
- 表具停用组件
- */
-export default {
-  title: '表具停用',
-  props: ['row'],
-  data () {
-    return {
-      blodid: '',
-      showupload: true,
-      model: {},
-      reason: this.$appdata.getParam('停用原因')
-    }
-  },
-  ready () {
-    this.blodid = this.row.f_userinfo_id
-  },
-  methods: {
-    async confirm () {
-      await this.$LogicService.meterDisable(this.model, this.row)
-      if (this.$appdata.getSingleValue('v4后台')) {
-        await this.$resetpost('api/af-revenue/entity/save/t_userfiles', {
-          f_userfiles_id: this.row.f_userfiles_id,
-          f_table_state: '停用',
-          version: this.row.version
-        }, {resolveMsg: '表具启用成功', rejectMsg: '表具启用失败'})
-      }
-      let array = [{
-        f_userfiles_id: this.row.f_userfiles_id,
-        f_user_id: this.row.f_userfiles_id,
-        f_alias: this.row.f_alias,
-        f_userinfo_id: this.row.f_userinfo_id,
-        f_orgname: this.$login.f.orgs,
-        f_orgid: this.$login.f.orgid,
-        f_meternumber: this.row.f_meternumber
-      }]
-      if (this.row.f_meter_type === '物联网表') {
-        await this.$resetpost('api/af-revenue/logic/iot_instructUpdateAndDelect',
-          {
-            data: {
-              data1: {
-                f_apply_type: '阀门控制',
-                userid: array,
-                nowDate: new Date(),
-                f_apply_value: '关阀',
-                f_apply_beizhu: '表具停用自动关阀',
-                f_apply_operator: this.$login.f.name
-              },
-              data2: {
-                userid: array,
-                instructtype: '阀门控制',
-                isOpen: '关阀',
-                instructTitle: '手动关阀',
-                reasonInfo: '表具停用自动关阀',
-                f_instruct_state: '待发送',
-                inputtor: this.$login.f.name
-              }
-            }
-          })
-      }
-      this.$dispatch('success')
-    },
-    clean () {
-      this.$dispatch('refresh')
-    }
-  }
-}
-</script>
-<style>
-</style>
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-4 form-group">
+            <label for="f_reason" class="font_normal_body">停用原因</label>
+            <v-select v-model="model.f_reason"
+                      placeholder='停用原因'
+                      :value.sync="model.f_reason"
+                      :options='reason'
+                      v-ref:reason
+                      close-on-select ></v-select>
+          </div>
+        </div>
+        <div class="row" style="margin-top:1px;">
+          <div class="col-sm-8 form-group"  :class="[$v.f_othereason.required ? 'has-error' : 'has-success']">
+            <label for="f_reason" class="font_normal_body">备&emsp;&emsp;注</label>
+            <input class="input_search" style="width:80%" v-model="model.f_othereason"  placeholder="备注"
+                   v-validate:f_othereason='{required: true }'/>
+          </div>
+        </div>
+      </form>
+      <div style="text-align:right;">
+        <button class="button_search button_spacing" @click="confirm()"  :disabled='!$v.valid'>确认</button>
+        <button class="button_clear" @click="clean()" >取消</button>
+      </div>
+    </validator>
+  </div>
+  <upload :blodid="blodid" v-if="false" isremark="true" fusetype="表具停用"></upload>
+</template>
+<script>
+import Vue from 'vue'
+/**
+ *综合业务
+ 表具停用组件
+ */
+export default {
+  title: '表具停用',
+  props: ['row'],
+  data () {
+    return {
+      blodid: '',
+      showupload: true,
+      model: {},
+      reason: this.$appdata.getParam('停用原因')
+    }
+  },
+  ready () {
+    this.blodid = this.row.f_userinfo_id
+  },
+  methods: {
+    async confirm () {
+      await this.$LogicService.meterDisable(this.model, this.row)
+      if (this.$appdata.getSingleValue('v4后台')) {
+        await this.$resetpost('api/af-revenue/entity/save/t_userfiles', {
+          f_userfiles_id: this.row.f_userfiles_id,
+          f_table_state: '停用',
+          version: this.row.version
+        }, {resolveMsg: '表具启用成功', rejectMsg: '表具启用失败'})
+      }
+      let array = [{
+        f_userfiles_id: this.row.f_userfiles_id,
+        f_user_id: this.row.f_userfiles_id,
+        f_alias: this.row.f_alias,
+        f_userinfo_id: this.row.f_userinfo_id,
+        f_orgname: this.$login.f.orgs,
+        f_orgid: this.$login.f.orgid,
+        f_meternumber: this.row.f_meternumber
+      }]
+      if (this.row.f_meter_type === '物联网表') {
+        await this.$resetpost('api/af-revenue/logic/iot_instructUpdateAndDelect',
+          {
+            data: {
+              data1: {
+                f_apply_type: '阀门控制',
+                userid: array,
+                nowDate: new Date(),
+                f_apply_value: '关阀',
+                f_apply_beizhu: '表具停用自动关阀',
+                f_apply_operator: this.$login.f.name
+              },
+              data2: {
+                userid: array,
+                instructtype: '阀门控制',
+                isOpen: '关阀',
+                instructTitle: '手动关阀',
+                reasonInfo: '表具停用自动关阀',
+                f_instruct_state: '待发送',
+                inputtor: this.$login.f.name
+              }
+            }
+          })
+      }
+      this.$dispatch('success')
+    },
+    clean () {
+      this.$dispatch('refresh')
+    }
+  }
+}
+</script>
+<style>
+</style>

package/src/filiale/xihu/IOTMeterCenter.vue CHANGED Viewed

@@ -262,7 +262,7 @@ let preamountGen = async function (self) {
   Object.assign(self.model, self.model, getGas.data)
   self.model.f_totalcost = ((self.model.f_totalcost - 0) - (self.dymoney - 0) + (self.alldue_fee - 0)).toFixed(self.row.f_fee_decimal || 4)
   if (self.config.floor) {
-    self.model.f_totalcost = Math.ceil(self.model.f_totalcost)
+    // self.model.f_totalcost = Math.ceil(self.model.f_totalcost)
   }
   // self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
   self.model.f_collection = self.model.f_totalcost
@@ -289,7 +289,7 @@ let pregasGen = async function (self) {
     Object.assign(self.model, self.model, getAmount.data)
     self.model.chargeprice = getAmount.data.chargeprice
     if (self.config.floor) {
-      self.model.f_totalcost = Math.ceil(self.model.f_totalcost)
+      // self.model.f_totalcost = Math.ceil(self.model.f_totalcost)
     }
     self.model.f_collection = self.model.f_totalcost
     if (self.model.f_payment == '赠气') {

package/src/filiale/xihu/NoCardMeterCenter.vue CHANGED Viewed

@@ -178,11 +178,11 @@ let preamountGen = async function (self) {
         if (self.row.f_alias === 'QiaoSong') {
           self.model.f_pregas = (getGas.data.gas - 0).toFixed(1)
         } else {
-          self.model.f_pregas = (getGas.data.gas - 0).toFixed(4)
+          self.model.f_pregas = (getGas.data.gas - 0).toFixed(2)
         }
       } else {
         let tempnum = Math.floor(getGas.data.gas - 0)
-        let dymoney1 = await self.$CommonService.gasCalculate(self.model, (tempnum).toFixed(4))
+        let dymoney1 = await self.$CommonService.gasCalculate(self.model, (tempnum).toFixed(2))
         dymoney = (getGas.data.chargenum - 0).toFixed(2) - (dymoney1.data.chargenum - 0).toFixed(2)
         self.model.f_pregas = Math.floor(getGas.data.gas - 0)
       }
@@ -190,10 +190,10 @@ let preamountGen = async function (self) {
     self.model.f_preamount = calFee - (dymoney - 0)
     self.model.chargeprice = getGas.data.chargeprice
     Object.assign(self.model, self.model, getGas.data)
-    self.model.f_totalcost = ((self.model.f_totalcost - 0) - (dymoney - 0)).toFixed(4)
+    self.model.f_totalcost = ((self.model.f_totalcost - 0) - (dymoney - 0)).toFixed(2)
     // self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
     if(self.config.floor){
-      self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
+      // self.model.f_totalcost=Math.ceil(self.model.f_totalcost)
     }
     self.calText(getGas.data.chargeprice)
   }
@@ -201,7 +201,7 @@ let preamountGen = async function (self) {
 // 输入气量，换算金额
 let pregasGen = async function (self) {
   if (self.row.f_isdecimal === '是') {
-    self.model.f_pregas = (self.model.f_pregas - 0).toFixed(4)
+    self.model.f_pregas = (self.model.f_pregas - 0).toFixed(2)
   } else {
     self.model.f_pregas = (self.model.f_pregas - 0).toFixed(0)
   }
@@ -209,12 +209,12 @@ let pregasGen = async function (self) {
     self.model.f_meter_type = self.row.f_meter_type
     let getAmount = await self.$CommonService.gasCalculate(self.model, self.model.f_pregas)
     self.model.f_preamount = getAmount.data.chargenum
-    self.model.f_totalcost = ((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(4))
+    self.model.f_totalcost = ((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(2))
     Object.assign(self.model, self.model, getAmount.data)
     self.model.chargeprice = getAmount.data.chargeprice
     self.model.f_collection = self.model.f_totalcost
     if(self.config.floor){
-      self.model.f_collection=Math.ceil(self.model.f_collection)
+      // self.model.f_collection=Math.ceil(self.model.f_collection)
     }
     self.calText(getAmount.data.chargeprice)
   }
@@ -478,12 +478,12 @@ export default {
     'curbalance' () {
       if (this.model.f_preamount) {
         if (this.row.f_collection_type === '按金额') {
-          return ((this.model.f_totalcost - 0) + (this.row.f_balance - 0) - (this.model.f_preamount - 0)).toFixed(4)
+          return ((this.model.f_totalcost - 0) + (this.row.f_balance - 0) - (this.model.f_preamount - 0)).toFixed(2)
         } else {
           if ((this.row.f_balance - 0) > (this.model.f_preamount - 0)) {
-            return ((this.row.f_balance - 0) - (this.model.f_preamount - 0)).toFixed(4)
+            return ((this.row.f_balance - 0) - (this.model.f_preamount - 0)).toFixed(2)
           } else {
-            return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(4)
+            return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(2)
           }
         }
       } else {

package/src/filiale/xihu/ShowCardSellGas.vue CHANGED Viewed

@@ -314,7 +314,7 @@ let preamountGen = async function (self) {
   self.model.f_totalcost = ((self.dymoney - 0) >= (self.model.f_totalcost - 0) ? 0 : (self.model.f_totalcost - 0) - (self.dymoney - 0).toFixed(self.row.f_fee_decimal || 4))
   self.model.f_collection = self.model.f_totalcost
   if (self.config.floor) {
-    self.model.f_collection = Math.ceil(self.model.f_collection)
+    // self.model.f_collection = Math.ceil(self.model.f_collection)
   }
   self.model.f_preamount = (calFee - (self.dymoney - 0)).toFixed(self.row.f_fee_decimal || 4)
   self.calText(getGas.data.chargeprice)
@@ -337,7 +337,7 @@ let pregasGen = async function (self) {
     self.model.chargeprice = getAmount.data.chargeprice
     self.model.f_collection = self.model.f_totalcost
     if (self.config.floor) {
-      self.model.f_collection = Math.ceil(self.model.f_collection)
+      // self.model.f_collection = Math.ceil(self.model.f_collection)
     }
     self.pricetext = getAmount.data.chargeprice[0].pricetext?getAmount.data.chargeprice[0].pricetext:null
     self.calText(getAmount.data.chargeprice)

package/src/main.js CHANGED Viewed

@@ -4,7 +4,7 @@ import App from './App'
 import system from 'system-clients/src/system'
 // import FilialeSale from './filiale/dexin/sale'
 import sale from './sale'
-import FilialeSale from './filiale/fugou/sale'
+import FilialeSale from './filiale/xihu/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'