sale-client 3.5.224 → 3.5.226

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://192.168.50.4:8400', '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://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)
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.224",
+  "version": "3.5.226",
   "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/FilesManage/UserGeneralInfoTest.vue

@@ -93,7 +93,7 @@
         </div>
         <div class="row">
           <div class="col-sm-2"></div>
-          <input v-if="fileSaveData.reason==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
+          <input v-if="fileSaveData.reason ==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">

package/src/components/revenue/base/leftview/otherinfo.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex" style="height: 90%;overflow-y: scroll">
-    <mix-price-info :data="data" v-if="data.f_price_type === '固定气价'"></mix-price-info>
-    <stairinfo :data="data" v-if="data.f_price_type === '阶梯气价'"></stairinfo>
+    <mix-price-info :data="data" v-if="data.f_meter_type && data.f_price_type === '固定气价'"></mix-price-info>
+    <stairinfo :data="data" v-if="data.f_meter_type && data.f_price_type === '阶梯气价'"></stairinfo>
     <bill-message @setstate="setstate" :state="state" :data="data"></bill-message>
     <valueaddinfo :data="data" v-ref:valueaddinfo></valueaddinfo>
     <safe-check :data="data"></safe-check>

package/src/components/revenue/machineHandManage/machineHandAudit.vue

@@ -394,7 +394,7 @@
   import * as Util from '../../../Util'
 
   let readyGen = async function (self) {
-    self.$refs.paged.$refs.cri.model.startDate =  self.$login.toStartAndEndDateString()[0]
+    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStartAndEndDateString()[0]
     self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
     await self.$LoadParams.loadMeterBook(self.f_filialeid)
     self.loadMeterBooks()
@@ -414,12 +414,13 @@
           dep: [],
           user: []
         },
-        config:{
-          examine: false,
+        config: {
+          examine: false
         },
         imgfilename: '',
         // 小区
         residentialArea: [],
+        inputtouPerson: [],
         imgshow: false,
         criteriaShow: false,
         orgCondtionStr: '',
@@ -444,8 +445,8 @@
           'f_adjustable_name': '调压箱名称',
           'f_inputtor': '抄表员'
         },
-        auditState:[{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
-        auditState1:[{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
+        auditState: [{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
+        auditState1: [{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
         meters: [{label: '全部', value: ''}, {label: '机表', value: '机表'}, {label: '物联网表', value: '物联网表'}],
         resultstate: this.$appdata.getParam('抄表结果状态'),
         meterstates: this.$appdata.getParam('抄表状态') ? [{
@@ -475,7 +476,7 @@
     methods: {
       // 修正本期底数
       amend (row) {
-        let tablebase = window.prompt('请输入你要修正的底数值，上期底数：'+ row.f_meter_base)
+        let tablebase = window.prompt('请输入你要修正的底数值，上期底数：' + row.f_meter_base)
         if (!tablebase) return
         if (tablebase < 0) {
           this.$showAlert(`底数不能小于0，请注意!`, 'warning', 2000)
@@ -596,9 +597,9 @@
         this.imgshow = false
       },
       imgShow (val) {
-        console.log("-----------val2:",val)
+        console.log('-----------val2:', val)
         this.imgfilename = `rs/image/file/` + val
-        console.log("-----------imgfilename2:",this.imgfilename)
+        console.log('-----------imgfilename2:', this.imgfilename)
         this.imgshow = true
       },
       async getaddress () {
@@ -632,6 +633,17 @@
         } else {
           args.condition = `${args.condition}` + this.orgCondtionStr
         }
+        // 抄表员查询条件
+        this.inputtouPerson = this.$refs.paged.$refs.cri.model.f_inputtor
+        if (this.inputtouPerson.length !== 0) {
+          let str = JSON.stringify(this.inputtouPerson)
+          str = str.replace(/"/g, `'`)
+          str = str.replace(/\[/g, ``)
+          str = str.replace(/\]/g, ``)
+          console.log('=====抄表员model22222222222绑定====', str)
+          // 查询多个抄表员时条件
+          args.condition += ` and f_inputtor in  ( ${str} )`
+        }
         this.excelCondition = args.condition
         this.$refs.paged.$refs.grid.selectInit()
         this.model.search(args.condition, args.model)
@@ -696,7 +708,7 @@
       },
       loadMeterBooks () {
         this.meterbooks = this.$GetSaleParam.getMeterBooks()
-      },
+      }
 
     },
     computed: {

package/src/filiale/fugu/components/BlackList/BlackList.vue

@@ -172,12 +172,25 @@
       }
     },
     ready () {
-
+      if (this.data) {
+        if (this.data.f_parameter_key != undefined) {
+          this.isBlackList = true
+          initGen(this, this.data)
+        } else {
+          this.isBlackList = false
+          this.initNormalModel(this.data,this)
+        }
+      } else {
+        this.isBlackList = false
+        this.initModel()
+      }
     },
     watch: {
       'data' (val) {
+        console.log('看看传进来的。。。。' + JSON.stringify(val))
+        this.data = val
         if (val) {
-          if(this.data.f_parameter_value){
+          if (this.data.f_parameter_key != undefined) {
             this.isBlackList = true
             initGen(this, this.data)
           } else {