sale-client 3.4.202 → 3.4.205

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.205",
   "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/charge/business/IOT/IotChangeFill.vue

@@ -186,6 +186,8 @@
       self.model.payments = self.paymentModel
 
       let param = {
+        f_share_times: self.row.f_share_times,
+        f_hascard: self.row.f_hascard,
         f_open_way: self.row.f_open_type,
         f_user_name: self.row.f_user_name,
         f_user_type: self.row.f_user_type,

package/src/components/common/userinfo_detail/UserBaseInfoNew.vue

@@ -123,7 +123,7 @@
         </div>
         <div  class="col-sm-4">
           <label class="font_normal_body_new">是否自动阀控</label>
-          <input class="input-underline" style="width:45%" :value="row.f_network_valve == '1' ? '否' : '是'" readonly>
+          <input class="input-underline" style="width:45%" :value="row.f_network_valve == '1' ? '是' : '否'" readonly>
         </div>
       </div>
       <div v-if="row.f_collection_type == '按气量'" >

package/src/components/revenue/HandManager/MbpeopleList.vue

@@ -147,6 +147,12 @@
                      condition="f_book_no like '%{}%'" placeholder='入户证号'
               >
             </div>
+            <div class="col-sm-3 form-group">
+              <label  class="font_normal_body">表&emsp;号&emsp;</label>
+              <input style="width:60%" type="text" class="form-control" v-model="model.f_meternumber"
+                     condition="f_meternumber like '%{}%'" placeholder='表号'
+              >
+            </div>
         </div>
         </div>
       </criteria>

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

@@ -63,7 +63,7 @@
               <div class="col-sm-1" v-if="$parent.$parent.$parent.isOperate" title="涉及权限:冲正权限">
                 <dropdown class="auto"
                           v-if="(row.type ==='机表收费撤销' || row.type ==='卡表收费撤销' || row.type ==='物联网收费撤销' || row.type ==='其他收费撤销' || row.type ==='气损收费撤销' ||
-                           row.type ==='预存缴费' || row.type === '补卡' || row.type === '物联网收费' || row.type === '用户退费' || row.type === '机表收费' ||
+                           row.type ==='预存缴费' || row.type === '补卡' || row.type === '物联网收费' || row.type === '用户退费' || row.type === '机表收费' || row.type === '数码表收费' ||
                           row.type === '卡表收费' || row.type === '超用收费' || row.type === '发卡售气' || row.type === '其他收费' ||
                           row.type === '换表' || row.state === 1 || row.type==='调价补费' || row.type==='卡表赠气' ||
                           row.type==='物联网赠气'|| row.type==='物联网赠费'|| row.type==='卡表赠费'|| row.type==='卡表赠气'||

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue

@@ -890,7 +890,7 @@ export default {
         data: {
           items: 'f_whether_pay',
           tablename: 't_handplan',
-          condition: ` f_user_id  = '${this.row.f_user_id}' and  f_hand_state = '有效' and f_meter_state='已抄表' `,
+          condition: ` f_user_id  = '${this.row.f_user_id}' and f_oughtfee > 0 and  f_hand_state = '有效' and f_meter_state='已抄表' `,
           orderitem: ' id desc'
         }
       }, {resolveMsg: null, rejectMsg: null}

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

@@ -28,6 +28,7 @@
                            condition="f_address like '%{}%'" placeholder='客户地址'>
                   </div>
                   <div class="span" style="float:right;">
+                    <button class="button_search button_spacing" @click="$parent.$parent.meterRead()">抄表</button>
                     <button class="button_search button_spacing" @click="$parent.$parent.confirmaddress()">取消关联</button>
                     <button class="button_search button_spacing" @click="search()">查询</button>
                     <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
@@ -150,7 +151,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>
@@ -251,7 +252,7 @@ export default {
         }
         let param = {
           f_orgid: this.$login.f.orgid,
-          f_orgname: this.$login.f.orgs,
+          f_orgname: this.$login.f.name,
           concentratorid: this.fileinfo.id,
           f_mpc_number: this.fileinfo.f_mpc_number,
           userfilesid: '',
@@ -262,6 +263,35 @@ export default {
         this.search()
       }
     },
+    async meterRead () {
+      let res = await this.$showMessage('确定对选择的表具进行抄表操作吗?', ['confirm', 'cancel'])
+      if (res === 'confirm') {
+        let rowdata = this.$refs.paged.$refs.grid.getRowData()
+        if (rowdata.length <= 0) {
+          this.$showMessage('请至少选择一个表具!')
+          return
+        }
+        console.log(rowdata)
+        let userfilesids = []
+        for (let row of rowdata) {
+          userfilesids.push({
+            f_userfiles_id: row.f_userfiles_id,
+            f_meternumber: row.f_meternumber
+          })
+        }
+        let param = {
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.name,
+          concentratorid: this.fileinfo.id,
+          f_mpc_number: this.fileinfo.f_mpc_number,
+          userfilesid: '',
+          userfilesids: userfilesids,
+          state: 'delete'
+        }
+        await this.$resetpost('rs/logic/concentratorMeterRead', param, {resolveMsg: '抄表操作成功!', rejectMsg: '抄表操作失败!'})
+        this.search()
+      }
+    },
     search () {
       this.$refs.paged.$refs.cri.search()
     },

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/revenue/machineHandManage/machineHandAudit.vue

@@ -39,6 +39,13 @@
 
                 <button class="button_search button_spacing" @click="$parent.$parent.search()">查询</button>
                 <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                <export-excel
+                  :data="{condition: $parent.$parent.excelCondition}"
+                  :field="$parent.$parent.fields"
+                  sqlurl="rs/logic/saleExport" progress="saleGetExportProgress" sql-name="getAuditMachineHand"
+                  template-name='抄表审核导出'
+                  :choose-col="true">
+                </export-excel>
                 <button class="button_search button_spacing width-60"
                         @click="$parent.$parent.allsuccess()" v-el:cx>全部通过</button>
                 <button class="button_search button_spacing width-60"
@@ -316,7 +323,7 @@
             <!--<td>{{row.f_building}}</td>-->
             <!--<td>{{row.f_unit}}</td>-->
             <!--<td>{{row.f_room}}</td>-->
-            <td>{{row.f_balacne}}</td>
+            <td>{{row.f_balance}}</td>
             <td style="text-align: center;">{{Math.round(row.avggas)}}</td>
             <td>{{row.f_meternumber}}</td>
             <td>{{row.f_meter_base}}</td>
@@ -416,6 +423,27 @@
         imgshow: false,
         criteriaShow:false,
         orgCondtionStr: '',
+        excelCondition: '',
+        fields: {
+          'f_userinfo_code': '客户编号',
+          'f_user_name': '客户名称',
+          'f_address': '客户地址',
+          'f_user_level': '用户等级',
+          'f_balance': '上期结余',
+          'f_meternumber': '表号',
+          'f_meter_base': '上期底数',
+          'f_tablebase': '本期底数',
+          'f_oughtamount': '应交气量',
+          'f_adjustment_volume': '增量值',
+          'f_oughtfee': '应交金额',
+          'f_result_state': '抄表结果状态',
+          'f_last_input_date': '上次抄表录入日期',
+          'f_hand_date': '下发日期',
+          'f_input_date': '抄表录入日期',
+          'f_book_name': '抄表册',
+          'f_adjustable_name': '调压箱名称',
+          'f_inputtor': '抄表员'
+        },
         auditState:[{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
         auditState1:[{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
         meters: [{label: '全部', value: ''}, {label: '机表', value: '机表'}, {label: '物联网表', value: '物联网表'}],
@@ -604,6 +632,7 @@
         } else {
           args.condition = `${args.condition}` + this.orgCondtionStr
         }
+        this.excelCondition = args.condition
         this.$refs.paged.$refs.grid.selectInit()
         this.model.search(args.condition, args.model)
       },

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'