sale-client 4.0.52-preview → 4.0.54-preview

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/', 'http://localhost:9026/']
+const [ serverRul, localUrl, v4Url ] = ['http://123.57.92.217:8900/', 'http://123.57.92.217:8900/', 'http://123.57.92.217:8900/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -19,26 +19,26 @@ var devConfig = {
       children: false // 不输出子模块构建信息
     },
     proxy: {
-      '/api/af-revenue/logic': {
-        pathRewrite: {
-          '/api/af-revenue/logic': '/logic'
-        },
-        target: 'http://localhost:9026/'
-      },
-      '/api/af-revenue/file': {
-        pathRewrite: {
-          '/api/af-revenue/file': '/file'
-        },
-        target: 'http://localhost:9026/'
-      },
-      '/api/af-revenue/sql': {
-        pathRewrite: {
-          '/api/af-revenue/sql': '/sql'
-        },
-        target: 'http://localhost:9026/'
-      },
+      // '/api/af-revenue/logic': {
+      //   pathRewrite: {
+      //     '/api/af-revenue/logic': '/logic'
+      //   },
+      //   target: 'http://localhost:9026/'
+      // },
+      // '/api/af-revenue/file': {
+      //   pathRewrite: {
+      //     '/api/af-revenue/file': '/file'
+      //   },
+      //   target: 'http://localhost:9026/'
+      // },
+      // '/api/af-revenue/sql': {
+      //   pathRewrite: {
+      //     '/api/af-revenue/sql': '/sql'
+      //   },
+      //   target: 'http://localhost:9026/'
+      // },
       '/api': {
-        target: 'http://192.168.50.67:31567'
+        target: 'http://123.57.92.217:8900/'
       },
       '/invoice/rs/logic/getInvoice': {
         target: serverRul

package/package.json

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

package/src/filiale/ruihua/FilesManage/MeterinfoTest.vue

@@ -182,7 +182,7 @@
         <div class="row">
           <div class="col-sm-4 form-group" :class="[$m.name.required ? 'has-error' : '']">
             <label for="pricename" class="font_normal_body">气价名称</label>
-            <v-select :value.sync="row.pricename" v-model="row.pricename" search min-width="230px"
+            <v-select :value.sync="row.pricename" v-model="row.pricename" search min-width="285px"
                       placeholder='气价名称' :options="getPricenames" @change="priceChange"
                       close-on-select :disabled="permissionPrice" v-ref:name></v-select>
             <input type="text" v-show="false" v-model="$refs.name.selectedItems" v-validate:name='{required: true }'>

package/src/filiale/ruihua/IOTMeterCenter.vue

@@ -43,7 +43,7 @@
             </div>
           </div>
           <div v-if="model.f_preamount" style="font-size: 18px; font-weight: bold; margin-left: 757px">
-            大写预购金额: {{ convertToChinese(model.f_preamount) }} 元
+            大写预购金额: {{ convertToChinese(model.f_preamount) }}
           </div>
           <div class="row" style="margin-top:6px;">
             <div class="col-sm-4 form-group" :class="[$v.printstyle.required ? 'select-error' : '']">
@@ -624,22 +624,57 @@
       }
     },
     methods: {
-      convertToChinese (num) {
-        // 简单的数字转换为中文大写金额的函数
-        const units = ['', '拾', '佰', '仟', '万', '亿', '兆']
-        const chars = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖']
-        const str = num.toString()
-        let result = ''
-        let unitIndex = 0
-
-        for (let i = str.length - 1; i >= 0; i--) {
-          const n = str[i]
-          result = chars[n] + (n === '0' ? '' : units[unitIndex]) + result
-          unitIndex++
+    convertToChinese(num) {
+      const units = ['', '拾', '佰', '仟', '万', '亿', '兆']
+      const chars = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖']
+      const str = num.toString()
+      const [integerPart, decimalPart] = str.split('.')
+
+      let result = ''
+      let unitIndex = 0
+      let zeroFlag = false
+      // 处理整数部分
+      for (let i = integerPart.length - 1; i >= 0; i--) {
+        const n = integerPart[i]
+        if (n === '0') {
+          if (!zeroFlag) {
+            result = chars[n] + result
+            zeroFlag = true
+          }
+        } else {
+          result = chars[n] + units[unitIndex] + result
+          zeroFlag = false
         }
+        unitIndex++
+      }
 
-        return result.replace(/零+/g, '零').replace(/零$/, '')
-      },
+      result = result.replace(/零+/g, '零').replace(/零$/, '')
+      if (result === '') {
+        result = '零'
+      }
+
+      result += '元'
+
+      // 处理小数部分
+      if (decimalPart) {
+        const jiao = decimalPart[0] || '0'
+        const fen = decimalPart[1] || '0'
+
+        if (jiao !== '0') {
+          result += chars[jiao] + '角'
+        }
+        if (fen !== '0') {
+          result += chars[fen] + '分'
+        }
+        if (jiao === '0' && fen === '0') {
+          result += '整'
+        }
+      } else {
+        result += '整'
+      }
+
+      return result
+    },
       // 根据收款金额计算划价信息
       // 需要配置 calculatePreByCollection = true
       async calculatePreByCollection () {