safecheck-client 3.1.1-gaomi-7 → 4.0.1

package/src/components/android/PlanChooserAndroid.vue

@@ -0,0 +1,133 @@
+<template>
+  <div>
+    <form class="form-inline">
+      <div class="row form-group">
+        <div class="col-sm-4">
+          <label class="font_normal_body" for="c_plan_year">年份:</label>
+          <v-select id="c_plan_year" :value.sync="c_plan_year"
+                    class="select_list select"
+                    style="width: 60%"
+                    :options='c_year_list' close-on-select clear-button></v-select>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body" for="c_plan_month">月份:</label>
+          <v-select id="c_plan_month" :value.sync="c_plan_month"
+                    class="select_list select"
+                    style="width: 60%"
+                    :options='c_month_list' close-on-select clear-button></v-select>
+        </div>
+        <div class="col-sm-4">
+          <label class="font_normal_body">人员:</label>
+          <v-select id="checker" :value.sync="model.f_checker_id" placeholder='安检员'
+                    :value-single="true"
+                    class="select_list select"
+                    style="width: 60%"
+                    :options='checkers' close-on-select clear-button> </v-select>
+        </div>
+      </div>
+      <div style="width: 65%;height:100%; display: inline-block">
+      </div>
+      <button type="button" class="button_search" @click="search()">查询</button>
+    </form>
+    <hr>
+    <table class="table table_sy">
+      <thead>
+      <tr>
+        <th></th>
+        <th>计划名称</th>
+        <th>计划类型</th>
+      </tr>
+      </thead>
+      <tbody>
+      <tr v-for="row in model.rows">
+        <td @click="select(row, $index)">{{row.selected ? '☆' : ''}}</td>
+        <td @click="select(row, $index)">{{row.f_plan_name}}</td>
+        <td @click="select(row, $index)">{{row.f_safecheck_type}}</td>
+      </tr>
+      </tbody>
+    </table>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  import Vue from 'vue'
+  import co from 'co'
+  import { HttpResetClass } from 'vue-client'
+
+  let select = function * (self) {
+    let http = new HttpResetClass()
+    http.load('POST', `${self.$androidUtil.getProxyUrl()}/rs/search`, {
+      source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1))',
+      userid: Vue.user.id
+    }, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      console.log('获取安检员', res)
+      res.data.forEach((checker)=>{
+        self.checkers.push({label:checker.name,value:checker.id})
+      })
+      self.checkers.push({label:'全部',value:''})
+    })
+  }
+
+
+  export default {
+    title: '选择安检计划',
+    props: ['f'],
+    data() {
+      let options = []
+      let year = (new Date()).getFullYear()
+      for(let i = year - 8; i <= year +1; i++ )
+        options.push({label: i+'', value: i+''})
+      let moptions = []
+      for(let i=1; i<=12; i++)
+        moptions.push({label: i + '', value: i + ''})
+      let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/FetchCheckerPlanYear`, 20,
+        {f_checker_id: 'this.f_checker_id', f_plan_year: 'this.f_plan_year', f_plan_month: 'this.f_plan_month'})
+      model.f_checker_id = ''
+      return {
+        checker:'',
+        checkers:[],
+        c_plan_year: [year + ''],
+        c_year_list: options,
+        c_month_list: moptions,
+        c_plan_month: [moptions[new Date().getMonth()].value],
+        model: model,
+        selectedRow: {}
+      }
+    },
+    ready () {
+      this.model.f_plan_year = this.c_plan_year[0]
+      this.model.f_plan_month = this.c_plan_month[0]
+      this.model.f_subcompany = Vue.f_subcompany
+
+      let gen = select(this)
+      return co(gen)
+    },
+    watch: {
+      'c_plan_year' (val) {
+        this.model.f_plan_year = val[0]
+      },
+      'c_plan_month' (val) {
+        this.model.f_plan_month = val[0]
+      },
+      'checker'(){
+        console.log("f_checker",this.checker)
+        this.selectedRow = {}
+      }
+    },
+    methods: {
+      search () {
+        this.model.rows = []
+        this.model.rows = []
+        this.model.search(`f_filialeid='${Vue.user.orgid}'`)
+      },
+      select(row, idx) {
+        if(this.selectedRow)
+          this.$set('model.rows[' + this.selectedRow.idx + '].selected', false)
+        this.selectedRow = row
+        this.selectedRow.idx = idx
+        this.$set('model.rows[' + idx + '].selected', true)
+      }
+    }
+  }
+</script>

package/src/components/android/PrearrangedPlan.vue

@@ -204,7 +204,7 @@ export default {
     },
     inspect(row) {
       if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && row.f_state == '未检')) {
-        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}}).then((response) => {
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}}).then((response) => {
           console.log(JSON.stringify(response))
         row['f_plan_meters'] = response.data
 

package/src/components/android/QueryCheckHandplanAlreadyList.vue

@@ -0,0 +1,408 @@
+<template>
+  <div class="auto">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
+        <div partial>
+          <form>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_userinfo_code" class=" font text-left">用户编号：</label>
+              </div>
+              <div class="col-xs-8">
+                <input id="f_userinfo_code" class="search_input input-font"
+                       v-model=model.f_userinfo_code condition="chp.f_userinfo_code = '{}'"/>
+                <span @click="$parent.$parent.scanCodeClick('f_userinfo_code')">
+                  <img src="../../assets/扫一扫.png" style="width: 6%" title="扫描用户专属条形码" alt="扫一扫"/>
+                </span>
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/表号.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_tableNumber" class=" font text-left">表号：</label>
+              </div>
+              <div class="col-xs-8">
+                <input id="f_tableNumber" class="search_input input-font"
+                       v-model=model.f_meternumber condition="chp.f_meternumber like '%{}%'"/>
+                <span @click="$parent.$parent.scanCodeClick('f_meternumber')">
+                  <img src="../../assets/扫一扫.png" style="width: 6%" title="扫描表上条形码" alt="扫一扫"/>
+                </span>
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/门牌.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_cardmeternumber" class=" font text-left">现场表号：</label>
+              </div>
+              <div class="col-xs-8">
+                <input id="f_cardmeternumber" class="search_input input-font"
+                       v-model=model.f_cardmeternumber condition="uf.f_cardmeternumber like '%{}%'"/>
+                <span @click="$parent.$parent.scanCodeClick('f_cardmeternumber')">
+                  <img src="../../assets/扫一扫.png" style="width: 6%" title="扫描表上条形码" alt="扫一扫"/>
+                </span>
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/用户姓名.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">用户姓名：</label>
+              </div>
+              <div class="col-xs-8">
+                <input class="search_input input-font"
+                       v-model=model.f_user_name condition="chp.f_user_name like '%{}%'"/>
+              </div>
+            </div>
+
+            <div class="row app-row">
+              <img src="../../assets/详细住址.png" style="width: 20px;margin-bottom: 5px" alt="">
+              <label class="font text-left">用户地址：</label>
+              <input class="search_input input-font"
+                     v-model=model.f_address condition="chp.f_address like '%{}%'"/>
+            </div>
+
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_housing" class="font text-left">小区名称：</label>
+              </div>
+              <div class="col-xs-8">
+                <input id="f_housing" class="search_input input-font"
+                       v-model="model.f_residential_area" condition="chp.f_residential_area like '%{}%'"/>
+              </div>
+            </div>
+
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/楼层.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_floor" class="font text-left">楼栋：</label>
+              </div>
+              <div class="col-xs-8">
+                <input id="f_floor" class="search_input input-font"
+                       v-model="model.f_building" condition="chp.f_building like '%{}%'"/>
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/单元.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_unit" class="font text-left">单元：</label>
+              </div>
+              <div class="col-xs-8">
+                <input id="f_unit" class="search_input input-font"
+                       v-model="model.f_unit" condition="chp.f_unit like '%{}%'"/>
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/门牌.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_keyword" class="font text-left">门牌：</label>
+              </div>
+              <div class="col-xs-8">
+                <input id="f_keyword" class="search_input input-font"
+                       v-model="model.f_room" condition="chp.f_room like '%{}%'"/>
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/shijian.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_last_hand_date" class="font text-left">开始时间：</label>
+              </div>
+              <div class="col-xs-8">
+                <datepicker
+                  class="select_list select"
+                  :value.sync="model.startdate"
+                  placeholder='开始时间' style="width: 60%"
+                  :disabled-days-of-week="[]"
+                  :format="'yyyy-MM-dd'"
+                  :show-rest-button="reset"
+                  v-model="model.startdate"
+                  condition="chp.f_hand_date >= '{} 00:00:00'">
+                </datepicker>
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/shijian.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_last_hand_date" class="font text-left">结束时间：</label>
+              </div>
+              <div class="col-xs-8">
+                <datepicker
+                  class="select_list select"
+                  :value.sync="model.enddate"
+                  placeholder='结束时间' style="width: 60%"
+                  :disabled-days-of-week="[]"
+                  :format="'yyyy-MM-dd'"
+                  :show-rest-button="reset"
+                  v-model="model.enddate"
+                  condition="chp.f_hand_date <= '{} 23:59:59'">
+                </datepicker>
+              </div>
+            </div>
+            <div class="row app-row" v-show="$parent.$parent.isroleNameCBY">
+              <div class="col-xs-4">
+                <img src="../../assets/用户类型.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_user_type" class="font text-left">用户类型：</label>
+              </div>
+              <div class="col-xs-8">
+                <v-select id="f_user_type" closeOnSelect="true" search="false" valueSingle="false" :value.sync="$parent.$parent.f_user_type" class="input-font"
+                          :options='$parent.$parent.user_types' placeholder='请选择用户类型'
+                          close-on-select clear-button
+                          v-model="$parent.$parent.f_user_type"></v-select>
+              </div>
+            </div>
+            <div class="row text-center" style="margin-top: 20px;">
+              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;" @click="search()">查询</button>
+            </div>
+            <div style="height:30px;"></div>
+          </form>
+        </div>
+      </criteria>
+      <list :model="model" partial='list'>
+        <div partial>
+          <div @click="$parent.$parent.$parent.inspect(row)" class="auto app-text" style="margin-top: 5px;">
+            <div class="panel" style="padding: 10px 10px 5px 10px;">
+              <div class="panel-body panel-self">
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">现场表号</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_cardmeternumber }}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">用户编号</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_userinfo_code }}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">用户名称</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_user_name }}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">用户类型</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_user_type }}
+                  </p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">用户电话</p>
+                  <p class="panel-title col-xs-8 text-left input-font">
+                    {{ row.f_user_phone }}
+                    <img src="../../assets/phone.png" style="width: 6%"
+                         v-on:click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_user_phone)' alt="电话" />
+                  </p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">小区名称</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_residential_area }}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">楼栋</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_building }}号楼</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">单元</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_unit }}单元</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">门牌</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_room }}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">用户地址</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_address }}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">表类型</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_meter_classify }}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">抄表时间</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_hand_date }}</p>
+                </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">抄表差值</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_difference_value }}</p>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import LocalPagedList from './LocalPagedList'
+import Vue from 'vue'
+import {PagedList} from 'vue-client'
+import * as Util from '../Util'
+
+export default {
+  title: '移动抄表已办',
+  data () {
+    return {
+      //${this.$androidUtil.getProxyUrl()}
+      model: new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/queryCheckHandplanAlreadyList`, 5,
+        {condition: 'this.condition',f_inputtor_id: 'this.f_inputtor_id',f_inputtor: 'this.f_inputtor'}),
+      user_types: [ //用户类型
+        {label: '请选择用户类型', value: ''},
+        {label: '民用', value: '民用'},
+        {label: '非民用', value: '非民用'}
+      ],
+      f_user_type: '民用',
+      f_role_name: Vue.user.f_role_name, //当前登录人的角色名
+
+    }
+  },
+  ready () {
+    this.model.f_inputtor_id = Vue.user.id; //当前登录人的id
+    this.model.f_inputtor = Vue.user.name; //当前登录人的name
+    this.$refs.paged.$refs.cri.search();
+  },
+  computed : {
+    // 当当前登录人具有抄表员角色时，可以对工业用户进行查询抄表
+    isroleNameCBY () {
+      if (this.f_role_name) {
+        let roleArray = this.f_role_name.split(" ")
+        for (let roleArrayElement of roleArray) {
+          if (roleArrayElement === '抄表员') {
+            return true;
+          }
+        }
+        return false;
+      }else {
+        return false;
+      }
+    }
+  },
+  methods: {
+    // 拨打方法
+    makeAPhoneCall(phoneNumber) {
+      this.$androidUtil.makeAPhoneCall(phoneNumber)
+    },
+    // 跳转
+    inspect (row) {
+        if (row.f_user_type === '民用') { //判断用户类型
+          var pardate = {
+            _this:this,
+            title:'移动抄表已办',
+            safe:true
+          }
+          this.$dispatch('gotoson',pardate)
+          this.$goto('check-meter-already-reading', {item: row, role: 'androidview', from: 'civil'}, 'self', this.reload)
+        } else {
+          var pardate = {
+            _this:this,
+            title:'移动抄表已办',
+            safe:true
+          }
+          this.$dispatch('gotoson',pardate)
+          this.$goto('check-meter-already-reading', {item: row, role: 'androidview' ,from: 'nocivil'}, 'self', this.reload)
+        }
+    },
+    search (args) {
+      this.model.f_inputtor_id = Vue.user.id; //当前登录人的id
+      this.model.f_inputtor = Vue.user.name; //当前登录人的name
+      if (this.f_user_type) {
+        args.condition+= ' '+`AND chp.f_filialeids='${Vue.user.orgid}' AND chp.f_user_type = '${this.f_user_type}'`
+      }else {
+        args.condition+= ' '+`AND chp.f_filialeids='${Vue.user.orgid}'`
+      }
+      return this.model.search(args.condition, args.model)
+    },
+    reload(){
+      this.$refs.paged.$refs.cri.search();
+    },
+    scanCodeClick(prop) {
+      if (prop ==='f_cardmeternumber') {
+        console.log("扫码用户标记")
+        HostApp.__this__=this
+        HostApp.scanCode({callback:"javascript:HostApp.__this__.getCode('f_cardmeternumber');"})
+      }else if (prop === 'f_userinfo_code'){
+        console.log("扫码用户编号")
+        HostApp.__this__=this
+        HostApp.scanCode({callback:"javascript:HostApp.__this__.getCode('f_userinfo_code');"})
+      }else if (prop === 'f_meternumber') {
+        console.log("扫码表号")
+        HostApp.__this__=this
+        HostApp.scanCode({callback:"javascript:HostApp.__this__.getCode('f_meternumber');"})
+      }
+    },
+    getCode(prop){
+      var datapa = HostApp.getCode().data;
+      console.log(`扫码返回值${datapa}`)
+      if (prop === 'f_meternumber') {
+        this.$refs.paged.$refs.cri.model.f_meternumber = datapa
+      }else if (prop === 'f_userinfo_code') {
+        this.$refs.paged.$refs.cri.model.f_userinfo_code = datapa
+      }else if (prop === 'f_cardmeternumber') {
+        this.$refs.paged.$refs.cri.model.f_cardmeternumber = datapa
+      }
+      this.$showMessage(`扫码返回值为：${datapa}`)
+    },
+  }
+}
+</script>
+<style>
+.bg {
+  background-color: blue;
+  height: 1px;
+  border: 0;
+}
+
+.app-row {
+  background-color: white;
+  padding: 10px 10px 0 10px;
+  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+}
+
+.search_input {
+  border: 0;
+  outline: none;
+}
+
+.font {
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
+
+.input-font {
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+
+.btn-font {
+  font: 600 16px PingFang-SC-Bold;
+  color: #499EDF;
+}
+
+.btn-color {
+  background-color: #FFFFFF;
+  border-radius: 10px;
+  border: 1px solid #499EDF;
+}
+
+.app-text {
+  font-size: 12px;
+}
+
+.panel-self {
+  border-radius: 10px;
+  border: 1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+
+.yybtn-color {
+  background-color: #499edf;
+  border-radius: 4px;
+  border: 1px solid #499EDF;
+  color: #FFFFFF;
+  font: 14px PingFang-SC-Bold;
+}
+
+.qxbtn-color {
+  background-color: #FFFFFF;
+  border-radius: 4px;
+  color: #499edf;
+  font: 14px PingFang-SC-Bold;
+  border: 1px solid #499EDF;
+}
+</style>
+