sale-client 3.5.3 → 3.5.6

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/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Fri Apr 02 10:09:16 CST 2021
+gradle.version=3.5.1

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -0,0 +1 @@
+

package/build/dev-server.js

@@ -11,9 +11,15 @@ 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 fuwu = 'http://192.168.50.4:8400'
+// var fuwu = 'http://192.168.89.62: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/'
 //铜川测试
@@ -100,7 +106,7 @@ var proxyTable = {
   '/rs': {
     // target: 'http://192.168.30.63:8081/'
     // target: 'http://121.36.106.17:8400/'
-    target: fuwu
+    target: bendi
   }
 }
 

package/package.json

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

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -93,7 +93,7 @@
         </div>
         <div class="row">
           <div class="col-sm-2"></div>
-          <input v-if="fileSaveData.reason==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
+          <input v-if="fileSaveData.reason ==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">

package/src/components/charge/business/OtherChargeNew.vue

@@ -163,7 +163,7 @@
           <button class="button_search btn-gn" v-if="authArr.includes('其它欠费生成')" @click="createQianfei()"
                   :disabled=' validflag || validateOk'>生成欠费
           </button>
-          <button class="button_search btn-gn" @click="checkInvoiceMsg()" :disabled=' validflag || validateOk'>确认
+          <button class="button_search btn-gn" @click="checkInvoiceMsg()" :disabled='config.checkFlag?false:(validflag || validateOk)'>确认
           </button>
           <button class="button_clear btn-gn" @click="clean()">取消</button>
         </div>
@@ -281,6 +281,7 @@ export default {
   data () {
     return {
       config: {
+        checkFlag: false,
         modificationList: false,
         dispatch: false,
         hasPrint: true,  // 默认打票

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>
@@ -63,18 +63,18 @@
               <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==='卡表赠气'||
                           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==='气损收费' ">
                     <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==='气损收费' ">
+                  <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 === '过户'">
 <!--                    <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/comprehen/SpecialUser/BasicLiving/BasicLivingList.vue

@@ -41,6 +41,7 @@
 <!--                     v-model="model.f_user_phone">-->
 <!--            </div>-->
             <div class="form-group  button-range" style="padding-right: 10px">
+              <import-excel template-name="低保户导入模板" logic-name="BasicLivingImport" import-json="basicLiving.json"></import-excel>
               <button @click="$parent.$parent.search()" class="button_search button_spacing" v-el:cx>查询</button>
               <button @click="$parent.$parent.add()" class="button_export button_spacing" style="width: max-content;"
                       v-el:cx>新增低保户
@@ -129,6 +130,9 @@
             <th style="text-align: center;"  v-show='!$parent.$parent.$parent.$parent.isdetail' >
               <nobr>结束时间</nobr>
             </th>
+            <th style="text-align: center;"  v-show='!$parent.$parent.$parent.$parent.isdetail' >
+              <nobr>附件查看</nobr>
+            </th>
           </tr>
         </template>
         <template partial='body'>
@@ -140,10 +144,20 @@
           <td v-show='!$parent.$parent.$parent.$parent.isdetail' style="text-align: center;"><nobr>{{row.f_price_name}}</nobr></td>
           <td v-show='!$parent.$parent.$parent.$parent.isdetail' style="text-align: center;"><nobr>{{row.f_start_date}}</nobr></td>
           <td v-show='!$parent.$parent.$parent.$parent.isdetail' style="text-align: center;"><nobr>{{row.f_end_date}}</nobr></td>
+          <td v-show='!$parent.$parent.$parent.$parent.isdetail' style="text-align: center;"> <nobr>
+            <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
+          </nobr></td>
         </template>
         <template partial='foot'></template>
       </data-grid>
     </criteria-paged>
+    <modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
+      <article slot="modal-body">
+        <upload  :blodid="selected.f_userinfo_id" isremark="true" :isremark="false" fusetype="低保户" v-ref:upload ></upload>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
   </div>
 </template>
 
@@ -171,6 +185,8 @@
         f_orgid: '',
         criteriaShow: false,
         clientWidth: document.body.clientWidth,
+        showupload:false,
+        selected: {},
         getfield: {
           'f_userinfo_code': '用户编号',
           'f_user_name': '姓名',
@@ -201,6 +217,11 @@
       this.search()
     },
     methods: {
+      view (row) {
+        this.showupload = true
+        this.selected = row
+        console.log('11', row)
+      },
       async getRes (condition, obj) {
         console.log('低保户condition =', condition)
         console.log('低保户obj =', obj)

package/src/components/webMeter/webInfo/WebMeterList.vue

@@ -36,14 +36,15 @@
                 <input type="text" class="input_search" style="width:60%" v-model="model.f_imei"
                        condition="f_imei='{}'" placeholder="IMEI码">
               </div>
-              <div :class="$parent.$parent.styles">
-                <label class="font_normal_body">组织机构</label>
-                <res-select restype='organization'
-                            :is-mul="false"
-                            :initresid="$parent.$parent.curorgid"
-                            @res-select="$parent.$parent.getorgCur">
-                </res-select>
-              </div>
+              <res-select-group  :show-component="['company']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+              <!--<div :class="$parent.$parent.styles">-->
+                <!--<label class="font_normal_body">组织机构</label>-->
+                <!--<res-select restype='organization'-->
+                            <!--:is-mul="false"-->
+                            <!--:initresid="$parent.$parent.curorgid"-->
+                            <!--@res-select="$parent.$parent.getorgCur">-->
+                <!--</res-select>-->
+              <!--</div>-->
               <div :class="$parent.$parent.styles" >
                 <label class="font_normal_body">气表品牌</label>
                 <v-select
@@ -224,7 +225,14 @@
         meterbrand: [],
         azstate: [{label: '全部', value: ''}, {label: '已安装', value: '已安装'}, {label: '未安装', value: '未安装'}],
         isreceived:[{label: '全部', value: ''}, {label: '已领用', value: '是'}, {label: '未领用', value: '否'}],
-        curorgid: [this.$login.f.orgid],
+        // curorgid: [this.$login.f.orgid],
+        orgCondtionStr: '',
+        // 公司下拉
+        initres: {
+          org: [],
+          dep: [],
+          user: []
+        },
         model: new PagedList('rs/sql/webMeterInfo', 20, {items: '"*"', tablename: '"t_meterinfo"', orderitem: '"id"'}),
         headers: {'username': Vue.$login.f.name, 'blodid': WebmeterUtil.guid()},
         criteriaShow: false,
@@ -245,6 +253,9 @@
     },
 
     methods: {
+      async getRes (condition, obj) {
+        this.orgCondtionStr = condition
+      },
       loadGetField () {
         this.getfield = {
           'f_meternumber': '表号',
@@ -337,11 +348,13 @@
       selfSearch (args) {
         this.$parent.meterinfos = []
         if (!this.f_orgid) {
-          this.getorgCur([this.$login.f.orgid])
-        }
-        if (this.f_orgid) {
-          args.condition = `${args.condition} and f_filialeid  in ${this.f_orgid}`
+          this.f_orgid = this.$login.f.orgid
         }
+        let f_orgstr = this.orgCondtionStr ? this.orgCondtionStr : "and f_filialeid in ('" + this.f_orgid + "')"
+        args.condition = `${args.condition} ` + f_orgstr
+        // if (this.f_orgid) {
+        //   args.condition = `${args.condition} and f_filialeid  in ${this.f_orgid}`
+        // }
         this.getCondition = {condition: args.condition}
         this.model.search(args.condition, args.model)
       },

package/src/filiale/tongchuan/StairPrice/GasPrice.vue

@@ -194,6 +194,9 @@
       <div v-if="data" style="text-align:right;height:auto;margin-top:6px;">
         <a @click="showChangeView">查看变更记录</a>
       </div>
+      <div>
+        <price-change-history :row="data"></price-change-history>
+      </div>
       <!--</div>-->
     </validator>
     <limit-gas :f_price_id="model.id" :show.sync="limitShow" @limit="getLimitGas"></limit-gas>

package/src/filiale/tongchuan/StairPrice/PriceChangeHistory.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="auto" style="height: 500px">
+  <div class="auto">
       <data-grid :model="model" class="list_area table_sy"  partial='list' v-ref:grid >
         <template partial='head'>
           <tr>

package/src/main.js

@@ -1,18 +1,22 @@
-import Vue from 'vue'
-import App from './App'
-import sale from './sale'
-import { address } from 'address-client'
-import { ldap } from 'ldap-clients'
-import VueClipboard from 'vue-clipboard2'
-Vue.use(VueClipboard)
-Vue.config.silent = true
-// 新打包写法
-Vue.use(sale, {filiale: 'tongchuan'})
-address()
-ldap()
-require('system-clients/src/styles/less/bootstrap.less')
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import { all } from 'vue-client'
+import App from './App'
+import { system } from 'system-clients'
+import sale from './sale'
+import { address } from 'address-client'
+import { ldap } from 'ldap-clients'
+import VueClipboard from 'vue-clipboard2'
+Vue.use(VueClipboard)
+Vue.config.silent = true
+
+all()
+system(false)
+sale()
+address()
+ldap()
+require('system-clients/src/styles/less/bootstrap.less')
+
+new Vue({
+  el: 'body',
+  components: { App }
+})

package/src/plugins/FileManageService.js

@@ -55,7 +55,7 @@ let FileManageService = {
       result.infobank.f_bank_name = bank.f_bank_name.length > 0 ? bank.f_bank_name[0] : ''
     }
     // 获取分公司id (通过ids拆分)
-      result.f_filialeid = data.f_filialeid
+    result.f_filialeid = data.f_filialeid
     if (result.f_userinfo_id === null) {
       result.f_createfile_person = Vue.$login.f.name
       result.f_createfile_date = Vue.$login.toStandardTimeString()
@@ -101,7 +101,7 @@ let FileManageService = {
       if (meter.f_hand_month) {
         meter.f_hand_month = meter.f_hand_month.length > 0 ? meter.f_hand_month[0] : null
       }
-      if (meter.f_overdue_set){
+      if (meter.f_overdue_set) {
         meter.f_overdue_set = meter.f_overdue_set.length > 0 ? meter.f_overdue_set[0] : null
       }
       if (meter.f_riser_shaft) {
@@ -156,24 +156,24 @@ let FileManageService = {
       }
 
       meter.f_user_type = meter.f_user_type.length > 0 ? meter.f_user_type[0] : ''
-      if(meter.fireinfo){
-        if(meter.f_user_type=='民用'){
-          meter.fireinfo.f_llj_scope=meter.fireinfo.f_control_brand=
-          meter.fireinfo.f_contact_method=
-          meter.fireinfo.f_control_model=meter.fireinfo.f_control_date=
-          meter.fireinfo.f_control_code=meter.fireinfo.f_control_number=
-          meter.fireinfo.f_appliance_type=meter.fireinfo.f_appliance_brand=
-          meter.fireinfo.f_appliance_model=meter.fireinfo.f_alarm_info=
-          meter.fireinfo.f_detector_number= null
-        }else{
-          meter.fireinfo.f_galvanize_pipe=meter.fireinfo.f_tee=
-          meter.fireinfo.f_nipple=meter.fireinfo.f_elbow=
-          meter.fireinfo.f_pipe_strap=meter.fireinfo.f_zqf=
-          meter.fireinfo.f_sebific_duct=meter.fireinfo.f_zbf=
-          meter.fireinfo.f_gas_appliance=meter.fireinfo.f_gas_appliance_num=
-          meter.fireinfo.f_geyser=meter.fireinfo.f_geyser_num=
-          meter.fireinfo.f_bgl=meter.fireinfo.f_bgl_style=
-          meter.fireinfo.f_bgl_num=  null
+      if (meter.fireinfo) {
+        if (meter.f_user_type == '民用') {
+          meter.fireinfo.f_llj_scope = meter.fireinfo.f_control_brand =
+          meter.fireinfo.f_contact_method =
+          meter.fireinfo.f_control_model = meter.fireinfo.f_control_date =
+          meter.fireinfo.f_control_code = meter.fireinfo.f_control_number =
+          meter.fireinfo.f_appliance_type = meter.fireinfo.f_appliance_brand =
+          meter.fireinfo.f_appliance_model = meter.fireinfo.f_alarm_info =
+          meter.fireinfo.f_detector_number = null
+        } else {
+          meter.fireinfo.f_galvanize_pipe = meter.fireinfo.f_tee =
+          meter.fireinfo.f_nipple = meter.fireinfo.f_elbow =
+          meter.fireinfo.f_pipe_strap = meter.fireinfo.f_zqf =
+          meter.fireinfo.f_sebific_duct = meter.fireinfo.f_zbf =
+          meter.fireinfo.f_gas_appliance = meter.fireinfo.f_gas_appliance_num =
+          meter.fireinfo.f_geyser = meter.fireinfo.f_geyser_num =
+          meter.fireinfo.f_bgl = meter.fireinfo.f_bgl_style =
+          meter.fireinfo.f_bgl_num = null
         }
       }
       // meter.f_industry_comments = meter.f_industry_comments.length > 0 ? meter.f_industry_comments[0] : ''
@@ -204,7 +204,7 @@ let FileManageService = {
       meter.f_userfiles_address = meter.f_userfiles_address ? meter.f_userfiles_address : null
       if (!meter.f_userfiles_id) {
         // 气表状态需要根据表型判断是否需要开通操作 目前物联网表需要做开通操作
-        meter.f_table_state = '正常'
+        meter.f_table_state = result.f_user_state === '预备' ? '待开通' : '正常'
         // meter.f_whether_hairpin = !item.gasbrand[0].f_meter_type.includes('机表') ? '未发' : '无卡'
         // 所有表变成未发
         meter.f_whether_hairpin = '未发'
@@ -271,16 +271,16 @@ let FileManageService = {
       meter.devicesinfo = userfilesdevices
       result.userfiles.push(meter)
     })
-    //用户设备信息
+    // 用户设备信息
     result.userphonelist = []
     let userphonelist = []
-    if(data.baseinfo.userphonelist){
+    if (data.baseinfo.userphonelist) {
       data.baseinfo.userphonelist.forEach((item) => {
-        if(item.f_rent_phone){
+        if (item.f_rent_phone) {
           let userphone = Object.assign({}, userphone, item)
           userphone.f_userinfo_id = result.f_userinfo_id ? result.f_userinfo_id + '' : null,
-          userphone.f_rent_phone = userphone.f_rent_phone ? userphone.f_rent_phone :null,
-          userphone.f_state= userphone.f_state ? userphone.f_state :'有效'
+          userphone.f_rent_phone = userphone.f_rent_phone ? userphone.f_rent_phone : null,
+          userphone.f_state = userphone.f_state ? userphone.f_state : '有效'
           userphone.f_operatorid = Vue.$login.f.id
           userphone.f_operator = Vue.$login.f.name
           userphone.f_orgid = Vue.$login.f.orgid
@@ -330,7 +330,7 @@ let FileManageService = {
     address = {
       id: data.addressinfo.id,
       f_area_id: data.addressinfo.f_area_id ? data.addressinfo.f_area_id : undefined,
-      f_address_state :data.addressinfo.f_address_state
+      f_address_state: data.addressinfo.f_address_state
     }
     if (data.oldaddressinfo.id) {
       address.oldid = data.oldaddressinfo.id