sale-client 3.6.591 → 3.6.593

package/package.json

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

package/src/filiale/qingjian/ChargeModal.vue

@@ -0,0 +1,110 @@
+<template>
+  <modal :show.sync="modalShow" backdrop="false" width="50%" title="提示信息">
+    <article slot="modal-body">
+      <div style="width:98%;margin: auto" v-show="showInformation">
+        <p>{{warninginfo.data.msgData}}</p>
+        <div  style="font-size: 15px;padding: 10px">
+          <span style="float: right">
+            <button class="button_search" v-show="!warninginfo.data.state.info"  @click="operational('files_complete')" style="width: max-content;">完善信息</button>
+            <button class="button_search" v-show="warninginfo.data.state.blacklist&&!warninginfo.data.state.dibao" @click="operational('basic-living')" style="width: max-content;">低保续保</button>
+            <button class="button_search" v-show="warninginfo.data.state.blacklist&&!warninginfo.data.state.dibao && warninginfo.data.state.dibaoend" @click="operational('stop-basic-living')" style="width: max-content;">停止续保</button>
+            <button class="button_search" v-show="!(!warninginfo.data.state.dibao&&warninginfo.data.state.dibaoend) && warninginfo.data.canCharge" @click="success()">确认</button>
+            <button class="button_search" v-show="warninginfo.data.state.hasOwnProperty('chargeAccount') && warninginfo.data.state.chargeAccount === false" @click="goToAccount()">去挂账管理</button>
+          </span>
+        </div>
+        <p>{{authorityInformation}}</p>
+      </div>
+      <div style="width:98%;margin: auto" v-show="!showInformation" >
+        <route v-ref:route @close="close" @success="success" v-show="!showInformation" :data="row"></route>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer" style="text-align: center;border: 0">
+      <!--如果想忽略到期信息，modal的值设为null-->
+      <!--      <button class="button_clear" @click="ignore" v-if="basicLiving">忽略</button>-->
+    </footer>
+  </modal>
+</template>
+<script>
+  let initGen = async function (self) {
+    if(self.warninginfo){
+      if (!self.warninginfo.data.state.info && !self.warninginfo.data.state.blacklist && !self.warninginfo.data.state.dibao) {
+        self.authorityInformation = '您没有相关的业务操作权限, 请联系管理员！！'
+      }
+    }
+
+  }
+
+  export default {
+    title: '收费弹出框',
+    props: {
+      // 动态属性表数据
+      warninginfo:{
+        type:Object
+      },
+      // 双击用户的数据
+      row: {
+        type: Object
+      },
+      modalShow: {
+        type: Boolean
+      }
+    },
+    data () {
+      return {
+        showInformation: true,
+        informationtype: '',
+
+        // 终止低保户 必选低保户到期
+        stopBasicLiving: false,
+
+        // 低保户到期提醒时间
+        dibao_remind: this.$appdata.getSingleValue('低保快到期提醒') ? this.$appdata.getSingleValue('低保快到期提醒') : 0,
+        // 低保户权限
+        basicLivingAuthority: false,
+        // 档案完善权限
+        filesCompleteAuthority: true
+      }
+    },
+    methods: {
+      goToAccount () {
+        console.log('点击了去挂帐管理')
+        if (window.parent !== window) {
+          window.parent.postMessage({type: 'route', path:'/duizhang/credit'}, '*')
+          this.close()
+        }
+      },
+      close () {
+        this.$emit('close')
+      },
+      async success (val) {
+
+        // 如果所有提示信息均处理，获取改户数据，进入收费操作
+        if (!this.warninginfo.data.info && !this.warninginfo.data.blacklist && !this.warninginfo.data.dibao) {
+          this.showInformation = false
+          let data = await this.$resetpost('rs/sql/sale_getUser', {data: {condition: `1=1 and f_userinfo_code = '${this.row.f_userinfo_code}' and u.f_filialeid = '${this.$login.f.orgid}'`}}, {resolveMsg: '', rejectMsg: ''})
+          this.$emit('modalsuccess', data.data[0])
+        } else { // 没有处理完，显示提示信息
+          this.showInformation = true
+        }
+      },
+      operational (val) {
+        this.showInformation = false
+        this.$refs.route.init(val, {data: this.row})
+      }
+    },
+    ready () {
+      initGen(this)
+      console.log('charge-modal', this.warninginfo.data.state)
+    }
+    // watch: {
+    //   'modalShow' (val) {
+    //     this.modal = val
+    //   }
+    // }
+  }
+</script>
+<style>
+  .basic-main {
+    width: 79%;
+  }
+</style>

package/src/filiale/qingjian/FileUserFiles.vue

@@ -236,6 +236,17 @@
                               close-on-select condition="f_send_usegas_card='{}'"
                               placeholder='天然气使用证' v-model="model.f_send_usegas_card"></v-select>
                   </div>
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group">
+                    <label class="font_normal_body">区&emsp;&emsp;域</label>
+                    <v-select :options='$parent.$parent.adjustarea' :search='true'
+                              :value.sync="model.f_region_id" multiple
+                              condition="f_region_id in {}"
+                              close-on-select
+                              placeholder='区域'
+                              v-model='model.f_region_id'></v-select>
+                  </div>
                   <div
                           :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                           class="form-group">
@@ -340,6 +351,12 @@
                   <th>
                     <nobr>客户电话</nobr>
                   </th>
+                  <th>
+                    <nobr>区域</nobr>
+                  </th>
+                  <th>
+                    <nobr>调压箱</nobr>
+                  </th>
                   <th  v-if="!$parent.$parent.$parent.isOper">
                     <nobr>客户地址</nobr>
                   </th>
@@ -395,6 +412,8 @@
                 <td style="text-align: center;">{{row.f_meternumber}}</td>
                 <td style="text-align: center;">{{row.f_card_id}}</td>
                 <td style="text-align: center;">{{row.f_user_phone}}</td>
+                <td style="text-align: center;">{{row.f_area}}</td>
+                <td style="text-align: center;">{{row.f_adjustable_name}}</td>
                 <td style="text-align: center;" v-if="!$parent.$parent.$parent.isOper">{{row.f_address_detail ? row.f_address + row.f_address_detail :
                   row.f_address}}
                 </td>
@@ -526,6 +545,7 @@ let loadParamGem = async function (self) {
     await self.$LoadParams.loadParam(self.f_filialeid)
     // await self.$LoadParams.loadMeterBook(self.f_filialeid)
     // await self.search()
+    await self.initAdjustArea()
     await self.initAdjustables()
   }
 
@@ -569,6 +589,7 @@ let loadParamGem = async function (self) {
         model: new PagedList('rs/sql/filemanage_getUserfies', 30, {orderitem: '"f_userinfo_id DESC"'}),
         row: null, // 选择一条客户信息，对其进行修改
         areainfo: null, // 小区批量建档使用的数据
+        adjustarea: [],
         rows: [], // 客户档案选择一条时，将只显示一条信息，rows用来存放整页的数据
         headers: {'username': this.$login.f.name, 'blodid': this.$login.guid()},
         contract: [{label: '全部', value: ' is null or f_contract_id is not null'}, {
@@ -649,7 +670,7 @@ let loadParamGem = async function (self) {
         resdata: '',
         resshow: false,
         batchpinshow: false, // 导入销户
-        titleShow: true, //是否显示部分档案信息类的筛选框
+        titleShow: true, // 是否显示部分档案信息类的筛选框
         useoptions: this.$appdata.getParam('使用类型'),
 
         userlevel: this.$appdata.getParam('用户等级') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户等级')] : []
@@ -657,7 +678,7 @@ let loadParamGem = async function (self) {
     },
     ready () {
       loadParamGem(this)
-      this.titleShow = this.$appdata.getSingleValue('是否显示筛选框') == null? true : this.$appdata.getSingleValue('是否显示筛选框')
+      this.titleShow = this.$appdata.getSingleValue('是否显示筛选框') == null ? true : this.$appdata.getSingleValue('是否显示筛选框')
       this.getAuthority()
     },
     compiled () {
@@ -671,13 +692,12 @@ let loadParamGem = async function (self) {
       closeBatchAdjustables () {
         this.showModifyAdjustables = false
       },
-      async openBatchModal() {
+      async openBatchModal () {
         let rowdata = this.$refs.paged.$refs.grid.getRowData()
         if (rowdata.length <= 0) {
-          this.$showMessage('请至少选择一个表具!')
-          return
+          this.$showMessage('不选择具体档案将批量修改所有满足条件的档案!')
         }
-        const getAdjustables = await this.$resetpost('rs/sql/singleTable_OrderBy',{
+        const getAdjustables = await this.$resetpost('rs/sql/singleTable_OrderBy', {
           data: {
             tablename: 't_adjustablebox',
             items: 'f_adjustable_name as label, id as value',
@@ -689,9 +709,9 @@ let loadParamGem = async function (self) {
         this.adjustablesNew = getAdjustables.data
         this.showModifyAdjustables = true
       },
-      async batchModifyAdjustables() {
+      async batchModifyAdjustables () {
         let rowdata = this.$refs.paged.$refs.grid.getRowData()
-        let userfilesIds = rowdata.map(item => item.f_userfiles_id);
+        let userfilesIds = rowdata.map(item => item.f_userfiles_id)
         console.log('已选择的数据', userfilesIds)
         console.log('已选择的调压箱', this.f_adjustable_id)
         let model = {
@@ -703,12 +723,11 @@ let loadParamGem = async function (self) {
           rejectMsg: '批量修改调压箱失败'
         }).then((res) => {
           if (res && res.data) {
-            this.$showMessage(`本次批量修改:  ${res.data}户`);
+            this.$showMessage(`本次批量修改:  ${res.data}户`)
           }
           this.closeBatchAdjustables()
           this.selfSearch()
         })
-
       },
       getAuthority () {
         if (this.$login.r.find(value => value == '销户导入')) {
@@ -716,18 +735,17 @@ let loadParamGem = async function (self) {
         }
       },
       getRes (obj) {
-        console.log("-----------------")
+        console.log('-----------------')
         this.orgcondition = obj
-        if(this.$refs.paged.$refs.criteria.$refs.sel.depresid.length>0){
-          this.f_filialeid=this.$refs.paged.$refs.criteria.$refs.sel.depresid[0]
-        }else{
-          this.f_filialeid=this.$login.f.orgid
+        if (this.$refs.paged.$refs.criteria.$refs.sel.depresid.length > 0) {
+          this.f_filialeid = this.$refs.paged.$refs.criteria.$refs.sel.depresid[0]
+        } else {
+          this.f_filialeid = this.$login.f.orgid
         }
-
       },
-      downloadFiles(){
-        let downurl='rs/downloadfile/file?filename=批量建档导出Excel模板';
-        this.$downFile(downurl,'批量建档导出Excel模板.xlsx')
+      downloadFiles () {
+        let downurl = 'rs/downloadfile/file?filename=批量建档导出Excel模板'
+        this.$downFile(downurl, '批量建档导出Excel模板.xlsx')
       },
       /**
        * 退出用户详细信息页面
@@ -750,7 +768,7 @@ let loadParamGem = async function (self) {
         } catch (e) {
         }
         try {
-          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}));
+          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}))
         } catch (e) {
         }
       },
@@ -859,8 +877,8 @@ let loadParamGem = async function (self) {
               count++
             })
             await this.$resetpost('rs/logic/saveCancellation', {infoIds: infoIds}, {resolveMsg: null, rejectMsg: '批量销户失败'}).then((res) => {
-              if(res && res.data){
-                this.$showMessage(`本次批量销户总计:  ${res.data.allnum}户  ,成功:  ${res.data.successnum}户  ,失败(已经销户):  ${res.data.errornum2}  户,失败(待审核):  ${res.data.errornum1}户 `);
+              if (res && res.data) {
+                this.$showMessage(`本次批量销户总计:  ${res.data.allnum}户  ,成功:  ${res.data.successnum}户  ,失败(已经销户):  ${res.data.errornum2}  户,失败(待审核):  ${res.data.errornum1}户 `)
               }
               this.xiaohushow = false
               this.close()
@@ -901,8 +919,6 @@ let loadParamGem = async function (self) {
         this.criteriaShow = false
         this.$refs.paged.$refs.grid.$el.scrollTop = 0
         this.model.search(args.condition, args.model)
-        let http = new HttpResetClass()
-
         this.clean()
       },
       // printok () {
@@ -939,6 +955,15 @@ let loadParamGem = async function (self) {
         delete row.id
         this.bulidFiles(row)
       },
+      async initAdjustArea () {
+        let area = await this.$resetpost('rs/sql/singleTable_OrderBy', {data: { tablename: 't_region',
+          items: 'f_name label, id as value',
+          condition: `f_name is not null`,
+          orderitem: 'id desc'
+        }}, {resolveMsg: '', rejectMsg: ''})
+        console.log(area)
+        this.adjustarea = [{label: '全部', value: ''}, ...area.data]
+      },
       async initAdjustables () {
         console.log('初始化调压箱', this.$GetSaleParam)
         let arr = []

package/src/filiale/qingjian/sale.js

@@ -17,4 +17,6 @@ export default function () {
   Vue.component('iot-refund', (resolve) => { require(['./IOTRefund'], resolve) })
   // 用户基本信息test
   Vue.component('file-user-essential-info', (resolve) => { require(['./UserEssentialInfoTest'], resolve) })
+  // 售气收费 --弹出框
+  Vue.component('charge-modal', (resolve) => { require(['./ChargeModal'], resolve) })
 }