sale-client 3.6.91 → 3.6.93

package/package.json

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

package/src/components/revenue/comprehen/ComprehenOperation/OffGasAddGas/OffGasAddGas.vue

@@ -48,7 +48,7 @@
       <div style="text-align:right;">
         <button class="button_search button_spacing" @click="accept()" v-if="config.hasAcceptance" :disabled='!$v.valid'>受理单</button>
         <button class="button_search button_spacing" v-show="config.approve == true ? applyButtonShow : false"  @click="apply()"  :disabled='!$v.valid'>掉气补气审核</button>
-        <button class="button_search button_spacing" v-show="config.approve == true ? !applyButtonShow : true"  @click="confirm()"  :disabled='!$v.valid'>确认</button>
+        <button class="button_search button_spacing" v-show="config.approve == true ? !applyButtonShow : true"  @click="confirm()"  :disabled='!$v.valid || buttonDisable'>确认</button>
         <button class="button_clear" v-show="applyButtonShow" @click="clean()">取消</button>
       </div>
     </validator>
@@ -142,7 +142,8 @@ export default {
         f_memorandum: ''
       },
       addTaskValid: false,
-      addTaskModalShow: false
+      addTaskModalShow: false,
+      buttonDisable: false
     }
   },
   props: {
@@ -206,7 +207,6 @@ export default {
       this.addTaskModel.f_work_flow_name = ''
       this.addTaskModel.f_task_name = ''
       this.addTaskModel.f_userinfo_code = ''
-      this.addTaskModel.f_approval = ''
       this.addTaskModel.f_memorandum = ''
     },
     addTask () {
@@ -283,6 +283,7 @@ export default {
       this.acceptprint = false
     },
     confirm () {
+      this.buttonDisable = true
       this.$dispatch('no-button')
       this.row.cardInfo = this.cardData
       this.$OffGasAddGasService.offGasAddGas(this.model, this.row).then((res) => {
@@ -294,6 +295,8 @@ export default {
             }
           }
           this.$dispatch('futureapply', obj)
+          // 向上级触发一个事件改变流程的操作状态
+          this.$dispatch('changeFlowOperateState')
         }
         if (this.config.hasPrint) {
           if (this.config.hasBillManage) {
@@ -313,6 +316,7 @@ export default {
           this.$error('重复提交')
           return
         }
+        this.buttonDisable = false
         this.$dispatch('error', '掉气补气', this.row, error)
       })
     },

package/src/components/revenue/comprehen/ComprehenOperation/OtherGas/OtherGas.vue

@@ -58,7 +58,7 @@
         <div style="text-align:right;margin-top: 2%">
           <button class="button_search" @click="accept()" v-if="config.hasAcceptance" :disabled='!$v.valid'>受理单</button>
           <button class="button_search" v-show="config.approve == true ? applyButtonShow : false"  @click="apply()"  :disabled='!$v.valid' >其他补气审核</button>
-          <button class="button_search" v-show="config.approve == true ? !applyButtonShow : true"  @click="confirm()"  :disabled='!$v.valid' >确认</button>
+          <button class="button_search" v-show="config.approve == true ? !applyButtonShow : true"  @click="confirm()"  :disabled='!$v.valid || buttonDisable' >确认</button>
           <button class="button_clear" v-show="applyButtonShow" @click="clean()" >取消</button>
         </div>
       </validator>
@@ -200,6 +200,7 @@
           rollback.f_tag = self.row.f_tag
         }
         await self.$resetpost('rs/logic/otherGasRollback', {data: rollback}, {rejectMsg: '其他补气回滚出错', resolveMsg: null})
+        self.buttonDisable = false
       }
     }
   }
@@ -258,7 +259,8 @@
           f_memorandum: ''
         },
         addTaskValid: false,
-        addTaskModalShow: false
+        addTaskModalShow: false,
+        buttonDisable: false
       }
     },
     props: {
@@ -291,7 +293,6 @@
         this.addTaskModel.f_work_flow_name = ''
         this.addTaskModel.f_task_name = ''
         this.addTaskModel.f_userinfo_code = ''
-        this.addTaskModel.f_approval = ''
         this.addTaskModel.f_memorandum = ''
       },
       addTask () {
@@ -347,6 +348,7 @@
         this.acceptprint = false
       },
       async confirm () {
+        this.buttonDisable = true
         let res = await otherGasGen(this)
         if (this.config.approve) {
           console.log('存储补气业务信息')
@@ -356,6 +358,8 @@
             }
           }
           this.$dispatch('futureapply', obj)
+          // 向上级触发一个事件改变流程的操作状态
+          this.$dispatch('changeFlowOperateState')
         }
         if (this.config.hasPrint) {
           if (this.config.hasBillManage) {

package/src/components/revenue/comprehen/SpecialUser/BlackList/BlackRecordQuery.vue

@@ -0,0 +1,213 @@
+<template>
+  <div id="unit" @keyup.enter="search" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex">
+        <criteria-paged :model="model" v-ref:paged>
+          <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+              <div class="row">
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">用户编号</label>
+                  <input class="input_search" condition="f_userinfo_code like '%{}%'" placeholder="用户编号" style="width:60%"
+                         type="text" v-model="model.ename"
+                  />
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">用户姓名</label>
+                  <input  class="input_search" condition="f_user_name = '{}'" placeholder="用户姓名" style="width:60%"
+                          type="text" v-model="model.name"
+                  />
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">地&emsp;&emsp;址</label>
+                  <input  :size="model.f_address ? model.f_address.length * 2 : 4" class="input_search" condition="f_address like '%{}%'" placeholder='用户地址' style="width:60%"
+                          type="text"
+                          v-model="model.f_address">
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">电&emsp;&emsp;话</label>
+                  <input :size="model.f_user_phone ? model.f_user_phone.length : 2" class="input_search" condition="f_user_phone = '{}'" placeholder='电话' style="width:60%"
+                         type="text"
+                         v-model="model.f_user_phone">
+                </div>
+                <div class="form-group col-sm-3 button-range" style="padding-right: 10px">
+                  <button @click="$parent.$parent.search()" class="button_search button_spacing" style="width:80px;margin-left:30px;" v-el:cx>查询</button>
+                  <export-excel
+                    :data="$parent.$parent.getCondition"
+                    :field="$parent.$parent.getfield"
+                    sqlurl="rs/logic/saleExport" progress="saleGetExportProgress" sql-name="sale_blackRecordQuery" template-name='黑名单记录导出'
+                    :choose-col="true">
+                  </export-excel>
+                  <div
+                    :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                    @click="$parent.$parent.hidden()" class="button_spacing" style="float: right"></div>
+                </div>
+              </div>
+              <div class="row" v-if="$parent.$parent.criteriaShow">
+                <res-select-group  :show-component="['company']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getorg" v-ref:sel></res-select-group>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">表&emsp;&emsp;号</label>
+                  <input  :size="model.f_meternumber ? model.f_meternumber.length * 2 : 4" class="input_search" condition="f_meternumber = '{}'" placeholder='表号' style="width:60%"
+                          type="text"
+                          v-model="model.f_meternumber">
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">卡&emsp;&emsp;号</label>
+                  <input  :size="model.f_card_id ? model.f_card_id.length * 2 : 4" class="input_search" condition="f_card_id = '{}'" placeholder='卡号' style="width:60%"
+                          type="text"
+                          v-model="model.f_card_id">
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">操作日期</label>
+                  <datepicker placeholder="开始日期"
+                              style="width:60%"
+                              class="datepicker"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd'"
+                              condition="f_operate_date >= '{} 00:00:00'">
+                  </datepicker>
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">操作日期</label>
+                  <datepicker placeholder="结束日期"
+                              style="width:60%"
+                              class="datepicker"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd'"
+                              condition="f_operate_date <= '{} 23:59:59'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">操作类型</label>
+                  <v-select :value.sync="model.f_operat_type"
+                            v-model="model.f_operat_type"
+                            style="width: 60%"
+                            condition="f_operat_type = '{}'"
+                            :options='$parent.$parent.operateType' placeholder='操作类型'
+                            close-on-select>
+                  </v-select>
+                </div>
+              </div>
+            </div>
+          </criteria>
+
+          <data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
+            <template partial='head'>
+              <tr>
+                <th style="text-align: center;">序号</th>
+                <th style="text-align: center;">用户编号</th>
+                <th style="text-align: center;">姓名</th>
+                <th style="text-align: center;">表号</th>
+                <th style="text-align: center;">卡号</th>
+                <th style="text-align: center;">电话</th>
+                <th style="text-align: center;">地址</th>
+                <th style="text-align: center;">操作日期</th>
+                <th style="text-align: center;">操作类型</th>
+                <th style="text-align: center;">操作人</th>
+                <th style="text-align: center;">操作原因</th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;">{{$index+1}}</td>
+              <td style="text-align: center;">{{row.f_userinfo_code}}</td>
+              <td style="text-align: center;">{{row.f_user_name}}</td>
+              <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_address}}</td>
+              <td style="text-align: center;">{{row.f_operate_date}}</td>
+              <td style="text-align: center;">{{row.f_operat_type}}</td>
+              <td style="text-align: center;">{{row.f_operator}}</td>
+              <td style="text-align: center;">{{row.f_comments}}</td>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+
+  export default {
+    data () {
+      return {
+        initres: {
+          org: [this.$login.f.orgid],
+          dep: [],
+          user: []
+        },
+        criteriaShow: false,
+        model: new PagedList('rs/sql/sale_blackRecordQuery', 20),
+        // 公司下拉
+        curorgid: [this.$login.f.orgid],
+        f_orgid: '',
+        getfield: {
+          'f_userinfo_code': '用户编号',
+          'f_user_name': '用户姓名',
+          'f_meternumber': '表号',
+          'f_card_id': '卡号',
+          'f_user_phone': '用户电话',
+          'f_address': '用户地址',
+          'f_operate_date': '操作日期',
+          'f_operat_type': '操作类型',
+          'f_operator': '操作人',
+          'f_comments': '原因'
+        },
+        operateType: [{label: '全部', value: ''}, {label: '拉黑 ', value: '拉黑'}, {label: '取消拉黑', value: '取消拉黑'}]
+      }
+    },
+    props: {
+      row: {},
+      ispartial: false
+    },
+    ready () {
+      this.$refs.paged.$refs.cri.model.startDate = this.data ? this.data.startDate : this.$login.toStandardDateString()
+      this.$refs.paged.$refs.cri.model.endDate = this.data ? this.data.endDate : this.$login.toStandardDateString()
+      this.search()
+    },
+    methods: {
+      async getRes (condition, obj) {
+        console.log('condition =', condition)
+        console.log('obj =', obj)
+      },
+      hidden () {
+        this.criteriaShow = !this.criteriaShow
+      },
+      search () {
+        this.$refs.paged.$refs.cri.search()
+        this.$dispatch('search')
+      },
+      getorg (val) {
+        this.f_orgid = val
+      },
+      selfSearch (args) {
+        if (!this.f_orgid) {
+          this.getorg('and f_orgid in' + '(\'' + [this.$login.f.orgid] + '\')')
+        }
+        console.log('查询。。。', this.f_orgid)
+        if (this.f_orgid) {
+          args.condition = `${args.condition}  ${this.f_orgid} `
+        }
+
+        this.model.search(args.condition, args.model)
+      }
+    },
+    watch: {
+      'model.rows.length' (val) {
+        if (val === 1) {
+          this.$refs.paged.$refs.grid.select(this.model.rows[0])
+        }
+      }
+    },
+    computed: {
+      getCondition () {
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.f_orgid}
+      }
+    }
+  }
+</script>

package/src/components/revenue/comprehen/SpecialUser/SpecialUserManage.vue

@@ -7,6 +7,9 @@
       <tabs header="黑名单管理" v-if="permission('黑名单管理')">
         <black-list-mangae   @deal-msg="dealMsg"></black-list-mangae>
       </tabs>
+      <tabs header="黑名单记录查询"  v-if="permission('黑名单记录查询')">
+        <black-record-query  @deal-msg="dealMsg"></black-record-query>
+      </tabs>
     </tab-button>
 <!--  </div>-->
 <!--  <div v-if="!listpage">-->

package/src/filiale/kelai/FileUserFiles.vue

@@ -713,37 +713,36 @@ export default {
           f_depname: this.$login.f.deps
         }
         let self = this
-        this.$resetpost('rs/logic/newPrepareSettleFileImport',param, {rejectMsg:'上传失败'},10 * 60 * 1000).then(res => {
-          if (res.data) {
-            self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)
-            self.iswork = false
-          }
-        })
-        // try {
-        //   axios.post('rs/logic/newPrepareSettleFileImport',
-        //         {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
-        //           if (res.data) {
-        //             self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)
-        //             self.iswork = false
-        //       // this.$showAlert('导入成功','success',2000)
-        //           }
-        //         })
-        // } catch (error) {
-        //   if (error.response) {
-        //     if (error.response.status == 500) {
-        //       this.$showAlert('服务繁忙,请重试!!!', 'danger', 3000)
-        //     } else if (error.response.status == 404) {
-        //       this.$showAlert('服务运行中,请耐心等待后进行重试!!', 'danger', 3000)
-        //     } else {
-        //       this.$showAlert(error.response.data, 'danger', 2000)
-        //     }
-        //   } else if (error.request) {
-        //     this.$showAlert(error.request, 'danger', 2000)
-        //   } else {
-        //     this.$showAlert(error.message, 'danger', 2000)
+        // this.$resetpost('rs/logic/newPrepareSettleFileImport',param, {rejectMsg:'上传失败'},10 * 60 * 1000).then(res => {
+        //   if (res.data) {
+        //     self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)
+        //     self.iswork = false
         //   }
-        //   this.iswork = false
-        // }
+        // })
+        try {
+          axios.post('rs/logic/newPrepareSettleFileImport',
+            {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
+            if (res.data) {
+              self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)
+              self.iswork = false
+            }
+          })
+        } catch (error) {
+          if (error.response) {
+            if (error.response.status == 500) {
+              this.$showAlert('服务繁忙,请重试!!!', 'danger', 3000)
+            } else if (error.response.status == 404) {
+              this.$showAlert('服务运行中,请耐心等待后进行重试!!', 'danger', 3000)
+            } else {
+              this.$showAlert(error.response.data, 'danger', 2000)
+            }
+          } else if (error.request) {
+            this.$showAlert(error.request, 'danger', 2000)
+          } else {
+            this.$showAlert(error.message, 'danger', 2000)
+          }
+          this.iswork = false
+        }
         this.$refs.file.$el.querySelector('input').value = ''
         this.batchMeterShow = false
         this.search()

package/src/filiale/shexian/revenue/newchangemeter/ChangeMeter.vue

@@ -297,7 +297,7 @@
           </button>
           <button class="button_search" v-show="config.approve == true ? !applyButtonShow : true" type="button" @click="confirmbefore()"
                   :disabled="(!meterinfo && !(model.f_type.includes('清零') ||
-                   model.f_type.includes('换卡控流量计'))) || !$v.valid"
+                   model.f_type.includes('换卡控流量计'))) || !$v.valid || buttonDisable"
           >确认
           </button>
           <button class="button_clear" v-show="applyButtonShow" type="button" @click="clean()">取消
@@ -500,7 +500,8 @@ export default {
         f_memorandum: ''
       },
       addTaskValid: false,
-      addTaskModalShow: false
+      addTaskModalShow: false,
+      buttonDisable: false
     }
   },
   props: {
@@ -555,7 +556,6 @@ export default {
       this.addTaskModel.f_work_flow_name = ''
       this.addTaskModel.f_task_name = ''
       this.addTaskModel.f_userinfo_code = ''
-      this.addTaskModel.f_approval = ''
       this.addTaskModel.f_memorandum = ''
     },
     validateBill (val) {
@@ -752,6 +752,7 @@ export default {
       }
     },
     async saveobj () {
+      this.buttonDisable = true
       try {
         this.model.f_operator = this.$login.f.name
         this.model.f_operatorid = this.$login.f.id
@@ -770,6 +771,8 @@ export default {
           resolveMsg: null,
           rejectMsg: '换表失败！！！'
         })
+        // 向上级触发一个事件改变流程的操作状态
+        this.$dispatch('changeFlowOperateState')
         let param = []
         for (let row of this.resid) {
           param.push({id: row.id})
@@ -859,8 +862,10 @@ export default {
       } catch (error) {
         console.log('抛出的错误。。', error)
         let res = error.data.toString()
+        this.buttonDisable = false
         this.$showAlert(res, 'danger', 2000)
         this.$dispatch('refresh')
+
       }
     },
     pregasChange () {

package/src/filiale/shexian/revenue/newchangemeter/ResetMeter.vue

@@ -297,7 +297,7 @@
           >清零审核
           </button>
           <button class="button_search" v-show="config.approve == true ? !applyButtonShow : true"  type="button" @click="confirmbefore()"
-                  :disabled="(!meterinfo && !(model.f_type.includes('清零') || model.f_type.includes('换卡控流量计'))) || !$v.valid"
+                  :disabled="(!meterinfo && !(model.f_type.includes('清零') || model.f_type.includes('换卡控流量计'))) || !$v.valid || buttonDisable"
           >确认
           </button>
           <button class="button_clear" v-show="applyButtonShow" type="button" @click="clean()">取消
@@ -502,7 +502,8 @@ export default {
         f_memorandum: ''
       },
       addTaskValid: false,
-      addTaskModalShow: false
+      addTaskModalShow: false,
+      buttonDisable: false
     }
   },
   props: {
@@ -553,7 +554,6 @@ export default {
       this.addTaskModel.f_work_flow_name = ''
       this.addTaskModel.f_task_name = ''
       this.addTaskModel.f_userinfo_code = ''
-      this.addTaskModel.f_approval = ''
       this.addTaskModel.f_memorandum = ''
     },
     addTask () {
@@ -748,6 +748,7 @@ export default {
       }
     },
     async saveobj () {
+      this.buttonDisable = true
       try {
         this.model.f_operator = this.$login.f.name
         this.model.f_operatorid = this.$login.f.id
@@ -766,6 +767,8 @@ export default {
           resolveMsg: null,
           rejectMsg: '换表失败！！！'
         })
+        // 向上级触发一个事件改变流程的操作状态
+        this.$dispatch('changeFlowOperateState')
         let param = []
         for (let row of this.resid) {
           param.push({id: row.id})
@@ -855,6 +858,7 @@ export default {
       } catch (error) {
         console.log('抛出的错误。。', error)
         let res = error.data.toString()
+        this.buttonDisable = false
         this.$showAlert(res, 'danger', 2000)
         this.$dispatch('refresh')
       }

package/src/sale.js

@@ -773,6 +773,8 @@ export default function () {
   Vue.component('black-list', (resolve) => { require(['./components/revenue/comprehen/SpecialUser/BlackList/BlackList'], resolve) })
   Vue.component('black-list-record', (resolve) => { require(['./components/revenue/comprehen/SpecialUser/BlackList/BlackListRecord'], resolve) })
   Vue.component('black-list-detail', (resolve) => { require(['./components/revenue/comprehen/SpecialUser/BlackList/BlackListDetail'], resolve) })
+  // 黑名单记录查询
+  Vue.component('black-record-query', (resolve) => { require(['./components/revenue/comprehen/SpecialUser/BlackList/BlackRecordQuery'], resolve) })
 // 工具卡制
   Vue.component('tool-card-making-manage', (resolve) => { require(['./components/revenue/comprehen/ToolCard/ToolCardMakingManage'], resolve) })
   Vue.component('tool-card-list', (resolve) => { require(['./components/revenue/comprehen/ToolCard/ToolCardList'], resolve) })