sale-client 3.5.264 → 3.5.266

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.264",
+  "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/shanxian/components/FilesManage/UserGeneralInfoTest.vue

@@ -215,7 +215,7 @@ export default {
     }
   },
   async ready () {
-    this.blodid = this.data.baseinfo.base.f_userinfo_id
+    this.blodid = '临时id' + Date.now()
     console.log('ready，，，', this.row)
     await this.getOvedueset()
     if (this.row) { // 修改用户
@@ -376,7 +376,7 @@ export default {
       return new Blob([bytesCode], {type: 'image/jpeg'})
     },
     newPhoto (Imgbase64) {
-      console.log('imgbase----->',Imgbase64)
+      // console.log('imgbase----->',Imgbase64)
       let form = new FormData()
       let xhr = new XMLHttpRequest()
       let formDataBoundary = '----WebkitFormBoundary' + 'GaoPaiYi'
@@ -385,6 +385,7 @@ export default {
       xhr.open('POST', 'rs/file/uploadFile')
 
       if (this.headers) {
+        console.log('this.blodid----->',this.blodid)
         this.headers.blodid = this.blodid
         for (var header in this.headers) {
           xhr.setRequestHeader(header, encodeURIComponent(this.headers[header]))

package/src/filiale/shanxian/components/FilesManageNew/UserGeneralInfoTest.vue

@@ -0,0 +1,617 @@
+<template>
+  <div>
+    <div style="overflow-y: scroll;height: 92%">
+      <div style="height: auto;width: 100%">
+        <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;">基本    信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
+          <button class="button_search" style="width: max-content" @click="uploadFiles()">上传附件</button>
+          <button class="button_search" style="width: max-content" @click="uploadPictures()">拍照</button>
+        </div>
+        <file-user-essential-info-new :baseinfo="data.baseinfo" :addressinfo="data.addressinfo" @valid="essentialInfo = true"
+                                      :f_filialeid="f_filialeid"    @invalid="essentialInfo = false" v-ref:useressential :isedit="isedit"></file-user-essential-info-new>
+      </div>
+
+      <div style="height: auto;width: 100%">
+        <file-user-meter-info-new :meterinfo="data.meterinfo" :f_filialeid="f_filialeid" :metervalid.sync="meterInfo"
+                         :f_userinfo_id="data.baseinfo.base.f_userinfo_id" v-ref:meter></file-user-meter-info-new>
+      </div>
+
+      <div style="height: auto;width: 100%">
+        <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;">发票信息</a>&nbsp;<a style="color: #999999"></a>
+        </div>
+        <user-paper-info-test :baseinfo="data.baseinfo"></user-paper-info-test>
+      </div>
+
+      <!--<div style="height: auto;width: 100%">-->
+        <!--<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;">附件信息</a>&nbsp;<a style="color: #999999"></a>-->
+        <!--</div>-->
+        <!--<upload :blodid="blodid" isremark="true" fusetype="档案"></upload>-->
+      <!--</div>-->
+    </div>
+
+    <div class="form-horizontal auto">
+      <div class="form-group">
+        <div style="text-align:right;">
+<!--          <button class="button_search" v-show="row.f_print_state === null" @click="ignitionSheet()">生成点火单</button>-->
+<!--          <button class="button_search" v-show="row.f_print_state === null" @click="schedule()">生成流程单</button>-->
+          <button v-if="config.meter_required" class="button_search" @click="confirm()" :disabled="!(essentialInfo && meterInfo )">确认
+          </button>
+          <button v-if="!config.meter_required" class="button_search" @click="confirm()" :disabled="!essentialInfo">确认
+          </button>
+          <button class="button_search" style="width: max-content" v-if="haslimit" @click="limitClick">限购配置</button>
+          <button class="button_clear" @click="cancel()">取消</button>
+        </div>
+      </div>
+    </div>
+    <limit-gas :show.sync="limitShow" :f_userinfo_id="data.baseinfo.base.f_userinfo_id"
+               @limit="getLimitGas"></limit-gas>
+    <modal :show.sync="showfiles" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
+      <article slot="modal-body">
+                <upload-idcard :blodid="blodid" isremark="true" @getidinfo="confirmIdCard" style="width:auto" fusetype="档案信息"></upload-idcard>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+  <high-meter-idcard :show.sync="highmetershow" v-if="highmetershow"  @photo-finish="newPhoto" v-on:confirminfo="confirmIdCard"></high-meter-idcard>
+  <user-flow-sheet :show="printflag" :bill-config='configs' :bill-data='billData' :data='newdata' v-on:toggle="close" @printok="printok" v-ref:printbill></user-flow-sheet>
+
+
+  </div>
+
+
+
+</template>
+
+<script>
+import UserPaperInfoTest from './../../../../components/FilesManageNew/UserPaperInfoTest'
+import {HttpResetClass} from 'vue-client'
+
+let getFileGen = async function (self, data) {
+  let http = new HttpResetClass()
+  let result = await http.load('POST', 'rs/logic/filemanage_getFilesDetail', data, {
+    resolveMsg: null,
+    rejectMsg: '用户详细信息加载失败，请重新选择，如果多次失败，请检查系统是否正常！'
+  })
+  if (result.data.meterinfo.length === 0) {
+    // 预备户可以不填表具信息 所以修正时如果没有表具信息 则初始化一个
+    result.data.meterinfo.push({
+      f_meternumber: '', f_metertitles: '', f_area_code: '', gasbrand: '', gasmodel: '', gasmodeltype: '',
+      pricetype: '', pricename: '', f_user_type: '', f_gasproperties: '', f_inputtor: '', f_position: '',
+      f_userfiles_address: '', f_usetype: '', f_usestate: '', f_aroundmeter: '', f_garbage_fee: '否', f_meter_base: '',
+      f_initial_base: '', f_gas_person: '', f_adjustable: '', f_detailprice: '', devicesinfo: []
+    })
+  }
+
+  self.data = result.data
+    // 更新地址
+    // 修改附件临时id为表档案id
+  self.blodid = self.data.baseinfo.base.f_userinfo_id
+  console.log('获取档案信息', self.data)
+  self.checkout()
+  console.log('附件id', self.blodid)
+}
+
+export default {
+  title: '综合信息',
+  props: ['f_filialeid', 'row', 'areainfo', 'haslimit', 'isedit', 'configs'],
+  components: {UserPaperInfoTest},
+  data () {
+    return {
+      config: {
+        adddevices: false,
+        // 预备户表具信息是否必填
+        meter_required: true,
+        f_building_suffix: '栋',
+        f_unit_suffix: '单元',
+        f_floor_suffix: '层',
+        f_room_suffix: '室'
+      },
+      headers: {'username': this.$login.f.name, 'blodid': '', 'fremarks': '', 'defname': '', 'fusetype': '档案信息'},
+      data: {
+        baseinfo: {
+          base: {
+            f_user_state: '',
+            f_print_dh: '否',
+            f_print_lc: '点火单',
+            f_credentials: '',
+            f_cost_type: '',
+            f_paper_type: '',
+            f_idnumber: ''
+          },
+          bank: {
+            f_bank_name: ''
+          }
+        },
+        addressinfo: {
+          id: '',
+          f_address: '',
+          f_address_state: ''
+        },
+        meterinfo: [{
+          f_user_type: '',
+          f_gasproperties: '',
+          devicesinfo: []
+        }],
+        devicesinfo: [],
+        address: {
+          id: '',
+          f_address: ''
+        }
+      },
+      printSheet: {
+        f_state: '有效',
+        f_print_state: '未打印',
+        f_type: '点火单',
+        f_orgid: this.$login.f.orgid ? this.$login.f.orgid : '',
+        f_orgname: this.$login.f.orgs ? this.$login.f.orgs : '',
+        f_depid: this.$login.f.depids ? this.$login.f.depids : '',
+        f_depname: this.$login.f.deps ? this.$login.f.deps : '',
+        f_operator: this.$login.f.name,
+        f_operatorid: this.$login.f.id
+      }, // 插入打印的模型
+      billData: {
+        url: 'rs/report/userignition',
+        bill: ''
+      },
+      oldAddress: {},
+      newdata: {},
+      highmetershow: false, // 高拍仪组件控制
+      showfiles: false,
+        // 子组件验证
+      essentialInfo: false,
+      meterInfo: false,
+      printflag: false,
+        // 地址相关属性
+      params: {
+        areas: [],
+        f_street: [],
+        f_residential_area: []
+      },
+
+        // 限购相关属性
+      limitShow: false,
+      limit_gas: null,
+      peopleNum: this.$appdata.getSingleValue('默认人口'),
+      blodid: '', // 附件的临时id
+      defaultMeterInfo: ''  // 默认的表具信息
+    }
+  },
+  async ready () {
+    this.blodid = '临时id' + Date.now()
+    console.log('ready，，，', this.row)
+    console.log('f_filialeid111，，，', this.f_filialeid)
+    try {
+      await this.$getConfig(this, 'FilesDetail')
+    } catch (error) {
+      console.log('捕获到异常', error)
+    }
+    console.log('FilesDetail的config:' + this.config)
+    if (this.row) { // 修改用户
+      await this.areaGen(this.row)
+    } else if (!this.row) { // 小区批量建档
+            // 将小区信息转化为综合信息的格式
+      await this.areainfoInUser(this.areainfo)
+    }
+  },
+  watch: {
+    async 'row' (val) {
+      console.log('观察row', val)
+      if (val) {
+        await this.areaGen(val)
+      } else {
+        await this.areainfoInUser(this.areainfo)
+      }
+    },
+    'areainfo' (val) {
+      console.log('小区观察。。', val)
+      if (val) {
+        this.$refs.meter.clearMeter()
+        this.blodid = '临时id' + Date.now()
+        this.areainfoInUser(val)
+      }
+    },
+    'essentialInfo' (val) {
+      console.log('观察到验证变化', val)
+    }
+  },
+  methods: {
+    close () {
+      this.printflag = false
+    },
+    printok () {
+      console.log('======================')
+      this.confirm()
+    },
+    downFiles (index) {
+      console.log('xxxxxxxxxxxxxxxxxxxxx')
+        // 下载不同文件
+      if (index == 0) {
+        let url = 'rs/report/userinstall'
+        this.billData.url = url
+        this.data.baseinfo.base.f_print_lc = '是'
+      } else {
+        let url = 'rs/report/userignition'
+        this.billData.url = url
+        this.data.baseinfo.base.f_print_dh = '是'
+      }
+      this.newdata = this.row
+      this.printflag = true
+    },
+    confirmIdCard (IdCardInfo) {
+      this.uploadPictures()
+      this.data.baseinfo.base.f_user_name = IdCardInfo.strName
+      this.data.baseinfo.base.f_idnumber = IdCardInfo.strID
+    },
+    uploadFiles () {
+      this.showfiles = !this.showfiles
+    },
+
+    uploadPictures () {
+      this.highmetershow = !this.highmetershow
+    },
+    savePrintSheet (res) {
+      console.log('保存单子:' + this.data.baseinfo.base.f_print_dh_stats)
+      if (!this.data.baseinfo.base.f_print_dh_stats) {
+        console.log('单子类型', this.data.baseinfo.base.f_print_dh)
+        this.printSheet.f_userinfo_id = res.f_userinfo_id
+        if (this.data.baseinfo.base.f_print_dh == '点火单') {
+          this.ignitionSheet()
+        }
+        if (this.data.baseinfo.base.f_print_dh == '流程单') {
+          this.schedule()
+        }
+      }
+    },
+    ignitionSheet () { // 点火单
+      this.printSheet.f_type = '点火单'
+      this.saveTablePrintSheet()
+    },
+    schedule () { // 流程单
+      this.printSheet.f_type = '流程单'
+      this.saveTablePrintSheet()
+    },
+    async saveTablePrintSheet () {
+      console.log(this.printSheet)
+      let check = await this.$resetpost('rs/logic/checkPrintUser', {data: {f_userinfo_id: this.printSheet.f_userinfo_id}}, {resolveMsg: '', rejectMsg: ''})
+      if (check.data.length === 0) {
+        await this.$resetpost('rs/logic/savePrintSheet', {data: {printData: this.printSheet}}, {resolveMsg: '', rejectMsg: ''})
+      }
+        // let check = await this.$resetpost('rs/logic/checkPrintUser', {data:{f_userinfo_id: this.printSheet.f_userinfo_id}}, {resolveMsg: '', rejectMsg: ''})
+        // if (check.data.length !== 0){
+        //     if(check.data[0].num !== 0){
+        //         // let msg = "您已生成了 \""+check.data[0].type+"\" ,请前往 [ 综合业务 ] --> [ 打印数据 ]页面查看";
+        //         // this.$showMessage(msg);
+        //         return ;
+        //     }
+        // }
+        // let expiration = await this.$resetpost('rs/logic/savePrintSheet', {
+        //     data:{printData:this.printSheet}
+        // }, {resolveMsg: '', rejectMsg: ''})
+        // console.log(expiration);
+        // if(expiration.data === 200){
+        //     this.$showMessage("您已成功生成 \""+this.printSheet.f_type+"\" ,请前往 [ 综合业务 ] --> [ 打印数据 ]页面查看")
+        // }
+    },
+    confirm () {
+      this.data.addressinfo.f_address = this.$refs.useressential.addressinfo.f_address
+      this.data.addressinfo.id = this.$refs.useressential.addressinfo.id
+      this.data.oldaddressinfo = this.oldAddress
+      this.data.inputcode = this.$refs.useressential.inputcode ? this.$refs.useressential.inputcode : '否'
+      this.data.limit_gas = this.limit_gas
+      if (this.f_filialeid && this.f_filialeid != '') {
+        this.data.f_filialeid = this.f_filialeid
+      } else {
+        this.data.f_filialeid = this.$login.f.orgid
+      }
+      if (this.row) {
+        this.data.baseinfo.base.version = this.row.version
+      }
+      this.$FileManageService.fileSave(this.$FileManageService.fileSaveBefore(this.data)).then((res) => {
+        this.savePrintSheet(res.data.result[0])
+        this.$dispatch('success')
+      }).catch((error) => {
+        if (error.status === 603) {
+          this.$error('重复提交')
+          return
+        }
+        this.$dispatch('error', '档案保存', this.data, error)
+      })
+    },
+    convertBase64ToBlob (base64String) {
+        // 将base64解码
+      var bytes = atob(base64String)
+        // var bytes = base64;
+      var bytesCode = new ArrayBuffer(bytes.length)
+        // 转换为类型化数组
+      var byteArray = new Uint8Array(bytesCode)
+
+        // 将base64转换为ascii码
+      for (var i = 0; i < bytes.length; i++) {
+        byteArray[i] = bytes.charCodeAt(i)
+      }
+        // 生成Blob对象（文件对象）
+      return new Blob([bytesCode], {type: 'image/jpeg'})
+    },
+    newPhoto (Imgbase64) {
+      //console.log('imgbase----->',Imgbase64)
+      let form = new FormData()
+      let xhr = new XMLHttpRequest()
+      let formDataBoundary = '----WebkitFormBoundary' + 'GaoPaiYi'
+      form.append('Content-Type', 'multipart/form-data;boundary=' + formDataBoundary)
+      form.append('file', this.convertBase64ToBlob(Imgbase64), 'GaoPaiYi.jpg')
+      xhr.open('POST', 'rs/file/uploadFile')
+
+      if (this.headers) {
+        console.log('this.blodid----->',this.blodid)
+        this.headers.blodid = this.blodid
+        for (var header in this.headers) {
+          xhr.setRequestHeader(header, encodeURIComponent(this.headers[header]))
+        }
+      }
+      xhr.send(form)
+      setTimeout(() => {
+        this.load(this)
+      }, 5000)
+    },
+    async areaGen (data) {
+      data.f_user_id = data.f_user_id + ''
+      await getFileGen(this, data)
+    },
+    cancel () {
+      this.$dispatch('clean', '取消档案修正', 'user-general-info', this.row)
+    },
+    checkout (val) {
+          // 对收到的综合信息进行校验（主要目的是为了防止下拉框没有默认值）
+          // 对综合用户基本信息进行校验
+
+          // 将oldAddress 置为空，
+      this.oldAddress = {}
+      this.data.baseinfo.base.f_user_state = this.data.baseinfo.base.f_user_state ? [this.data.baseinfo.base.f_user_state] : '正常'
+      this.data.baseinfo.base.f_credentials = this.data.baseinfo.base.f_credentials ? [this.data.baseinfo.base.f_credentials] : '身份证'
+      this.data.baseinfo.base.f_cost_type = this.data.baseinfo.base.f_cost_type ? [this.data.baseinfo.base.f_cost_type] : '现金缴费'
+      this.data.baseinfo.base.f_paper_type = this.data.baseinfo.base.f_paper_type ? [this.data.baseinfo.base.f_paper_type] : '国税发票'
+      this.data.baseinfo.bank.f_bank_name = this.data.baseinfo.bank.f_bank_name ? [this.data.baseinfo.bank.f_bank_name] : '中国银行'
+      this.data.baseinfo.base.f_people_num = this.data.baseinfo.base.f_people_num ? this.data.baseinfo.base.f_people_num : (this.peopleNum ? this.peopleNum : 0)
+
+      if (this.data.baseinfo.base.f_slice_area) {
+        this.data.baseinfo.base.f_slice_area = [this.data.baseinfo.base.f_slice_area]
+      } else {
+        this.data.baseinfo.base.f_slice_area = ''
+      }
+      this.oldAddress.f_address = this.data.addressinfo.f_address
+      this.oldAddress.id = this.data.addressinfo.id
+
+          // 地址信息
+          // loadStreetAndResGen(this)
+
+          // 对表具信息进行校验
+      this.data.meterinfo.forEach((row) => {
+        if (row.gasbrand) {
+          this.meterbrands.forEach((item) => {
+            if (item.label === row.gasbrand) {
+              row.gasbrand = [item.value]
+            }
+          })
+        } else {
+          row.gasbrand = ''
+        }
+        if (row.gasmodel && (row.gasbrand instanceof Array)) {
+          row.gasbrand[0].gasmodel.forEach((item) => {
+            if (item.label === (val === 'area' ? row.gasmodel : row.gasmodel + row.gasmodeltype)) {
+              row.gasmodel = [item.value]
+            }
+          })
+        } else {
+          row.gasmodel = ''
+        }
+        if (row.f_fire_state === '1') {
+          row.f_fire_state1 = true
+        } else if (row.f_fire_state === '0') {
+          row.f_fire_state1 = false
+        }
+        row.f_install_date = row.f_install_date ? row.f_install_date : null
+        row.f_gas_date = row.f_gas_date ? row.f_gas_date : null
+        row.f_changetube_date = row.f_changetube_date ? row.f_changetube_date : null
+        row.f_aroundmeter = row.f_aroundmeter ? [row.f_aroundmeter] : ''
+        row.f_garbage_fee = row.f_garbage_fee ? [row.f_garbage_fee] : '否'
+        row.f_valve_state = row.f_valve_state ? [row.f_valve_state] : '开阀'
+        row.f_inputtor = row.f_inputtor ? [row.f_inputtor] : ''
+        row.f_position = row.f_position ? row.f_position : ''
+
+        row.f_user_type = row.f_user_type ? [row.f_user_type] : ''
+        row.f_gasproperties = row.f_gasproperties ? [row.f_gasproperties] : ''
+        row.pricetype = row.pricetype ? [row.pricetype] : ''
+
+        if (row.pricename) {
+          let names = this.getPricenames(row.f_user_type,
+                    row.f_gasproperties,
+                    row.pricetype)
+          if (names.length > 0) {
+            names.forEach((item) => {
+              if (item.label === row.pricename) {
+                row.pricename = [item.value]
+                row.f_detailprice = this.$CommonService.getShowPriceDetail(item.value.detailprice)
+              }
+            })
+          } else {
+            row.pricename = ''
+          }
+        } else {
+          row.pricename = ''
+        }
+
+        if (row.f_adjustable) {
+          this.adjustables.forEach((item) => {
+            if (item.label === row.f_adjustable) {
+              row.f_adjustable = [item.value]
+            }
+          })
+        } else {
+          row.f_adjustable = ''
+        }
+      })
+          // console.log('5555555555', this.data.meterinfo)
+          // 对设备进行校验
+          // this.data.devicesinfo.forEach((row) => {
+          //     row.f_devices_type = row.f_devices_type ? [row.f_devices_type] : ''
+          // })
+    },
+    getPricenames (f_user_type, f_gasproperties, f_price_type) {
+      let rs = []
+      if (f_user_type.length === 1 && f_gasproperties.length === 1 && f_price_type.length === 1) {
+        rs = this.$GetSaleParam.getPrice({
+          f_user_type: f_user_type[0],
+          f_gasproperties: f_gasproperties[0],
+          f_price_type: f_price_type[0],
+          filter: this.f_filialeid
+        })
+      }
+      return rs
+    },
+        // 将小区信息转化为综合信息的格式
+    async areainfoInUser (areainfo) {
+            // this.nextTick(() => {
+            //
+            // })
+            // await this.$getConfig(this, 'UserAddress')
+      this.data = {
+        baseinfo: {
+          base: {
+            f_user_state: '预备',
+            f_print_dh: '',
+            f_print_lc: '否',
+            f_is_mgq: '',
+            f_slice_area: '', // 片区
+                  // 附件表临时id
+            blodid: this.blodid,
+                  // 用户姓名
+            f_user_name: '',
+                  // 用户电话
+            f_user_phone: '',
+            f_people_num: 0,
+                  // 备用电话
+            f_rent_phone: '',
+            f_credentials: '身份证',
+            f_cost_type: '',
+            f_address: '',
+            addressid: '',
+            f_idnumber: ''
+          },
+          bank: {}
+        },
+        addressinfo: {
+                // 详细地址
+          f_address: '',
+          id: ''
+        },
+        meterinfo: [{
+                // 表号
+          f_meternumber: '',
+          f_metertitles: '',
+          f_area_code: '',
+                // 气表品牌
+          gasbrand: '',
+                // 气表型号
+          gasmodel: '',
+                // 气表类型
+          gasmodeltype: '',
+          pricetype: '', // 气价类型
+          pricename: '', // 气价名称
+          f_user_type: '', // 用户类型
+          f_gasproperties: '', // 用气性质
+          f_inputtor: '',
+                // 安装位置
+          f_position: '',
+                // 安装地址
+          f_userfiles_address: '',
+                // 使用类型
+          f_usetype: '',
+                // 使用状态
+          f_usestate: '',
+                // 左右表
+          f_aroundmeter: '',
+          f_garbage_fee: '否',
+          f_meter_base: '',
+          f_initial_base: '',
+                // 通气人
+          f_gas_person: '',
+          f_adjustable: '', // 调压箱
+          f_detailprice: '',  // 价格详情显示
+          devicesinfo: [] // 设备信息
+        }],
+        devicesinfo: []
+      }
+            // 若有id，则表示该地址是更新操作
+            /* if (areainfo.id) {
+                this.data.addressinfo.id = areainfo.id
+            }
+            // 改地址是 只有表没有户信息
+            if (areainfo.meter) {
+                Object.assign(this.data.meterinfo[0], this.data.meterinfo[0], areainfo.meter)
+            }
+            if (areainfo.user) {
+                Object.assign(this.data.baseinfo.base, this.data.baseinfo.base, areainfo.user)
+            } */
+
+      this.checkout('area')
+    },
+    limitClick () {
+      this.limitShow = true
+    },
+    getLimitGas (val) {
+      this.limit_gas = val
+    },
+    clearinfo () {
+      this.blodid = '临时id' + Date.now()
+      this.areainfoInUser(this.areainfo)
+    }
+  },
+  computed: {
+    meterbrands () {
+      return this.$GetSaleParam.getGasbrand()
+    },
+    adjustables () {
+      return this.$GetSaleParam.getAdjustable()
+    },
+    getMeterBooks () {
+      return this.$GetSaleParam.getMeterBooks()
+    }
+  },
+  events: {
+      // 设置表具气价等默认值
+    defaultOtheret (row) {
+      if (!this.isedit) {
+        let temp = {
+          gasmodel: row.f_meter_style,
+          gasbrand: row.f_meter_brand,
+          gasmodeltype: row.f_meter_style,
+          pricetype: row.f_price_type,
+          pricename: row.f_price_name,
+          f_user_type: row.f_user_type,
+          f_gasproperties: row.f_gasproperties,
+          f_position: row.f_position,
+          f_inputtor: row.f_inputtor,
+          f_meter_book_num: row.f_meter_book,
+          f_adjustable: row.f_adjustable_id,
+          f_hand_month: [row.f_hand_month]
+        }
+        if (!(temp.f_position instanceof Array)) {
+          temp.f_position = [temp.f_position]
+        }
+        Object.assign(this.data.meterinfo[0], this.data.meterinfo[0], temp)
+
+        this.checkout('area')
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+
+
+</style>

package/src/filiale/shanxian/sale.js

@@ -22,7 +22,8 @@ export default function () {
   Vue.component('file-meter-info', (resolve) => { require(['./components/FilesManage/MeterinfoTest'], resolve) })
 // 用户综合信息(有单户建档确认的页面)
   Vue.component('file-user-general-info', (resolve) => { require(['./components/FilesManage/UserGeneralInfoTest'], resolve) })
-
+// 用户综合信息
+  Vue.component('file-user-general-info-new', (resolve) => { require(['./components/FilesManageNew/UserGeneralInfoTest'], resolve) })
   Vue.component('insurance-manage', (resolve) => { require(['./components/revenue/InsuranceManage'], resolve) })
   Vue.component('insurance-lists', (resolve) => { require(['./components/revenue/InsuranceList'], resolve) })
   Vue.component('insurance-add', (resolve) => { require(['./components/revenue/InsuranceAdd'], 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)
     })