sale-client 4.3.2 → 4.3.3

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://121.36.106.17:31467/', 'http://121.36.106.17:31467/']
+const [ serverRul, localUrl ] = ['http://222.83.114.229:31785/', 'http://222.83.114.229:31785/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/components/FilesManageNew/FileUserFiles.vue

@@ -116,6 +116,14 @@
                            type="text"
                            v-model="model.f_olduserinfo_code">
                   </div>
+                  <div
+                    :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+                    class="form-group">
+                    <label class="font_normal_body">客户类型</label>
+                    <v-select :options='$parent.$parent.user_type' :value.sync="model.f_user_type"
+                              close-on-select condition="f_user_type='{}'" :value-single="true" @change="$parent.$parent.userTypeChange()"
+                              placeholder='客户类型' v-model="model.f_user_type"></v-select>
+                  </div>
                   <div
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                     class="form-group">
@@ -374,7 +382,11 @@ let loadParamGem = async function (self) {
           orderFields: {
             f_userinfo_id: 'no'
           },
-
+          user_type: this.$appdata.getParam('用户类型') ? [{
+            label: '全部',
+            value: ''
+          }, ...this.$appdata.getParam('用户类型')] : [],
+          gasproperties: [],
           createFile: false,
 
           curorgid: [this.$login.f.orgid],
@@ -396,7 +408,7 @@ let loadParamGem = async function (self) {
 
           criteriaShow: false,
 
-          gasproperties: this.$appdata.getParam('用气性质') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')] : [],
+          // gasproperties: this.$appdata.getParam('用气性质') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')] : [],
           userstates: this.$appdata.getParam('预备客户状态参数') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('预备客户状态参数')] : [{label: '预备', value: '预备'}],
           f_user_state: '预备',
           showselectaddress: false,
@@ -457,6 +469,15 @@ let loadParamGem = async function (self) {
         },
         showFileInfo () {
 
+        },
+        userTypeChange () {
+          this.gasproperties = []
+          if (this.$refs.paged.$refs.criteria.model !== null) {
+            this.$refs.paged.$refs.criteria.model.f_gasproperties = ''
+            this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type)
+          } else {
+            this.gasproperties = [{label: '全部', value: ''}]
+          }
         },
         closemodal () {
           this.batchMeterShow = false

package/src/components/charge/ChargeList.vue

@@ -80,6 +80,12 @@
                           condition="f_meter_brand = '{}'"
                           close-on-select style="width: 60%"></v-select>
               </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">客户类型</label>
+                <v-select :options='$parent.$parent.user_type' :value.sync="model.f_user_type" style="width: 60%"
+                          close-on-select condition="u.f_user_type='{}'"  @change="$parent.$parent.userTypeChange()"
+                          placeholder='客户类型' v-model="model.f_user_type"></v-select>
+              </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">用气性质</label>
                 <v-select v-model="model.f_gasproperties"
@@ -687,6 +693,11 @@ let cardBtnGen = async function (self, val) {
         orderFields: {
           f_userinfo_id: 'no'
         },
+        gasproperties: [],
+        user_type: this.$appdata.getParam('用户类型') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('用户类型')] : [],
         filiale: '',
         outlet: '',
         fields: {
@@ -713,7 +724,7 @@ let cardBtnGen = async function (self, val) {
         fileStates: this.$appdata.getParam('档案状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('档案状态')] : [],
 
         // userTypes: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : [],
-        gasproperties: this.$appdata.getParam('用气性质') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')] : [],
+        // gasproperties: this.$appdata.getParam('用气性质') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')] : [],
 
         meterbrand: [],
         userlevel: this.$appdata.getParam('用户等级') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户等级')] : [],
@@ -865,12 +876,10 @@ let cardBtnGen = async function (self, val) {
   },
   userTypeChange () {
     this.gasproperties = []
-    if (this.$refs.paged.$refs.cri.model.f_user_type.length === 1) {
-      if (this.$refs.paged.$refs.cri.model.f_user_type[0]) {
-        this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
-      } else {
-        this.$refs.paged.$refs.cri.model.f_gasproperties = ''
-      }
+    if (this.$refs.paged.$refs.cri.model.f_user_type !== null) {
+      this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type)
+    } else {
+      this.$refs.paged.$refs.cri.model.f_gasproperties = ''
     }
   },
   async hasGasContinue () {

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

@@ -143,7 +143,7 @@
                 <label class="font_normal_body">用户类型</label>
                 <v-select :value.sync="model.f_user_type" v-model="model.f_user_type"
                           :options='$parent.$parent.usertypes' placeholder='用户类型'
-                          close-on-select :search='true'
+                          close-on-select :search='true' @change="$parent.$parent.userTypeChange()"
                           condition="f_user_type = '{}'"></v-select>
               </div>
               <div class="col-sm-2 form-group">
@@ -483,7 +483,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
           user: []
         },
         shengyu: this.$appdata.getSingleValue('在线抄表计算剩余气量') ? this.$appdata.getSingleValue('在线抄表计算剩余气量') : 'true',
-        orgCondtionStr: ''
+        orgCondtionStr: '',
+        gasproperties: []
       }
     },
     ready () {
@@ -497,6 +498,15 @@ import {HttpResetClass, PagedList} from 'vue-client'
       })
     },
     methods: {
+      userTypeChange () {
+        this.gasproperties = []
+        if (this.$refs.paged.$refs.criteria.model !== null) {
+          this.$refs.paged.$refs.criteria.model.f_gasproperties = ''
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type)
+        } else {
+          this.gasproperties = [{label: '全部', value: ''}]
+        }
+      },
       hidden () {
         this.criteriaShow = !this.criteriaShow
       },
@@ -782,9 +792,9 @@ import {HttpResetClass, PagedList} from 'vue-client'
       ventilationstate () {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('通气手续')]
       },
-      gasproperties () {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
-      },
+      // gasproperties () {
+      //   return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+      // },
       pricenames () {
         let arr = []
         AppData.getOnlyPrice().forEach((item) => {

package/src/components/revenue/batchDeduction/batchDeductionList.vue

@@ -13,11 +13,26 @@
             <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
                    condition="tbd.f_user_name = '{}'" placeholder='用户姓名'>
           </div>
-          <div class="form-group col-sm-2" v-if="!$parent.$parent.chargeShow" >
-            <label class="font_normal_body"><nobr>用气性质</nobr></label>
-            <input type="text" style="width:60%" class="input_search" v-model="model.f_gasproperties"
-                   condition="uf.f_gasproperties='{}'" placeholder='用气性质'>
+          <div
+            :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
+            class="form-group">
+            <label class="font_normal_body">客户类型</label>
+            <v-select :options='$parent.$parent.user_type' :value.sync="model.f_user_type"
+                      close-on-select condition="f_user_type='{}'" :value-single="true" @change="$parent.$parent.userTypeChange()"
+                      placeholder='客户类型' v-model="model.f_user_type"></v-select>
+          </div>
+          <div
+            class="form-group col-sm-2" v-if="!$parent.$parent.chargeShow">
+            <label class="font_normal_body">用气性质</label>
+            <v-select :options='$parent.$parent.gasproperties' :value.sync="model.f_gasproperties"
+                      close-on-select condition="uf.f_gasproperties='{}'"
+                      placeholder='用气性质' v-model="model.f_gasproperties"></v-select>
           </div>
+<!--          <div class="form-group col-sm-2" v-if="!$parent.$parent.chargeShow" >-->
+<!--            <label class="font_normal_body"><nobr>用气性质</nobr></label>-->
+<!--            <input type="text" style="width:60%" class="input_search" v-model="model.f_gasproperties"-->
+<!--                   condition="uf.f_gasproperties='{}'" placeholder='用气性质'>-->
+<!--          </div>-->
 
           <div class="span" style="float:right;">
             <button class="button_export button_spacing" @click="$parent.$parent.importToSuccess()">一键生成补扣费记录</button>
@@ -114,6 +129,11 @@ export default {
     return {
       criteriaShow: false,
       model: new PagedList('api/af-revenue/sql/getDeductionRecord', 30 ,{}),
+      gasproperties: [],
+      user_type: this.$appdata.getParam('用户类型') ? [{
+        label: '全部',
+        value: ''
+      }, ...this.$appdata.getParam('用户类型')] : [],
       fileShow: false,
       condition: '',
       searchEd: false,
@@ -134,6 +154,15 @@ export default {
       let downurl = 'api/af-revenue/downloadfile/file?filename=' + this.templateName
       this.$downFile(downurl, this.templateName + '.xlsx')
     },
+    userTypeChange () {
+      this.gasproperties = []
+      if (this.$refs.paged.$refs.criteria.model !== null) {
+        this.$refs.paged.$refs.criteria.model.f_gasproperties = ''
+        this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type)
+      } else {
+        this.gasproperties = [{label: '全部', value: ''}]
+      }
+    },
     selfSearch (args) {
       this.condition = args.condition
       this.model.search(args.condition, this.model)

package/src/components/revenue/comprehen/Message/AllUser.vue

@@ -59,6 +59,7 @@
               placeholder='用户类型'
               :value.sync="model.f_user_type"
               :options='$parent.$parent.getusertype'
+              @change="$parent.$parent.userTypeChange()"
               condition="f_user_type = '{}'"
               style="width: 60%"
               close-on-select >
@@ -356,10 +357,11 @@ export default {
 
         { label: '民用', value: '民用' },
         { label: '非民用', value: '非民用' }],
-      gasproperties: this.$appdata.getParam('用气性质') ? [{
-        label: '全部',
-        value: ''
-      }, ...this.$appdata.getParam('用气性质')] : [],
+      // gasproperties: this.$appdata.getParam('用气性质') ? [{
+      //   label: '全部',
+      //   value: ''
+      // }, ...this.$appdata.getParam('用气性质')] : [],
+      gasproperties: [],
       f_whether: '全部',
       pcdslist: [],
       isFirst: true
@@ -397,6 +399,15 @@ export default {
     }
   },
   methods: {
+    userTypeChange () {
+      this.gasproperties = []
+      if (this.$refs.paged.$refs.cri.model !== null) {
+        this.$refs.paged.$refs.cri.model.f_gasproperties = ''
+        this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type)
+      } else {
+        this.gasproperties = [{label: '全部', value: ''}]
+      }
+    },
     loadMeterBooks () {
       let meterbrand = this.$GetSaleParam.getGasbrand()
       for (let row of meterbrand) {

package/src/filiale/dexin/FileUserFiles.vue

@@ -130,7 +130,7 @@
                     class="form-group">
                     <label class="font_normal_body">客户类型</label>
                     <v-select :options='$parent.$parent.user_type' :value.sync="model.f_user_type"
-                              close-on-select condition="f_user_type='{}'"
+                              close-on-select condition="f_user_type='{}'" :value-single="true" @change="$parent.$parent.userTypeChange()"
                               placeholder='客户类型' v-model="model.f_user_type"></v-select>
                   </div>
                   <div
@@ -640,10 +640,7 @@ let loadParamGem = async function (self) {
           label: '全部',
           value: ''
         }, ...this.$appdata.getParam('工业备注')] : [],
-        gasproperties: this.$appdata.getParam('用气性质') ? [{
-          label: '全部',
-          value: ''
-        }, ...this.$appdata.getParam('用气性质')] : [],
+        gasproperties: [],
         user_type: this.$appdata.getParam('用户类型') ? [{
           label: '全部',
           value: ''
@@ -734,6 +731,15 @@ let loadParamGem = async function (self) {
       cancel () {
         this.isShowDetailInfo = false
       },
+      userTypeChange () {
+        this.gasproperties = []
+        if (this.$refs.paged.$refs.criteria.model !== null) {
+          this.$refs.paged.$refs.criteria.model.f_gasproperties = ''
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type)
+        } else {
+          this.gasproperties = [{label: '全部', value: ''}]
+        }
+      },
       /**
        * 展示用户详细信息
        * @param obj 传递的row

package/src/filiale/dexin/cardsHand.vue

@@ -144,7 +144,7 @@
                 <label class="font_normal_body">用户类型</label>
                 <v-select :value.sync="model.f_user_type" v-model="model.f_user_type"
                           :options='$parent.$parent.usertypes' placeholder='用户类型'
-                          close-on-select :search='true'
+                          close-on-select :search='true' @change="$parent.$parent.userTypeChange()"
                           condition="f_user_type = '{}'"></v-select>
               </div>
               <div class="col-sm-2 form-group">
@@ -517,7 +517,8 @@ export default {
       },
       meterbrands: [{label: '全部', value: ''}],
       upshow: false,
-      orgCondtionStr: ''
+      orgCondtionStr: '',
+      gasproperties: []
     }
   },
   beforeDestroy () {
@@ -530,6 +531,15 @@ export default {
     loadParamGem(this)
   },
   methods: {
+    userTypeChange () {
+      this.gasproperties = []
+      if (this.$refs.paged.$refs.criteria.model !== null) {
+        this.$refs.paged.$refs.criteria.model.f_gasproperties = ''
+        this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type)
+      } else {
+        this.gasproperties = [{label: '全部', value: ''}]
+      }
+    },
     downloadFiles () {
       let downurl = 'api/af-revenue/downloadfile/file?filename=德信卡表批量抄表导入模板'
       this.$downFile(downurl,'卡表批量抄表导入模板.xlsx')
@@ -814,9 +824,9 @@ export default {
     ventilationstate () {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('通气手续')]
     },
-    gasproperties () {
-      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
-    },
+    // gasproperties () {
+    //   return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+    // },
     pricenames () {
       let arr = []
       AppData.getOnlyPrice().forEach((item) => {

package/src/main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
-import FilialeSale from './filiale/HuaiLai/sale'
+import FilialeSale from './filiale/dexin/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'