sale-client 3.5.8 → 3.5.11

package/.babelrc

@@ -1,5 +1,5 @@
-{
-  "presets": ["es2015", "stage-2"],
-  "plugins": ["transform-runtime"],
-  "comments": false
-}
+{
+  "presets": ["es2015", "stage-2"],
+  "plugins": ["transform-runtime"],
+  "comments": false
+}

package/build/dev-server.js

@@ -10,16 +10,10 @@ var compiler = webpack(config)
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-var bendi = 'http://127.0.0.1:8080',bendi1 = 'http://121.36.106.17:8400/'
-// var bendi = 'http://192.168.50.4:8300/',bendi1 = 'http://121.36.106.17:8400/'
-// var bendi = 'http://192.168.50.4:8400/',bendi1 = 'http://121.36.106.17:8400/'
-// var bendi = 'http://139.214.92.34:8301/',bendi1 = 'http://121.36.106.17:8400/'
+var bendi = 'http://127.0.0.1:8072',bendi1 = 'http://121.36.106.17:8400/'
 // 公司测试服务
-// var fuwu = 'http://192.168.89.62:8400'
+var fuwu = 'http://192.168.50.4:8400'
 // var fuwu = 'http://121.36.106.17:8400/'
-var fuwu = 'http://192.168.50.4:8400/'
-// var fuwu = 'http://192.168.50.4:8300/'
-// var fuwu = 'http://139.214.92.34:8301/'
 //铜川正式
 //  var fuwu = 'http://61.134.55.234:9999/'
 //铜川测试

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.8",
+  "version": "3.5.11",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -25,7 +25,7 @@
     "yarn": "^1.22.10"
   },
   "devDependencies": {
-    "address-client": "3.2.27",
+    "address-client": "3.2.29",
     "axios": "0.15.3",
     "babel-core": "^6.0.0",
     "babel-loader": "^6.0.0",

package/src/components/FilesManage/FileUserFiles.vue

@@ -66,6 +66,7 @@
                             v-if="$parent.$parent.rows  && $parent.$parent.rows.length > 1 && this.$login.r.includes('批量销户')">
                       批量销户
                     </button>
+                    <import-excel template-btn-name= "销户模板" template-name= "销户模板" btn-name="导入销户" logic-name="batchpinusers" import-json="pinuser.json"></import-excel>
                     <button  @click="$parent.$parent.bulkOperations('批量销户', 'batch-cancellation')"
                             class="button_delete button_spacing"
                             style="float: right"
@@ -581,6 +582,7 @@ let loadParamGem = async function (self) {
         newdata: {},
         resdata: '',
         resshow: false,
+        batchpinshow: false, // 导入销户
         titleShow: true, //是否显示部分档案信息类的筛选框
         useoptions: this.$appdata.getParam('使用类型'),
 
@@ -848,6 +850,9 @@ let loadParamGem = async function (self) {
       importFile () {
         this.show = true
       },
+      pin () {
+        this.batchpinshow = true
+      },
       clear () {
         Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
           this.$refs.paged.$refs.criteria.model[key] = []

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -150,6 +150,7 @@ export default {
       data: {
         baseinfo: {
           base: {
+            f_user_name:'',
             f_user_state: '',
             f_credentials: '',
             f_cost_type: '',

package/src/components/common/userinfo_detail/ic_detail/ChargeRecordQuery.vue

@@ -28,7 +28,7 @@
             <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.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>

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

@@ -50,10 +50,10 @@
                   style="cursor: pointer;">
               <div class="col-sm-11">
 <!--                <div class="row"  v-if="row.f_state==='冲正' " style="color: red">-->
-                <!--                  <strong :title="row.f_userinfo_code" class="col-sm-4" show-overflow-tooltip="true">{{row.f_userinfo_code.length>9?''+row.f_userinfo_code.substring(0,9)+'...':row.f_userinfo_code}}</strong>-->
-                <!--                  <span class="col-sm-4">{{$parent.$parent.$parent.dateDes(row.f_operate_date)}}</span>-->
-                <!--                  <span class="col-sm-4">{{row.type}}</span>-->
-                <!--                </div>-->
+<!--                  <strong :title="row.f_userinfo_code" class="col-sm-4" show-overflow-tooltip="true">{{row.f_userinfo_code.length>9?''+row.f_userinfo_code.substring(0,9)+'...':row.f_userinfo_code}}</strong>-->
+<!--                  <span class="col-sm-4">{{$parent.$parent.$parent.dateDes(row.f_operate_date)}}</span>-->
+<!--                  <span class="col-sm-4">{{row.type}}</span>-->
+<!--                </div>-->
                 <div class="row">
                   <strong :title="row.f_userinfo_code" class="col-sm-4" show-overflow-tooltip="true">{{row.f_userinfo_code.length>9?''+row.f_userinfo_code.substring(0,9)+'...':row.f_userinfo_code}}</strong>
                   <span class="col-sm-4">{{$parent.$parent.$parent.dateDes(row.f_operate_date)}}</span>
@@ -62,19 +62,21 @@
               </div>
               <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 === '机表收费' ||
+                          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.state === 1 || 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.type!=='转气转入'||row.type === '过户'">
-                  <button data-toggle="dropdown" style="border: 0px;background: none;" type="button" v-if="row.f_user_state==='正常'||row.f_user_state==='预备'||row.type==='气损收费' ">
+                          row.type === '气表清零' || row.type === '掉气补气' || row.type === '其他补气'  || row.type === '清零补气' ||
+                          row.type === '换表补气') && row.type!=='新增户档案' && row.type!=='转气转出' && row.type!=='转气转入'">
+                  <button data-toggle="dropdown" style="border: 0px;background: none;" type="button"
+                          v-if="row.f_user_state==='正常'||row.f_user_state==='预备'||row.type==='气损收费' ">
                     <span class="glyphicon glyphicon-th-list"></span>
                   </button>
-                  <ul class="dropdown-menu dropdown-menu-right" slot="dropdown-menu" style=" min-width: 60px;" v-if="row.f_user_state==='正常'||row.f_user_state==='预备'||row.type==='气损收费' ||row.type === '过户'">
+                  <ul class="dropdown-menu dropdown-menu-right" slot="dropdown-menu" style=" min-width: 60px;" v-if="row.f_user_state==='正常'||row.f_user_state==='预备'||row.type==='气损收费' ">
 <!--                    <li-->
 <!--                      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.type==='卡表收费撤销'||row.type==='物联网补费' || row.type==='物联网扣费'||row.type==='机表补费'||row.type==='机表扣费'||row.type==='物联网补气'||row.type==='物联网扣气'||row.type==='气损收费' ">-->

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,14 +414,15 @@
           dep: [],
           user: []
         },
-        config:{
-          examine: false,
+        config: {
+          examine: false
         },
         imgfilename: '',
         // 小区
         residentialArea: [],
+        inputtouPerson: [],
         imgshow: false,
-        criteriaShow:false,
+        criteriaShow: false,
         orgCondtionStr: '',
         excelCondition: '',
         fields: {
@@ -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: {