sale-client 3.6.78 → 3.6.80

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [serverRul, localUrl ] = ['http://121.36.106.17:8400/', 'http://localhost:8080/']
+const [serverRul, localUrl ] = ['http://203.57.101.233:8400/', 'http://203.57.101.233:8400/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -430,7 +430,7 @@ export default {
 
           // 将oldAddress 置为空，
       this.oldAddress = {}
-      this.data.baseinfo.base.f_user_state = this.data.baseinfo.base.f_user_state === '预备' ? ['正常'] : [this.data.baseinfo.base.f_user_state]
+      this.data.baseinfo.base.f_user_state = this.data.baseinfo.base.f_user_state === '预备' ? '正常' : this.data.baseinfo.base.f_user_state
           // this.data.baseinfo.base.f_user_nature = this.data.baseinfo.base.f_user_nature ? [this.data.baseinfo.base.f_user_nature] : '民用'
           // this.data.baseinfo.base.f_credentials = this.data.baseinfo.base.f_credentials ? [this.data.baseinfo.base.f_credentials] : '身份证'
       this.data.baseinfo.base.f_cost_type = this.data.baseinfo.base.f_cost_type ? [this.data.baseinfo.base.f_cost_type] : '现金缴费'

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

@@ -6,6 +6,16 @@
           <criteria partial='criteria' v-ref:criteria @condition-changed="$parent.selfSearch">
             <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>
+                  <res-select
+                    :initresid='$parent.$parent.curorgid'
+                    @res-select="$parent.$parent.getorg"
+                    is-mul="false"
+                    restype='organization'
+                  >
+                  </res-select>
+                </div>
                 <div class="form-group col-sm-2" >
                   <label class="font_normal_body">客户编号</label>
                   <input type="text" class="input_search" style="width:60%"
@@ -197,7 +207,7 @@
   let readySomething = async function (self) {
     self.$refs.paged.$refs.criteria.model.startDate = self.$login.toStandardDateString()
     self.$refs.paged.$refs.criteria.model.endDate = self.$login.toStandardDateString()
-    self.$resetpost('rs/sql/getpriceid', {data: {f_filialeids: self.$login.f.orgid}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+    self.$resetpost('rs/sql/getpriceid', {data: {f_filialeids: self.f_filialeid}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
       console.log(res.data)
       let rs = []
       for (let i = 0; i < res.data.length; i++) {
@@ -220,6 +230,8 @@
     title: '调价补差',
     data () {
       return {
+        f_orgid: '',
+        f_filialeid: this.$login.f.orgid,
         pricechange: true,
         criteriaShow: false,
         pricers: [{label: '全部', value: '', flage: ''}],
@@ -234,6 +246,7 @@
         f_old_price:0.0,
         f_change_price:0.0,
         show: false,
+        curorgid: [this.$login.f.orgid],
         addSelectParam: ''
         // joinTable:'',
       }
@@ -246,6 +259,9 @@
       })
     },
     methods: {
+      getorg (val) {
+        this.f_filialeid = val[0]
+      },
       hidden () {
         this.criteriaShow = !this.criteriaShow
       },
@@ -394,7 +410,7 @@
         } else {
           this.pricechange = true
         }
-        this.condition = `${args.condition} and u2.f_orgid = '${this.$login.f.orgid}'`
+        this.condition = `${args.condition} and u2.f_orgid = '${this.f_filialeid}'`
         this.model.search(this.condition, args.model)
       },
       clear () {

package/src/components/revenue/comprehen/gasbrand/AddGasBrand.vue

@@ -159,6 +159,15 @@
             <label  class="font_normal_body ">表号长度</label>
             <input class="input_search" placeholder="表号长度" style="width:60%" type="number" v-model="gasmessage.f_meternumber_len">
           </div>
+          <div class="col-sm-4 form-group" v-if="gasmessage.f_meter_type[0].includes('卡表')">
+            <label for="hasCard" class="font_normal_body">动&ensp;态&ensp;库<br/>到&ensp;期&ensp;日</label>
+            <datepicker placeholder="动态库到期日" style="width: 60%"
+                        v-model="gasmessage.f_dynamic_expire"
+                        :value.sync="gasmessage.f_dynamic_expire"
+                        :format="'yyyy-MM-dd'">
+            </datepicker>
+          </div>
+
 
           <div class="col-sm-12 form-group" style="height: auto !important;">
             <label  class="font_normal_body " style="margin-top:-20px">备&emsp;&emsp;注</label>
@@ -214,7 +223,8 @@ export default {
         f_is_check: [],
         f_is_step: [],
         f_meterverification: '',
-        f_meternumber_len: ''
+        f_meternumber_len: '',
+        f_dynamic_expire: ''
       },
       modelvalid: false, // 验证型号
       colletype: false,

package/src/filiale/wenxi/UserGeneralInfoTest.vue

@@ -440,7 +440,7 @@ export default {
 
       // 将oldAddress 置为空，
       this.oldAddress = {}
-      this.data.baseinfo.base.f_user_state = this.data.baseinfo.base.f_user_state === '预备' ? ['正常'] : [this.data.baseinfo.base.f_user_state]
+      this.data.baseinfo.base.f_user_state = this.data.baseinfo.base.f_user_state === '预备' ? '正常' : this.data.baseinfo.base.f_user_state
       // this.data.baseinfo.base.f_user_nature = this.data.baseinfo.base.f_user_nature ? [this.data.baseinfo.base.f_user_nature] : '民用'
       // this.data.baseinfo.base.f_credentials = this.data.baseinfo.base.f_credentials ? [this.data.baseinfo.base.f_credentials] : '身份证'
       this.data.baseinfo.base.f_cost_type = this.data.baseinfo.base.f_cost_type ? [this.data.baseinfo.base.f_cost_type] : '现金缴费'

package/src/filiale/wenxi/plugins/FileManageService.js

@@ -209,7 +209,7 @@ let FileManageService = {
       meter.f_adjustable_id = meter.f_adjustable.length > 0 ? meter.f_adjustable[0].id : null
       meter.f_userfiles_address = meter.f_userfiles_address ? meter.f_userfiles_address : null
       // 气表状态需要根据表型判断是否需要开通操作 目前物联网表需要做开通操作
-      meter.f_table_state = result.f_user_state === '预备' ? '待开通' : '正常'
+      meter.f_table_state = result.f_user_state === '预备' ? '待开通' : (meter.f_table_state? meter.f_table_state : '正常')
       if (!meter.f_userfiles_id) {
         // meter.f_whether_hairpin = !item.gasbrand[0].f_meter_type.includes('机表') ? '未发' : '无卡'
         // 所有表变成未发

package/src/filiale/wuhai/CardMeterCenter.vue

@@ -138,7 +138,7 @@
                      v-el:fcollection
                      @blur="config.calculatePreByCollection && calculatePreByCollection()"
                      @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
-                     v-scale="[model.f_collection, 2]" disabled>
+                     v-scale="[model.f_collection, 4]" :disabled="!config.calculatePreByCollection">
             </div>
             <div class="col-sm-1 form-group" v-show=" row.f_meter_type.includes('卡表')">
               <give-change :curbalance="curbalance" :collection.sync="model.f_collection" v-ref:givechange></give-change>

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import wenxi from './filiale/yuansheng/sale'
+import wenxi from './filiale/jingwei/sale'
 // import FilialeSale from './filiale/yuansheng/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'

package/src/plugins/FileManageService.js

@@ -210,7 +210,7 @@ let FileManageService = {
       meter.f_adjustable_id = meter.f_adjustable.length > 0 ? meter.f_adjustable[0].id : null
       meter.f_userfiles_address = meter.f_userfiles_address ? meter.f_userfiles_address : null
       // 气表状态需要根据表型判断是否需要开通操作 目前物联网表需要做开通操作
-      meter.f_table_state = result.f_user_state === '预备' ? '待开通' : '正常'
+      meter.f_table_state = result.f_user_state === '预备' ? '待开通' : (meter.f_table_state? meter.f_table_state : '正常')
       if (!meter.f_userfiles_id) {
         // meter.f_whether_hairpin = !item.gasbrand[0].f_meter_type.includes('机表') ? '未发' : '无卡'
         // 所有表变成未发

package/src/plugins/LogicService.js

@@ -237,6 +237,7 @@ let LogicService = {
       f_priority: model.f_priority,
       f_support_purchase: model.f_support_purchase,
       f_issupport_feededuction: model.f_issupport_feededuction,
+      f_dynamic_expire: model.f_dynamic_expire,
       f_hascard: model.f_hascard,
       f_share_times: model.f_share_times,
       f_share_open: model.f_share_open,