sale-client 3.5.265 → 3.5.266

package/package.json

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

package/src/filiale/rongcheng/CustomerDeviceInfoTest.vue

@@ -0,0 +1,252 @@
+<template>
+  <div class="auto">
+    <modal :show.sync="show_devices" width="80%" title="设备信息" v-ref:modal large backdrop="false">
+      <article slot="modal-body" class="modal-body" style="height: auto">
+        <div class="flex-row flex-deviceinfo">
+          <div class="flex-row flex-two-info panel panel-default" v-for="(index,row) in devicesinfonew">
+            <avatar-upload :img-src.sync="row.img.content" :filename.sync="row.img.filename"></avatar-upload>
+            <form class="form-horizontal select-overspread " style="flex: 1;">
+              <div class="row auto" style="margin-top: 10px;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_devices_type" v-model="row.f_devices_type"
+                            :options='devicetypes' placeholder='设备类型' :value-single="true"
+                            close-on-select @change="onChange"></v-select>
+                </div>
+                <div class="col-sm-6 form-group" style="padding-right: 5px;">
+                  <label class=" font_normal_body">厂&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;家&nbsp;</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="row.f_manufactor"
+                         placeholder='厂家' v-next-el="{id: $index+'brand'}">
+                </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>
+                  <input type="text" class="input_search" style="width:60%" v-model="row.f_devices_no" placeholder='设备编号' v-next-el="{id: $index+'brand'}">
+                </div>
+                <div class="col-sm-6 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">设备品牌</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="row.f_brand" placeholder='设备品牌' v-next-el="{id: $index+'devicesmodel'}"   :id="$index+'brand'">
+                </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>
+                  <input type="text" class="input_search" style="width:60%" v-model="row.f_devices_model"
+                         placeholder='设备型号' :id="$index+'devicesmodel'">
+                </div>
+                <div class="col-sm-6 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">&nbsp;安&nbsp;装&nbsp;人&nbsp;</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="row.f_instaler_person"
+                         placeholder='安装人' v-next-el="{id: $index+'f_instaler_person'}" :id="$index+'brand'">
+                </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>
+                  <datepicker placeholder="生产日期" style="width: 60%"
+                              v-model="row.f_make_date"
+                              :value.sync="row.f_make_date"
+                              :format="'yyyy-MM-dd HH:mm:ss'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-6 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">安装日期</label>
+                  <datepicker placeholder="安装日期" style="width: 60%"
+                              v-model="row.f_input_date"
+                              :value.sync="row.f_input_date"
+                              :onchange="expireDate(index)"
+                              :format="'yyyy-MM-dd HH:mm:ss'">
+                  </datepicker>
+                </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>
+                  <input type="number" class="input_search" style="width:60%" v-model="row.f_devices_num"
+                         placeholder='设备数量' v-next-el="{id: $index+'devicesmodel'}" :id="$index+'brand'">
+                </div>
+                <div class="col-sm-6 form-group" style="padding-right: 5px;"  v-show="row.f_devices_type == '报警器'">
+                  <label class="font_normal_body">首校日期</label>
+                  <datepicker placeholder="首校日期" style="width: 60%"
+                              v-model="row.f_firstcheck_date"
+                              :value.sync="row.f_firstcheck_date"
+                              :onchange="alarmExpireDate(index)"
+                              :format="'yyyy-MM-dd HH:mm:ss'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-6 form-group" style="padding-right: 5px;" v-show="row.f_devices_type == '调压器'">
+                  <label class="font_normal_body">流&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;量&nbsp;</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="row.f_rate_flow"
+                         placeholder='流量' v-next-el="{id: $index+'devicesmodel'}" :id="$index+'brand'">
+                </div>
+                <div class="col-sm-6 form-group" style="padding-right: 5px;" v-if="row.f_devices_type == '切断阀' && devicesinfoShow">
+                  <label class="font_normal_body">报废日期</label>
+                  <datepicker placeholder="报废日期" style="width: 60%"
+                              v-model="row.f_expire_date" disabled
+                              :value.sync="row.f_expire_date"
+                              :format="'yyyy-MM-dd HH:mm:ss'">
+                  </datepicker>
+                </div>
+              </div>
+              <div class="row auto" style="margin-left: 10px;">
+                <div class="col-sm-6 form-group" style="padding-right: 5px;" v-if="row.f_devices_type == '报警器' && devicesinfoShow">
+                  <label class="font_normal_body">报废日期</label>
+                  <datepicker placeholder="报废日期" style="width: 60%"
+                              v-model="row.f_expire_date" disabled
+                              :value.sync="row.f_expire_date"
+                              :format="'yyyy-MM-dd HH:mm:ss'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-6 form-group" style="padding-right: 5px;"  v-if="row.f_devices_type == '报警器' && devicesinfoShow">
+                  <label class="font_normal_body">下次校验</label>
+                  <datepicker placeholder="下次校验日期" style="width: 60%"
+                              v-model="row.f_nextcheck_date" disabled
+                              :value.sync="row.f_nextcheck_date"
+                              :format="'yyyy-MM-dd HH:mm:ss'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-6 form-group" style="padding-right: 5px;"  v-show="row.f_devices_type == '调压器'">
+                  <label class="font_normal_body">压力范围</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="row.f_pressure_range"
+                         placeholder='压力范围' v-next-el="{id: $index+'devicesmodel'}" :id="$index+'brand'">
+                </div>
+              </div>
+              <div class="row auto" style="margin-left: 10px;">
+                <div style="" class="col-sm-8 form-group">
+                  <label for="f_comments" class="font_normal_body ">&nbsp;&nbsp;&nbsp;备&nbsp;&nbsp;&nbsp;注</label>
+                  <input class="input_search" style="width:80%" v-model="row.f_comments"/>
+                </div>
+              </div>
+            </form>
+            <img :src="imgdelete" 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" style="width: 60px;padding: 10px;cursor: pointer;"
+                 @click="addDevice()">
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+  </div>
+
+</template>
+
+<script>
+export default {
+  title: '表具设备信息',
+  data () {
+    return {
+      imgdelete: '/images/mainicon/deletedevice.png',
+      imgadd: '/images/mainicon/adddevice.png',
+      devicetypes: [{label: '调压器', value: '调压器'}, {label: '报警器', value: '报警器'}, {label: '切断阀', value: '切断阀'}],
+      devicesinfoShow: false
+    }
+  },
+  props: {
+    devicesinfonew: {
+      type: Array,
+      default: []
+    },
+    show_devices: {
+      type: Boolean,
+      default: false
+    },
+    usertype: {
+      type: String
+    }
+  },
+  methods: {
+    onChange (val) {
+      console.log('。。。。。看看变化的值：' + val)
+      this.changeDate()
+    },
+    changeDate () {
+      for (let i = 0; i < this.devicesinfonew.length; i++) {
+        if (this.devicesinfonew[i].f_devices_type == '报警器') {
+          this.alarmExpireDate(i)
+        } else if (this.devicesinfonew[i].f_devices_type == '切断阀') {
+          this.expireDate(i)
+        }
+      }
+    },
+    expireDate (index) {
+      if (this.devicesinfonew[index].f_devices_type == '切断阀') {
+        if (this.devicesinfonew[index].f_input_date === '' || this.devicesinfonew[index].f_input_date === undefined) {
+        } else {
+          let b = new Date(this.devicesinfonew[index].f_input_date)
+          let year = (b.getFullYear() - 0) + 10
+          let month = (b.getMonth() - 0) + 1
+          var day = b.getDate()
+          this.devicesinfonew[index].f_expire_date = year + '-' + (month < 10 ? '0' + month : month) + '-' + (day < 10 ? '0' + day : day)
+          this.devicesinfoShow = false
+          this.$nextTick(() => {
+            this.devicesinfoShow = true
+          })
+        }
+      }
+    },
+    alarmExpireDate (index) {
+      if (this.devicesinfonew[index].f_firstcheck_date === '' || this.devicesinfonew[index].f_firstcheck_date === undefined) {
+      } else {
+        let b = new Date(this.devicesinfonew[index].f_firstcheck_date)
+        let year = (b.getFullYear() - 0) + 3
+        let year2 = (b.getFullYear() - 0) + 1
+        let month = (b.getMonth() - 0) + 1
+        var day = b.getDate()
+        this.devicesinfonew[index].f_expire_date = year + '-' + (month < 10 ? '0' + month : month) + '-' + (day < 10 ? '0' + day : day)
+        this.devicesinfonew[index].f_nextcheck_date = year2 + '-' + (month < 10 ? '0' + month : month) + '-' + (day < 10 ? '0' + day : day)
+        this.devicesinfoShow = false
+        this.$nextTick(() => {
+          this.devicesinfoShow = true
+        })
+      }
+    },
+    deleteDevice (index, row) {
+      console.log('删除的信息', row)
+      if (!this.$login.r.includes('删除表具设备信息')) {
+        return this.$showAlert('【删除表具设备信息】权限不足！！！', 'info', 1000)
+      }
+      if (row.id) {
+        this.$showMessage('此操作无法还原，是否确定要删除此设备？', ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            this.$resetpost('rs/logic/deletedevices', {param: row}, {
+              resolveMsg: `成功删除此设备`,
+              rejectMsg: '删除设备失败'
+            }).then((res) => {
+              this.devicesinfonew.splice(index, 1)
+            })
+          }
+        })
+      } else {
+        this.devicesinfonew.splice(index, 1)
+      }
+    },
+    addDevice () {
+      console.log('设备信息', this.devicesinfonew)
+      this.devicesinfonew.push({
+        f_devices_type: '调压器',
+        f_input_date: this.$login.toStandardTimeString()
+      })
+    }
+  }
+}
+</script>
+<style lang="less">
+.flex-deviceinfo {
+  padding: 0px 20px;
+  justify-content: space-between;
+  height: auto;
+  flex-wrap: wrap;
+}
+
+.flex-two-info {
+  margin-bottom: 10px;
+  align-items: center;
+  width: 48%;
+}
+</style>

package/src/filiale/rongcheng/UserMeterInfoTest.vue

@@ -0,0 +1,179 @@
+<template>
+  <div class="auto">
+    <div class="" v-for="row in meterinfo">
+      <div style="margin-bottom: 2%; margin-top: 2%">
+        <img style="margin-top: -5px" src="../../../static/images/lefticon/矩形1183.png">
+        <a style="font-size: 20px;font-weight: 500;">表具{{ $index + 1 }}信息</a>&nbsp;<a
+        style="color: #999999;text-decoration: none"></a>
+        <button class="button_search" style="width: max-content" @click="deleteMeter($index, row)"
+                v-if="!row.f_table_state ">删除表具
+        </button>
+        <button class="button_search" style="width: max-content" @click="showDevices($index, row)">用气设备信息</button>
+        <button class="button_search" style="width: max-content" @click="showDevicesNew($index, row)">设备信息</button>
+      </div>
+      <file-meter-info :curuser="curuser" :meter="row" :f_filialeid="f_filialeid" :usertype="usertype"
+                       :gasproperties="gasproperties" :overdueset="overdueset" @self-valid='valida'
+                       @delete-meter="deleteMeter($index)" :f_userinfo_id="f_userinfo_id"></file-meter-info>
+      <file-user-fire-info @clearfire="clearfire(row)" :addressinfo="addressinfo" :fireinfo.sync="fireinfo"
+                           :show_fire.sync="show_fire" :meter.sync="row" :baseinfo.sync="baseinfo"
+                           :userinfoid='data.baseinfo.base.f_userinfo_id'></file-user-fire-info>
+
+    </div>
+    <div class="panel panel-default auto text-center" @click="addMeter()" style="cursor: pointer;"
+         v-if="permission('建档一户多表')">
+      <span class="glyphicon glyphicon-plus"></span>
+      <!--<img :src="imgmeter" alt="图片加载失败" class="img-rounded" style="width: 50px;margin:10px;">-->
+    </div>
+    <file-user-device-info :devicesinfo.sync="devicesinfo" :show_devices.sync="show_devices"
+                           :f_input_person="f_input_person"
+                           :userinfoid='data.baseinfo.base.f_userinfo_id'></file-user-device-info>
+    <customer-device-info-test :devicesinfonew.sync="devicesinfonew" :show_devices.sync="show_devices_new"
+                               :f_input_person="f_input_person" :usertype.sync="data.baseinfo.base.f_user_type"
+                               :userinfoid='data.baseinfo.base.f_userinfo_id'></customer-device-info-test>
+  </div>
+</template>
+
+<script>
+import UserDeviceInfoTest from './UserDeviceInfoTest'
+import CustomerDeviceInfoTest from './CustomerDeviceInfoTest'
+
+export default {
+  components: {CustomerDeviceInfoTest, UserDeviceInfoTest},
+  title: '表具信息',
+  data () {
+    return {
+      pricenames: [],
+      devicesinfo: [],
+      devicesinfonew: [],
+      show_devices: false,
+      show_devices_new: false,
+      fireinfo: {},
+      f_input_person: '',
+      show_fire: false,
+      imgdelete: '/images/mainicon/deletedevice.png',
+      imgsrc: '/images/mainicon/biaopan.png',
+      imgmeter: '/images/mainicon/addmeter.png'
+    }
+  },
+  // props: ['meterinfo', 'usertype', 'gasproperties', 'metervalid'],
+
+  props: {
+    meterinfo: [],
+    usertype: {},
+    gasproperties: {},
+    metervalid: {
+      twoWay: true
+    },
+    addressinfo: {},
+    baseinfo: {},
+    f_filialeid: {},
+    f_userinfo_id: {},
+    overdueset: {},
+    curuser: {}
+  },
+  ready () {
+    console.log('表具信息，，，，', this.meterinfo)
+  },
+  methods: {
+    permission (name) {
+      if (!this.$login.r.find(value => value == name)) {
+        return false
+      }
+      return true
+    },
+    isNull (value) {
+      return value && value.length > 0
+    },
+    addMeter () {
+      this.meterinfo.push({
+        // 表号
+        f_meternumber: '',
+        f_metertitles: '',
+        f_area_code: '',
+        // 气表品牌
+        gasbrand: '',
+        // 气表型号
+        gasmodel: '',
+        // 气表类型
+        gasmodeltype: '',
+        pricetype: '', // 气价类型
+        pricename: '', // 气价名称
+        f_user_type: '', // 用户类型
+        f_gasproperties: '', // 用气性质
+        f_inputtor: '',
+        // 安装位置
+        f_position: '',
+        f_subscribe_date: '',
+        // 左右表
+        f_aroundmeter: '',
+        f_garbage_fee: '',
+        f_meter_base: '',
+        // 安装人
+        f_instaler_person: '',
+        // 通气人
+        f_gas_person: '',
+        f_adjustable: '', // 调压箱
+        devicesinfo: [],
+        fireinfo: {}
+      })
+    },
+
+    showDevices (index, row) {
+      this.devicesinfo = []
+      this.show_devices = true
+      this.devicesinfo = row.devicesinfo
+      if (row.f_install_person[0]) {
+        this.f_input_person = row.f_install_person[0]
+      }
+      console.log('查看设备信息', this.devicesinfo)
+      console.log('查看设备信息', Object.prototype.toString.call(this.devicesinfo) === '[object Array]')
+    },
+    showDevicesNew (index, row) {
+      this.devicesinfonew = []
+      this.show_devices_new = true
+      this.devicesinfonew = row.devicesinfonew
+      if (row.f_install_person[0]) {
+        this.f_input_person = row.f_install_person[0]
+      }
+      console.log('查看设备信息2', this.devicesinfonew)
+    },
+    showFire (index, row) {
+      if (row.f_user_type.length == 0) {
+        this.$showAlert('请先确定客户类型', 'warning', 3000)
+      } else {
+        this.fireinfo = {}
+        this.show_fire = true
+        this.fireinfo = row.fireinfo ? row.fireinfo : {}
+      }
+    },
+    // 清楚表具信息
+
+    clearMeter () {
+      this.meterinfo = []
+    },
+    deleteMeter (index) {
+      this.meterinfo.splice(index, 1)
+      this.valida()
+    },
+    valida () {
+      for (var i = 0; i < this.meterinfo.length; i++) {
+        console.log('表具信息验证', this.meterinfo, this.meterinfo[i].valid)
+        if (!this.meterinfo[i].valid) {
+          this.metervalid = false
+          return
+        }
+      }
+      this.metervalid = true
+    }
+  }
+}
+</script>
+<style lang="less">
+.user-meter-padding {
+  .form-group {
+    > div {
+      padding-right: 5px;
+    }
+  }
+}
+</style>

package/src/filiale/rongcheng/sale.js

@@ -101,4 +101,8 @@ export default function () {
   Vue.component('al-returns-money', (resolve) => { require(['./alReturnsMoney'], resolve) })
   // 收费
   Vue.component('charge-list', (resolve) => { require(['./ChargeList'], resolve) })
+  Vue.component('customer-device-info', (resolve) => { require(['./CustomerDeviceInfoTest'], resolve) })
+
+  // 用户表具信息test
+  Vue.component('file-user-meter-info', (resolve) => { require(['./UserMeterInfoTest'], resolve) })
 }

package/src/filiale/wenxi/MeterinfoTest.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="auto" id="meterInfoTest">
-    <validator name='m' @valid="mValid(true)" @invalid="mValid(true)">
+    <validator name='m' @valid="mValid(true)" @invalid="mValid(false)">
       <form class="form-horizontal select-overspread ">
         <div style="margin-top: 2%;">
           <a style="font-size: 16px;font-weight: 500;">表具信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
@@ -350,9 +350,9 @@
                       v-ref:aroundmeter
                       ></v-select>
           </div>
-          <div class="col-sm-4 form-group"  v-if="this.flag===1"  >
+          <div class="col-sm-4 form-group"  v-if="this.flag===1"  :class="[$m.aroundmeter.required ? 'has-error' : '']" >
             <label for="f_aroundmeter" class="font_normal_body">&ensp;左&ensp;右&ensp;表</label>
-            <input type="text" v-model="row.f_aroundmeter" v-show="false">
+            <input type="text" v-model="row.f_aroundmeter" v-show="false" v-validate:aroundmeter='{required: true }'>
             <v-select :value.sync="row.f_aroundmeter" v-model="row.f_aroundmeter"
                       :options='aroundmeters' placeholder='请选择'
                       close-on-select

package/src/filiale/wenxi/UserGeneralInfoTest.vue

@@ -42,7 +42,7 @@
       <div class="form-group">
         <div style="text-align:right;">
 
-          <button class="button_search" @click="confirm()" :disabled="flag===2?!(essentialInfo && meterInfo ):false">确认
+          <button class="button_search" @click="confirm()" :disabled="!(essentialInfo && meterInfo )">确认
           </button>
           <button class="button_search" style="width: max-content" v-if="haslimit" @click="limitClick">限购配置</button>
           <button class="button_clear" @click="cancel()">取消</button>
@@ -325,6 +325,7 @@ export default {
       // 如果是修改, 则展示修改的明细给用户
       if (this.fileSaveData.userinfo.f_userinfo_id) {
         if (this.row.f_user_state === '预备' && this.fileSaveData.userinfo.f_user_state === '正常') {
+          this.fileSaveData.userinfo.f_createfile_person = this.$login.f.name
           this.fileSaveData.modifyReason = this.reason = '建档（档案信息完善）'
         } else {
           this.reason = '其他'
@@ -362,9 +363,9 @@ export default {
       console.log('打印保存数据', this.fileSaveData)
       console.log('打印id', this.fileSaveData.userinfo.f_userinfo_id)
       // 如果是修改操作则修改建党人
-      if (this.fileSaveData.userinfo.f_userinfo_id) {
-        this.fileSaveData.userinfo.f_createfile_person = this.$login.f.name
-      }
+      // if (this.fileSaveData.userinfo.f_userinfo_id) {
+      //   this.fileSaveData.userinfo.f_createfile_person = this.$login.f.name
+      // }
       console.log('二次打印打印保存数据', this.fileSaveData)
       FileManageService.fileSave(this.fileSaveData).then((res) => {
         this.$parent.resdata = res.data.result[0].f_userinfo_code

package/src/plugins/FileManageService.js

@@ -271,6 +271,47 @@ let FileManageService = {
         // }
         userfilesdevices.push(userfilesdevice)
       })
+      // 这里是给荣成新增的一个模块
+      if (meter.devicesinfonew != undefined && Object.prototype.toString.call(meter.devicesinfonew) === '[object Array]') {
+        meter.devicesinfonew.forEach((devitem) => {
+          let userfilesdevice = Object.assign({}, userfilesdevice, devitem)
+          userfilesdevice.f_user_id = data.meterinfo[0].f_user_id ? data.meterinfo[0].f_user_id : null
+          userfilesdevice.f_devices_type = userfilesdevice.f_devices_type
+          userfilesdevice.WatchPurchase = userfilesdevice.WatchPurchase
+          userfilesdevice.f_state = userfilesdevice.f_state ? userfilesdevice.f_state : '有效'
+          userfilesdevice.f_devices_no = userfilesdevice.f_devices_no ? userfilesdevice.f_devices_no : null
+          userfilesdevice.f_brand = userfilesdevice.f_brand ? userfilesdevice.f_brand : null
+          userfilesdevice.f_builderunit = userfilesdevice.f_builderunit ? userfilesdevice.f_builderunit : null
+          userfilesdevice.f_builder_phone = userfilesdevice.f_builder_phone ? userfilesdevice.f_builder_phone : null
+          userfilesdevice.f_devices_model = userfilesdevice.f_devices_model ? userfilesdevice.f_devices_model : null
+          userfilesdevice.f_devices_num = userfilesdevice.f_devices_num ? userfilesdevice.f_devices_num : null
+          userfilesdevice.f_input_person = userfilesdevice.f_input_person ? userfilesdevice.f_input_person : null
+          userfilesdevice.f_input_date = userfilesdevice.f_input_date ? userfilesdevice.f_input_date : null
+          userfilesdevice.f_make_date = userfilesdevice.f_make_date ? userfilesdevice.f_make_date : null
+          userfilesdevice.f_service_life = userfilesdevice.f_service_life ? userfilesdevice.f_service_life : null
+          userfilesdevice.f_expire_date = userfilesdevice.f_expire_date ? userfilesdevice.f_expire_date : null
+          userfilesdevice.f_pipeinstall_date = userfilesdevice.f_pipeinstall_date ? userfilesdevice.f_pipeinstall_date : null
+          userfilesdevice.f_pipe_type = userfilesdevice.f_pipe_type ? userfilesdevice.f_pipe_type : null
+          userfilesdevice.f_pipeexpire_date = userfilesdevice.f_pipeexpire_date ? userfilesdevice.f_pipeexpire_date : null
+          userfilesdevice.f_userinfodevices_state = userfilesdevice.f_userinfodevices_state ? userfilesdevice.f_userinfodevices_state : null
+          userfilesdevice.f_manufactor = userfilesdevice.f_manufactor ? userfilesdevice.f_manufactor : null
+          userfilesdevice.f_rate_flow = userfilesdevice.f_rate_flow ? userfilesdevice.f_rate_flow : null
+          userfilesdevice.f_pressure_range = userfilesdevice.f_pressure_range ? userfilesdevice.f_pressure_range : null
+          userfilesdevice.f_firstcheck_date = userfilesdevice.f_firstcheck_date ? userfilesdevice.f_firstcheck_date : null
+          userfilesdevice.f_nextcheck_date = userfilesdevice.f_nextcheck_date ? userfilesdevice.f_nextcheck_date : null
+          userfilesdevice.f_comments = userfilesdevice.f_comments ? userfilesdevice.f_comments : null
+          userfilesdevice.img = userfilesdevice.img ? userfilesdevice.img : {content: null, filename: null}
+          userfilesdevice.img.content = userfilesdevice.img.content ? userfilesdevice.img.content : null
+          userfilesdevice.img.filename = userfilesdevice.img.filename ? userfilesdevice.img.filename : null
+          userfilesdevice.f_operator = Vue.$login.f.name
+          userfilesdevice.f_operatorid = Vue.$login.f.id
+          // if (!userfilesdevice.id) {
+          //   userfilesdevice.f_input_person = Vue.$login.f.name
+          //   userfilesdevice.f_input_date =  Vue.$login.toStandardTimeString ()
+          // }
+          userfilesdevices.push(userfilesdevice)
+        })
+      }
       meter.devicesinfo = userfilesdevices
       result.userfiles.push(meter)
     })