safecheck-client 4.0.2-63 → 4.0.2-65

package/src/components/android/QueryCheckHistory.vue

@@ -1,122 +1,122 @@
-<template>
-  <div class="app-bg auto">
-    <tools-page :need-back='true' title="安检历史查询"  @back="back()"></tools-page>
-    <div class="row app-input">
-      <label class="col-xs-4 control-label text-left">用户编号</label>
-      <input class="col-xs-8" v-model="model.f_userid" placeholder="请输入用户编号">
-    </div>
-    <div class="row app-input">
-      <label class="col-xs-4 control-label text-left">用户姓名</label>
-      <input class="col-xs-8" v-model="model.f_username" placeholder="请输入用户姓名">
-    </div>
-    <div class="row app-input">
-      <label class="col-xs-4 control-label text-left">表号</label>
-      <input class="col-xs-8" v-model="model.f_meter_no" placeholder="请输入表编号">
-    </div>
-    <div class="row app-input">
-      <label class="col-xs-4 control-label text-left">卡号</label>
-      <input class="col-xs-6" v-model="model.f_cardid" placeholder="请输入用户卡号">
-    </div>
-    <div class="row app-input">
-      <label class="col-xs-4 control-label text-left">地址</label>
-      <input class="col-xs-8" v-model="model.f_address" placeholder="请输入用户地址（可模糊查询）">
-    </div>
-    <div class="row app-input">
-      <label class="col-xs-4 control-label text-left">开始时间</label>
-      <datepicker
-        :value.sync="model.f_start_date"
-        placeholder='开始时间'
-        :disabled-days-of-week="[]"
-        :format="'yyyy-MM-dd'"
-        :show-rest-button="reset"
-        v-model="model.f_start_date">
-      </datepicker>
-    </div>
-    <div class="row app-input">
-      <label class="col-xs-4 control-label text-left">结束时间</label>
-      <datepicker
-        :value.sync="model.f_end_date"
-        placeholder='结束时间'
-        :disabled-days-of-week="[]"
-        :format="'yyyy-MM-dd'"
-        :show-rest-button="reset"
-        v-model="model.f_end_date">
-      </datepicker>
-    </div>
-    <div class="row app-btn" style="margin-bottom: -5px;">
-      <button class="btn btn-primary col-xs-6" @click= "historinfo()"><span class="glyphicon glyphicon-zoom-in" style="margin-right: 20px;"></span>查询</button>
-    </div>
-    <div v-for='row in user' class="app-list auto " @click= "checkhistory(row)">
-      <div class="row" style="color: #00B9F1;">
-        <span class="col-xs-3">户号：</span><span class="col-xs-3">{{row.f_userid}}</span>
-        <span class="col-xs-3">姓名：</span><span class="col-xs-3">{{row.f_username}}</span>
-      </div>
-      <div class="row">
-        <span class="col-xs-3">表号：</span><span class="col-xs-3">{{row.f_meter_number}}</span>
-        <span class="col-xs-3">用户类型：</span><span class="col-xs-3">{{row.f_usertype}}</span>
-      </div>
-      <div class="row">
-        <span class="col-xs-3">地址：</span><span class="col-xs-8">{{row.f_address}}</span>
-      </div>
-    </div>
-  </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 {
-        model: {
-          f_userid:'',
-          f_user_name: '',
-          f_meter_number: '',
-          f_cardid: '',
-          f_address: ''
-        },
-        user:[],
-        showModal: false,
-        param: null
-      }
-    },
-    methods: {
-      //头部事件回掉
-      back () {
-        this.$back()
-      },
-      // 跳到用户信息组件
-      checkhistory(row) {
-          this.$goto('query-check-history-item', {userinfo: row})
-      },
-      historinfo(){
-          // 只能自己拼接输入条件
-          let condition = '1=1'
-          for (var key in this.model) {
-            if (this.model[key] !== '') {
-              if (key == 'f_start_date'){
-                condition = condition + `and f_check_date >=  to_date('${this.model[key]}','yyyy-MM-dd')`
-              } else if(key=='f_end_date'){
-                condition = condition + ` and f_check_date <=  to_date('${this.model[key]}','yyyy-MM-dd')`
-              } else
-              condition  = condition + ` and ${key} like '%${this.model[key]}%'`
-            }
-          }
-        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/path/getUserinfomation`,{data:{condition:condition}})
-            .then((res)=>{
-              this.user = res.data
-            })
-            .catch(()=>{
-
-            })
-      }
-    }
-  }
-</script>
-<style>
-
-</style>
+<template>
+  <div class="app-bg auto">
+    <tools-page :need-back='true' title="安检历史查询"  @back="back()"></tools-page>
+    <div class="row app-input">
+      <label class="col-xs-4 control-label text-left">用户编号</label>
+      <input class="col-xs-8" v-model="model.f_userid" placeholder="请输入用户编号">
+    </div>
+    <div class="row app-input">
+      <label class="col-xs-4 control-label text-left">用户姓名</label>
+      <input class="col-xs-8" v-model="model.f_username" placeholder="请输入用户姓名">
+    </div>
+    <div class="row app-input">
+      <label class="col-xs-4 control-label text-left">表号</label>
+      <input class="col-xs-8" v-model="model.f_meter_no" placeholder="请输入表编号">
+    </div>
+    <div class="row app-input">
+      <label class="col-xs-4 control-label text-left">卡号</label>
+      <input class="col-xs-6" v-model="model.f_cardid" placeholder="请输入用户卡号">
+    </div>
+    <div class="row app-input">
+      <label class="col-xs-4 control-label text-left">地址</label>
+      <input class="col-xs-8" v-model="model.f_address" placeholder="请输入用户地址（可模糊查询）">
+    </div>
+    <div class="row app-input">
+      <label class="col-xs-4 control-label text-left">开始时间</label>
+      <datepicker
+        :value.sync="model.f_start_date"
+        placeholder='开始时间'
+        :disabled-days-of-week="[]"
+        :format="'yyyy-MM-dd'"
+        :show-rest-button="reset"
+        v-model="model.f_start_date">
+      </datepicker>
+    </div>
+    <div class="row app-input">
+      <label class="col-xs-4 control-label text-left">结束时间</label>
+      <datepicker
+        :value.sync="model.f_end_date"
+        placeholder='结束时间'
+        :disabled-days-of-week="[]"
+        :format="'yyyy-MM-dd'"
+        :show-rest-button="reset"
+        v-model="model.f_end_date">
+      </datepicker>
+    </div>
+    <div class="row app-btn" style="margin-bottom: -5px;">
+      <button class="btn btn-primary col-xs-6" @click= "historinfo()"><span class="glyphicon glyphicon-zoom-in" style="margin-right: 20px;"></span>查询</button>
+    </div>
+    <div v-for='row in user' class="app-list auto " @click= "checkhistory(row)">
+      <div class="row" style="color: #00B9F1;">
+        <span class="col-xs-3">户号：</span><span class="col-xs-3">{{row.f_userid}}</span>
+        <span class="col-xs-3">姓名：</span><span class="col-xs-3">{{row.f_username}}</span>
+      </div>
+      <div class="row">
+        <span class="col-xs-3">表号：</span><span class="col-xs-3">{{row.f_meter_number}}</span>
+        <span class="col-xs-3">用户类型：</span><span class="col-xs-3">{{row.f_usertype}}</span>
+      </div>
+      <div class="row">
+        <span class="col-xs-3">地址：</span><span class="col-xs-8">{{row.f_address}}</span>
+      </div>
+    </div>
+  </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 {
+        model: {
+          f_userid:'',
+          f_user_name: '',
+          f_meter_number: '',
+          f_cardid: '',
+          f_address: ''
+        },
+        user:[],
+        showModal: false,
+        param: null
+      }
+    },
+    methods: {
+      //头部事件回掉
+      back () {
+        this.$back()
+      },
+      // 跳到用户信息组件
+      checkhistory(row) {
+          this.$goto('query-check-history-item', {userinfo: row})
+      },
+      historinfo(){
+          // 只能自己拼接输入条件
+          let condition = '1=1'
+          for (var key in this.model) {
+            if (this.model[key] !== '') {
+              if (key == 'f_start_date'){
+                condition = condition + `and f_check_date >=  to_date('${this.model[key]}','yyyy-MM-dd')`
+              } else if(key=='f_end_date'){
+                condition = condition + ` and f_check_date <=  to_date('${this.model[key]}','yyyy-MM-dd')`
+              } else
+              condition  = condition + ` and ${key} like '%${this.model[key]}%'`
+            }
+          }
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/path/getUserinfomation`,{data:{condition:condition}})
+            .then((res)=>{
+              this.user = res.data
+            })
+            .catch(()=>{
+
+            })
+      }
+    }
+  }
+</script>
+<style>
+
+</style>

package/src/components/android/QueryCheckHistoryItem.vue

@@ -1,62 +1,62 @@
-<template>
-  <div class="no-close flex" id="app-nav-top-template" style="height: 100%;">
-    <tools-page :need-back='true' title="历史安检查看" @back="back()"></tools-page>
-    <div class="flex span" id="top-nav">
-      <tabset v-ref:tabs :close="false" >
-        <tab header="用户信息">
-          <user-gasinfo  :user='user' :model="userinfo" :show="showModal"></user-gasinfo>
-        </tab>
-        <tab header="设备检查">
-          <equipment-inspection :show="showModal" :user='user' :equipmentinspection="userinfo.equipment" v-ref:userinfo.equipment></equipment-inspection>
-        </tab>
-        <tab header="隐患检查">
-          <hiddentrouble-investigation :show="showModal"  :user='user' :imgs="userinfo.imgs" :hinvestigation="userinfo.hiddentrouble" v-ref:userinfo.hiddentrouble></hiddentrouble-investigation>
-        </tab>
-        <tab header="用户意见">
-          <customer-opinions :user='user' :show="showModal"  :userinfo="userinfo" :equipmentinspection="userinfo.equipment" :hinvestigation="userinfo.hiddentrouble" :customer="userinfo.customer" v-ref:userinfo.customer></customer-opinions>
-        </tab>
-      </tabset>
-    </div>
-  </div>
-</template>
-
-<script>
-import Vue from 'vue'
-import * as Util from '../Util'
-
-export default {
-  title: '查询安检历史',
-  props: {
-      userinfo:{
-        type:Object,
-      }
-  },
-  data() {
-    return {
-      user:{},
-      showModal: true,
-    }
-  },
-  methods: {
-    //头部事件回掉
-    back() {
-      this.$back()
-    }
-  }
-}
-</script>
-<style lang="less">
-  #app-nav-top-template{
-    .nav {
-      > li {
-        width: 25%;
-        text-align: center;
-        > a {
-          padding: 10px 0px;
-        }
-      }
-    }
-  }
-
-</style>
-
+<template>
+  <div class="no-close flex" id="app-nav-top-template" style="height: 100%;">
+    <tools-page :need-back='true' title="历史安检查看" @back="back()"></tools-page>
+    <div class="flex span" id="top-nav">
+      <tabset v-ref:tabs :close="false" >
+        <tab header="用户信息">
+          <user-gasinfo  :user='user' :model="userinfo" :show="showModal"></user-gasinfo>
+        </tab>
+        <tab header="设备检查">
+          <equipment-inspection :show="showModal" :user='user' :equipmentinspection="userinfo.equipment" v-ref:userinfo.equipment></equipment-inspection>
+        </tab>
+        <tab header="隐患检查">
+          <hiddentrouble-investigation :show="showModal"  :user='user' :imgs="userinfo.imgs" :hinvestigation="userinfo.hiddentrouble" v-ref:userinfo.hiddentrouble></hiddentrouble-investigation>
+        </tab>
+        <tab header="用户意见">
+          <customer-opinions :user='user' :show="showModal"  :userinfo="userinfo" :equipmentinspection="userinfo.equipment" :hinvestigation="userinfo.hiddentrouble" :customer="userinfo.customer" v-ref:userinfo.customer></customer-opinions>
+        </tab>
+      </tabset>
+    </div>
+  </div>
+</template>
+
+<script>
+import Vue from 'vue'
+import * as Util from '../Util'
+
+export default {
+  title: '查询安检历史',
+  props: {
+      userinfo:{
+        type:Object,
+      }
+  },
+  data() {
+    return {
+      user:{},
+      showModal: true,
+    }
+  },
+  methods: {
+    //头部事件回掉
+    back() {
+      this.$back()
+    }
+  }
+}
+</script>
+<style lang="less">
+  #app-nav-top-template{
+    .nav {
+      > li {
+        width: 25%;
+        text-align: center;
+        > a {
+          padding: 10px 0px;
+        }
+      }
+    }
+  }
+
+</style>
+

package/src/components/android/RepairMain.vue

@@ -1,60 +1,60 @@
-<template>
-  <div class="auto">
-    <div style="text-align:center">欢迎</div>
-    <div style="text-align:center">
-      <span>{{orgCrumb}}</span>
-      <img src="../../assets/mute.png" width="32" height="32" @click="mute"></img>
-    </div>
-    <route :comp="{name: 'void-page'}" name="repairman-router"></route>
-    <footer class="navbar-default navbar-fixed-bottom">
-    <div class="container-fluid">
-      <table width="100%" height="30px">
-        <tr>
-          <td @click="go2('phone-state', 'repair')">维修员状态<td>
-          <td @click="go2('repair-area-list')">维修单<td>
-          <td @click="go2('system-setting')">系统设置<td>
-          <td @click="go2('check-notice')">通知公告<td>
-          <td @click="go2('phone-book')">通讯录<td>
-        </tr>
-      </table>
-    </div>
-    </footer>
-  </div>
-</template>
-
-<script>
-import Vue from 'vue'
-
-export default {
-  title: '维修员界面',
-  data() {
-    return {
-      orgs : Vue.orgs
-    }
-  },
-  computed: {
-    orgCrumb: function() {
-      let oc = []
-      if(this.orgs) {
-        this.orgs.filter((item) => {
-          return item.level != 5
-        }).forEach(function(org) {
-            oc.push(org.name)
-        })
-      }
-      return oc.join('--')
-    }
-  },
-  ready() {
-    this.go2('phone-state', 'repair')
-  },
-  methods: {
-    go2: function(widget, param) {
-      this.$goto(widget, {role: param}, 'repairman-router')
-    },
-    mute: function() {
-      HostApp.mute()
-    },
-  },
-}
-</script>
+<template>
+  <div class="auto">
+    <div style="text-align:center">欢迎</div>
+    <div style="text-align:center">
+      <span>{{orgCrumb}}</span>
+      <img src="../../assets/mute.png" width="32" height="32" @click="mute"></img>
+    </div>
+    <route :comp="{name: 'void-page'}" name="repairman-router"></route>
+    <footer class="navbar-default navbar-fixed-bottom">
+    <div class="container-fluid">
+      <table width="100%" height="30px">
+        <tr>
+          <td @click="go2('phone-state', 'repair')">维修员状态<td>
+          <td @click="go2('repair-area-list')">维修单<td>
+          <td @click="go2('system-setting')">系统设置<td>
+          <td @click="go2('check-notice')">通知公告<td>
+          <td @click="go2('phone-book')">通讯录<td>
+        </tr>
+      </table>
+    </div>
+    </footer>
+  </div>
+</template>
+
+<script>
+import Vue from 'vue'
+
+export default {
+  title: '维修员界面',
+  data() {
+    return {
+      orgs : Vue.orgs
+    }
+  },
+  computed: {
+    orgCrumb: function() {
+      let oc = []
+      if(this.orgs) {
+        this.orgs.filter((item) => {
+          return item.level != 5
+        }).forEach(function(org) {
+            oc.push(org.name)
+        })
+      }
+      return oc.join('--')
+    }
+  },
+  ready() {
+    this.go2('phone-state', 'repair')
+  },
+  methods: {
+    go2: function(widget, param) {
+      this.$goto(widget, {role: param}, 'repairman-router')
+    },
+    mute: function() {
+      HostApp.mute()
+    },
+  },
+}
+</script>

package/src/components/android/Repairman.vue

@@ -1,12 +1,12 @@
-<template>
-  <div>
-    <route :comp="{name: 'repair-main'}"></route>
-  </div>
-</template>
-
-<script>
-export default {
-  title: '维修导航界面',
-  props: ['orgs']
-}
-</script>
+<template>
+  <div>
+    <route :comp="{name: 'repair-main'}"></route>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '维修导航界面',
+  props: ['orgs']
+}
+</script>

package/src/components/android/StationMaster.vue

@@ -1,12 +1,12 @@
-<template>
-  <div>
-    <route :comp="{name: 'master-main'}"></route>
-  </div>
-</template>
-
-<script>
-export default {
-  title: '所长界面',
-  props: ['orgs']
-}
-</script>
+<template>
+  <div>
+    <route :comp="{name: 'master-main'}"></route>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '所长界面',
+  props: ['orgs']
+}
+</script>

package/src/components/android/week/CheckResultSimple.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="select-overspread repair-bg auto" style="padding-bottom:5px;">
+  <div class="select-overspread repair-bg auto simple">
     <div class="panel panel-default auto repair-info-content">
       <div class="panel-body" style="padding: 0">
         <!-- 周检项内容 -->
@@ -18,7 +18,7 @@
                         <div class="row" style="height: 240px;overflow: scroll;top: 1px" >
                           <div class="col-xs-4 col-sm-3 col-md-2" style="margin-bottom: 35px" v-for="(index,img) in row.images">
                             <img-self v-if="row.state === '未检'" :src="img.f_path" :alt="row.f_item_name" :width="140" :height="170"></img-self>
-                            <img-self v-if="row.state === '已检'" :src="'/rs/image/file/'+img.filename" :alt="row.f_item_name" :width="140" :height="170"></img-self>
+                            <img-self v-if="row.state === '已检'" :src="`${url}/rs/image/file/`+img.filename" :alt="row.f_item_name" :width="140" :height="170"></img-self>
                             <img v-if="!row.readonly" src="../../../assets/删除.png" @click="delfile(img.f_path,index,idxs)" style="width: 15px;margin-top: -80px" alt="">
                           </div>
                         </div>
@@ -89,7 +89,8 @@ export default {
   title: '周检列表信息',
   data() {
     return {
-      selectindex: null
+      selectindex: null,
+      url: this.$androidUtil.getProxyUrl()
     }
   },
   props: ['itemname','items'],
@@ -188,6 +189,12 @@ export default {
 }
 </script>
 <style lang="less" scoped>
+.simple {
+  padding: 10px 10px 5px 10px;
+  margin-bottom: 0;
+  background-color: #fff;
+  border: 1px solid transparent;
+}
 .class-erro {
   color: #a94442;
 }

package/src/components/android/week/FirstWeekCheck.vue

@@ -170,8 +170,27 @@ export default {
       this.loading = false
       this.showbutton = false
     },
-    uploadCheckPaper(){
+    async uploadCheckPaperPics () {
+      let tableImages =  []
+      this.weekCheck.forEach((item) => {
+        if (item.type == 'picture'){
+          item.images.forEach(image=>{
+            image.filename = image.f_path.substring(image.f_path.lastIndexOf('/')+1)
+            tableImages.push({
+              path: image.f_path,
+            })
+          })
+        }
+      })
+      HostApp.__this__ = this
+      HostApp.logicWithHint({
+        'logic': 'imagesUploadAndroid', 'callback': 'javascript: HostApp.__this__.commitCallBack()',
+        'data': {tableImages:tableImages}, 'backresult': 1
+      })
+    },
+    async uploadCheckPaper(){
       this.loading = true
+      await this.uploadCheckPaperPics()
       const  json = JSON.parse(this.weekConfig.f_json)
       json.forEach(res=>{
         if (res.itemname === '首检'){
@@ -195,6 +214,8 @@ export default {
         f_safecheck_type_id: this.weekConfig.f_security_check_type_id,
         f_safe_type_version: this.weekConfig.version,
         f_upload_date: Util.toStandardTimeString(),
+        f_checker_id: Vue.user.id,
+        f_checker_name: Vue.user.name,
         f_filialeid: Vue.user.orgid,
         f_orgid: Vue.user.orgid,
         f_orgname: Vue.user.orgs,
@@ -213,6 +234,11 @@ export default {
           weekCheckpaper.f_last_inspection_agency = item.f_item_value
         }
         if (item.f_item_name === '检定时间'){
+          if (item.f_item_value && item.f_item_value > Util.toStandardTimeString()){
+            this.$showMessage('只能选择当前或者之前的时间!')
+            throw '只能选择当前或者之前的时间!'
+            return
+          }
           weekCheckpaper.f_complete_date = item.f_item_value
         }
         if (item.f_item_name === '检定结果'){