safecheck-client 3.0.35-56 → 3.0.35-58

package/src/components/pc/SecurityCheckLedger.vue

@@ -56,19 +56,25 @@
               <th>
                 <nobr>距离下周期时间（天）</nobr>
               </th>
+              <th>
+                <nobr>操作</nobr>
+              </th>
             </tr>
           </template>
           <template partial='body'>
-            <td style="text-align: center">{{row.f_residential_area}}</td>
-            <td style="text-align: center">{{row.area_num}}</td>
-            <td style="text-align: center">{{row.f_plan_name}}</td>
-            <td style="text-align: center">{{row.plan_num}}</td>
-            <td style="text-align: center">{{row.f_issue_time}}</td>
-            <td style="text-align: center">{{row.first_check_date}}</td>
-            <td style="text-align: center">{{row.f_use_end_time}}</td>
-            <td style="text-align: center">{{row.zq_value}}</td>
-            <td style="text-align: center">{{row.dw_value}}</td>
-            <td :style="{ 'text-align': 'center', color: row.difference_day <= 100 ? 'red' : '' }">{{ row.difference_day }}</td>
+            <td style="text-align: center" @click="$parent.$parent.$parent.showList(row)">{{row.f_residential_area}}</td>
+            <td style="text-align: center" @click="$parent.$parent.$parent.showList(row)">{{row.area_num}}</td>
+            <td style="text-align: center" @click="$parent.$parent.$parent.showList(row)">{{row.f_plan_name}}</td>
+            <td style="text-align: center" @click="$parent.$parent.$parent.showList(row)">{{row.plan_num}}</td>
+            <td style="text-align: center" @click="$parent.$parent.$parent.showList(row)">{{row.f_issue_time}}</td>
+            <td style="text-align: center" @click="$parent.$parent.$parent.showList(row)">{{row.first_check_date}}</td>
+            <td style="text-align: center " @click="$parent.$parent.$parent.showList(row)">{{row.f_use_end_time}}</td>
+            <td style="text-align: center" @click="$parent.$parent.$parent.showList(row)">{{row.zq_value}}</td>
+            <td style="text-align: center" @click="$parent.$parent.$parent.showList(row)">{{row.dw_value}}</td>
+            <td :style="{ 'text-align': 'center', color: row.difference_day <= 100 ? 'red' : '' }" @click="$parent.$parent.$parent.showList(row)">{{ row.difference_day }}</td>
+            <td style="text-align: center">
+              <button class="button_spacing button_search" @click="$parent.$parent.$parent.showUser(row)">计划下发</button>
+            </td>
           </template>
         </data-grid>
       </criteria-paged>
@@ -109,6 +115,10 @@ export default {
         row.val = row
         this.$parent.selected(row)
       },
+      showUser(row){
+        row.val = row
+        this.$parent.selected2(row)
+      },
       selfSearch(args) {
         this.model.search(args.condition, args.model, args.condValue)
       }

package/src/components/pc/SecurityCheckManage.vue

@@ -1,11 +1,14 @@
 <template>
   <div id="unit" class="flex-row" v-if="listpage" >
-    <div :class="{'basic-main':((!isdetail) && (!usershow)),'binary-left':isdetail||usershow}" >
-      <security-check-ledger1 v-ref:list :row="row" @select-changed="selected"></security-check-ledger1>
+    <div :class="{'basic-main':((!isdetail) && (!usershow) && (!isdetail2)),'binary-left':isdetail||usershow||isdetail2}" >
+      <security-check-ledger1 v-ref:list :row="row"></security-check-ledger1>
     </div>
     <div class="binary-right" style="overflow-y: scroll" v-if="isdetail">
       <security-check-ledger2 :checkrow="checkrow" ></security-check-ledger2>
     </div>
+    <div class="binary-right" style="overflow-y: scroll" v-if="isdetail2">
+      <security-check-ledger3 :checkrow="checkrow" ></security-check-ledger3>
+    </div>
   </div>
 </template>
 <script>
@@ -28,6 +31,7 @@ export default {
       checkrow: null,
       parentData: '',
       isdetail: false,
+      isdetail2: false,
       gasPriceShow: false,
       usershow: false,
       // 控制气价信息界面和变更操作记录界面的展示
@@ -47,15 +51,18 @@ export default {
       this.f_userinfo_id = val.f_userinfo_id
     },
     selected (obj) {
-      //tag)
-      //tag)
       this.checkrow = obj.val
       this.isdetail = true
+      this.isdetail2 = false
       this.usershow = false
       this.listpage = true
     },
     selected2 (obj) {
-
+      this.checkrow = obj.val
+      this.isdetail = false
+      this.isdetail2 = true
+      this.usershow = false
+      this.listpage = true
     },
     refresh () {
       this.row = null

package/src/components/pc/SecurityCheckUser.vue

@@ -0,0 +1,440 @@
+<template>
+  <div class="flex">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">用户名称</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_user_name" placeholder='用户名称'
+                     condition="ui.f_user_name like '%{}%'">
+            </div>
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">用户编号</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code"
+                     placeholder='用户编号' condition="ui.f_userinfo_code like '%{}%'">
+            </div>
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">用户地址</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code"
+                     placeholder='用户地址' condition="ua.f_address like '%{}%'">
+            </div>
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">用户类型:</label>
+              <v-select class="select select_list" :value.sync="model.f_user_type" v-model="model.f_user_type"
+                        :options='$parent.$parent.userTypes' placeholder='请选择' condition="uf.f_user_type='{}'" :search="false"
+                        close-on-select value-single>
+              </v-select>
+            </div>
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">用户状态:</label>
+              <v-select class="select select_list" :value.sync="model.f_user_state" v-model="model.f_user_state"
+                        :options='$parent.$parent.userStates' placeholder='请选择' condition="ui.f_user_state='{}'" :search="false"
+                        close-on-select value-single>
+              </v-select>
+            </div>
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">用气性质:</label>
+              <v-select class="select select_list" :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
+                        :options='$parent.$parent.gasproperties' placeholder='请选择' condition="uf.f_gasproperties='{}'"
+                        :search="false" close-on-select value-single>
+              </v-select>
+            </div>
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">开户起始:</label>
+              <datepicker placeholder='请选择' style="width:60%" :disabled-days-of-week="[]" :format="'yyyy-MM-dd'"
+                          :show-rest-button="reset" :value.sync="model.f_startfile_time" v-model="model.f_startfile_time"
+                          condition="ui.f_createfile_date >= '{} 00:00:00'">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">开户截止:</label>
+              <datepicker placeholder='请选择' :disabled-days-of-week="[]" style="width:60%" :format="'yyyy-MM-dd'"
+                          :show-rest-button="reset" :value.sync="model.f_endfile_time" v-model="model.f_endfile_time"
+                          condition="ui.f_createfile_date <= '{} 23:59:59'">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">派发情况:</label>
+              <v-select class="select select_list" :value.sync="model.yearCheck" v-model="model.yearCheck"
+                        :options='$parent.$parent.yearCheckList' placeholder='请选择' condition="{}" :search="false"
+                        close-on-select value-single>
+              </v-select>
+            </div>
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">安检起始:</label>
+              <datepicker placeholder='请选择' style="width:60%" :disabled-days-of-week="[]" :format="'yyyy-MM-dd'"
+                          :show-rest-button="reset" :value.sync="model.f_start_time" v-model="model.f_start_time">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">安检截止:</label>
+              <datepicker placeholder='请选择' :disabled-days-of-week="[]" style="width:60%" :format="'yyyy-MM-dd'"
+                          :show-rest-button="reset" :value.sync="model.f_end_time" v-model="model.f_end_time">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">安检状态:</label>
+              <v-select class="select select_list" :value.sync="model.f_last_check_state"
+                        v-model="model.f_last_check_state" :options='$parent.$parent.entry_status' placeholder='请选择'
+                        :search="false" close-on-select value-single>
+              </v-select>
+            </div>
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">安检时间:</label>
+              <input type="number" class="input_search" v-model="model.month" style="width: 60%"
+                     placeholder="距上次安检时间(月)">
+            </div>
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">入户次数</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code"
+                     placeholder='入户次数' condition="f_num = '{}'">
+            </div>
+          </div>
+          <div class="row">
+            <div class="form-group col-sm-2 button-range">
+              <button class="button_search" style="margin-right: 10px" @click="search()" v-el:cba>查询</button>
+              <button class="button_search" style="margin-right: 10px" @click="$parent.$parent.showCreateCheckPlan()"
+                      v-el:cba>生成并下发</button>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" class="table_sy" partial='list' v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>
+              <nobr>
+                <input type="checkbox" onClick="event.cancelBubble = true" :checked="$parent.$parent.$parent.checkAll"
+                       @change="$parent.$parent.$parent.setCheckAll()" /> 全选
+              </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>
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr>
+            <td style="text-align: center;white-space:nowrap;">
+              <input v-if="!row.f_plan_id" type="checkbox" onClick="event.cancelBubble = true"
+                     :checked="$parent.$parent.$parent.isChecked(row.id)"
+                     @change="$parent.$parent.$parent.setCheckes(row.id)" />
+            </td>
+            <td style="text-align:center"><span>{{ row.f_userinfo_code }}</span></td>
+            <td style="text-align:center"><span>{{ row.f_user_name }}</span></td>
+            <td style="text-align:center"><span>{{ row.f_user_type }}</span></td>
+            <td style="text-align:center"><span>{{ row.f_user_phone }}</span></td>
+            <td style="text-align:center"><span>{{ row.f_meter_classify }}</span></td>
+            <td style="text-align:center"><span>{{ row.f_last_check_date }}</span></td>
+            <td style="text-align:center"><span>{{ row.f_address }}</span></td>
+          </tr>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+    <modal :show.sync="showCreatePlan" v-ref:modal1 :width="'50%'" :backdrop="false">
+      <div slot="modal-header" class="modal-header">
+        <h4 class="modal-title">
+          新建计划
+        </h4>
+      </div>
+      <div slot="modal-body" class="modal-body">
+        <div class="row">
+          <div class="form-group col-sm-4">
+            <label class="font_normal_body">计划名称:</label>
+            <input type="text" class="input_search" v-model="createPlan.f_plan_name" style="width: 60%"
+                   placeholder="请选择" />
+          </div>
+          <div class="form-group col-sm-4">
+            <label class="font_normal_body">计划年份:</label>
+            <v-select class="select select_list" :value.sync="createPlan.f_plan_year" v-model="createPlan.f_plan_year"
+                      :search="false" :options='yearList' placeholder='请选择' close-on-select value-single>
+            </v-select>
+          </div>
+          <div class="form-group col-sm-4">
+            <label class="font_normal_body">计划月份:</label>
+            <v-select class="select select_list" :value.sync="createPlan.f_plan_month" v-model="createPlan.f_plan_month"
+                      :search="false" :options='monthList' placeholder='请选择' close-on-select value-single>
+            </v-select>
+          </div>
+          <div class="form-group col-sm-4">
+            <label class="font_normal_body">是否共享:</label>
+            <v-select class="select select_list" :search="false" :value.sync="createPlan.isShare"
+                      v-model="createPlan.isShare" :options='isAndNot' placeholder='请选择' close-on-select value-single>
+            </v-select>
+          </div>
+          <div class="form-group col-sm-4" v-show="createPlan.isShare == '否'">
+            <label class="font_normal_body">安&ensp;检&ensp;员:</label>
+            <v-select class="select select_list" :value.sync="createPlan.checker" v-model="createPlan.checker"
+                      :options='checker' placeholder='请选择' close-on-select value-single>
+            </v-select>
+          </div>
+
+          <div class="form-group col-sm-4">
+            <label class="font_normal_body">安检类型:</label>
+            <v-select class="select select_list" :value.sync="createPlan.f_safecheck_type"
+                      v-model="createPlan.f_safecheck_type" :search="false" :options='ntoway' placeholder='请选择' close-on-select
+                      value-single>
+            </v-select>
+          </div>
+          <!--          <div class="form-group col-sm-4" v-show="createPlan.isShare=='是'">-->
+          <!--            <label class="font_normal_body">安&ensp;检&ensp;员:</label>-->
+          <!--            <v-select-->
+          <!--              class="select select_list"-->
+          <!--              :value.sync="createPlan.checkers"-->
+          <!--              v-model="createPlan.checkers"-->
+          <!--              :options='checker'-->
+          <!--              placeholder='请选择'-->
+          <!--              :multiple="true"-->
+          <!--            >-->
+          <!--            </v-select>-->
+          <!--          </div>-->
+        </div>
+      </div>
+      <div slot="modal-footer" class="modal-footer" style="text-align: center">
+        <button class="button_search" style="margin-right: 15px" @click="addNewPlan()">创建计划</button>
+        <button class="button_search" @click="cancel">取消</button>
+      </div>
+    </modal>
+    <work-busy :is-busy="isBusy"></work-busy>
+
+  </div>
+</template>
+
+<script>
+import { HttpResetClass, PagedList } from 'vue-client'
+import Vue from "vue";
+import * as Util from "./../Util";
+export default {
+  title: '安检情况明细',
+  data() {
+    return {
+      checkAll: false,
+      searchCondition: '',
+      isBusy:false,
+      createPlan: {
+        f_plan_name: '',
+        f_plan_year: '',
+        checkers: [],
+        f_plan_month: '',
+        isShare: '否',
+        f_issued: '否',
+        f_checker_id: null,
+        checker: {},
+        f_checker: null,
+        f_safecheck_type: '',
+      },
+      yearList: [{ label: 2020, value: 2020 }, { label: 2021, value: 2021 }, { label: 2022, value: 2022 }, { label: 2023, value: 2023 }, { label: 2024, value: 2024 }, { label: 2025, value: 2025 }, { label: 2026, value: 2026 }, { label: 2027, value: 2027 }, { label: 2028, value: 2028 }, { label: 2029, value: 2029 }, { label: 2030, value: 2030 }],
+      monthList: [{ label: "1", value: 1 }, { label: "2", value: 2 }, { label: "3", value: 3 }, { label: "4", value: 4 }, { label: "5", value: 5 }, { label: "6", value: 6 }, { label: "7", value: 7 }, { label: "8", value: 8 }, { label: "9", value: 9 }, { label: "10", value: 10 }, { label: "11", value: 11 }, { label: "12", value: 12 }],
+      isAndNot: [{ label: '是', value: '是' }, { label: '否', value: '否' }],
+      checker: [],
+      checkes: [],
+      showCreatePlan: false,
+      entry_status: this.$appdata.getParam('安检状态') ? [{ label: '全部', value: '' }, ...this.$appdata.getParam('安检状态')] : [{ label: '全部', value: '' }],
+      yearCheckList: [{ label: "全部", value: "" }, { label: "已在计划中", value: "ua.f_plan_id is not null" }, { label: "未在计划中", value: "ua.f_plan_id is null" }],
+      gasproperties: this.$appdata.getParam('用气性质') ? [{ label: '全部', value: '' }, ...this.$appdata.getParam('用气性质')] : [{ label: '全部', value: '' }],
+      userStates: this.$appdata.getParam('安检用户状态') ? [{ label: '全部', value: '' }, ...this.$appdata.getParam('安检用户状态')] : [{ label: '全部', value: '' }],
+      userTypes: this.$appdata.getParam('用户类型') ? [{ label: '全部', value: '' }, ...this.$appdata.getParam('用户类型')] : [{ label: '全部', value: '' }],
+      model: new PagedList('rs/sql/FetchUserFileByOrgNoRuHuSXQ', 50, { orderitem: '"f_residential_area,f_building,f_unit,f_floor,f_room"' }),
+    }
+  },
+  props: ['checkrow'],
+  async ready() {
+    this.search()
+    await this.searchChecker()
+  },
+  computed: {
+    ntoway() {
+      return this.$appdata.getParam('安检类型')
+    }
+  },
+  methods: {
+    isChecked(v) {
+      // 如果全选，不在的按选中算，否则，在的按选中算
+      if (this.checkAll) {
+        return this.checkes.indexOf(v) == -1
+      } else {
+        return this.checkes.indexOf(v) != -1
+      }
+    },
+    setCheckes(id) {
+      let index = this.checkes.indexOf(id)
+      if (index < 0) {
+        this.checkes.push(id)
+      } else {
+        this.checkes.splice(index, 1)
+      }
+    },
+    async searchChecker() {
+      let res = await new HttpResetClass().load('POST', '/rs/search', {
+        source: `root.getResourceById($${this.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
+        userid: this.$login.f.id
+      }, { resolveMsg: null, rejectMsg: null })
+      let arr = []
+      res.data.forEach((resRow) => {
+        if (!arr.includes(resRow.name) && resRow.state == '在职') {
+          arr.push(resRow.name)
+          this.checker.push({ label: resRow.name, value: resRow })
+        }
+      })
+    },
+    setCheckAll() {
+      this.checkAll = !this.checkAll
+      this.checkes = []
+    },
+    showCreateCheckPlan() {
+      if (this.model.rows.length == 0) {
+        Vue.showMessage("未检测到列表中有用户！")
+        return
+      }
+      if (!this.checkAll && this.checkes.length == 0) {
+        Vue.showMessage("请先勾选用户！")
+        return
+      }
+      this.showCreatePlan = true
+    },
+    validationCreatePlan() {
+      if (!this.createPlan.f_plan_name) {
+        Vue.showMessage("请输入安检计划名称！")
+        return false
+      }
+      if (!this.createPlan.f_plan_year) {
+        Vue.showMessage("请选择安检年份！")
+        return false
+      }
+      if (!this.createPlan.f_plan_month) {
+        Vue.showMessage("请选择安检月份！")
+        return false
+      }
+      if (this.createPlan.isShare == "否") {
+        if (JSON.stringify(this.createPlan.checker) == '{}') {
+          Vue.showMessage("请选择安检人员！")
+          return false
+        }
+      } else {
+        this.createPlan.f_checker = ''
+      }
+      if (!this.createPlan.f_safecheck_type) {
+        Vue.showMessage("请选择安检类型！")
+        return false
+      }
+      return true
+    },
+    async addNewPlan() {
+      if (!this.validationCreatePlan()) {
+        return
+      }
+      this.isBusy = true
+      let res = await new HttpResetClass().load("POST", "/rs/sql/getCheckplan", { data: { condition: "f_plan_name='" + this.createPlan.f_plan_name + "'", sortfield: 'f_create_time desc' } })
+      if (res.data.length > 0) {
+        Vue.showMessage("计划名称不能重复！")
+        this.isBusy = false
+        return
+      }
+      if (this.createPlan.isShare == "是") {
+        if (this.createPlan.checkers.length > 0) {
+          this.createPlan.checkers.forEach((value) => {
+            this.createPlan.f_checkerstr += `${value},`
+          })
+          this.createPlan.f_checkerstr = this.createPlan.f_checkerstr.slice(0, -1)
+        }
+        this.createPlan.f_checker_id = null
+        this.createPlan.f_checker = null
+      } else {
+        this.createPlan.f_checker_id = this.createPlan.checker.id
+        this.createPlan.f_checker = this.createPlan.checker.name
+      }
+      this.createPlan.f_plan_type = '预约计划'
+      this.createPlan.f_subcompany = this.$login.f.orgs
+      this.createPlan.f_filialeid = this.$login.f.orgid
+      this.createPlan.f_create_operator = this.$login.f.name
+      this.createPlan.f_create_time = Util.toStandardTimeString()
+      this.createPlan.checkAll = this.checkAll
+      this.createPlan.searchCondition = this.searchCondition
+      this.createPlan.checkes = this.checkes.join()
+
+      new HttpResetClass().load('POST', "/rs/logic/createCheckPlanAndAddPlanItem", {
+        data: this.createPlan
+      }, { resolveMsg: '新建计划成功！', rejectMsg: '新建计划失败！' })
+        .then(() => {
+          this.checkAll = false
+          this.checkes = []
+          this.showCreatePlan = false
+          this.$showMessage('创建计划成功')
+          this.isBusy = false
+        }).catch(() => {
+          this.checkAll = false
+          this.checkes = []
+          this.showCreatePlan = false
+          this.$showMessage('创建计划失败')
+          this.isBusy = false
+      })
+      this.createPlan = {
+        f_plan_name: '',
+        f_plan_year: '',
+        f_plan_month: '',
+        isShare: '否',
+        f_issued: '否',
+        f_checker_id: null,
+        checker: {},
+        checkers: [],
+        f_checker: null,
+        f_checkerstr: null,
+        f_safecheck_type: '',
+        f_create_operator: ''
+      }
+    },
+    cancel() {
+      this.showCreatePlan = false
+      this.checkes = []
+      this.createPlan = {
+        f_plan_name: '',
+        f_plan_year: '',
+        f_plan_month: '',
+        isShare: '否',
+        f_issued: '否',
+        f_checker_id: null,
+        checker: {},
+        f_checker: null,
+        f_safecheck_type: '',
+      }
+    },
+    search() {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    async selfSearch(args) {
+      if (!this.checkrow) {
+        return
+      }
+      let condition = ''
+      condition = args.condition += `and area.f_residential_area = '${this.checkrow.f_residential_area}'`
+      this.searchCondition = condition
+      this.model.search(condition)
+    },
+  },
+  watch: {
+    'checkrow'() {
+      this.search()
+    }
+  }
+}
+</script>

package/src/components/userfile/InfoModifyModal.vue

@@ -98,6 +98,7 @@
                 f_userinfo_code:this.userinfome.baseinfo.base.f_userinfo_code,
                 f_user_name:this.userinfome.baseinfo.base.f_user_name,
                 f_user_phone:this.userinfome.baseinfo.base.f_user_phone,
+                f_zuhu_phone:this.userinfome.baseinfo.base.f_zuhu_phone,
                 f_remark:this.userinfome.baseinfo.base.f_remark,
                 f_used_name:this.userinfome.baseinfo.base.f_used_name,
                 f_rent_phone:this.userinfome.baseinfo.base.f_rent_phone,

package/src/components/userfile/UserInfoAudit.vue

@@ -214,6 +214,8 @@ export default {
         let userinfoms=Object.assign({},this.userInformation.baseinfo.base)
         //userinfoms.f_user_name=row.f_user_name
         userinfoms.f_operator_record=row.f_modifier
+        userinfoms.f_user_phone=row.f_user_phone
+        userinfoms.f_zuhu_phone=row.f_zuhu_phone
         userinfoms.f_operatorid_record=row.f_modifier_id
         //userinfoms.f_remark=row.f_remark
         //tag

package/src/components/userfile/UserinfoModify.vue

@@ -17,6 +17,12 @@
       <input type="text" class="form-control" v-model="content.f_user_phone" readonly="true">
     </div>
   </div>
+  <div class="form-group">
+    <label  class="col-sm-4">租户电话:</label>
+    <div class="col-sm-6">
+      <input type="text" class="form-control" v-model="content.f_zuhu_phone" readonly="true">
+    </div>
+  </div>
 <!--  <div class="form-group">-->
 <!--    <label  class="col-sm-4">备用电话:</label>-->
 <!--    <div class="col-sm-6">-->

package/src/filiale/minsheng/android/PhoneUpUserinfo.vue

@@ -272,7 +272,8 @@
         </div>
         <div class="row auto" style="margin: 5px 0" v-if="userinfo.meterinfo[0].f_bqf_state == '关阀'">
           <label class="righttxt">关阀原因:</label>
-          <v-select class="rightipt" :value.sync="userinfo.meterinfo[0].bqf_states_reason"
+          <v-select class="rightipt"
+                    :value.sync="userinfo.meterinfo[0].bqf_states_reason"
                     v-model="userinfo.meterinfo[0].bqf_states_reason"
                     placeholder='请选择'
                     :width='wid'
@@ -281,6 +282,18 @@
                     close-on-select value-single></v-select>
           <input type="text" style="float: left;margin-left: 31%;" v-if="userinfo.meterinfo[0].bqf_states_reason == '其他'" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_bqf_states_reason"/>
         </div>
+        <div class="row auto" style="margin: 5px 0" v-if="userinfo.meterinfo[0].f_bqf_state == '开阀'">
+          <label class="righttxt">开阀原因:</label>
+          <v-select class="rightipt"
+                    :value.sync="userinfo.meterinfo[0].bqf_states_reason"
+                    v-model="userinfo.meterinfo[0].bqf_states_reason"
+                    placeholder='请选择'
+                    :width='wid'
+                    readonly
+                    :options="kf_states_reasons"
+                    close-on-select value-single></v-select>
+          <input type="text" style="float: left;margin-left: 31%;" v-if="userinfo.meterinfo[0].bqf_states_reason == '其他'" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_bqf_states_reason"/>
+        </div>
         <!--        <div class="row auto" style="margin: 5px 0">
                   <div style="display: flex;justify-content: center;">
                     <button v-if="userinfo.meterinfo[0].f_meter_classify=='机表'" class="col-sm-3 btn btn-primary" @click="upUserState()">机表关阀停用</button>
@@ -418,6 +431,7 @@ export default {
       cityTypes: [{label: '市区', value: '市区'}, {label: '城镇', value: '城镇'}],
       bqf_states: [{label: '开阀', value: '开阀'}, {label: '关阀', value: '关阀'}],
       bqf_states_reasons: Vue.$appdata.getParam('关阀原因'),
+      kf_states_reasons: Vue.$appdata.getParam('开阀原因'),
       pcds: [],
       streets: [],
       update: false,
@@ -727,6 +741,9 @@ export default {
           if(this.userinfo.meterinfo[0].f_bqf_state === '关阀'){
             this.userinfo_old.meterinfo[0].f_off_valve_reason = this.userinfo.meterinfo[0].bqf_states_reason !== '其他' ? this.userinfo.meterinfo[0].bqf_states_reason : this.userinfo.meterinfo[0].f_bqf_states_reason
           }
+          if(this.userinfo.meterinfo[0].f_bqf_state === '开阀'){
+            this.userinfo_old.meterinfo[0].f_off_valve_reason = this.userinfo.meterinfo[0].bqf_states_reason !== '其他' ? this.userinfo.meterinfo[0].bqf_states_reason : this.userinfo.meterinfo[0].f_bqf_states_reason
+          }
           this.userinfo_old.meterinfo[0].f_if_direct = this.userinfo.meterinfo[0].f_if_direct
           userinfoms.userfiles = []
           this.userinfo_old.meterinfo[0].devicesinfo = this.model