sale-client 3.4.202 → 3.4.203

package/build/dev-server.js

@@ -100,7 +100,7 @@ var proxyTable = {
   '/rs': {
     // target: 'http://192.168.30.63:8081/'
     // target: 'http://121.36.106.17:8400/'
-    target: fuwu
+    target: bendi
   }
 }
 

package/build/webpack.prod.conf.js

@@ -70,7 +70,7 @@ module.exports = merge(baseConfig, {
     }),
     new ParallelUglifyPlugin({
       // 用作缓存的可选绝对路径。如果未提供，则不使用缓存。
-      cacheDir: '.cache/',
+      // cacheDir: '.cache/',
       uglifyJS: {
         output: {
           // 是否保留代码中的注释，默认为保留

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.4.202",
+  "version": "3.4.203",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -8,7 +8,7 @@
     "dev": "node build/dev-server.js",
     "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
     "unit": "karma start test/unit/karma.conf.js",
-    "build": "rimraf dist && mkdirp dist && ncp static dist/mergeUser && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "build": "rimraf lib && mkdirp lib && cross-env webpack --progress --hide-modules --config build/webpack.prod.conf.js",
     "e2e": "node test/e2e/runner.js",
     "release": "bash build/release.sh"
   },
@@ -88,7 +88,7 @@
     "style-loader": "^0.20.3",
     "system-clients": "3.2.0-2",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.51",
+    "vue-client": "1.24.52",
     "vue-clipboard2": "0.3.1",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",

package/src/components/FilesManageNew/FileAddressList.vue

@@ -75,15 +75,12 @@
     },
     title: '地址列表',
     props: {
-      f_filialeids: {
+      f_filialeid: {
         type: String
-      },
-      company: {
-        type: String,
-        default: ''
       }
     },
     ready () {
+      console.log('f_filialeid8888:',this.f_filialeid)
       this.search()
     },
     methods: {
@@ -92,7 +89,7 @@
       },
       // 添加方法
       add (val) {
-        if (this.f_filialeids) {
+        if (this.f_filialeid) {
           this.$refs.paged.$refs.grid.selectStore.selected = null
           this.$dispatch('add', val)
         } else {
@@ -114,10 +111,10 @@
       },
 
       selfSearch (args) {
-        if (!this.f_orgid) {
+        if (!this.f_filialeid) {
           this.getorg([this.$login.f.orgid])
         }
-        args.condition = `${args.condition} and a.f_userinfo_id is null and a.f_filialeid = '${this.f_filialeids}'`
+        args.condition = `${args.condition} and a.f_userinfo_id is null and a.f_filialeid = '${this.f_filialeid}'`
         this.model.search(args.condition, args.model)
       },
 
@@ -127,14 +124,14 @@
       },
       getorg (val) {
         this.f_orgid = this.$login.convertToIn(val)
-        this.f_filialeids = val[0]
+        this.f_filialeid = val[0]
       }
     },
     watch: {
-      'company' (val) {
-        this.f_orgid = val
-        this.f_filialeids = val
-      }
+      // 'company' (val) {
+      //   this.f_orgid = val
+      //   this.f_filialeids = val
+      // }
     }
 
   }

package/src/components/FilesManageNew/FileAddressManage.vue

@@ -1,11 +1,12 @@
 <template>
   <div id="unit" class="flex-row">
     <div :class="{'basic-main':!useraddressShow,'binary-left':useraddressShow}" v-show="isSelect">
-      <file-address-list-new @select-changed="selected" v-ref:addresslist :style="style" :select=select :company=company :f_filialeids.sync="f_filialeids"></file-address-list-new>
+      <file-address-list-new @select-changed="selected" v-ref:addresslist :style="style"
+                             :select=select  :f_filialeid="f_filialeid"></file-address-list-new>
     </div>
     <div v-show="useraddressShow"  :class="{'basic-main':!isSelect, 'binary-right': isSelect}">
       <div class="flex">
-        <user-address :f_filialeids.sync="f_filialeids" :usertype="isSpecial" :isedit="isSelect" :row="row" v-ref:fileuseraddress></user-address>
+        <user-address :f_filialeids="f_filialeid" :usertype="isSpecial" :isedit="isSelect" :row="row" v-ref:fileuseraddress></user-address>
 
         <file-user-address-change-new v-if="addressId" :address_id="addressId"></file-user-address-change-new>
       </div>
@@ -18,10 +19,12 @@
     title: '地址管理',
     components: {
     },
+    props: ['isSelect', 'fileinfo', 'f_filialeid', 'showselectaddress'],
     data () {
       return {
         // 分公司id串
-        f_filialeids: this.$login.f.orgid,
+        // f_filialeids: this.$login.f.orgid,
+        f_filialeid: '',
         area: [],
         street: [],
         residential: [],
@@ -31,23 +34,8 @@
         isSpecial: false
       }
     },
-    props: {
-      isSelect: {
-        type: Boolean,
-        default: false
-      },
-      fileinfo: {
-        type: Object,
-        default: {}
-      },
-      company: {
-        type: String,
-        default: ''
-      },
-      showselectaddress: {
-        type: Boolean,
-        default: false
-      }
+    ready () {
+
     },
     watch: {
       'showselectaddress' (val) {

package/src/components/FilesManageNew/MeterinfoTest.vue

@@ -284,10 +284,13 @@ import Vue from 'vue'
 let meterBookGen = function * (self) {
     if (self.$login.r.find(value => value == '抄表册建档')) {
       self.opteratormetrbook = true
-  }
+    }
+    if(!self.f_filialeid){
+      self.f_filialeid = self.$login.f.orgid
+    }
     let temp = {
       tablename: 't_meter_book',
-      condition: `f_book_state='有效' and f_filiale_id='${self.$login.f.orgid}'`
+      condition: `f_book_state='有效' and f_filiale_id='${self.f_filialeid}'`
     }
     let http = new HttpResetClass()
   let meterbooks = yield http.load('POST', 'rs/sql/saleSingleTable', {data: temp},

package/src/components/FilesManageNew/UserEssentialInfoTest.vue

@@ -193,7 +193,9 @@
     <modal v-if="showselectaddress" :show.sync="showselectaddress" width="80%" title="地址信息" v-ref:modal large backdrop="false">
       <article slot="modal-body" class="modal-body" style="height: 700px;padding: 0!important;">
         <file-address-manage-new :is-select="isSelect" :fileinfo="addressinfo"
-                             @address-valid="doNothing"   :showselectaddress.sync="showselectaddress" v-ref:fileaddress ></file-address-manage-new>
+                             @address-valid="doNothing"   :showselectaddress.sync="showselectaddress"
+                                 :f_filialeid="f_filialeid"
+                                 v-ref:fileaddress ></file-address-manage-new>
       </article>
       <footer slot="modal-footer" class="modal-footer">
       </footer>
@@ -220,7 +222,7 @@
 
     export default {
       title: '基本信息',
-      props: ['baseinfo', 'addressinfo', 'isedit'],
+      props: ['baseinfo', 'addressinfo', 'isedit', 'f_filialeid'],
       data () {
         return {
           showselectaddress: false,
@@ -247,6 +249,7 @@
         }
       },
       ready () {
+        console.log('f_filialeid222，，，', this.f_filialeid)
         getEditUserState(this)
         this.$resetValidation()
             // this.highMeterPlugin = new HighMeter(this,this.readIDCardCallback)

package/src/components/FilesManageNew/UserGeneralInfoTest.vue

@@ -9,7 +9,7 @@
           <button class="button_search" style="width: max-content" @click="uploadPictures()">拍照</button>
         </div>
         <file-user-essential-info-new :baseinfo="data.baseinfo" :addressinfo="data.addressinfo" @valid="essentialInfo = true"
-                             @invalid="essentialInfo = false" v-ref:useressential :isedit="isedit"></file-user-essential-info-new>
+                                      :f_filialeid="f_filialeid"    @invalid="essentialInfo = false" v-ref:useressential :isedit="isedit"></file-user-essential-info-new>
       </div>
 
       <div style="height: auto;width: 100%">
@@ -179,6 +179,7 @@ export default {
   async ready () {
     this.blodid = '临时id' + Date.now()
     console.log('ready，，，', this.row)
+    console.log('f_filialeid111，，，', this.f_filialeid)
     try {
       await this.$getConfig(this, 'FilesDetail')
     } catch (error) {
@@ -305,7 +306,6 @@ export default {
       if (this.row) {
         this.data.baseinfo.base.version = this.row.version
       }
-      console.log('档案保存之前，。。。', this.data)
       this.$FileManageService.fileSave(this.$FileManageService.fileSaveBefore(this.data)).then((res) => {
         this.savePrintSheet(res.data.result[0])
         this.$dispatch('success')

package/src/components/FilesManageNew/UserMeterInfoTest.vue

@@ -16,7 +16,7 @@
       <span class="glyphicon glyphicon-plus"></span>
       <!--<img :src="imgmeter" alt="图片加载失败" class="img-rounded" style="width: 50px;margin:10px;">-->
     </div>
-    <file-user-device-info-new :devicesinfo.sync="devicesinfo" :show_devices.sync="show_devices"
+    <file-user-device-info-new :devicesinfo.sync="devicesinfo" :show_devices.sync="show_devices" :f_filialeid="f_filialeid"
                            :userinfoid='data.baseinfo.base.f_userinfo_id'></file-user-device-info-new>
   </div>
 </template>

package/src/components/revenue/concentrator/ncArchivesList.vue

@@ -191,7 +191,7 @@
       },
       getorg (val) {
         this.f_orgid = this.$login.convertToIn(val)
-        this.f_filialeids = val[0]
+        if (val[0]) this.f_filialeids = val[0]
       }
     }
 

package/src/components/revenue/concentrator/ncUserfilesList2.vue

@@ -150,7 +150,7 @@
                   <nobr>{{row.f_price_name}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.networkState ? '已组网' : '未组网'}}</nobr>
+                  <nobr>{{row.networkstate ? '已组网' : '未组网'}}</nobr>
                 </td>
                 <td style="text-align: center;">
                   <nobr>{{row.f_meter_brand}}</nobr>

package/src/components/revenue/concentrator/ncarchivesmanage.vue

@@ -12,7 +12,7 @@
   </div>
   <modal v-if="addmeterinfoshow" :show.sync="addmeterinfoshow" width="80%" title="表具信息" v-ref:modal large backdrop="false">
     <article slot="modal-body" class="modal-body" style="height: 700px;padding: 0!important;">
-      <archives-userfiles-manage :is-select="isSelect"  :fileinfo="allarearow" :f_filialeid="f_filialeids"
+      <archives-userfiles-manage :is-select="isSelect"  :fileinfo="allarearow" :f_filialeid.sync="f_filialeids"
                                    @address-valid="doNothing"  v-ref:userfilesadd ></archives-userfiles-manage>
 <!--      <concentrator-userfiles-list :is-select="isSelect" :meterinfo="meterinfo" :fileinfo="areamodel" :f_filialeid.sync="f_filialeids" :usertype="areamodel.f_user_type"-->
 <!--                                   @address-valid="doNothing"  v-ref:userfilesadd ></concentrator-userfiles-list>-->

package/src/components/webMeter/MeterManage/WebMeterBatchOperationValve.vue

@@ -308,7 +308,7 @@
 
 <script>
   import {PagedList} from 'vue-client'
-import vue from 'vue'
+import Vue from 'vue'
 import * as Util from '../../../Util'
 import {HttpResetClass} from 'vue-client'
 

package/src/components/webMeter/approvalHandleList.vue

@@ -276,7 +276,7 @@
 
 <script>
   import {PagedList} from 'vue-client'
-import vue from 'vue'
+import Vue from 'vue'
 import * as Util from '../../Util'
 import {HttpResetClass} from 'vue-client'
 

package/src/filiale/rizhao/UserEssentialInfoTest.vue

@@ -190,6 +190,7 @@
     <modal v-if="showselectaddress" :show.sync="showselectaddress" width="80%" title="地址信息" v-ref:modal large backdrop="false">
       <article slot="modal-body" class="modal-body" style="height: 700px;padding: 0!important;">
         <file-address-manage-new :is-select="isSelect" :fileinfo="addressinfo"
+                                 :f_filialeid="f_filialeid"
                              @address-valid="doNothing"   :showselectaddress.sync="showselectaddress" v-ref:fileaddress ></file-address-manage-new>
       </article>
       <footer slot="modal-footer" class="modal-footer">
@@ -217,7 +218,7 @@
 
     export default {
       title: '基本信息',
-      props: ['baseinfo', 'addressinfo', 'isedit'],
+      props: ['baseinfo', 'addressinfo', 'isedit', 'f_filialeid'],
       data () {
         return {
           showselectaddress: false,

package/src/filiale/tongchuan/ChargeManage.vue

@@ -38,15 +38,11 @@
   </div>
 </template>
 <script>
-  import ChargeList from './ChargeList'
-  import ChargeOper from './ChargeOper'
+
   import {HttpResetClass} from 'vue-client'
 
 export default {
     title: '收费综合',
-    components: {
-      ChargeList, ChargeOper
-    },
     data () {
       return {
         // 页面开关

package/src/filiale/tongchuan/base/otherinfo.vue

@@ -14,9 +14,6 @@
 *客户相关信息
 */
 
-import MixPriceInfo from './MixPriceInfo'
-import SafeCheck from './SafeCheck'
-import ServiceRepair from './ServiceRepair'
 export default {
   title: '客户相关信息',
   data () {
@@ -24,7 +21,7 @@ export default {
       name: ''
     }
   },
-  components: {MixPriceInfo, SafeCheck, ServiceRepair},
+
   props: {
     data: {
       type: Object

package/src/filiale/tongchuan/sale.js

@@ -6,6 +6,9 @@ let specialComp = {
   // 档案信息
   'file-user-files': (resolve) => { require(['./FileUserFiles'], resolve) },
   'charge-manage': (resolve) => { require(['./ChargeManage'], resolve) },
+  'charge-list': (resolve) => { require(['./ChargeList'], resolve) },
+  'charge-oper': (resolve) => { require(['./ChargeOper'], resolve) },
+  // 导入IC卡相关查询界面
   'high-meter-idcard': (resolve) => { require(['./HighMeterIdCard'], resolve) },
   'high-meter': (resolve) => { require(['./HighMeter'], resolve) },
   'meter-charge-record-query': (resolve) => { require(['./ChargeRecordQuery'], resolve) },
@@ -81,6 +84,10 @@ let specialComp = {
 
   // 当前选择用户的其他信息
   'otherinfo': (resolve) => { require(['./base/otherinfo'], resolve) },
+  // 客户相关信息
+  'mix-price-info': (resolve) => { require(['./base/MixPriceInfo'], resolve) },
+  'safe-check': (resolve) => { require(['./base/SafeCheck'], resolve) },
+  'service-repair': (resolve) => { require(['./base/ServiceRepair'], resolve) },
 
   'record-cancel': (resolve) => { require(['./base/RecordCancel'], resolve) },
   'card-meter-charge-cancel': (resolve) => { require(['./CardMeterChargeCancel'], resolve) },

package/src/filiale/wuhai/ChargeRecordQuery.vue

@@ -0,0 +1,98 @@
+<template>
+    <div style="height:100%">
+      <data-grid :model="model" class="table_sy"   partial='list' v-ref:grid >
+        <template partial='head' >
+          <tr>
+            <th><nobr>序号</nobr></th>
+
+            <th><nobr>气量</nobr></th>
+            <th><nobr>应交</nobr></th>
+            <th><nobr>付款方式</nobr></th>
+            <th><nobr>上期结余</nobr></th>
+            <th><nobr>收款</nobr></th>
+            <th><nobr>本期结余</nobr></th>
+            <th><nobr>操作类型</nobr></th>
+            <th><nobr>操作时间 </nobr></th>
+            <th><nobr>操作员 </nobr></th>
+            <th><nobr>备注</nobr></th>
+          </tr>
+        </template>
+        <template partial='body' >
+          <tr >
+            <td style="text-align:center;white-space:nowrap;">{{$index+1}}</td>
+
+            <td style="text-align:center;white-space:nowrap;">{{row.gas.toFixed(2)}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.fee}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_payment}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_balance}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_collection}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_curbalance}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.type}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_operate_date}}</td>
+            <td style="text-align:center;white-space:nowrap;">{{row.f_operator}}</td>
+            <td style="text-align:left;white-space:nowrap;">{{row.note}}{{row.f_write_card}}</td>
+          </tr>
+        </template>
+      </data-grid>
+      <modal :show.sync="cardCental" v-ref:modal backdrop="false">
+        <header slot="modal-header" class="modal-header">
+          <h4 class="modal-title">温馨提示</h4>
+        </header>
+        <article slot="modal-body" class="modal-body">
+          <div class="form-group">
+           <p> 当日此用户已经进行过一次购气,若卡上无气,请先进行补卡(未过表),之后掉气补气即可</p>
+          </div>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+          <button  type="button" class="btn btn-success" @click='cancel()'>确认
+          </button>
+        </footer>
+      </modal>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+
+  export default {
+    title: '操作查询',
+    data () {
+      return {
+        model: {rows: []},
+        cardCental:false
+      }
+    },
+    props: ['searchdata'],
+    ready () {
+      this.getsalerecord()
+    },
+    methods: {
+      cancel(){
+          this.cardCental = false;
+      },
+      async getsalerecord () {
+        let http = new HttpResetClass()
+        // this.condition = `1=1 and f_user_id = '${this.searchdata.f_user_id}'`
+        this.condition = `1=1 and f_userfiles_id = '${this.searchdata.f_userfiles_id}'`
+        let record = await http.load('POST', 'rs/sql/sale_RecordQuery', {data: {condition: this.condition}}, {
+          rejectMsg: '流水查询出错！！',
+          resolveMsg: null
+        })
+        this.model.rows = record.data
+        if(this.model.rows.length>0 && ( this.model.rows[0].type== '发卡售气' ||  this.model.rows[0].type== '卡表收费' ) ){
+          let checkdata = this.model.rows[0].operate_date.substr(0,10)
+          let nowdate = new Date();
+          let pdate = nowdate.getFullYear()+'-'+(nowdate.getMonth()<10? '0'+nowdate.getMonth()+1 : nowdate.getMonth()+1) +'-'+(nowdate.getDate()<10? '0'+nowdate.getDate() : nowdate.getDate());
+          if(new Date(checkdata).getTime() == new Date(pdate).getTime()){
+            this.cardCental = true;
+          }
+        }
+      }
+    },
+    watch: {
+      'searchdata' () {
+        this.getsalerecord()
+      }
+    }
+  }
+</script>

package/src/filiale/wuhai/sale.js

@@ -16,6 +16,8 @@ let specialComp = {
   // 其他收费xin
   'other-charge-new': (resolve) => { require(['./OtherChargeNew'], resolve) },
   // 过户
-  'transfer-manage': (resolve) => { require(['./TransferManage'], resolve) }
+  'transfer-manage': (resolve) => { require(['./TransferManage'], resolve) },
+  // 收费页面的流水查询
+  'meter-charge-record-query': (resolve) => { require(['./ChargeRecordQuery'], resolve) },
 }
 exports.specialComp = specialComp

package/src/main.js

@@ -1,23 +1,18 @@
-import Vue from 'vue'
-import { all } from 'vue-client'
-import App from './App'
-import { system } from 'system-clients'
-import sale from './sale'
-import { address } from 'address-client'
-import { ldap } from 'ldap-clients'
-import VueClipboard from 'vue-clipboard2'
-import moment from 'moment'
-Vue.use(VueClipboard)
-Vue.config.silent = true
-
-all()
-system(false)
-sale()
-address()
-ldap()
-require('system-clients/src/styles/less/bootstrap.less')
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import sale from './sale'
+import { address } from 'address-client'
+import { ldap } from 'ldap-clients'
+import VueClipboard from 'vue-clipboard2'
+Vue.use(VueClipboard)
+Vue.config.silent = true
+// 新打包写法
+Vue.use(sale, {filiale: null})
+address()
+ldap()
+require('system-clients/src/styles/less/bootstrap.less')
+
+new Vue({
+  el: 'body',
+  components: { App }
+})

package/src/plugins/FileManageService.js

@@ -55,7 +55,7 @@ let FileManageService = {
       result.infobank.f_bank_name = bank.f_bank_name.length > 0 ? bank.f_bank_name[0] : ''
     }
     // 获取分公司id (通过ids拆分)
-    result.f_filialeid = data.f_filialeid
+      result.f_filialeid = data.f_filialeid
     if (result.f_userinfo_id === null) {
       result.f_createfile_person = Vue.$login.f.name
       result.f_createfile_date = Vue.$login.toStandardTimeString()
@@ -344,7 +344,6 @@ let FileManageService = {
     return {userinfo: result, address: address, limit_gas: data.limit_gas, hasnumber: data.hasnumber, inputcode: data.inputcode}
   },
   fileSave (data) {
-    console.log(data)
     return Vue.resetpost('rs/logic/filemanage_fileSave', {data: data})
   },
   batchOperate (model, type) {