sale-client 3.6.264-test → 3.6.264

package/package.json

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

package/src/components/FilesManage/UserEssentialInfoTest.vue

@@ -235,7 +235,7 @@
         <div >
           <div class="col-sm-4 form-group"
                v-show="(formconfig && formconfig.f_gas_pointsnumber && formconfig.f_gas_pointsnumber.required) || !onlyshowmust"
-               :class="[$v.f_gas_pointsnumber.dctest ? 'has-error' : '']" v-if="getConfigShowItem('f_people_num')">
+               :class="[$v.f_gas_pointsnumber.dctest ? 'has-error' : '']" v-if="getConfigShowItem('f_gas_pointsnumber')">
             <label for="f_people_num" style="letter-spacing: 0.5em;margin-right: -0.5em" class="font_normal_body w3">{{getConfigLabelName('f_gas_pointsnumber','用气点数量')}}</label>
             <v-select id="f_people_num" :value.sync="baseinfo.base.f_gas_pointsnumber"
                       v-model="baseinfo.base.f_gas_pointsnumber"

package/src/components/common/userinfo_detail/UserBaseInfoNew.vue

@@ -162,7 +162,7 @@
               class="button_search" type="button" @click="openUser">开户</button>
       <button v-if="row.f_meter_type.includes('物联网表') && valveLimit"
               class="button_search" type="button" @click="valvecontrol">开关阀</button>
-      <button v-if="row.f_meter_type.includes('物联网表')"
+      <button v-if="row.f_meter_type.includes('物联网表') && autoValveLimit"
               class="button_search" type="button" @click="zdfk">开关自动阀控</button>
       <div
         :class="{'button_shrink_top':criteriaShow,'button_shrink_bottom':!criteriaShow}"
@@ -267,6 +267,7 @@
         criteriaShow: false,
         devices: [],
         valveLimit: false,
+        autoValveLimit: false,
         // 开关阀操作原因
         operateReason: '',
         valve: false
@@ -276,6 +277,7 @@
     ready () {
       this.getDevice()
       this.valveLimit = this.$login.r.includes('开关阀权限')
+      this.autoValveLimit = this.$login.r.includes('自动阀控权限')
     },
     methods: {
       // 发送请求去数据
@@ -359,6 +361,9 @@
       // 阀控管理
       zdfk () {
         let data = {
+          inputtor: Vue.$login.f.name,
+          inputtorid: Vue.$login.f.id,
+          meterBrandName: this.row.f_alias,
           f_userfiles_id: this.row.f_userfiles_id
         }
         if (this.row.f_network_valve !== '1') {
@@ -391,6 +396,7 @@
           meterBrandName: this.row.f_alias,
           f_instruct_state: '待发送',
           inputtor: Vue.$login.f.name,
+          inputtorid: Vue.$login.f.id,
           reasonInfo: this.operateReason,
           meternumberf: this.row.f_meternumber,
           contentData: {isOpen: oper ? 1 : 0}

package/src/components/revenue/comprehen/Maintenance/hand/handListMaintain.vue

@@ -556,11 +556,12 @@ const myMap = new Map()
         this.show = true
       },
       selfSearch (args) {
+        console.log('>>> args = ', args)
         if (!this.f_orgid) {
           this.f_orgid = this.$login.f.orgid
         }
         let f_orgstr = this.orgCondtionStr ? this.orgCondtionStr : "and h.f_orgid in ('" + this.f_orgid + "')"
-        args.condValueStr = `${args.condValueStr} ` + f_orgstr
+        args.condValueStr = `${args.condValueStr === undefined ? '1=1' : args.condValueStr} ` + f_orgstr
         this.model.search(args.condition, args.model, args.condValueStr)
         this.condition = args.condition
         this.condValueStr = args.condValueStr

package/src/components/webMeter/MeterManage/WebMeterBatchOperationValve.vue

@@ -602,6 +602,12 @@ import axios from 'axios'
       },
       openzdkf (val) {
         let data = {
+          f_operator: this.$login.f.name,
+          f_operatorid: this.$login.f.id,
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.orgs,
+          f_depid: this.$login.f.depids,
+          f_depname: this.$login.f.deps,
           condition: this.condition,
           type: val
         }

package/src/filiale/alashan/UserBaseInfoNew.vue

@@ -370,6 +370,9 @@
       // 阀控管理
       zdfk () {
         let data = {
+          inputtor: Vue.$login.f.name,
+          inputtorid: Vue.$login.f.id,
+          meterBrandName: this.row.f_alias,
           f_userfiles_id: this.row.f_userfiles_id
         }
         if (this.row.f_network_valve !== '1') {
@@ -402,6 +405,7 @@
           meterBrandName: this.row.f_alias,
           f_instruct_state: '待发送',
           inputtor: Vue.$login.f.name,
+          inputtorid: Vue.$login.f.id,
           reasonInfo: this.operateReason,
           meternumberf: this.row.f_meternumber,
           contentData: {isOpen: oper ? 1 : 0}