sale-client 3.6.288 → 3.6.289

package/package.json

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

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

@@ -92,6 +92,7 @@
           <tr>
             <th>序号</th>
             <th>用户编号</th>
+            <th>用户姓名</th>
             <th>银行名称</th>
             <th>燃气方订单号</th>
             <th>银行方订单号</th>
@@ -107,6 +108,7 @@
         <template partial='body'>
           <td style="text-align: center;">{{$index+1}}</td>
           <td>{{row.f_userinfo_code}}</td>
+          <td>{{row.f_user_name}}</td>
           <th>{{row.f_bank_name?row.f_bank_name:row.bankname}}</th>
           <td>{{row.f_serial_id}}</td>
           <td>{{row.f_trade_number}}</td>
@@ -180,8 +182,8 @@
         f_orgid: this.$login.f.orgid,
         curorgid: [this.$login.f.orgid],
         model: new PagedList('rs/sql/bankPayment', 20, {bankname: 'this.model.f_bank_name[0]', startDate: 'this.model.startDate', endDate: 'this.model.endDate', orderitem: '"delivery_date DESC "'}, {f_collection: '', f_total_charge: ''}),
-        bodydata: ['f_userinfo_code', 'f_bank_name', 'f_serial_id', 'f_trade_number', 'f_collection', 'f_total_charge', 'f_operate_date', 'f_state', 'msg'],
-        header: ['用户编号', '银行名称', '燃气方流水号', '银行流水号', '燃气方金额', '银行金额', '燃气方日期', '银行日期', '燃气方记录是否有效', '对账信息']
+        bodydata: ['f_userinfo_code', 'f_user_name', 'f_bank_name', 'f_serial_id', 'f_trade_number', 'f_collection', 'f_total_charge', 'f_operate_date', 'f_state', 'msg'],
+        header: ['用户编号', '用户姓名', '银行名称', '燃气方流水号', '银行流水号', '燃气方金额', '银行金额', '燃气方日期', '银行日期', '燃气方记录是否有效', '对账信息']
 
       }
     },

package/src/components/revenue/comprehen/TotalSplit/TotalSplitManage.vue

@@ -1,9 +1,9 @@
 <template>
-  <div>
-    <div class="col-sm-6">
+  <div class="binary">
+    <div class="binary-left">
       <all-user-files v-ref:alluser :row="row" @select-changed="selected"></all-user-files>
     </div>
-    <div class="col-sm-6">
+    <div class="binary-right">
       <div class="flex">
         <strong class="bg-info text-center">可选择的分表信息</strong>
         <split-list v-ref:split :data="row" @refresh="refreshView"></split-list>

package/src/components/revenue/comprehen/handAudit/MeterReadAudit.vue

@@ -134,6 +134,7 @@
             <th>审核人</th>
             <th>审核状态</th>
             <th>审核时间</th>
+            <th>审核原因</th>
             <th>操作</th>
           </tr>
         </template>
@@ -166,6 +167,7 @@
           <td style="text-align:center" v-if="row.f_hand_state !== '有效'">未通过</td>
           <td style="text-align:center" v-if="row.f_meter_state === '已抄表' && row.f_hand_state === '有效'">已通过</td>
           <td style="text-align:center">{{ row.f_audit_date }}</td>
+          <td style="text-align:center">{{ row.f_examinereason }}</td>
           <td style="text-align: center" v-if="row.f_meter_state === '待审核' && row.f_hand_state === '有效'">
             <button type="button" class="button_search button_spacing width-60"
                     v-if="row.f_last_tablebase === row.f_meter_base"
@@ -233,7 +235,9 @@ export default {
         label: '未通过',
         value: ` f_hand_state = '无效'`
       }, {label: '已通过', value: `f_meter_state = '已抄表' and f_hand_state ='有效'`}],
-      meterbooks: [{label: '全部', value: ''}]
+      meterbooks: [{label: '全部', value: ''}],
+      //待更新不通过原因的人的id
+      update_f_examinereason_id : ''
     }
   },
   ready () {
@@ -343,12 +347,20 @@ export default {
         // this.row = row
         // this.pushdata.openid = row.f_open_id
         // this.show = true
+        // 1、不通过操作执行
         let sql = `UPDATE t_handplan SET f_hand_state = '无效',f_audit_person = '${this.$login.f.name}',f_audit_date = getDate() WHERE id = ${row.id}`
         await this.$resetpost('rs/logic/runSQL', {sql: sql}, {resolveMsg: '操作成功', rejectMsg: '操作失败'})
         this.search()
+        // 2、不通过原因弹窗
+        this.show = true
+        this.update_f_examinereason_id = row.id
       }
     },
     async confirm () {
+      //更新不通过原因
+      let update = `UPDATE t_handplan SET f_examinereason ='${this.pushdata.cause}' where id = ${this.update_f_examinereason_id}`
+      await this.$resetpost('rs/logic/runSQL', {sql: update}, {resolveMsg: '原因提交成功', rejectMsg: '操作失败'})
+      console.log(update)
       await this.$resetpost('rs/logic/weixinHanPlanAudit', this.row, {resolveMsg: '操作成功', rejectMsg: '操作失败'})
       await this.$resetpost('http://www.hunanhongdaranqi.com/weixin/rs/logic/meterReadFailed', this.pushdata, {
         resolveMsg: null,

package/src/filiale/qingtongxia/UserBaseInfoNew.vue

@@ -0,0 +1,603 @@
+<template>
+  <div class="auto">
+    <div class="auto form-group-new row">
+      <div class="col-sm-6" style="height:auto;width:49%;">
+        <p style="font-weight: bold;margin: 0"><img src="../../../static/mainicon/矩形1828.png"/>&nbsp;&nbsp;基本信息</p>
+        <!--    第一行数据-->
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">客户编号</label>
+          <input class="input-underline" style="width:60%" :value="row.f_userinfo_code" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">客户姓名</label>
+          <input class="input-underline" style="width:60%" :value="row.f_user_name" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">用户状态</label>
+          <input class="input-underline" style="width:60%" :value="row.f_user_state" readonly>
+        </div>
+        <div class="col-sm-8">
+          <label class="font_normal_body_new">客户地址</label>
+          <input class="input-underline" style="width:80%" :value="row.f_address" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">客户电话</label>
+          <input class="input-underline" style="width:60%" :value="row.f_user_phone" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">客户类型</label>
+          <input class="input-underline" style="width:60%" :value="row.f_user_type" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">用气性质</label>
+          <input class="input-underline" style="width:60%" :value="row.f_gasproperties" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">证件类型</label>
+          <input class="input-underline" style="width:60%" :value="row.f_credentials" readonly>
+        </div>
+        <div class="col-sm-8">
+          <label class="font_normal_body_new">证件号码</label>
+          <input class="input-underline" style="width:80%" :value="row.f_idnumber" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">用户状态</label>
+          <input class="input-underline" style="width:60%" :value="row.f_user_state" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">账户余额</label>
+          <input class="input-underline" style="width:60%" :value="row.f_balance" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">人&ensp;口&ensp;数</label>
+          <input class="input-underline" style="width:60%" :value="row.f_people_num" readonly>
+        </div>
+
+      </div>
+      <div class="col-sm-6" style="height:auto;width:49%;">
+        <p style="font-weight: bold;margin: 0"><img src="../../../static/mainicon/矩形1828.png"/>&nbsp;&nbsp;表具信息</p>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">表&emsp;号&emsp;</label>
+          <input class="input-underline" style="width:60%" :value="row.f_meternumber" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">气表状态</label>
+          <input class="input-underline" style="width:60%" :value="row.f_table_state" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">当前底数</label>
+          <input class="input-underline" style="width:60%" :value="row.f_meter_base" readonly>
+        </div>
+
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">气表品牌</label>
+          <input class="input-underline" style="width:60%" :value="row.f_meter_brand" readonly>
+        </div>
+
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">气价名称</label>
+          <input class="input-underline" style="width:60%" :value="row.f_price_name" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">气价类型</label>
+          <input class="input-underline" style="width:60%" :value="row.f_price_type" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">价格详情</label>
+          <input class="input-underline" style="width:60%" :value="row.f_detailprice" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">用&ensp;气&ensp;点</label>
+          <input class="input-underline" style="width:60%" :value="row.f_userfiles_address" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new" title="最后上报时间">上报时间</label>
+          <input class="input-underline" style="width:60%" :value="row.f_meteread_date ? row.f_meteread_date : '暂无'"
+                 readonly>
+        </div>
+        <div v-if="row.f_collection_type == '按金额'" class="col-sm-4">
+          <label class="font_normal_body_new">累购金额</label>
+          <input class="input-underline" style="width:60%" :value="row.total_fee" readonly>
+        </div>
+        <div v-if="row.f_collection_type == '按气量'">
+          <div class="col-sm-4">
+            <label class="font_normal_body_new">累购气量</label>
+            <input class="input-underline" style="width:60%" :value="row.f_total_gas" readonly>
+          </div>
+          <div class="col-sm-4">
+            <label class="font_normal_body_new">最后结算时间</label>
+            <input class="input-underline" style="width:45%" :value="row.f_hand_date  ? row.f_hand_date :'暂无'" readonly>
+          </div>
+        </div>
+        <div v-if="row.f_meter_type.includes('物联网表')">
+          <div class="col-sm-4">
+            <label class="font_normal_body_new">物联网次数</label>
+            <input class="input-underline" style="width:55%" :value="row.f_iot_times" readonly>
+          </div>
+          <div class="col-sm-4">
+            <label class="font_normal_body_new">表剩余金额</label>
+            <input class="input-underline" style="width:55%" :value="row.f_balance_amount" readonly>
+          </div>
+          <div class="col-sm-4">
+            <label class="font_normal_body_new">阀门状态</label>
+            <input class="input-underline" style="width:60%" :value="row.f_valvestate == 0 ? '已开阀' : '已关阀'" readonly>
+          </div>
+          <div class="col-sm-4">
+            <label class="font_normal_body_new">累计上报次数</label>
+            <input class="input-underline" style="width:45%" :value="row.f_meteread_number ? row.f_meteread_number : 0"
+                   readonly>
+          </div>
+          <div class="col-sm-4">
+            <label class="font_normal_body_new">阀控状态</label>
+            <input class="input-underline" style="width:50%" :value="row.f_network_valve == '1' ? '手动' : '自动'" readonly>
+            <span v-if="row.f_network_valve" @click.stop="openModal"
+                  class=" glyphicon glyphicon-pencil clickchange" title="修改阀控状态">
+          </span>
+          </div>
+        </div>
+        <div v-if="row.f_collection_type == '按气量'">
+          <div class="col-sm-4" v-if="!row.f_calculation.includes('表端结算')">
+            <label class="font_normal_body_new">表剩余气量</label>
+            <input class="input-underline" style="width:55%" :value="row.f_balance_gas" readonly>
+          </div>
+          <div class="col-sm-4" v-if="row.f_meter_type.includes('表端结算')">
+            <label class="font_normal_body_new">表剩余气量</label>
+            <input class="input-underline" style="width:55%" :value="row.f_jval" readonly>
+          </div>
+          <div class="col-sm-4">
+            <label class="font_normal_body_new">累计用气金额</label>
+            <input class="input-underline" style="width:45%" :value="row.f_total_usegas_amount" readonly>
+          </div>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">写卡次数</label>
+          <input class="input-underline" style="width:45%" :value="row.f_times" readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">抄表册名</label>
+          <input class="input-underline" style="width:45%"
+                 :value="(row.f_book_code!=null ? '['+row.f_book_code + '] ' : '') + (row.f_book_name!=null ? row.f_book_name:'')"
+                 readonly>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body_new">抄表册册序号</label>
+          <input class="input-underline" style="width:45%" :value="row.f_meter_book_sort" readonly>
+        </div>
+      </div>
+      <div class="auto" style="float: right;">
+        <button class="button_clear " @click="cancelmain()">返回</button>
+        <button class="button_search" v-show="buttonshow" type="button" @click="goChargeManage">去收费</button>
+        <button v-if="row.f_meter_brand.includes('西美')&&row.f_meter_type.includes('物联网表')"
+                class="button_search" type="button" @click="clearBarrier">清除障碍
+        </button>
+        <button v-if="row.f_meter_type.includes('物联网表')"
+                class="button_search" type="button" @click="openUser">开户
+        </button>
+        <button v-if="row.f_meter_type.includes('物联网表') && valveLimit && row.f_network_valve === '1'"
+                class="button_search" type="button" @click="valvecontrol">开关阀
+        </button>
+        <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}"
+          @click="criteriaShow=!criteriaShow"
+          class="button_spacing"
+          style="float: right"></div>
+      </div>
+    </div>
+
+    <div class="auto row">
+      <div class="col-sm-6" style="width:49%;"></div>
+      <div class="auto form-group-new">
+        <div class="col-sm-6" style="height:auto;width:49%;" v-show="criteriaShow">
+          <div class="col-sm-4">
+            <label class="font_normal_body_new">气表型号</label>
+            <input class="input-underline" style="width:60%" :value="row.f_meter_style" readonly>
+          </div>
+          <div class="col-sm-4">
+            <label class="font_normal_body_new">气表类型</label>
+            <input class="input-underline" style="width:60%" :value="row.f_meter_type" readonly>
+          </div>
+          <div class="col-sm-4">
+            <label class="font_normal_body_new">初始底数</label>
+            <input class="input-underline" style="width:60%" :value="row.f_initial_base" readonly>
+          </div>
+          <div class="col-sm-4">
+            <label class="font_normal_body_new">左&ensp;右&ensp;表</label>
+            <input class="input-underline" style="width:60%" :value="row.f_aroundmeter" readonly>
+          </div>
+          <div class="col-sm-4">
+            <label class="font_normal_body_new">建表日期</label>
+            <input class="input-underline" style="width:60%" :value="row.f_input_date.substring(0,7)" readonly>
+          </div>
+          <div v-if="devices.length > 0" v-show="false" style="height: auto">
+            <p style="font-weight: bold;margin: 0">设备信息</p>
+            <div class="panel-heading" style="height: 30px">
+              <h4 style="display:inline-block;margin-top: auto">设备信息</h4>
+            </div>
+            <div v-for="device in devices">
+
+              <form class="form-horizontal">
+                <div class="col-sm-4">
+                  <label class="font_normal_body_new">设备类型</label>
+                  <input class="input-underline" style="width:60%" :value="device.f_devices_type" readonly>
+                </div>
+                <div class="col-sm-4">
+                  <label class="font_normal_body_new">设备品牌</label>
+                  <input class="input-underline" style="width:60%" :value="device.f_brand" readonly>
+                </div>
+                <div class="col-sm-4">
+                  <label class="font_normal_body_new">设备型号</label>
+                  <input class="input-underline" style="width:60%" :value="device.f_devices_model" readonly>
+                </div>
+                <div class="col-sm-4">
+                  <label class="font_normal_body_new">设备数量</label>
+                  <input class="input-underline" style="width:60%" :value="device.f_devices_num" readonly>
+                </div>
+              </form>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!--阀控管理弹框-->
+    <modal :show.sync="valve">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="close()"><span>&times;</span></button>
+        <h4 class="modal-title" align="center">阀控管理</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="form-group " style="padding-left: 8px">
+          <label class="font_normal_body" :class="operateReason?'text-info':'text-danger'">操作原因</label>
+          <textarea class="form-control" style="width:80%" v-model="operateReason" rows="3"
+                    placeholder="请填写操作原因"></textarea>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="button_search btn-ln fr" :disabled="!operateReason" @click='valveoperate(true)'>
+          开阀
+        </button>
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        <button type="button" class="btn btn-info btn-ln fr" :disabled="!operateReason" @click='valveoperate(false)'>
+          关阀
+        </button>
+      </footer>
+    </modal>
+
+    <modal :show.sync="showModal" v-ref:modal backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h4 class="modal-title">修改阀控状态</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <validator name='v'>
+          <form class="form-horizontal select-overspread">
+            <div class="row">
+              <div class="form-group">
+                <label class=" col-sm-3 control-label">阀控状态:</label>
+                <div class="col-sm-4">
+                  <v-select v-model="f_network_valve"
+                            placeholder='请选择'
+                            :value.sync="disableModel.f_network_valve"
+                            :options='f_network_valve'
+                            :value-single="true"
+                            close-on-select clear-button>
+                  </v-select>
+                </div>
+              </div>
+              <div>
+                <label class=" col-sm-3 control-label">操作原因:</label>
+                <div class="col-sm-8">
+                                <textarea class="form-control" v-model="disableModel.f_othereason" rows="3"
+                                          placeholder="多行输入"></textarea>
+                </div>
+              </div>
+            </div>
+          </form>
+        </validator>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="button_search" @click='confirm()'>提交</button>
+        <button type="button" class="button_clear" @click='close1'>取消</button>
+      </footer>
+    </modal>
+  </div>
+
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+import Vue from 'vue'
+
+export default {
+  title: '基本信息',
+  props: {
+    row: {
+      type: Object,
+      default: undefined
+    },
+    buttonshow: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data () {
+    return {
+      showModal: false,
+      disableModel: {
+        f_othereason: '',
+        f_network_valve: ''
+      },
+      criteriaShow: false,
+      devices: [],
+      valveLimit: false,
+      autoValveLimit: false,
+      // 开关阀操作原因
+      operateReason: '',
+      valve: false,
+      showselectncuserinfo: false,
+      f_network_valve: this.$appdata.getParam('阀控状态') ? [{
+        // label: '全部',
+        value: ''
+      }, ...this.$appdata.getParam('阀控状态')] : []
+    }
+  },
+
+  ready () {
+    this.getDevice()
+    this.valveLimit = this.$login.r.includes('开关阀权限')
+    this.autoValveLimit = this.$login.r.includes('自动阀控权限')
+  },
+  methods: {
+    // 发送请求去数据
+    async getDevice () {
+      if (this.row) {
+        let http = new HttpResetClass()
+        let condition = `f_userinfo_id = '${this.row.f_userinfo_id}'`
+        let getDevices = await http.load('POST', 'rs/sql/sale_GetDevicesInfo', {data: {condition: condition}}, {
+          rejectMsg: '获取设备信息出错！！',
+          resolveMsg: null
+        })
+        this.devices = getDevices.data
+      }
+    },
+    openModal () {
+      this.showModal = true
+    },
+    async confirm () {
+
+      let operInfo = {
+        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,
+        f_network_valve: this.disableModel.f_network_valve,
+        f_othereason: this.disableModel.f_othereason
+      }
+
+      let userlist = [
+        {
+          f_userinfo_id: this.row.f_userinfo_id,
+          f_user_name: this.row.f_user_name,
+          f_userfiles_id: this.row.f_userfiles_id,
+          f_table_state: this.row.f_table_state
+        }
+
+      ]
+
+      let param = {
+        userlist,
+        operInfo
+      }
+
+      console.log(param)
+
+      await this.$resetpost('rs/logic/importNetworkValve', {data: param}, {
+        rejectMsg: '同步失败',
+        resolveMsg: '同步成功'
+      })
+      this.$emit('search-main')
+
+      this.showModal = false
+    },
+
+    close1 () {
+      // 关闭对话框的逻辑
+      this.showModal = false
+    },
+    // 返回
+    cancelmain () {
+      this.$emit('cancel-main')
+    },
+    clearBarrier () {
+      // 地址
+      // 127.0.0.1:8445
+      // 参数
+      let datas = {
+        moduleName: 'XiMeiSystem', // 固定值
+        content: {
+          tradeCode: '3015', // 固定值
+          appid: 'yysf', // 固定值
+          partner: 'cqsemay_bcts', // 固定值
+          version: 'v1', // 固定值
+          tasked: this.getuuid(), // 任务id
+          notifyUrl: 'http://192.168.2.10:8445/webmeter/rs/logic/XiMeiSystemCallBack', // 固定值
+          meterNo: this.row.f_meternumber, // 表号
+          signType: ' MD5' // 固定值
+        },
+        title: '清除异常', // 固定值
+        type: '清除异常', // 固定值
+        inputtor: this.row.f_operator, // 操作人
+        userId: this.row.f_userfiles_id,   // 表档案ID
+        dataId: null // 操作记录ID
+      }
+      this.$resetpost('/webmeter/rs/logic/syncSaveSetParamsTemplate', {data: datas}, {
+        resolveMsg: `清理成功`,
+        rejectMsg: `清理失败`
+      }).then(res => {
+      })
+    },
+    getuuid () {
+      let uuidA = ''
+      var s = []
+      var hexDigits = '0123456789abcdef'
+      for (var i = 0; i < 36; i++) {
+        s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1)
+      }
+      s[14] = '4'
+      s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1)
+      s[8] = s[13] = s[18] = s[23] = '-'
+      uuidA = s.join('')
+      return uuidA
+    },
+    async goChargeManage () {
+      await this.$copyText(this.row.f_userinfo_code)
+      this.$showAlert(`用户编号已复制到剪切板！`, 'success', 2000)
+      if (this.row.parentname === 'charge-manage') {
+        this.$emit('cancel-re')
+      } else {
+        try {
+          this.$goto('charge-manage', {f: this.$login.f}, 'main')
+        } catch (e) {
+        }
+        try {
+          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}))
+        } catch (e) {
+        }
+      }
+    },
+    openUser () {
+      this.$showMessage(`是否需要给用户进行开户？`, ['confirm', 'cancel']).then(async (res) => {
+        if (res === 'confirm') {
+          let data = {
+            f_userfiles_id: this.row.f_userfiles_id
+          }
+          this.$resetpost('rs/logic/startup', data)
+        }
+      })
+    },
+    // 阀控管理
+    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') {
+        this.$resetpost('rs/logic/openzdfk', data, {resolveMsg: '关闭自动阀控成功。', rejectMsg: '关闭自动阀控失败!!!'})
+        this.row.f_network_valve = '1'
+      } else {
+        this.$resetpost('rs/logic/closezdfk', data, {resolveMsg: '开启自动阀控成功。', rejectMsg: '开启自动阀控失败!!!'})
+        this.row.f_network_valve = null
+      }
+    },
+    // 阀控管理
+    valvecontrol () {
+      if (this.$login.r.includes('开关阀')) {
+        this.valve = true
+      } else {
+        this.$showAlert('您没有开关阀权限,请联系管理员！！', 'warning', 3000)
+      }
+    },
+    close () {
+      this.valve = false
+      this.operateReason = ''
+    },
+    // 开关阀操作
+    async valveoperate (oper) {
+      let msg = oper ? '开阀' : '关阀'
+      let datas = {
+        instructType: '阀门控制',
+        instructTitle: `手动${msg}`,
+        condition: `t_userfiles.f_userfiles_id='${this.row.f_userfiles_id}'`,
+        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}
+      }
+      let _this = this
+      await this.$resetpost('rs/sql/iot_searchInstruct', {data: datas},
+        {warnMsg: null, resolveMsg: null}).then(res => {
+        if (res.data.length === 0) {
+          _this.$resetpost('rs/logic/iot_saveInstruct', {data: datas},
+            {warnMsg: `确定要进行${msg}操作吗？`, resolveMsg: `${msg}成功`, rejectMsg: `${msg}失败`}).then(res => {
+            _this.valve = false
+            _this.operateReason = ''
+          })
+        } else {
+          this.$showAlert('存在开关阀待发送的指令，系统不生成同样的待发送指令', 'warning', 3000)
+          _this.valve = false
+          _this.operateReason = ''
+        }
+      })
+    }
+  },
+  watch: {
+    'row' () {
+      this.getDevice()
+    }
+
+  }
+}
+</script>
+<style scoped lang="less">
+.form-group-new > div {
+  height: 3% !important;
+
+}
+
+.datapanel {
+  color: #333;
+  background-color: white;
+  box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
+  padding: 10px 30px 10px 30px;
+  height: auto;
+  border-radius: 15px;
+}
+
+.text-info {
+  color: lightskyblue;
+}
+
+.text-danger {
+  color: red;
+}
+
+.input-underline {
+  border-bottom: 1px solid #dbdbdb;
+  border-top: 0px;
+  border-left: 0px;
+  border-right: 0px;
+}
+
+.font_normal_body_new {
+  font-weight: 100;
+  float: left;
+  margin-top: 0px;
+  font-size: 1.4rem !important;
+  line-height: 30px;
+}
+
+.col-sm-4, .col-sm-8 {
+  display: flex;
+  align-items: center;
+  margin: 7px 0;
+
+  label {
+    line-height: unset;
+    margin-bottom: 0;
+  }
+}
+
+.clickchange:hover {
+  color: #3592ef;
+  cursor: pointer;
+}
+
+</style>

package/src/filiale/qingtongxia/sale.js

@@ -13,4 +13,5 @@ export default function () {
   Vue.component('sale-userinfo', (resolve) => { require(['./Userinfo'], resolve) })
   Vue.component('card-meter-center', (resolve) => { require(['./CardMeterCenter'], resolve) })
   // Vue.component('machine-meter-center', (resolve) => { require(['./MachineMeterCenter'], resolve) })
+  Vue.component('user-base-info-new', (resolve) => { require(['./UserBaseInfoNew'], resolve) })
 }

package/src/filiale/yuncheng/HandplanQuery.vue

@@ -260,6 +260,11 @@
                             close-on-select
                             condition="f_bank_name = '{}'"></v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">表前阀状态</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_bqf_state"
+                         condition="f_bqf_state like '%{}%'" placeholder="表前阀状态">
+                </div>
                 <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body">收费日期</label>
                   <datepicker id="handStartDate" placeholder="开始日期" style="width:60%"
@@ -317,6 +322,9 @@
                 <th>
                   <nobr>表号</nobr>
                 </th>
+                <th>
+                  <nobr>表前阀状态</nobr>
+                </th>
                 <th>
                   <nobr>数据年月</nobr>
                 </th>
@@ -487,6 +495,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_meternumber}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_bqf_state}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.ym_data}}</nobr>
               </td>