sale-client 3.6.415 → 3.6.416-1

package/package.json

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

package/src/filiale/dongguan/components/common/userinfo_detail/iot_detail/QueryInstruct.vue

@@ -213,7 +213,7 @@
         cancelreason: '',
         cancelid: '',
         f_userfiles_id: '',
-        model: new PagedList('rs/sql/insturctDetailQuery', 30),
+        model: new PagedList('rs/sql/insturctDetailQuery', 30, {f_userfiles_id: this.row.f_userfiles_id}),
         row: null,
         searchshow: false,
         show: false

package/src/filiale/meihekou/handOperate.vue

@@ -263,7 +263,7 @@
         console.log("this.$login000",this.$login,this.oldmodel,this.model)
         let arr = this.$GetSaleParam.inputtors.filter((res) => {
           if (res.rolestr != null && res.rolestr != '') {
-            return res.f_department_name == this.model.f_depname
+            return res.f_department_id == this.model.f_depid
           }
         })
         arr.forEach((res) => {

package/src/filiale/shimen/UserBaseInfoNew.vue

@@ -0,0 +1,707 @@
+<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 v-if="row.f_meter_type.includes('物联网表')" class="col-sm-4">
+          <label class="font_normal_body_new" title="结算方式">计费终端</label>
+          <input class="input-underline" style="width:60%" :value="row.f_calculation ? row.f_calculation : '获取异常'"
+                 readonly>
+        </div>
+        <div v-if="row.f_meter_type.includes('物联网表')" class="col-sm-4">
+          <label class="font_normal_body_new" title="结算方式">结算方式</label>
+          <input class="input-underline" style="width:60%"
+                 :value="row.f_collection_type ? row.f_collection_type : '获取异常'"
+                 readonly>
+        </div>
+        <div v-if="row.f_meter_type.includes('物联网表')" 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_meter_type.includes('卡表')" 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:60%" :value="row.total_fee" readonly>
+        </div>
+        <div v-if="row.f_collection_type == '按气量' && row.f_meter_type.includes('物联网表')">
+          <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:45%" :value="row.f_meteread_number ? row.f_meteread_number : 0"
+                   readonly>
+          </div>
+        </div>
+
+        <div class="col-sm-4" v-if="row.f_meter_type.includes('物联网表') && row.f_collection_type == '按气量'">
+          <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('物联网表') && row.f_collection_type == '按金额'">
+          <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" v-if="row.f_calculation.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" v-if="row.f_calculation.includes('表端结算')">-->
+        <!--          <label class="font_normal_body_new">未上表金额</label>-->
+        <!--          <input class="input-underline" style="width:55%" :value="row.f_not_amount" readonly>-->
+        <!--        </div>-->
+        <div class="col-sm-4" v-if="!row.f_calculation.includes('表端结算')">
+          <label class="font_normal_body_new">累计用气金额</label>
+          <input class="input-underline" style="width:45%" :value="row.f_total_usegas_amount" readonly>
+        </div>
+        <div v-if="row.f_meter_type.includes('物联网表')" 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 v-if="row.f_meter_type.includes('物联网表')" 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 v-if="!row.f_meter_type.includes('物联网表')" 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 v-if="!row.f_meter_type.includes('物联网表')" 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 v-if="!row.f_meter_type.includes('物联网表')" 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('物联网表') && !(row.f_table_state === '停用' && row.f_network_valve === null)"
+          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">阀控状态</label>
+          <div class="col-sm-3">
+            <select v-model="selectedOption" class="input_search">
+              <option value="">请选择</option>
+              <option v-for="option in networkValveOptions" :value="option">
+                {{ option }}
+              </option>
+            </select>
+          </div>
+        </div>
+
+        <div class="form-group " style="padding-left: 8px">
+          <label class="font_normal_body" :class="operateReason?'':'text-danger'">操作原因</label>
+          <textarea class="form-control" style="width:80%" v-model="operateReason" rows="1"
+                    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,0)' title="屏蔽特殊条件下(充值开阀等)触发的自动开阀指令">强制开阀</button>-->
+        <button type="button" class="button_search button_spacing" :disabled="!operateReason"
+                @click='valveoperate(true,1)'>
+          开阀
+        </button>
+        <!--        <button type="button" class="btn btn-info btn-ln fr" :disabled="!operateReason" @click='valveoperate(false, 0)' title="屏蔽特殊条件下(欠费关阀等)触发的自动开阀指令">强制关阀</button>-->
+        <button type="button" class="button_spacing" :class="operateReason? 'button_export' : 'button_search' "
+                :disabled="!operateReason"
+                @click='valveoperate(false, 1)'>关阀
+        </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 {
+      selectedOption: '手动',
+      delaySeconds: '',
+      networkValveOptions: [
+        '手动',
+        '自动',
+        '1小时后自动',
+        '3小时后自动',
+        '6小时后自动',
+        '12小时后自动'
+      ],
+      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, value) {
+      let msg = oper ? '开阀' : '关阀'
+      let valueState = '自动'
+      if (value == 0) {
+        valueState = '自动'
+      } else {
+        valueState = '手动'
+      }
+      let delaySeconds = 0 // 初始化 delaySeconds 变量
+      let currentTime = new Date() // 获取当前时间
+      let adjustedTime = new Date(currentTime) // 创建一个新的 Date 对象用于计算延迟后的时间
+
+      let beijingTime = new Date(currentTime.getTime() + 8 * 60 * 60 * 1000)
+      let formattedBeijingTime = beijingTime.toISOString().slice(0, 19).replace('T', ' ')
+
+      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},
+        auto_adjust_option: this.selectedOption,
+        delaySeconds: delaySeconds,
+        executeDelayedOperation: true,
+        f_timestamp: formattedBeijingTime, // 使用北京时间
+        f_userfiles_id: this.row.f_userfiles_id,
+        f_userinfo_id: this.row.f_userinfo_id
+      }
+
+      let _this = this
+
+      // 计算延迟时间
+      switch (_this.selectedOption) {
+        case '1小时后自动':
+          delaySeconds = 3600 // 1小时 = 3600秒
+          break
+        case '3小时后自动':
+          delaySeconds = 10800 // 3小时 = 10800秒
+          break
+        case '6小时后自动':
+          delaySeconds = 21600 // 6小时 = 21600秒
+          break
+        case '12小时后自动':
+          delaySeconds = 43200 // 12小时 = 43200秒
+          break
+        default:
+          delaySeconds = 0
+      }
+      adjustedTime.setSeconds(adjustedTime.getSeconds() + delaySeconds)
+      let adjustedBeijingTime = new Date(adjustedTime.getTime() + 8 * 60 * 60 * 1000)
+      let formattedAdjustedBeijingTime = adjustedBeijingTime.toISOString().slice(0, 19).replace('T', ' ')
+
+      // 更新 datas 对象
+      datas.delaySeconds = delaySeconds
+      datas.f_current_timestamp = formattedAdjustedBeijingTime // 使用延迟后的北京时间
+
+      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 = ''
+            if (_this.selectedOption !== '手动') {
+              let msg = _this.selectedOption !== '自动' ? `阀控状态将在${_this.selectedOption}后自动调整为【自动】` : `阀控状态自动调整为 【自动】`
+              _this.$showAlert(msg, 'info', 3000)
+              _this.$resetpost('rs/logic/iot_processDelayedOperations', {data: datas}, {
+                warnMsg: null,
+                resolveMsg: null
+              }).then(res => {
+                this.$emit('refresh')
+                console.log('延时操作逻辑已执行')
+              })
+            } else {
+              this.$emit('refresh')
+            }
+          })
+        } 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/shimen/meterinfodetail.vue

@@ -0,0 +1,411 @@
+<template>
+  <partial-view v-ref:pv>
+    <div class="panel panel-info auto" style="margin-top: auto">
+      <div class="panel-heading"  style="height: 35px">
+        <h4 style="display:inline-block;margin-top: auto">表具信息</h4>
+      </div>
+      <div class="auto ">
+        <div class="row" v-if="data.f_customer">
+          <label class = "col-sm-5 " style="color: brown">团缴编号</label>
+          <span class = "col-sm-7" style="color: brown">{{data.f_customer?data.f_customer:'无'}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >气表类型</label>
+          <span class = "col-sm-7">{{data?data.f_meter_type:dafault.f_meter_brand}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >气表品牌</label>
+          <span class = "col-sm-7">{{data?data.f_meter_brand:dafault.f_meter_brand}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >气表型号</label>
+          <span class = "col-sm-7">{{data?data.f_meter_style:dafault.f_meter_style}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 " >计费终端</label>
+          <span class = "col-sm-7" >{{data?data.f_calculation:dafault.f_calculation}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 " >结算方式</label>
+          <span class = "col-sm-7" >{{data?data.f_collection_type:dafault.f_collection_type}}</span>
+        </div>
+        <div class="row">
+          <label class="col-sm-5" style="color: brown">表具状态</label>
+          <span class="col-sm-7" style="color: brown">{{data?data.f_table_state:dafault.f_table_state}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网') && data.f_collection_type === '按金额'">
+          <label class = "col-sm-5 " style="color: brown">系统余额</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_balance_amount:dafault.f_balance_amount}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网') && data.f_collection_type === '按气量'">
+          <label class = "col-sm-5 " style="color: brown">系统余量</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_balance_gas:dafault.f_balance_gas}}</span>
+        </div>
+        <div class="row" v-if="data.f_calculation.includes('表端结算') && data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 " style="color: brown">表端上报余额</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_jval:dafault.f_jval}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >初始表底数</label>
+          <span class = "col-sm-7" >{{data?data.f_initial_base:dafault.f_initial_base}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >表当前底数</label>
+          <span class = "col-sm-7" >{{data?data.f_meter_base:dafault.f_meter_base}}</span>
+        </div>
+        <div class="row" v-show="data.f_times">
+          <label class = "col-sm-5 " >写卡次数</label>
+          <span class = "col-sm-7" >{{data?data.f_times:dafault.f_times}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 ">指令上表次数</label>
+          <span class = "col-sm-7" >{{data?data.f_iot_times:dafault.f_iot_times}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 ">表累购金额</label>
+          <span class = "col-sm-7" >{{data?data.f_total_fee:dafault.f_total_fee}}
+            <span v-if="data && this.$login.r.includes('收费页面修改累购')" @click.stop="changeMeterFee"
+                  class="glyphicon glyphicon-pencil  click-change"  title="修改累购金额">
+            </span>
+          </span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 ">户累购金额</label>
+          <span class = "col-sm-7" >{{data?data.f_total_fee_all:dafault.f_total_fee_all}}</span>
+        </div>
+        <div class="row" v-if="(data.f_meter_type === '机表' || data.f_meter_type === '物联网表') && data.f_deduction_gas > 0">
+          <label class = "col-sm-5 " >剩余抵扣量</label>
+          <span class = "col-sm-7" >{{data?data.f_deduction_gas:dafault.f_deduction_gas}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('卡表')">
+          <label class = "col-sm-5 " style="color: brown" >户累购气量</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas_all:dafault.f_total_gas_all}}</span>
+        </div>
+        <div class="row" v-if="(data.f_meter_brand.includes('数码表'))">
+          <label class = "col-sm-5 " style="color: brown" >累购气量</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas:dafault.f_total_gas}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('卡表') && data.f_meter_type === '气量卡表'">
+          <label class = "col-sm-5 " style="color: brown" >累购气量</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas:dafault.f_total_gas}}
+            <span v-if="data && this.$login.r.includes('收费页面修改累购')" @click.stop="changeMeterGas"
+                  class="glyphicon glyphicon-pencil  click-change"  title="修改累购气量">
+            </span>
+          </span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('卡表')">
+          <label class = "col-sm-5 " style="color: brown">累购金额</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_total_fee:dafault.f_total_fee}}
+            <span v-if="data && this.$login.r.includes('收费页面修改累购')" @click.stop="changeMeterFee"
+                  class="glyphicon glyphicon-pencil  click-change"  title="修改累购金额">
+            </span>
+          </span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('卡表')">
+          <label class = "col-sm-5 " style="color: brown">累购写卡金额</label>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_write_totalfee:dafault.f_total_fee}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >气表表号</label>
+          <span class = "col-sm-7">{{data?data.f_meternumber:dafault.f_meternumber}}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('卡表') || (data.f_meter_type.includes('物联网表') && data.f_hascard==='是')">
+          <label class = "col-sm-5 " >卡&emsp;&emsp;号</label>
+          <span class = "col-sm-7">{{data?data.f_card_id:dafault.f_card_id}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >表封号</label>
+          <span class="col-sm-7">{{data?data.f_metertitles:dafault.f_metertitles}}
+            <span v-if="data" @click.stop="changemetertitles"
+                  class="glyphicon glyphicon-pencil  click-change"  title="修正表封号"></span>
+          </span>
+        </div>
+<!--        <div class="row" v-if="data.f_meter_type.includes('卡表') || data.f_meter_type.includes('物联网表') && data.f_hascard==='是'">-->
+<!--          <label class = "col-sm-5 " >写卡次数</label>-->
+<!--          <span class = "col-sm-7">{{data?data.f_times:dafault.f_times}}</span>-->
+<!--        </div>-->
+        <div class="row">
+          <label class = "col-sm-5 " >用气性质</label>
+          <span class = "col-sm-7">{{data?data.f_gasproperties:dafault.f_gasproperties}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >气价名称</label>
+          <span class = "col-sm-7">{{data?data.f_price_name:dafault.f_price_name}}</span>
+        </div>
+        <!--<div class="row" v-if="data.f_balance < 0">-->
+        <!--<label class = "col-sm-5 "  >账户欠费</label>-->
+        <!--<span class = "col-sm-7" title="不包含违约金">{{data?0 - (data.f_balance - 0):dafault.f_balance}}</span>-->
+        <!--</div>-->
+        <!--<div class="row" v-else>-->
+        <!--<label class = "col-sm-5 " >账户余额</label>-->
+        <!--<span class = "col-sm-7">{{data?data.f_balance:dafault.f_balance}}</span>-->
+        <!--</div>-->
+        <div class="row" v-if="data.f_remanent_money > 0">
+          <label class = "col-sm-5 " >应补金额</label>
+          <span class = "col-sm-7">{{data?data.f_remanent_money:dafault.f_remanent_money}}</span>
+        </div>
+        <div class="row" v-if="data.f_remanent_gas > 0">
+          <label class = "col-sm-5 " >应补气量</label>
+          <span class = "col-sm-7">{{data?data.f_remanent_gas:dafault.f_remanent_gas}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >表&emsp;&emsp;向</label>
+          <span class = "col-sm-7">{{data?data.f_aroundmeter:dafault.f_hand_date}}</span>
+        </div>
+        <div class="row" v-if="!data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 " >抄表册名</label>
+          <span class = "col-sm-7">{{data?'['+data.f_book_code + '] '+ (data.f_book_name ? data.f_book_name:''):dafault.f_book_name}}</span>
+        </div>
+        <div class="row" v-if="!data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 " >抄表册册序号</label>
+          <span class = "col-sm-7">{{data?data.f_meter_book_sort:dafault.f_meter_book_sort}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >安装位置</label>
+          <span class = "col-sm-7">{{data?data.f_position:dafault.f_position}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >置换人员</label>
+          <span class = "col-sm-7">{{data?data.f_gas_person:dafault.f_hand_date}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >置换时间</label>
+          <span class = "col-sm-7">{{data?data.f_gas_date.substring(0,7):dafault.f_hand_date}}</span>
+        </div>
+        <div class="row" v-if="!data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 " >抄表员</label>
+          <span class = "col-sm-7">{{data?data.f_inputtor:dafault.f_inputtor}}</span>
+        </div>
+        <div class="row" v-if="!data.f_meter_type.includes('物联网')">
+          <label class = "col-sm-5 " >上次抄表日</label>
+          <span class = "col-sm-7">{{data?data.f_hand_date.substring(0,7):dafault.f_hand_date}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >建档日期</label>
+          <span class = "col-sm-7">{{data?data.f_input_date.substring(0,7):dafault.f_input_date}}</span>
+        </div>
+        <div class="row">
+          <label class = "col-sm-5 " >备&emsp;&emsp;注</label>
+          <span class = "col-sm-7">{{data?data.comments:dafault.comments}}</span>
+        </div>
+        <modal v-if="showselectncuserfile" :show.sync="showselectncuserfile" width="40%" title="修正表封号"
+               v-ref:modal large backdrop="false">
+          <article slot="modal-body" class="modal-body">
+            <div class="form-horizontal">
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">旧表封号</label>
+                  <input disabled readonly type="text" style="width:80%" class="input_search"
+                         v-model="data.f_metertitles" placeholder='旧表封号'>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">新表封号</label>
+                  <input type="text" style="width:80%" class="input_search" v-model="newmetertitles"
+                         placeholder='新表封号'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid ' @click="modifyUserFile('表封号')">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
+        <modal v-if="showSelectUserFee" :show.sync="showSelectUserFee" width="40%" title="修正表累购金额"
+               v-ref:modal large backdrop="false">
+          <article slot="modal-body" class="modal-body">
+            <div class="form-horizontal">
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">旧表累购金额</label>
+                  <input readonly type="text" style="width:80%" class="input_search"
+                         v-model="data.f_total_fee" placeholder='旧表累购金额'>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">旧表累购金额</label>
+                  <input type="text" style="width:80%" class="input_search" v-model="newMeterFee"
+                         placeholder='旧表累购金额'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid ' @click="modifyUserFile('累购金额')">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
+        <modal v-if="showSelectUserGas" :show.sync="showSelectUserGas" width="40%" title="修正表累购气量"
+               v-ref:modal large backdrop="false">
+          <article slot="modal-body" class="modal-body">
+            <div class="form-horizontal">
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">旧表累购气量</label>
+                  <input readonly type="text" style="width:80%" class="input_search"
+                         v-model="data.f_total_gas" placeholder='旧表累购气量'>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-sm-12 form-group">
+                  <label class="font_normal_body">新表累购气量</label>
+                  <input type="text" style="width:80%" class="input_search" v-model="newMeterGas"
+                         placeholder='新表累购气量'>
+                </div>
+              </div>
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" :disabled='!$m.valid ' @click="modifyUserFile('累购气量')">确定</button>
+            <button type="button" class="button_clear" @click='close'>取消</button>
+          </footer>
+        </modal>
+      </div>
+    </div>
+  </partial-view>
+</template>
+
+<script>
+  /* 用户档案相关信息组件 */
+  export default {
+    ready () {
+      console.log('看看userinfo里面接收的data数据', this.data)
+    },
+    title: '客户基本信息',
+    data () {
+      return {
+        dafault: {
+          f_total_gas_all: 0,
+          f_total_fee_all: 0,
+          f_balance_amount: 0,
+          f_balance_gas: 0,
+          f_initial_base: 0,
+          f_meter_base: 0,
+          f_deduction_gas: 0,
+          f_total_gas: 0,
+          f_total_fee: 0,
+          f_card_id: '*****',
+          f_times: 0,
+          f_iot_times: 0,
+          f_meternumber: 0,
+          f_metertitles: '',
+          f_gasproperties: '****',
+          f_price_name: '****',
+          f_meter_brand: '****',
+          f_balance: 0,
+          f_user_type: '**',
+          f_remanent_gas: 0,
+          f_position: '****',
+          f_inputtor: '****',
+          f_jval: 0,
+          f_table_state: 0
+        },
+        model: null,
+        showselectncuserfile: false,
+        showSelectUserFee: false,
+        showSelectUserGas: false,
+        newmetertitles: '',
+        newMeterGas: 0,
+        newMeterFee: 0
+      }
+    },
+    props: ['data'],
+    methods: {
+      dealmsg (val) {
+        this.$dispatch('deal-msg', val)
+      },
+      changemetertitles () {
+        // 修正表封号
+        this.showselectncuserfile = true
+        this.newmetertitles = 0
+      },
+      changeMeterGas () {
+        // 修改累购气量
+        this.showSelectUserGas = true
+      },
+      changeMeterFee () {
+        // 修改累购金额
+        this.showSelectUserFee = true
+      },
+      async modifyUserFile (type) {
+        let param = {
+          f_userinfo_id: this.data.f_userinfo_id,
+          f_user_id: this.data.f_user_id,
+          f_userfiles_id: this.data.f_userfiles_id,
+          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
+        }
+        if (type == '表封号') {
+          param.new_metertitles = this.newmetertitles
+        } else if (type == '累购气量') {
+          param.new_metergas = this.newMeterGas
+        } else if (type == '累购金额') {
+          param.new_meterfee = this.newMeterFee
+        }
+        await this.$resetpost('/rs/logic/changeuserfilesmetertitles', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
+        this.data.f_metertitles = this.newmetertitles
+        if (type == '表封号') {
+          this.data.f_metertitles = this.newmetertitles
+        } else if (type == '累购气量') {
+          this.data.f_total_gas = this.newMeterGas
+        } else if (type == '累购金额') {
+          this.data.f_total_fee = this.newMeterFee
+        }
+        this.$parent.$parent.close()
+        this.$parent.$parent.clean()
+        this.$parent.$parent.$refs.list.searchNoData()
+        this.close()
+      },
+      close () {
+        this.showselectncuserfile = false
+        this.showSelectUserGas = false
+        this.showSelectUserFee = false
+        this.newmetertitles = 0
+        this.newMeterGas = 0
+        this.newMeterFee = 0
+      }
+    },
+    watch: {
+      'data' (val) {
+        console.log('val========', val)
+      }
+    },
+
+  }
+</script>
+<style lang="less">
+  .row {
+    /*border-bottom:1px solid #F2F6FA;*/
+    margin-left: 0;
+    margin-right: 0;
+  }
+  .click-change:hover {
+    color: #3592ef;
+    cursor: pointer;
+  }
+  // . {
+  //   height: 23px;
+  //   border-right: 1px solid #F2F6FA;
+  //   margin-bottom: 0;
+  //   text-align: left;
+  // }
+  // #address {
+  //   border-left: 1px solid #F2F6FA;
+  // }
+  // #user-info {
+  //   padding:6px;
+  //   span {
+  //     padding-left: 5px;
+  //   }
+  // }
+  // #address1 {
+  //   border-right: 0;
+  // }
+</style>

package/src/filiale/shimen/sale.js

@@ -5,4 +5,8 @@ export default function () {
   Vue.component('file-user-device-info', (resolve) => { require(['./UserDeviceInfoTest.vue'], resolve) })
   // 其他收费欠费收缴
   Vue.component('other-charge-bypay', (resolve) => { require(['./OtherChargeByPay'], resolve) })
+  // 当前选择用户的表具基本信息
+  Vue.component('user-meterinfodetail', (resolve) => { require(['./meterinfodetail'], resolve) })
+  // 360页面用户详情页
+  Vue.component('user-base-info-new', (resolve) => { require(['./UserBaseInfoNew'], resolve) })
 }

package/src/filiale/tongchuan/common/userinfo_detail/iot_detail/QueryInstruct.vue

@@ -210,7 +210,7 @@
         cancelreason: '',
         cancelid: '',
         f_userfiles_id: '',
-        model: new PagedList('rs/sql/insturctDetailQuery', 30),
+        model: new PagedList('rs/sql/insturctDetailQuery', 30, {f_userfiles_id: this.row.f_userfiles_id}),
         // model: null,
         row: null,
         searchshow: false,

package/src/filiale/yangchun/FilesManage/UserEssentialInfoTest.vue

@@ -316,7 +316,7 @@
           <div class="col-sm-4 form-group"
                v-show="(formconfig && formconfig.f_project_money && formconfig.f_project_money.required) || !onlyshowmust">
             <label for="f_project_money" class="font_normal_body">&ensp;{{getConfigLabelName('f_project_money','抵扣金额')}}</label>
-            <input type="text" v-model="baseinfo.base.f_project_money" disabled class="input_search" style="width:60%">
+            <input type="text" v-model="baseinfo.base.f_project_money" class="input_search" style="width:60%">
           </div>
 
         </div>

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/jinbin/sale'
+import FilialeSale from './filiale/shimen/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Wed Oct 30 09:57:55 CST 2024
-gradle.version=5.2.1