sale-client 3.5.216 → 3.5.218

package/build/dev-server.js

@@ -1,97 +1,97 @@
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var path = require('path')
-var webpackDevServer = require('webpack-dev-server')
-var compiler = webpack(config)
-// 自己改了这里不要提交 来回覆盖挺麻烦的
-const [localUrl, serverRul] = ['http://127.0.0.1:8080', 'http://192.168.50.4:8400']
-const port = 8089
-
-// eslint-disable-next-line new-cap
-var server = new webpackDevServer(compiler, {
-  contentBase: path.join(__dirname, 'src'),
-  hot: true,
-  publicPath: config.output.publicPath,
-  historyApiFallback: true,
-  open: true,
-  stats: {
-    all: false, // 关闭全部日志
-    colors: true, // 配置控制台输出彩色日志
-    errors: true, // 输出构建错误日志
-    warnings: true, // 输出构建警告日志
-    moduleTrace: true, // 显示 module 路径信息
-    errorDetails: true, // 显示构建错误的详细信息
-    chunks: false, // 不输出构建 chunk 信息
-    entrypoints: false, // 不输出入口文件信息
-    children: false, // 不输出子模块构建信息
-    performance: true // 输出性能提示
-  },
-  proxy: {
-    '/rs/file': {
-      target: serverRul
-    },
-    // 查找资源服务数据
-    '/rs/search': {
-      target: serverRul
-    },
-    // 查找资源服务数据
-    '/rs/logic/getLogin': {
-      target: serverRul
-    },
-    // 查找资源服务数据
-    '/rs/logic/getInitData': {
-      target: serverRul
-    },
-    '/rs/logic/getSaleInitData': {
-      target: serverRul
-    },
-    // 用户登录服务地址
-    '/rs/user': {
-      target: serverRul
-    },
-    '/rs/path': {
-      target: serverRul
-    },
-    '/rs/data': {
-      target: serverRul
-    },
-    '/rs/license': {
-      target: serverRul
-    },
-    '/rs/db': {
-      target: serverRul
-    },
-    '/excel': {
-      target: serverRul
-    },
-    '/rs/config': {
-      target: serverRul
-    },
-    '/rs/report': {
-      target: serverRul
-    },
-    '/rs/vue': {
-      target: serverRul
-    },
-    '/rs/logic': {
-      target: localUrl
-    },
-    '/rs/sql': {
-      target: localUrl
-    },
-    '/webmeter': {
-      target: serverRul
-    },
-    '/rs': {
-      target: serverRul
-      // changeOrigin: true
-    }
-  }
-})
-server.listen(port, 'localhost', function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:' + port)
-})
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var path = require('path')
+var webpackDevServer = require('webpack-dev-server')
+var compiler = webpack(config)
+// 自己改了这里不要提交 来回覆盖挺麻烦的
+const [localUrl, serverRul] = ['http://127.0.0.1:8080', 'http://121.36.106.17:8400']
+const port = 8089
+
+// eslint-disable-next-line new-cap
+var server = new webpackDevServer(compiler, {
+  contentBase: path.join(__dirname, 'src'),
+  hot: true,
+  publicPath: config.output.publicPath,
+  historyApiFallback: true,
+  open: true,
+  stats: {
+    all: false, // 关闭全部日志
+    colors: true, // 配置控制台输出彩色日志
+    errors: true, // 输出构建错误日志
+    warnings: true, // 输出构建警告日志
+    moduleTrace: true, // 显示 module 路径信息
+    errorDetails: true, // 显示构建错误的详细信息
+    chunks: false, // 不输出构建 chunk 信息
+    entrypoints: false, // 不输出入口文件信息
+    children: false, // 不输出子模块构建信息
+    performance: true // 输出性能提示
+  },
+  proxy: {
+    '/rs/file': {
+      target: serverRul
+    },
+    // 查找资源服务数据
+    '/rs/search': {
+      target: serverRul
+    },
+    // 查找资源服务数据
+    '/rs/logic/getLogin': {
+      target: serverRul
+    },
+    // 查找资源服务数据
+    '/rs/logic/getInitData': {
+      target: serverRul
+    },
+    '/rs/logic/getSaleInitData': {
+      target: serverRul
+    },
+    // 用户登录服务地址
+    '/rs/user': {
+      target: serverRul
+    },
+    '/rs/path': {
+      target: serverRul
+    },
+    '/rs/data': {
+      target: serverRul
+    },
+    '/rs/license': {
+      target: serverRul
+    },
+    '/rs/db': {
+      target: serverRul
+    },
+    '/excel': {
+      target: serverRul
+    },
+    '/rs/config': {
+      target: serverRul
+    },
+    '/rs/report': {
+      target: serverRul
+    },
+    '/rs/vue': {
+      target: serverRul
+    },
+    '/rs/logic': {
+      target: localUrl
+    },
+    '/rs/sql': {
+      target: localUrl
+    },
+    '/webmeter': {
+      target: serverRul
+    },
+    '/rs': {
+      target: serverRul
+      // changeOrigin: true
+    }
+  }
+})
+server.listen(port, 'localhost', function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:' + port)
+})

package/package.json

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

package/src/components/FilesManage/FileAddressManage.vue

@@ -3,7 +3,7 @@
     <div :class="{'basic-main':!useraddressShow,'binary-left':useraddressShow}" v-show="isSelect">
       <file-address-list @select-changed="selected" v-ref:addresslist :style="style" :select=select :company=company :f_filialeids.sync="f_filialeids"></file-address-list>
     </div>
-    <div v-show="useraddressShow"  :class="{'basic-main':!isSelect, 'binary-right': isSelect}">
+    <div v-show="useraddressShow"  :class="{'basic-main':!isSelect, 'binary-right': isSelect}" style="width:60%">
       <div class="flex">
         <file-user-address :f_filialeids.sync="f_filialeids" :is_pecial="isSpecial" :isedit="isSelect" :row="row" v-ref:fileuseraddress></file-user-address>
 

package/src/components/FilesManage/UserEssentialInfoTest.vue

@@ -205,7 +205,7 @@
         </div>
       </form>
     </validator>
-    <modal v-if="showselectaddress" :show.sync="showselectaddress" width="50%" height="80%" title="地址信息" v-ref:modal large backdrop="false">
+    <modal v-if="showselectaddress" :show.sync="showselectaddress" width="70%" height="80%" title="地址信息" v-ref:modal large backdrop="false">
       <article slot="modal-body" class="modal-body" style="height: 700px;padding: 0!important;">
         <file-address-manage :is-select="isSelect" :fileinfo="addressinfo"
                              @address-valid="doNothing"   :showselectaddress.sync="showselectaddress" v-ref:fileaddress ></file-address-manage>

package/src/components/charge/business/CardMeterCenter.vue

@@ -364,6 +364,9 @@
               self.billData.url = 'rs/report/fmy_card_bill'
             }
           }
+          if (self.row.f_meter_type === '金额卡表' && self.$appdata.getSingleValue('金额气量区分卡表票据')) {
+            self.billData.url = 'rs/report/fee_card_bill'
+          }
           if (self.config.hasBillManage) {
             // 启用发票管理，获取票据管理中的票号并存储记录
             self.row.id = res

package/src/components/charge/business/ShowCardSellGas.vue

@@ -381,6 +381,9 @@ let initCardGen = async function (self) {
             self.billData.url = 'rs/report/fmy_sendCard_bill'
           }
         }
+        if (self.row.f_meter_type === '金额卡表' && self.$appdata.getSingleValue('金额气量区分卡表票据')) {
+          self.billData.url = 'rs/report/fee_sendCard_bill'
+        }
         if (self.config.hasBillManage) {
           // 启用发票管理，获取票据管理中的票号并存储记录 d
           self.row.id = res.data.id

package/src/components/revenue/base/rightview/CardList.vue

@@ -446,13 +446,21 @@
           if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
             name = 'rs/report/fmy_sendCard_bill'
           } else {
-            name = 'rs/report/sendCard_bill'
+            if (row.f_meter_classify === '金额卡表' && this.$appdata.getSingleValue('金额气量区分卡表票据')) {
+              name = 'rs/report/fee_sendCard_bill'
+            } else {
+              name = 'rs/report/sendCard_bill'
+            }
           }
         } else if (type === '卡表收费' || type === '卡表收费撤销' || type === '卡表赠气' || type === '卡表收费撤销') {
           if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
             name = 'rs/report/fmy_card_bill'
           } else {
-            name = 'rs/report/card_bill'
+            if (row.f_meter_classify === '金额卡表' && this.$appdata.getSingleValue('金额气量区分卡表票据')) {
+              name = 'rs/report/fee_card_bill'
+            } else {
+              name = 'rs/report/card_bill'
+            }
           }
         } else if (type === '预存缴费') {
           name = 'rs/report/pre_sell'

package/src/filiale/rongcheng/FileAddressManage.vue

@@ -3,7 +3,7 @@
     <div :class="{'basic-main':!useraddressShow,'binary-left':useraddressShow}" v-show="isSelect">
       <file-address-list @select-changed="selected" v-ref:addresslist :style="style" :select=select :company=company :f_filialeids.sync="f_filialeids"></file-address-list>
     </div>
-    <div v-show="useraddressShow"  :class="{'basic-main':!isSelect, 'binary-right': isSelect}">
+    <div v-show="useraddressShow"  :class="{'basic-main':!isSelect, 'binary-right': isSelect}" style="width:60%">
       <div class="flex">
         <file-user-address :f_filialeids.sync="f_filialeids" :is_pecial="isSpecial" :isedit="isSelect" :row="row" v-ref:fileuseraddress></file-user-address>
 

package/src/filiale/shanxian/components/FilesManage/FileAddressList.vue

@@ -5,14 +5,14 @@
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
 
           <div class="row">
-            <div class="col-sm-4 form-group">
+            <div class="col-sm-6 form-group">
               <label class="font_normal_body">地址信息</label>
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_address"
                       condition="f_address like '%{}%'" placeholder="地址信息"
                       @keyup.enter.stop="search()"
                       :size="model.f_address ? model.f_address.length*2 : 8"/>
             </div>
-            <div class="col-sm-4 form-group button-range" >
+            <div class="col-sm-6 form-group button-range" >
               <button class="button_search button_spacing" @click="search()" >查询</button>
               <button class="button_new button_spacing"  style="width: max-content" @click="$parent.$parent.add('民用')">添加民用地址</button>
               <button class="button_new button_spacing" style="width: max-content" @click="$parent.$parent.add('非民用')">添加特殊地址</button>