sale-client 4.0.30-preview → 4.0.32-preview

package/package.json

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

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

@@ -9,21 +9,18 @@
               <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" placeholder='客户编号'
                      condition="info.f_userinfo_code = '{}'" @keyup.enter="search()">
             </div>
-
             <div class="form-group col-sm-4 button-range" >
-
               <button class="button_search" style="margin-right: 10px"  @click="search()" v-el:cba>查询</button>
               <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.autoMeterBookSort()">表箱号排序</button>
               <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.saveSort()">保存当前顺序</button>
-              <button class="button_search" v-if="$parent.$parent.editsort==false" @click="$parent.$parent.editsort=true" v-el:cba>调整顺序</button>
-              <button class="button_search" v-if="$parent.$parent.editsort==true" @click="$parent.$parent.saveEditSort" v-el:cba>保存顺序</button>
+              <button class="button_search" v-if="$parent.$parent.editsort == false" @click="$parent.$parent.editsort=true" v-el:cba>调整顺序</button>
+              <button class="button_search" v-if="$parent.$parent.editsort == true" @click="$parent.$parent.saveEditSort" v-el:cba>保存顺序</button>
               <export-excel
                 :data="{condition: $parent.$parent.condition,orderitem: $parent.$parent.orderitem}"
                 :field="$parent.$parent.getfield"
                 sqlurl="api/af-revenue/logic/saleExport" sql-name="getMeterBookUser" :template-name="$parent.$parent.model.rows[0].f_book_name+'抄表册名'"
                 :choose-col="true"></export-excel>
               <button class="button_export button_spacing" @click="$parent.$parent.importFile">导入</button>
-
               <div
                 :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
                 @click="$parent.$parent.criteriaShow=!$parent.$parent.criteriaShow"
@@ -150,7 +147,8 @@
       <data-grid :model="model" class="table_sy"  partial='list' v-ref:grid>
         <template partial='head' >
           <tr>
-            <th v-if="$parent.$parent.$parent.editsort"><nobr>操作</nobr></th>
+            <th v-if="$parent.$parent.$parent.editsort"><nobr>排序</nobr></th>
+            <th v-if="$parent.$parent.$parent.removebook"><nobr>移出</nobr></th>
             <th><nobr>客户编号</nobr></th>
             <th><nobr>客户名称</nobr></th>
             <th>
@@ -181,7 +179,6 @@
               <data-order field="f_room" name="房间号"
                           :order.sync="$parent.$parent.$parent.orderFields.f_room"></data-order>
             </th>
-
             <th><nobr>客户电话</nobr></th>
             <th><nobr>表号</nobr></th>
             <th>
@@ -201,10 +198,18 @@
           </tr>
         </template>
         <template partial='body' >
-          <tr >
-            <td style="text-align:center" v-if="$parent.$parent.$parent.editsort"><nobr>
-              <span class="glyphicon glyphicon-arrow-up" @click="$parent.$parent.$parent.sortUp($index, row)" v-el:cba></span></nobr>
-              <span class="glyphicon glyphicon-arrow-down"  @click="$parent.$parent.$parent.sortDown($index, row)" v-el:cba></span></nobr>
+          <tr>
+            <td style="text-align:center" v-if="$parent.$parent.$parent.editsort">
+              <nobr>
+                <span class="glyphicon glyphicon-arrow-up" @click="$parent.$parent.$parent.sortUp($index, row)" v-el:cba></span>
+                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                <span class="glyphicon glyphicon-arrow-down"  @click="$parent.$parent.$parent.sortDown($index, row)" v-el:cba></span>
+              </nobr>
+            </td>
+            <td style="text-align:center" v-if="$parent.$parent.$parent.removebook">
+              <nobr>
+                <span title="移出表册" class="glyphicon glyphicon-paste"  style="font-size: 20px" @click="$parent.$parent.$parent.delete($index, row)" v-el:cba></span>
+              </nobr>
             </td>
             <td style="text-align:center"><nobr><span @click="$parent.$parent.$parent.dealmsg(row)"><a><b>{{row.f_userinfo_code}}</b></a></span></nobr></td>
             <td style="text-align:center"><nobr>{{row.f_user_name}}</nobr></td>
@@ -291,19 +296,20 @@
     title: '',
     data () {
       return {
-        model: new PagedList('api/af-revenue/sql/getMeterBookUser', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_meter_book_sort asc'`}),
+        model: new PagedList('api/af-revenue/sql/getMeterBookUser', 20, {orderitem: this.orderitem ? '"' + this.orderitem + ' "' : `'f_meter_book_sort asc'`}),
         condition: '',
         getfield: {},
         show: false,
-        row:null,
-        sortShow:false,
+        removebook: true,
+        row: null,
+        sortShow: false,
         fileinfo: {
-          code:null,
-          meterbook:null,
-          booknum:null,
-          sort:null,
-          fileid:null,
-          infoid:null
+          code: null,
+          meterbook: null,
+          booknum: null,
+          sort: null,
+          fileid: null,
+          infoid: null
         },
         gasproperties: [],
         f_filialeid: this.$login.f.orgid,
@@ -318,11 +324,11 @@
         adjustables: [],
         meterstyle: {},
         criteriaShow: false,
-        editsort:false,
-        //排序
-        sortitem:'f_meter_book_sort',
-        rule:'asc',
-        orderitem:'f_meter_book_sort asc',
+        editsort: false,
+        // 排序
+        sortitem: 'f_meter_book_sort',
+        rule: 'asc',
+        orderitem: 'f_meter_book_sort asc',
         orderFields: {
           f_meter_book_sort: 'no'
         },
@@ -348,7 +354,7 @@
         }
       }
     },
-    props: ['f_meterbook_num','usercount'],
+    props: ['f_meterbook_num', 'usercount'],
     async ready () {
       readyGen(this)
     },
@@ -365,38 +371,38 @@
         // 如果新规则不排序，还原为默认排序
         if (rule === 'no') {
           this.model.paramSource.orderitem = `'f_meter_book_sort asc'`
-          this.rule= 'asc'
-          this.sortitem='f_meter_book_sort'
+          this.rule = 'asc'
+          this.sortitem = 'f_meter_book_sort'
         } else {
           this.model.paramSource.orderitem = `'${field} ${rule}'`
           this.orderitem = this.model.paramSource.orderitem
-          this.rule= rule
-          this.sortitem=field
+          this.rule = rule
+          this.sortitem = field
         }
         this.search()
       },
-      async saveSort(){
+      async saveSort () {
         if (!this.$login.r.find(value => value == '册内用户排序')) {
           this.$showMessage('你没有【册内用户排序】的权限,请联系管理员!')
           return
         }
-          if(this.model.count<this.usercount){
-            this.$showAlert('该功能适用于给表册内所有用户排序的情况，请去掉查询条件', 'warning', 3000)
-          }else{
-            this.$showMessage('此操作会将表册内用户按照现有查询结果的顺序排序，是否继续', ['confirm', 'cancel']).then((res) => {
-              if (res == 'confirm') {
-                this.$resetpost('api/af-revenue/logic/changeBookSort',
-                  {
-                    data: {
-                      f_meter_book_num: this.f_meterbook_num,
-                      sortitem: this.sortitem,
-                      rule: this.rule
-                    }
-                  }, {resolveMsg: '已成功修改册内排序！！', rejectMsg: '册内排序修改失败！！'})
-                this.search()
-              }
-            })
-          }
+        if (this.model.count < this.usercount) {
+          this.$showAlert('该功能适用于给表册内所有用户排序的情况，请去掉查询条件', 'warning', 3000)
+        } else {
+          this.$showMessage('此操作会将表册内用户按照现有查询结果的顺序排序，是否继续', ['confirm', 'cancel']).then((res) => {
+            if (res == 'confirm') {
+              this.$resetpost('api/af-revenue/logic/changeBookSort',
+                {
+                  data: {
+                    f_meter_book_num: this.f_meterbook_num,
+                    sortitem: this.sortitem,
+                    rule: this.rule
+                  }
+                }, {resolveMsg: '已成功修改册内排序！！', rejectMsg: '册内排序修改失败！！'})
+              this.search()
+            }
+          })
+        }
       },
       async autoMeterBookSort () {
         if (!this.$login.r.find(value => value == '册内用户排序')) {
@@ -424,131 +430,140 @@
         }
         this.show = true
       },
-      async sortEdit(position){
-        if(!this.fileinfo.code){
+      async sortEdit (position) {
+        if (!this.fileinfo.code) {
           this.$showMessage('请输入目标用户编号')
           return
         }
         //  position:
         //  0--将改用户的表册顺序排到目标用户前
         //  1--将改用户的表册顺序排到目标用户后
-        if((!this.fileinfo.sort) ||(!this.fileinfo.booknum) ){
+        if ((!this.fileinfo.sort) || (!this.fileinfo.booknum)) {
           this.$showMessage('目标用户无表册或在表册内无排序')
           return
         }
         let http = new HttpResetClass()
-        await http.load('POST',  'api/af-revenue/logic/sale_editBookSort', {data: {fileinfo: this.fileinfo,position:position,userfilesid:this.row.f_userfiles_id}}, {resolveMsg: '已成功将改表移到指定的表册位置', rejectMsg: '移动册内位置失败'})
-        this.fileinfo= {
-          code:null,
-          fileid:null,
-          booknum:null,
-          meterbook:null,
-          infoid:null,
-          sort:null
+        await http.load('POST', 'api/af-revenue/logic/sale_editBookSort', {data: {fileinfo: this.fileinfo, position: position, userfilesid: this.row.f_userfiles_id}}, {resolveMsg: '已成功将改表移到指定的表册位置', rejectMsg: '移动册内位置失败'})
+        this.fileinfo = {
+          code: null,
+          fileid: null,
+          booknum: null,
+          meterbook: null,
+          infoid: null,
+          sort: null
         }
-        this.sortShow=false
+        this.sortShow = false
         this.search()
       },
-      async getBook(){
-        if(this.fileinfo.code){
+      async getBook () {
+        if (this.fileinfo.code) {
           let http = new HttpResetClass()
           let res = await http.load('POST', 'api/af-revenue/sql/sale_getUserMeterBook', {
             data: {
               condition: `i.f_userinfo_code='${this.fileinfo.code}'`
             }
           }, {resolveMsg: null, rejectMsg: null})
-          console.log("-------------------res:",res.data)
-          if(res.data.length===1){
-            if((!res.data[0].f_meter_book_sort )||(!res.data[0].f_meter_book_num) ){
+          console.log('-------------------res:', res.data)
+          if (res.data.length === 1) {
+            if ((!res.data[0].f_meter_book_sort) || (!res.data[0].f_meter_book_num)) {
               this.$showMessage('该用户不在表册内或在表册内无排序')
-              this.fileinfo= {
-                code:this.fileinfo.code,
-                fileid:null,
-                booknum:null,
-                meterbook:null,
-                infoid:null,
-                sort:null
+              this.fileinfo = {
+                code: this.fileinfo.code,
+                fileid: null,
+                booknum: null,
+                meterbook: null,
+                infoid: null,
+                sort: null
               }
               return
             }
-            this.fileinfo.meterbook=res.data[0].f_book_name
-            this.fileinfo.sort=res.data[0].f_meter_book_sort
-            this.fileinfo.fileid=res.data[0].f_userfiles_id
-            this.fileinfo.infoid=res.data[0].f_userinfo_id
-            this.fileinfo.booknum=res.data[0].f_meter_book_num
-          }else{
+            this.fileinfo.meterbook = res.data[0].f_book_name
+            this.fileinfo.sort = res.data[0].f_meter_book_sort
+            this.fileinfo.fileid = res.data[0].f_userfiles_id
+            this.fileinfo.infoid = res.data[0].f_userinfo_id
+            this.fileinfo.booknum = res.data[0].f_meter_book_num
+          } else {
             this.$showMessage('请核对输入的用户编号')
-            this.fileinfo= {
-              code:this.fileinfo.code,
-              fileid:null,
-              booknum:null,
-              meterbook:null,
-              infoid:null,
-              sort:null
+            this.fileinfo = {
+              code: this.fileinfo.code,
+              fileid: null,
+              booknum: null,
+              meterbook: null,
+              infoid: null,
+              sort: null
             }
           }
         }
-
       },
       // dblclick(obj){
       //   console.log("-------------------------row",obj)
       //   this.row=obj
       //   this.sortShow=true
       // },
-      async saveEditSort (){
+      async saveEditSort () {
         for (let item of this.$refs.paged.$refs.grid.model.rows) {
-            let param={
-              f_userfiles_id:item.f_userfiles_id,
-              version:item.fileversion,
-              f_meter_book_sort:item.f_meter_book_sort
-            }
-            let http = new HttpResetClass()
-            await http.load('POST', 'api/af-revenue/entity/save/t_userfiles',
+          let param = {
+            f_userfiles_id: item.f_userfiles_id,
+            version: item.fileversion,
+            f_meter_book_sort: item.f_meter_book_sort
+          }
+          let http = new HttpResetClass()
+          await http.load('POST', 'api/af-revenue/entity/save/t_userfiles',
             param,
-            {resolveMsg: null, rejectMsg: "保存失败"})
+            {resolveMsg: null, rejectMsg: '保存失败'})
         }
-        this.editsort=false
+        this.editsort = false
       },
       // 下移按钮
       sortDown (index, row) {
         if (index === (this.model.rows.length - 1)) {
           this.$showAlert('已经是本页最后一个了', 'warning', 2000)
         } else {
-          let rows=this.$refs.paged.$refs.grid.model.rows
-          this.$refs.paged.$refs.grid.model.rows=[]
+          let rows = this.$refs.paged.$refs.grid.model.rows
+          this.$refs.paged.$refs.grid.model.rows = []
           let temp = rows[index + 1]
-          rows[index+1]=rows[index]
-          rows[index]=temp
+          rows[index + 1] = rows[index]
+          rows[index] = temp
 
-          let tempsort=rows[index + 1].f_meter_book_sort
-          rows[index+1].f_meter_book_sort=rows[index].f_meter_book_sort
-          rows[index].f_meter_book_sort=tempsort
-
-          this.$refs.paged.$refs.grid.model.rows=rows
+          let tempsort = rows[index + 1].f_meter_book_sort
+          rows[index + 1].f_meter_book_sort = rows[index].f_meter_book_sort
+          rows[index].f_meter_book_sort = tempsort
 
+          this.$refs.paged.$refs.grid.model.rows = rows
         }
       },
       // 上移按钮
       sortUp (index, row) {
-
         if (index === 0) {
           this.$showAlert('已经是本页第一个了', 'warning', 2000)
         } else {
+          let rows = this.$refs.paged.$refs.grid.model.rows
 
-
-          let rows=this.$refs.paged.$refs.grid.model.rows
-
-          this.$refs.paged.$refs.grid.model.rows=[]
+          this.$refs.paged.$refs.grid.model.rows = []
           let temp = rows[index - 1]
-          rows[index-1]=rows[index]
-          rows[index]=temp
-          console.log("--------------this.$refs.paged.$refs.grid.model.rows,",rows)
+          rows[index - 1] = rows[index]
+          rows[index] = temp
+          console.log('--------------this.$refs.paged.$refs.grid.model.rows,', rows)
 
-          let tempsort=rows[index - 1].f_meter_book_sort
-          rows[index-1].f_meter_book_sort=rows[index].f_meter_book_sort
-          rows[index].f_meter_book_sort=tempsort
-          this.$refs.paged.$refs.grid.model.rows=rows
+          let tempsort = rows[index - 1].f_meter_book_sort
+          rows[index - 1].f_meter_book_sort = rows[index].f_meter_book_sort
+          rows[index].f_meter_book_sort = tempsort
+          this.$refs.paged.$refs.grid.model.rows = rows
+        }
+      },
+      // 移出表册
+      async delete (index, row) {
+        let param = {
+          f_userfiles_id: row.f_userfiles_id,
+          version: row.fileversion,
+          f_meter_book_sort: '',
+          f_meter_book_num: ''
         }
+        let http = new HttpResetClass()
+        await http.load('POST', 'api/af-revenue/entity/save/t_userfiles',
+          param,
+          {resolveMsg: null, rejectMsg: '保存失败'})
+        this.$refs.paged.$refs.criteria.search()
       },
       close () {
         this.show = false
@@ -626,7 +641,7 @@
       },
 
       selfSearch (args) {
-        this.editsort=false
+        this.editsort = false
         args.condition = `${args.condition} and f_meter_book_num = '${this.f_meterbook_num}'`
         this.condition = args.condition
         this.model.search(args.condition, args.model)
@@ -649,15 +664,15 @@
         // res.f_downloadpath.replace('\\','/')
         this.$resetpost('api/af-revenue/logic/upLoadBookFile',
           {data: {
-              condition: this.condition,
-              filepath: res.f_downloadpath
-            }
+            condition: this.condition,
+            filepath: res.f_downloadpath
+          }
           },
           {resolveMsg: null, rejectMsg: '上传失败'}).then((res) => {
-          this.show = false
-          this.$showAlert(`导入成功`, 'success', 2000)
-          this.search()
-        })
+            this.show = false
+            this.$showAlert(`导入成功`, 'success', 2000)
+            this.search()
+          })
       }
     },
     computed: {

package/src/filiale/fugou/components/revenue/comprehen/ComprehenOperation/GiftFee/icTable.vue

@@ -100,12 +100,6 @@ let otherGasGen = async function (self) {
       throw new Error(`卡服务错误：${cardRes.data.Err}${cardRes.data.Exception}，请联系开发人员处理！！`)
     } else {
       await self.$CommonService.updatePassword(self.row, cardRes)
-      if (self.config.hasPrint) {
-        self.row.id = result.data.id
-        self.row.f_bill_type = self.isGas ? '卡表赠气' : '卡表赠费'
-        self.row.f_bill_style = '普通收据'
-        self.print = true
-      }
       self.$showAlert('赠气成功', 'success', 2000)
       return result.data.id
     }
@@ -122,8 +116,8 @@ let otherGasGen = async function (self) {
   }
 }
 let asyncIcTable = async function (self) {
-  await self.$getConfig(self, 'iotTable')
-  console.log('机表补费扣费config', self.config)
+  await self.$getConfig(self, 'icTable')
+  console.log('卡表赠气赠费config', self.config)
 }
 
 export default {
@@ -201,7 +195,14 @@ export default {
         }
         this.$resetpost('api/af-revenue/logic/updatefiles', data)
 
-        this.$dispatch('success')
+        if (this.config.hasPrint) {
+          this.row.id = res
+          this.row.f_bill_type = this.isGas ? '卡表赠气' : '卡表赠费'
+          this.row.f_bill_style = '普通收据'
+          this.print = true
+        } else {
+          this.$dispatch('success')
+        }
       })
     },
     pregas () {

package/src/filiale/fugou/components/revenue/comprehen/ComprehenOperation/GiftFee/iotTable.vue

@@ -62,7 +62,7 @@
 import Vue from 'vue'
 let asyncIotTable = async function (self) {
   await self.$getConfig(self, 'iotTable')
-  console.log('机表补费扣费config', self.config)
+  console.log('赠气赠费config', self.config)
 }
 export default {
   title: '赠气赠费',
@@ -99,13 +99,10 @@ export default {
     asyncIotTable(this)
     if (this.row.f_collection_type === '按气量') {
       this.model.f_operat_type = ['物联网赠气']
+      this.billData.url = 'rs/report/iotGiftGas'
     } else {
       this.model.f_operat_type = ['物联网赠费']
-    }
-    if (this.row.f_collection_type === '按气量') {
-      this.billData.url = 'api/af-revenue/report/iotGiftGas'
-    } else {
-      this.billData.url = 'api/af-revenue/report/iotGiftFee'
+      this.billData.url = 'rs/report/iotGiftFee'
     }
   },
   events: {

package/src/filiale/ronghao/DisableManage.vue

@@ -0,0 +1,120 @@
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-4 form-group">
+            <label for="f_reason" class="font_normal_body">停用原因</label>
+            <v-select v-model="model.f_reason"
+                      placeholder='停用原因'
+                      :value.sync="model.f_reason"
+                      :options='reason'
+                      v-ref:reason
+                      close-on-select ></v-select>
+          </div>
+          <div class="col-sm-4 form-group">
+            <input type="checkbox" class="large-checkbox" id="f_valveState" v-model="valveStateChecked">
+            <label for="f_operator" class="font-size-large">立即关阀</label>
+          </div>
+        </div>
+        <div class="row" style="margin-top:1px;">
+          <div class="col-sm-8 form-group">
+            <label for="f_reason" class="font_normal_body">备&emsp;&emsp;注</label>
+            <input class="input_search" style="width:80%" v-model="model.f_othereason"  placeholder="备注"/>
+          </div>
+        </div>
+      </form>
+      <div style="text-align:right;">
+        <button class="button_search button_spacing" @click="confirm()"  :disabled='!$v.valid'>确认</button>
+        <button class="button_clear" @click="clean()" >取消</button>
+      </div>
+    </validator>
+  </div>
+  <upload :blodid="blodid" v-if="false" isremark="true" fusetype="表具停用"></upload>
+</template>
+<script>
+/**
+ *综合业务
+ 表具停用组件
+ */
+export default {
+  title: '表具停用',
+  props: ['row'],
+  data () {
+    return {
+      valveStateChecked: false,
+      blodid: '',
+      showupload: true,
+      model: {},
+      reason: this.$appdata.getParam('停用原因')
+    }
+  },
+  ready () {
+    this.blodid = this.row.f_userinfo_id
+  },
+  methods: {
+    async confirm () {
+      await this.$LogicService.meterDisable(this.model, this.row)
+      let array = [{
+        f_user_id: this.row.f_user_id,
+        f_userfiles_id: this.row.f_userfiles_id,
+        f_alias: this.row.f_alias,
+        f_userinfo_id: this.row.f_userinfo_id,
+        f_orgname: this.$login.f.orgs,
+        f_orgid: this.$login.f.orgid,
+        f_meternumber: this.row.f_meternumber
+      }]
+      if (this.row.f_meter_type === '物联网表' && this.valveStateChecked) {
+        let data1 = {
+          f_apply_type: '阀门控制',
+          userid: array,
+          nowDate: new Date(),
+          f_apply_value: '关阀',
+          f_apply_beizhu: '表具停用自动关阀',
+          f_apply_operator: this.$login.f.name
+        }
+        // 根据复选框的状态添加条件
+        if (this.valveStateChecked) {
+          data1.f_valveState = 1
+        }
+        let data2 = {
+          userid: array,
+          instructtype: '阀门控制',
+          isOpen: '关阀',
+          instructTitle: '手动关阀',
+          reasonInfo: '表具停用自动关阀',
+          f_instruct_state: '待发送',
+          inputtor: this.$login.f.name
+        }
+        await this.$resetpost('rs/logic/iot_instructUpdateAndDelect',
+          {
+            data: {
+              data1: data1,
+              data2: data2
+            }
+          })
+      }
+      this.$dispatch('success')
+    },
+    clean () {
+      this.$dispatch('refresh')
+    }
+  }
+}
+</script>
+
+<style>
+.large-checkbox {
+  width: 20px;
+  height: 20px;
+  transform: scale(1.4);
+  margin-right: 14px;
+  margin-top: 15px;
+}
+
+.font-size-large {
+  padding-top: 10px;
+  padding-left: 10px;
+  font-size: 16px;
+}
+</style>