sale-client 3.6.330 → 3.6.331

package/package.json

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

package/src/Util.js

@@ -38,6 +38,30 @@ export function toStandardDateString () {
   let date = dt.getDate()
   return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
 }
+export function getLastDayOfMonth(dateString) {
+  // 解析输入日期字符串
+  var parts = dateString.split('-');
+  var year = parseInt(parts[0], 10);
+  var month = parseInt(parts[1], 10);
+
+  // 创建一个日期对象，表示下个月的第一天
+  var nextMonthFirstDay = new Date(year, month, 1);
+
+  // 减去一天，得到本月的最后一天
+  nextMonthFirstDay.setDate(nextMonthFirstDay.getDate() - 1);
+
+  // 获取年、月、日
+  var lastDay = nextMonthFirstDay.getDate();
+  var lastMonth = nextMonthFirstDay.getMonth() + 1; // 月份从0开始，需要加1
+  var lastYear = nextMonthFirstDay.getFullYear();
+
+  // 格式化日期为 YYYY-MM-DD
+  var formattedDate = lastYear + '-' +
+    (lastMonth < 10 ? '0' + lastMonth : lastMonth) + '-' +
+    (lastDay < 10 ? '0' + lastDay : lastDay);
+
+  return formattedDate;
+}
 
 export function toStartAndEndDateString () {
   let dt = new Date()

package/src/components/FilesManage/UserDeviceInfoTest.vue

@@ -135,6 +135,69 @@
                   <input class="input_search" style="width:60%" v-model="row.f_comments"/>
                 </div>
               </div>
+              <!--              租赁相关-->
+              <div class="row auto" style="margin-left: 10px;">
+                <div class="col-sm-6 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">是否租赁</label>
+                  <v-select :value.sync="row.f_is_tenant" v-model="row.f_is_tenant"
+                            :options='isTenant' placeholder='是否租赁' :value-single="true"
+                            close-on-select></v-select>
+                </div>
+                <div style="" class="col-sm-6 form-group" v-if="row.f_is_tenant==='true'">
+                  <label class="font_normal_body ">租赁时间</label>
+                  <datepicker placeholder="租赁起始时间" style="width: 60%"
+                              v-model="row.f_tenant_date"
+                              :value.sync="row.f_tenant_date"
+                              :format="'yyyy-MM-dd'">
+                  </datepicker>
+                </div>
+              </div>
+              <div class="row auto" style="margin-left: 10px;" v-if="row.f_is_tenant==='true'">
+                <div class="col-sm-6 form-group" style="padding-right: 5px;" >
+                  <label class="font_normal_body">租赁单价</label>
+                  <input class="input_search" style="width:60%" @blur="showTips" v-model="row.f_tenant_price"/>
+                </div>
+                <div style="" class="col-sm-6 form-group">
+                  <label class="font_normal_body ">租赁年限</label>
+                  <input class="input_search" type="number" style="width:60%" v-model="row.f_tenant_liferg" :value.sync="row.f_tenant_liferg" placeholder="将自动计算" disabled/>
+                </div>
+              </div>
+              <div class="row auto" style="margin-left: 10px;" v-if="row.f_is_tenant==='true'">
+                <div class="col-sm-12 form-group" style="padding-right: 5px;" >
+                  <nobr>
+                    <label class="font_normal_body">计价周期</label></nobr>
+                  <input class="input_search" style="width:25%" v-model="row.time_year" @input="validateInt"
+                         @blur="figureYear(row.time_year, row.time_month, row.time_day, row.f_figure_times, row)"
+                         @change="figureYear(row.time_year, row.time_month, row.time_day, row.f_figure_times, row)"
+                         placeholder="年"/>&nbsp;&nbsp;&nbsp;
+                  <input class="input_search" style="width:25%" v-model="row.time_month" @input="validateInt"
+                         @blur="figureYear(row.time_year, row.time_month, row.time_day, row.f_figure_times, row)"
+                         @change="figureYear(row.time_year, row.time_month, row.time_day, row.f_figure_times, row)"
+                         placeholder="月"/>&nbsp;&nbsp;&nbsp;
+                  <input class="input_search" style="width:25%" v-model="row.time_day" @input="validateInt"
+                         @blur="figureYear(row.time_year, row.time_month, row.time_day, row.f_figure_times, row)"
+                         @change="figureYear(row.time_year, row.time_month, row.time_day, row.f_figure_times, row)"
+                         placeholder="日"/>
+                </div>
+              </div>
+              <div class="row auto" style="margin-left: 10px;" v-if="row.f_is_tenant==='true'&&this.showTip===true">
+                <div class="col-sm-12 form-group" style="padding-right: 5px;" >
+                  <label style="color: red;padding-right: 3px;padding-bottom: 0;margin-bottom: 2px;">*</label>
+                  <label style="font-size: 1.0rem !important;font-family: PingFang;color: #999999">计价周期填写时不需要全部填写（比如需要计价周期为3月，只需要在月输入框输入3）</label>
+                </div>
+              </div>
+              <div class="row auto" style="margin-left: 10px;" v-if="row.f_is_tenant==='true'">
+                <div class="col-sm-12 form-group" style="padding-right: 5px;" >
+                  <label class="font_normal_body">周期数量</label>
+                  <input class="input_search" style="width:30%" v-model="row.f_figure_times"
+                         @input="validateInt"
+                         @input.stop="figureYear(row.time_year, row.time_month, row.time_day, row.f_figure_times, row)"
+                         @change="figureYear(row.time_year, row.time_month, row.time_day, row.f_figure_times, row)"
+                         @blur="figureYear(row.time_year, row.time_month, row.time_day, row.f_figure_times, row)"
+                         placeholder="周期数量"/>
+                </div>
+              </div>
+
               <div>
                 <img style="margin-top: -2px;margin-left: 2px" src="../../../static/images/lefticon/矩形1183.png">
                 <a style="font-size: 16px;font-weight: 500;">连接管信息</a>&nbsp;<a
@@ -174,12 +237,12 @@
                 </div>
               </div>
             </form>
-            <img :src="imgdelete" alt="图片加载失败" class="img-rounded"
+            <img src="../../../static/mainicon/deletedevice.png" alt="图片加载失败" class="img-rounded"
                  style="width: 60px;padding: 20px;margin-left: -15px;cursor: pointer;"
                  @click="deleteDevice($index, row)">
           </div>
           <div class="panel panel-default flex-two-info text-center" style="line-height: 164px;">
-            <img :src="imgadd" alt="图片加载失败1" class="img-rounded"
+            <img src="../../../static/mainicon/adddevice.png" alt="图片加载失败1" class="img-rounded"
                  style="width: 60px;padding: 10px;cursor: pointer;"
                  @click="addDevice()">
           </div>
@@ -225,9 +288,9 @@
                 <td style="text-align:center">{{row.f_userinfodevices_state}}</td>
                 <td style="text-align:center">{{row.f_comments}}</td>
                 <td style="text-align: center">
-                  <img :src="imgdelete" alt="图片加载失败" class="img-rounded"
-                    style="width: 60px;padding: 20px;margin-left: -15px;cursor: pointer;"
-                    @click="deleteDevice($index, row)">
+                  <img src="../../../static/mainicon/deletedevice.png" alt="图片加载失败" class="img-rounded"
+                       style="width: 60px;padding: 20px;margin-left: -15px;cursor: pointer;"
+                       @click="deleteDevice($index, row)">
                 </td>
               </tr>
             </table>
@@ -254,9 +317,10 @@ export default {
   title: '表具设备信息',
   data () {
     return {
+      showTip: false,
       showTable: false,
-      imgdelete: '/images/mainicon/deletedevice.png',
-      imgadd: '/images/mainicon/adddevice.png',
+      imgdelete: '../../../static/mainicon/deletedevice.png',
+      imgadd: '../../../static/mainicon/adddevice.png',
       devicetypes: this.$appdata.getParam('设备类型'),
       pipetypes: this.$appdata.getParam('管道类型'),
       WatchPurchases: this.$appdata.getParam('购买方式'),
@@ -268,7 +332,15 @@ export default {
       f_expire_date: '',
       f_service_life: 0,
       devicesinfoShow: true,
-      ljgDevicesinfoShow: true
+      ljgDevicesinfoShow: true,
+      //是否租赁
+      isTenant: [{label: '是', value: 'true'},{label: '否', value: 'false'}],
+      //租赁时间
+      f_tenant_date: null,
+      //租赁年限
+      f_tenant_liferg: null,
+      //租赁单价
+      f_tenant_price: null,
     }
   },
   props: {
@@ -301,6 +373,60 @@ export default {
   ready () {
   },
   methods: {
+    showTips(){
+      this.showTip = true
+    },
+    validateInt(event){
+      //整数合法检验
+      const value = event.target.value;
+      if (!/^\d*$/.test(value)) {
+        event.target.value = '';
+      }
+    },
+    figureYear(year, month, day, times, row){
+      year = parseInt(year)
+      month = parseInt(month)
+      day = parseInt(day)
+      times = parseInt(times)
+      if(!Number.isInteger(day)){
+        day = 0
+      }
+      if(!Number.isInteger(month)){
+        month = 0
+      }
+      if(!Number.isInteger(year)){
+        year = 0
+      }
+      if(!Number.isInteger(times)){
+        times = 0
+      }
+      console.log('计算依据',year, month, day, times, row)
+      const now = new Date();
+      const expiry = new Date(now);
+      expiry.setFullYear(expiry.getFullYear() + year)
+      expiry.setMonth(expiry.getMonth() + month)
+      expiry.setDate(expiry.getDate() + day)
+      const expiry_format = this.formatDate(expiry)
+      const duration = expiry.getTime() - now.getTime()
+      const duration_year = duration / (365.25 * 24 * 60 * 60 * 1000);
+      const duration_day = duration / (24 * 60 * 60 * 1000);
+      console.log('计价周期(年/日)', duration_year.toFixed(2), duration_day.toFixed(0));
+      row.f_figure_end_date = expiry
+      row.f_figure_circle = duration_day.toFixed(0)
+      //租赁年限 = 计价周期 * 周期数量
+      const full_duration = duration_year * times
+      console.log('租赁年限', full_duration.toFixed(1))
+      row.f_tenant_liferg = full_duration.toFixed(1)
+    },
+    formatDate (date){
+      const year = date.getFullYear();
+      const month = this.padZero(date.getMonth() + 1);
+      const day = this.padZero(date.getDate());
+      return `${year}-${month}-${day}`;
+    },
+    padZero(num) {
+      return num.toString().padStart(2, '0');
+    },
     showTableBtn () {
       this.showTable = !this.showTable
       console.log('表具信息', this.devicesinfo)
@@ -356,7 +482,16 @@ export default {
         f_devices_type: '家用灶具',
         f_input_person: this.f_input_person,
         f_userinfodevices_state: '正常',
-        f_input_date: this.$login.toStandardTimeString()
+        f_input_date: this.$login.toStandardTimeString(),
+        f_is_tenant: null,
+        f_tenant_date: null,
+        f_tenant_liferg: null,
+        f_tenant_price: null,
+        f_figure_circle: null,
+        f_figure_times: null,
+        time_year: null,
+        time_month: null,
+        time_day: null
       })
     },
     closeModal () {

package/src/filiale/kelai/UserGeneralInfoTest.vue

@@ -324,6 +324,7 @@ export default {
       })
       if (this.data.meterinfo[0].f_gas_date != null) {
         this.data.addressinfo.f_address_state = '已通气'
+        this.data.meterinfo[0].f_open_date = this.data.meterinfo[0].f_gas_date
       }
       // 获取保存数据
       Object.assign(this.fileSaveData, {}, this.$FileManageService.fileSaveBefore(this.data))

package/src/filiale/lixianV3/meterinfodetail.vue

@@ -0,0 +1,247 @@
+<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">
+          <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_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_jval:dafault.f_jval}}</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_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>
+        </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>
+        </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>
+        </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" 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">
+          <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">
+          <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">
+          <label class = "col-sm-5 " >抄表员</label>
+          <span class = "col-sm-7">{{data?data.f_inputtor:dafault.f_inputtor}}</span>
+        </div>
+        <div class="row">
+          <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>
+      </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_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
+    }
+  },
+  props: ['data'],
+  methods: {
+    dealmsg (val) {
+      this.$dispatch('deal-msg', val)
+    }
+  },
+  watch: {
+    'data' (val) {
+      console.log('val========', val)
+    }
+  }
+}
+</script>
+<style lang="less">
+.row {
+  /*border-bottom:1px solid #F2F6FA;*/
+  margin-left: 0;
+  margin-right: 0;
+}
+// . {
+//   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/lixianV3/sale.js

@@ -18,4 +18,6 @@ export default function () {
   Vue.component('owe-list', (resolve) => { require(['./OweList'], resolve) })
   // 机表收费
   Vue.component('machine-meter-center', (resolve) => { require(['./MachineMeterCenter'], resolve) })
+  // 当前选择用户的表具基本信息
+  Vue.component('user-meterinfodetail', (resolve) => { require(['./meterinfodetail'], resolve) })
 }

package/src/filiale/qianneng/revenue/sms/AccountBillList.vue

@@ -73,6 +73,8 @@
           <th><nobr>用户编号</nobr></th>
           <th><nobr>用户地址</nobr></th>
           <th><nobr>账期</nobr></th>
+          <th><nobr>上期抄表时间</nobr></th>
+          <th><nobr>本期抄表时间</nobr></th>
           <th><nobr>起数</nobr></th>
           <th><nobr>止数</nobr></th>
           <th><nobr>用气量</nobr></th>
@@ -96,6 +98,8 @@
         <td style="text-align:center">{{row.f_userinfo_code}}</td>
         <td style="text-align:center">{{row.f_address}}</td>
         <td style="text-align:center">{{row.hand_date}}</td>
+        <td style="text-align:center">{{row.f_last_input_date}}</td>
+        <td style="text-align:center">{{row.f_input_date}}</td>
         <td style="text-align:center">{{row.f_last_tablebase}}</td>
         <td style="text-align:center">{{row.f_tablebase}}</td>
         <td style="text-align:center">{{row.f_oughtamount}}</td>
@@ -201,6 +205,8 @@
  */
 import {HttpResetClass, PagedList} from 'vue-client'
 import Vue from 'vue'
+import * as Util from '../../../../Util'
+import {getLastDayOfMonth} from '../../../../Util'
 
 // let readySomething = async function (self) {
 //   // await self.$LoadParams.loadParam(self.f_filialeid)
@@ -212,13 +218,12 @@ import Vue from 'vue'
 export default {
   data () {
     return {
-      model: new PagedList('rs/sql/getAccountUser', 50, {
-        startDate: 'this.model.startDate',
-        endDate: 'this.model.endDate'
-      }),
+      model: new PagedList('rs/sql/getAccountUser', 50),
       model2: new PagedList('rs/sql/getSendModel', 30, {orderitem: " \'id desc\'"}),
       // 短信模板选择
       infoshow: false,
+      startDate: '',
+      endDate: '',
       // 下选后其他查询条件
       criteriaShow: false,
       // 短信发送
@@ -227,8 +232,6 @@ export default {
       allshow2: false,
       alldownDate: '',
       sendtimeingdate: '',  // 定时发送日期
-      startDate: '',
-      endDate: '',
       sendtype: '',
       fontSizeNum: 0,
       userdefinedMessage: '',
@@ -392,8 +395,6 @@ export default {
       }
 
       this.allshow = false
-      this.startDate = this.$refs.paged.$refs.cri.model.startDate
-      this.endDate = this.$refs.paged.$refs.cri.model.endDate
       this.model.condition = this.model.condition + " and f_orgid = \'" + Vue.$login.f.orgid + "\'"
       if (this.ids.length !== 0) {
         console.log('ids', this.ids)
@@ -436,6 +437,12 @@ export default {
       console.log('args1:', args)
       args.condition = `${args.condition} and f_user_state = '正常'`
       args.condition = `${args.condition} and f_orgid = '${Vue.$login.f.orgid}'`
+      console.log(this.$refs.paged.$refs.cri.model.hand_date + '-01')
+      this.startDate = this.$refs.paged.$refs.cri.model.hand_date + '-01'
+      this.model.params.startDate = this.$refs.paged.$refs.cri.model.hand_date + '-01'
+      // 获取开始时间和结束实际
+      this.model.params.endDate = Util.getLastDayOfMonth(this.$refs.paged.$refs.cri.model.hand_date + '-01')
+      this.endDate = Util.getLastDayOfMonth(this.$refs.paged.$refs.cri.model.hand_date + '-01')
       console.log('args.model', args.model)
       this.model.search(args.condition, args.model)
       if (this.isFirst) {

package/src/filiale/qianneng/revenue/sms/MessageReport.vue

@@ -62,6 +62,7 @@ export default {
   },
   events: {
     'create' (condition, userdefinedMessage, downDate, sendtype, startDate, endDate, msg) {
+      console.log(startDate,endDate)
       let data = {
         // 短信模板
         userdefinedMessage: msg,
@@ -91,7 +92,7 @@ export default {
         console.log('查看短信返回参数', data)
         console.log(res.data)
         if (res.data.success) {
-          this.$showMessage(`成功生成短信${res.data.success}条`)
+          this.$showMessage(`成功生成短信${res.data.success}条,生成失败${res.data.fail}条`)
           // this.$refs.list.search()
           this.$refs.message.$refs.paged.$refs.cri.search()
           this.$refs.message.model.condition = 'convert(varchar(10),f_create_date,120) = ' + "'" + this.$login.toStandardDateString() + "'"

package/src/filiale/qingjian/UserBaseInfoNew.vue

@@ -0,0 +1,686 @@
+<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_calculation.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_calculation.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('物联网表') && valveLimit && (row.f_network_valve === '1' || (row.f_table_state === '停用' && row.f_network_valve === null))"
+                class="button_search" type="button" @click="valvecontrol">
+          开关阀
+          <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 >阀控状态</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-info':'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 btn-ln fr" :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="btn btn-info btn-ln fr" :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 !== '手动') {
+              _this.$showAlert(`阀控状态将在${_this.selectedOption}后自动调整为“自动”`, 'info', 3000)
+
+              _this.$resetpost('rs/logic/iot_processDelayedOperations', { data: datas }, { warnMsg: null, resolveMsg: null }).then(res => {
+                console.log('延时操作逻辑已执行')
+              })
+            }
+          })
+        } 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/qingjian/sale.js

@@ -10,4 +10,5 @@ export default function () {
   Vue.component('file-user-files', (resolve) => { require(['./FileUserFiles'], resolve) })
   // 单个表具信息
   Vue.component('file-meter-info', (resolve) => { require(['./MeterinfoTest'], resolve) })
+  Vue.component('user-base-info-new', (resolve) => { require(['./UserBaseInfoNew'], resolve) })
 }