readmeter-changan 1.0.39 → 1.0.40

package/.idea/workspace.xml

@@ -6,6 +6,11 @@
   <component name="ChangeListManager">
     <list default="true" id="3ff22a91-c12c-46e5-8072-9f6930fa055a" name="Default Changelist" comment="修复抄表记录界面翻页选项被遮挡">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/components/readingmeter/CheckInfo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/readingmeter/CheckInfo.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/components/server/ReadMeterHome.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/server/ReadMeterHome.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/components/server/ReadMeterNavBottom.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/server/ReadMeterNavBottom.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/readmeter-android.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/readmeter-android.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/readmeter.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/readmeter.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -419,6 +424,8 @@
       <workItem from="1752238191936" duration="1822000" />
       <workItem from="1753265804521" duration="1171000" />
       <workItem from="1753320827001" duration="1546000" />
+      <workItem from="1753927585913" duration="2588000" />
+      <workItem from="1760685783403" duration="659000" />
     </task>
     <task id="LOCAL-00001" summary="新增卡表抄表气量核算">
       <created>1553677761707</created>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "readmeter-changan",
-  "version": "1.0.39",
+  "version": "1.0.40",
   "description": "手机抄表客户端",
   "author": "15529257852@163.com",
   "private": false,

package/src/components/readingmeter/CheckInfo.vue

@@ -374,7 +374,7 @@
           <picture-area  :model="model.imgs"></picture-area>
         </div>
         <div class="row col-xs-12 col-sm-12 col-md-12  auto mt-20"  v-if="!data.hidden">
-          <div class="col-xs-2 col-sm-2 col-md-2  col-xs-offset-4 col-sm-offset-4 col-md-offset-4">
+          <div class="col-xs-2 col-sm-2 col-md-2  col-xs-offset-4 col-sm-offset-4 col-md-offset-4" v-if="!data.f_sign">
             <button type="button" class="btn btn-lg btn-color btn-font"  @click="save()">保存</button>
           </div>
           <div class="col-xs-2 col-sm-2 col-md-2 col-xs-offset-1 col-sm-offset-1 col-md-offset-1" >

package/src/components/readingmeter/CheckOnline.vue

@@ -0,0 +1,231 @@
+<template>
+  <div class="app-row">
+    <criteria-paged :model="model"  v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
+        <div partial>
+          <form>
+            <div class="row col-xs-12 col-sm-6 col-md-6 app-row">
+              <div class="col-xs-4 col-sm-4 col-md-4">
+                <img src="../../assets/卡号.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">卡&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号：</label>
+              </div>
+              <div class="col-xs-8 col-sm-8 col-md-8" >
+                <input class="search_input input-font"
+                       v-model=model.f_card_id condition="f_card_id = '{}'" placeholder="请输入卡号" />
+              </div>
+            </div>
+            <div class="row col-xs-12 col-sm-6 col-md-6 app-row">
+              <div class="col-xs-4 col-sm-4 col-md-4">
+                <img src="../../assets/表号.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">表&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号：</label>
+              </div>
+              <div class="col-xs-8 col-sm-8 col-md-8" >
+                <input class="search_input input-font"
+                       v-model=model.f_meternumber condition="f_meternumber = '{}'" placeholder="请输入表号" />
+              </div>
+            </div>
+            <div class="row col-xs-12 col-sm-6 col-md-6 app-row">
+              <div class="col-xs-4 col-sm-4 col-md-4">
+                <img src="../../assets/姓名.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">用户名称：</label>
+              </div>
+              <div class="col-xs-8 col-sm-8 col-md-8" >
+                <input class="search_input input-font" condition="f_user_name like '%{}%'" v-model="model.f_username" placeholder="请输入用户名称">
+              </div>
+            </div>
+            <div class="row col-xs-12 col-sm-6 col-md-6 app-row">
+              <div class="col-xs-4 col-sm-4 col-md-4">
+                <img src="../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">小区名称：</label>
+              </div>
+              <div class="col-xs-8 col-sm-8 col-md-8" >
+                <input style="width: 100%" condition="f_residential_area like '%{}%'" class="search_input input-font" v-model="model.f_residential_area" placeholder="请输入用户小区（可模糊查询）">
+              </div>
+            </div>
+            <div class="row col-xs-12 col-sm-6 col-md-6 app-row">
+              <div class="col-xs-4 col-sm-4 col-md-4">
+                <img src="../../assets/街道.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">街&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;道：</label>
+              </div>
+              <div class="col-xs-8 col-sm-8 col-md-8" >
+                <input style="width: 100%" class="search_input input-font" condition="f_street like '{}%'" v-model="model.f_street" placeholder="请输入用户单元">
+              </div>
+            </div>
+            <div class="row col-xs-12 col-sm-6 col-md-6 app-row">
+              <div class="col-xs-4 col-sm-4 col-md-4">
+                <img src="../../assets/地址.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">用户地址：</label>
+              </div>
+              <div class="col-xs-8 col-sm-8 col-md-8" >
+                <input style="width: 100%" condition="f_address like '%{}%'" class="search_input input-font" v-model="model.f_address" placeholder="请输入用户地址（可模糊查询）">
+              </div>
+            </div>
+            <div class="row col-xs-12 col-sm-12 col-md-6 text-center" style="margin-top: 20px;">
+              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="search">查询</button>
+            </div>
+            <div style="height:30px;"></div>
+          </form>
+        </div>
+      </criteria>
+
+      <list :model="model" partial='list'>
+        <div partial>
+          <div @click="$parent.$parent.$parent.selectCheck(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 col-xs-12 col-sm-6 col-md-6">
+                  <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">卡&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</p>
+                  <p class="panel-title col-xs-8 col-sm-8 col-md-8 text-left input-font">{{ row.f_card_id }}</p>
+                </div>
+                <div class="row col-xs-12 col-sm-6 col-md-6">
+                  <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">表&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</p>
+                  <p class="panel-title col-xs-8 col-sm-8 col-md-8 text-left input-font">{{ row.f_meternumber }}</p>
+                </div>
+                <div class="row col-xs-12 col-sm-6 col-md-6">
+                  <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">用户名称</p>
+                  <p class="panel-title col-xs-8 col-sm-8 col-md-8 text-left input-font">{{ row.f_user_name }}</p>
+                </div>
+                <div class="row col-xs-12 col-sm-6 col-md-6">
+                  <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">气表品牌</p>
+                  <p class="panel-title col-xs-8 col-sm-8 col-md-8-8 text-left input-font">{{ row.f_meter_brand }}</p>
+                </div>
+                <div class="row col-xs-12 col-sm-6 col-md-6">
+                  <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">用户电话</p>
+                  <p class="panel-title col-xs-8 col-sm-8 col-md-8 text-left input-font">{{ row.f_user_phone }}</p>
+                </div>
+
+                <div class="row col-xs-12 col-sm-6 col-md-6">
+                  <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">小区名称</p>
+                  <p class="panel-title col-xs-8 col-sm-8 col-md-8 text-left input-font">{{ row.f_residential_area }}</p>
+                </div>
+                <div class="row col-xs-12 col-sm-6 col-md-6">
+                  <p class="panel-title col-xs-4 col-sm-4 col-md-4-4 text-left font">用户地址</p>
+                  <p class="panel-title col-xs-8 col-sm-8 col-md-8 text-left input-font">{{ row.f_address }}</p>
+                </div>
+                <div class="row col-xs-12 col-sm-6 col-md-6">
+                  <p class="panel-title col-xs-4 col-sm-4 col-md-4 text-left font">最后抄表日期</p>
+                  <p class="panel-title col-xs-8 col-sm-8 col-md-8 text-left input-font">{{ row.f_lasttimecb }}</p>
+                </div>
+
+              </div>
+            </div>
+
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+    <back-page :need-back='true'   @flag="$back()"></back-page>
+  </div>
+</template>
+
+<script>
+import { PagedList } from 'vue-client'
+import Vue from 'vue'
+import co from 'co'
+let getDataGen = function * (val,self) {
+  yield self.$resetpost(Vue.handdataUrl + 'rs/sql/getUserInfo', {data:{
+      condition:`card_id = '${val.f_card_id}'`
+    }}, {resolveMsg: null, rejectMsg: null})
+    .then((res) =>{
+      console.log(JSON.stringify(res.data))
+      if(res.data.length>0){
+        self.row = Object.assign(self.row,res.data[0])
+      }
+      console.log(self.row)
+      self.row.id = self.row.f_download
+      self.row.f_plan_type = '周检表计划'
+      self.row.f_sign = '临时周检'
+      self.row.f_card_id = self.row.card_id
+      console.log(Vue.user)
+      self.row.f_inputtor = Vue.user.name
+      self.$dispatch('changepage', self.row, 'onlinecheck')
+    })
+}
+export default {
+  title: '临时周检',
+  data () {
+    let model = new PagedList(Vue.handdataUrl + 'rs/sql/getHandUserInfo', 20, {})
+    return {
+      model: model,
+      row:{},
+      showModal:false,
+      selectRow:null
+    }
+  },
+  ready () {
+  },
+  computed: {
+
+    reload(){
+      this.$refs.paged.loadPage(this.$refs.paged.model.pageIndex)
+    },
+    selected () {
+      return this.$refs.paged.$refs.grid.selected
+    }
+  },
+  methods:{
+    selectCheck(info){
+      console.log(info)
+      let gen = getDataGen(info,this)
+      co(gen)
+    },
+    ok(){
+
+    },
+    cancel(){
+      this.showModal=false
+      this.safecheckType='工商无计划安检'
+    },
+    search(args){
+      console.log('args',args)
+      console.log('this.model',this.model)
+      this.model.search(args.condition, args.model)
+    }
+  }
+}
+</script>
+<style>
+.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{
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+}
+.qxbtn-color{
+  background-color: #FFFFFF;
+  border-radius: 4px ;
+  border: 1px solid #499EDF;
+}
+</style>

package/src/components/server/ReadMeterHome.vue

@@ -63,6 +63,9 @@
         if (param === '计划下载') {
           this.name = 'plan-down'
           this.$refs.route.init(this.name)
+        }else if (param === '临时周检') {
+          this.name = 'check-online'
+          this.$refs.route.init(this.name)
         } else if (param === '表单上传') {
           this.name = 'plan-update'
           this.$refs.route.init(this.name)
@@ -79,10 +82,16 @@
         }
       },
       'changepage' (val, param) {
+        console.log(val)
         if (param === 'save') {
           window.currentPage = '抄表录入'
           this.name = 'phone-hand-home'
           this.$refs.route.init('phone-hand-home', {data: val, type: param})
+        }else if (param === 'onlinecheck') {
+          //选择用气点
+          window.currentPage = '临时周检'
+          this.name = 'phone-hand-home'
+          this.$refs.route.init('phone-hand-home', {param: val, type: param})
         } else if (param === 'selectpoint') {
           //选择用气点
           window.currentPage = '选择用气点'
@@ -125,6 +134,13 @@
           this.$refs.route.init('read-meter')
           return
         }
+        if (window.currentPage && window.currentPage === '临时周检') {
+          this.showTop = true
+          this.pageName = '临时周检'
+          window.currentPage = undefined
+          this.$refs.route.init('check-online')
+          return
+        }
         if (window.currentPage && window.currentPage === '选择用气点') {
           this.showTop = true
           this.pageName = '选择用气点'

package/src/components/server/ReadMeterNavBottom.vue

@@ -22,6 +22,10 @@
         <img src="../../assets/抄表记录.png" class="imgs" alt="">
         <p class="text-center name" style="margin: 10px 0;">抄表记录</p>
       </div>
+      <div class="col-xs-4 text-center pageskuang"  @click="goPage('临时周检')">
+        <img src="../../assets/抄表管理.png" class="imgs" alt="">
+        <p class="text-center name" style="margin: 10px 0;">临时周检</p>
+      </div>
       <div class="col-xs-4 text-center pageskuang" @click="goPage('表单上传')">
       <img src="../../assets/表单上传.png" class="imgs" alt="">
       <p class="text-center name" style="margin: 10px 0;">表单上传</p>

package/src/readmeter-android.js

@@ -30,5 +30,6 @@ export default function () {
  // Vue.component('hand-info', (resolve) => { require(['../../SaleClient/src/components/revenue/HandManager/handplan/HandInfo'], resolve) })
 // 单户抄表(在产品的client 中)
   Vue.component('phone-hand', (resolve) => { require(['./components/readingmeter/PhoneHand'], resolve) })
-
+  //在线周检表信息
+  Vue.component('check-online', (resolve) => { require(['./components/readingmeter/CheckOnline'], resolve) })
 }

package/src/readmeter.js

@@ -39,6 +39,8 @@ export default function () {
   Vue.component('phone-handplan-info', (resolve) => { require(['./components/readingmeter/PhoneHandplanInfo'], resolve) })
   //周检表信息
   Vue.component('handplan-check-info', (resolve) => { require(['./components/readingmeter/CheckInfo'], resolve) })
+  //在线周检表信息
+  Vue.component('check-online', (resolve) => { require(['./components/readingmeter/CheckOnline'], resolve) })
   //周检表信息
   Vue.component('phone-hand-home', (resolve) => { require(['./components/readingmeter/PhoneHandHome'], resolve) })
   //售气历史主页