safecheck-client 4.0.2-63 → 4.0.2-65

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

@@ -16,6 +16,7 @@
         </div>
       </div>
     </div>
+    <week-check-user-info :userinfo="weekUserInfo"></week-check-user-info>
     <check-rsult-simple  :itemname="itemname"  :items="weekCheck" ></check-rsult-simple>
     <div class="row text-center" style="margin-top: 20px;">
       <button v-if="showbutton" type="button" class="col-sm-3 btn btn-primary" @click="uploadCheckPaper">提交</button>
@@ -27,6 +28,7 @@
 import {HttpResetClass, PagedList} from 'vue-client'
 import Vue from 'vue'
 import * as Util from '../../Util'
+import WeekCheckUserInfo from './WeekCheckUserInfo'
 
 export default {
   title: '周检待办详情',
@@ -38,6 +40,9 @@ export default {
       }
     }
   },
+  components: {
+    WeekCheckUserInfo
+  },
   data () {
     return {
       weekConfig:{},
@@ -46,7 +51,8 @@ export default {
       current: null,
       showbutton:false,
       weekCheckPaper:{},
-      itemname:''
+      itemname:'',
+      weekUserInfo:{}
     }
   },
   ready () {
@@ -70,6 +76,7 @@ export default {
     }else {
       this.getweekconfig(this.weekdata.safechecktype_id)
     }
+    this.getWeekUserInfo()
   },
   computed: {
   },
@@ -213,6 +220,14 @@ export default {
           item.f_item_value = this.weekdata.f_table_state
           item.readonly = true
         }
+        if (item.f_item_name === '操作人'){
+          item.f_item_value = Vue.user.name
+          item.readonly = true
+        }
+        if (item.f_item_name === '完成时间') {
+          item.f_item_value = Util.toStandardTimeString()
+          item.readonly = true
+        }
       })
     },
     // 监听表单
@@ -367,6 +382,11 @@ export default {
         }
         if (this.steps[this.current] == '上传报告'){
           if (item.f_item_name === '检定时间' ){
+            if (item.f_item_value && item.f_item_value > Util.toStandardTimeString()){
+              this.$showMessage('只能选择当前或者之前的时间!')
+              throw '只能选择当前或者之前的时间!'
+              return
+            }
             data.f_complete_date = item.f_item_value
           }
         }
@@ -378,7 +398,15 @@ export default {
         this.weekCheckPaper = res.data[0]
       })
       this.$dispatch('confirm')
-    }
+    },
+    async getWeekUserInfo () {
+      const http = new HttpResetClass()
+      http.load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/getWeekUserinfo`, {
+        condition:` uf.f_userinfo_id = '${this.weekdata.f_userinfo_id}'`
+      }).then(res=>{
+        this.weekUserInfo = res.data[0]
+      })
+    },
   }
 }
 </script>

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

@@ -61,8 +61,25 @@
                           close-on-select clear-button></v-select>
               </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" >
+                <v-select id="f_complete"
+                          :value.sync="model.f_check_state_text"
+                          class="input-font"
+                          :options='$parent.$parent.checkstates'
+                          placeholder='请选择周检状态'
+                          v-model="model.f_check_state_text"
+                          condition="f_check_state_text like '%{}%'"
+                          close-on-select clear-button></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: 45%;" @click="search">查询</button>
+              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 30%;" @click="search">查询</button>
+              <button type="button" class="btn btn-lg btn-font btn-color" style="margin-right: 20px;width: 30%;" @click="$parent.$parent.sealScan">铅封识别</button>
             </div>
           </form>
         </div>
@@ -91,7 +108,7 @@
                 </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_state }}</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_check_state_text }}</p>
                 </div>
               </div>
             </div>
@@ -125,6 +142,13 @@ export default {
         {label:'输入检定结果',value:'输入检定结果'},
         {label:'装表',value:'装表'},
         {label:'上传报告',value:'上传报告'},
+      ],
+      checkstates:[
+        {label:'请选择周检状态',value:''},
+        {label:'未检',value:'未检'},
+        {label:'过期',value:'过期'},
+        {label:'临期',value:'临期'},
+        {label:'正常',value:'正常'}
       ]
     }
   },
@@ -134,6 +158,40 @@ export default {
   computed: {
   },
   methods:{
+    sealScan() {
+      HostApp.__this__ = this
+      HostApp.readNfc({
+        'callback': 'javascript:HostApp.__this__.sealScanCallback()',
+        // 固定key，代表是否将logic执行结果作为参数传入回调方法，1代表true，0代表false，
+        // 执行回调方法传入key为backresult
+        // 如需额外拼接参数，写在logic返回值的params，例如xxlogic返回:{"params": "success"}
+        'backresult': 1
+      })
+    },
+    sealScanCallback() {
+      console.log('sealScanCallback=========')
+      let result = HostApp.getNfcUUID()
+      console.log('result=', result)
+      if (result.code == 200){
+        const sealUID = result.data
+        if (!Util.isEmpty(sealUID)){
+          let http = new HttpResetClass()
+          http.load('post', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/getWeekPlanitem`, {data:{
+              condition:` 1=1 and sr.f_uid = '${sealUID}'`,
+              f_user_name: Vue.user.name
+            }
+          }).then(res =>{
+            if (res.data.length>0){
+              this.inspect(res.data[0])
+            }else {
+              this.$showMessage("未找到该铅封信息，请联系管理员检查！")
+            }
+          })
+        }
+      } else {
+        this.$showMessage("未识别到铅封信息，请重新尝试！")
+      }
+    },
     scan(){
       HostApp.__this__=this,
         HostApp.scanCode({callback:"javascript:HostApp.__this__.getCode();"})

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

@@ -45,6 +45,22 @@
                        v-model=model.f_address condition="f_address 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 class="font text-left">检定结果：</label>
+              </div>
+              <div class="col-xs-8" >
+                <v-select id="f_complete"
+                          :value.sync="model.f_week_check_result"
+                          class="input-font"
+                          :options='$parent.$parent.checkresults'
+                          placeholder='请选择检定结果'
+                          v-model="model.f_week_check_result"
+                          condition="f_week_check_result = '{}'"
+                          close-on-select clear-button></v-select>
+              </div>
+            </div>
             <div class="row app-row">
               <div class="col-xs-4">
                 <img src="../../../assets/是否已检.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -80,7 +96,8 @@
               </datepicker>
             </div>
             <div class="row text-center" style="margin-top: 20px;">
-              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 45%;" @click="search">查询</button>
+              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 30%;" @click="search">查询</button>
+              <button type="button" class="btn btn-lg btn-font btn-color" style="margin-right: 20px;width: 30%;" @click="$parent.$parent.sealScan">铅封识别</button>
             </div>
           </form>
         </div>
@@ -112,8 +129,8 @@
                   <p class="panel-title col-xs-8 text-left input-font">{{ row.f_upload_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_state }}</p>
+                  <p class="panel-title col-xs-4 text-left font">检定结果</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_week_check_result }}</p>
                 </div>
               </div>
             </div>
@@ -140,7 +157,11 @@ export default {
     model.f_user_name = `${Vue.user.name}`
     return {
       model: model,
-
+      checkresults:[
+        {label:'请选择检定结果',value:''},
+        {label:'合格',value:'合格'},
+        {label:'不合格',value:'不合格'},
+      ]
     }
   },
   ready () {
@@ -159,6 +180,40 @@ export default {
     search () {
       this.$refs.paged.$refs.cri.search()
     },
+    sealScan() {
+      HostApp.__this__ = this
+      HostApp.readNfc({
+        'callback': 'javascript:HostApp.__this__.sealScanCallback()',
+        // 固定key，代表是否将logic执行结果作为参数传入回调方法，1代表true，0代表false，
+        // 执行回调方法传入key为backresult
+        // 如需额外拼接参数，写在logic返回值的params，例如xxlogic返回:{"params": "success"}
+        'backresult': 1
+      })
+    },
+    sealScanCallback() {
+      console.log('sealScanCallback=========')
+      let result = HostApp.getNfcUUID()
+      console.log('result=', result)
+      if (result.code == 200){
+        const sealUID = result.data
+        if (!Util.isEmpty(sealUID)){
+          let http = new HttpResetClass()
+          http.load('post', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/getWeekPaper`, {data:{
+              condition:` 1=1 and sr.f_uid = '${sealUID}'`,
+              f_user_name: Vue.user.name
+            }
+          }).then(res =>{
+            if (res.data.length>0){
+              this.inspect(res.data[0])
+            }else {
+              this.$showMessage("未找到该铅封信息，请联系管理员检查！")
+            }
+          })
+        }
+      } else {
+        this.$showMessage("未识别到铅封信息，请重新尝试！")
+      }
+    },
     inspect (row) {
       var pardate = {
         _this:this,

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

@@ -11,7 +11,7 @@
               </div>
               <div class="col-xs-8" >
                 <input class="search_input input-font"
-                       v-model=model.f_plan_name condition="f_plan_name like '%{}%'" style="width: 70%" placeholder="请输入用户名称" />
+                       v-model=model.f_plan_name condition="f_plan_name like '%{}%'" style="width: 70%" placeholder="请输入计划名称" />
               </div>
             </div>
             <div class="row text-center" style="margin-top: 20px;">

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

@@ -0,0 +1,99 @@
+<template>
+  <div class="auto app-text">
+    <div class="panel" style="padding: 10px 10px 5px 10px;">
+      <div class="panel-body panel-self">
+        <div class="col-xs-12" style="padding: 2px 0">
+          <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户编号:</b></p>
+          <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_userinfo_id }}</p>
+        </div>
+        <div class="col-xs-12" style="padding: 2px 0">
+          <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户名称:</b></p>
+          <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_user_name }}</p>
+        </div>
+        <div class="col-xs-12" style="padding: 2px 0">
+          <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户电话:</b></p>
+          <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_user_phone }}</p>
+        </div>
+        <div class="col-xs-12" style="padding: 2px 0">
+          <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户地址:</b></p>
+          <p class="panel-title text-left input-font" style="width: 79%;float: left">{{ userinfo.f_address }}</p>
+        </div>
+        <div class="col-xs-12" style="padding: 2px 0">
+          <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>表厂家:</b></p>
+          <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_manufacturers }}</p>
+        </div>
+        <div class="col-xs-12" style="padding: 2px 0">
+          <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>表类型:</b></p>
+          <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_manufacturers }}</p>
+        </div>
+        <div class="col-xs-12" style="padding: 2px 0">
+          <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>表品牌:</b></p>
+          <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_meter_brand }}</p>
+        </div>
+        <div class="col-xs-12" style="padding: 2px 0">
+          <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>表型号:</b></p>
+          <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_meter_style }}</p>
+        </div>
+        <div class="col-xs-12" style="padding: 2px 0">
+          <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>表号:</b></p>
+          <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_meternumber }}</p>
+        </div>
+        <div class="col-xs-12" style="padding: 2px 0">
+          <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>首检时间:</b></p>
+          <p class="panel-title col-xs-7 text-left input-font">{{userinfo.f_first_inspection_date}}</p>
+        </div>
+        <div class="col-xs-12" style="padding: 2px 0">
+          <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>检定时间:</b></p>
+          <p class="panel-title col-xs-7 text-left input-font">{{userinfo.f_last_inspection_date}}</p>
+        </div>
+        <div class="col-xs-12" style="padding: 2px 0">
+          <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>周检状态:</b></p>
+          <p class="panel-title col-xs-7 text-left input-font">{{userinfo.f_check_state_text}}</p>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+import * as Util from '../../Util'
+import Vue from 'vue'
+
+export default {
+  title: 'WeekCheckUserInfo',
+  props: ['userinfo'],
+  data () {
+    return {}
+  },
+  ready () {
+  },
+  methods: {
+  },
+  components: {
+  }
+}
+</script>
+
+<style scoped>
+.input-font {
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+.app-text {
+  font-size: 12px;
+}
+.font {
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+.panel-self {
+  border-radius: 5px;
+  border: 1px solid #c5e1f7;
+  background-color: #F2F6FA;
+}
+.text-left {
+  text-align: left;
+}
+
+</style>

package/src/components/defects/DefectModal.vue

@@ -1,101 +1,101 @@
-<template>
-  <modal :show.sync="$parent.show" v-ref:modal>
-    <div slot="modal-header" class="modal-header">
-      <h4 class="modal-title">
-        隐患处理
-      </h4>
-    </div>
-    <div slot="modal-body" class="modal-body">
-      <div class="row auto">
-      <div class="form-group">
-        <label class="col-sm-12 control-label">隐患级别：</label>
-        <div class="col-sm-12">{{defect.f_defect_level}}</div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label text-left">隐患：</label>
-        <div class="col-sm-12">{{defect.f_defect}}</div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">部位：</label>
-        <div class="col-sm-12">{{defect.f_device_type}}</div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">处理方式：</label>
-        <div class="col-sm-12">
-          <radio-group :value.sync="defect.f_resolve_type" type="success" buttons="false" disabled="disabled">
-          <radio disabled="disabled" v-if="defect.f_resolve_type =='现场处理'" value="现场处理">现场处理</radio>
-          <radio disabled="disabled" v-if="defect.f_resolve_type =='用户处理'" value="用户处理">用户处理</radio>
-          <radio disabled="disabled" v-if="defect.f_resolve_type =='维修处理'"  value="维修处理">维修处理</radio>
-        </radio-group></div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">整改结果：</label>
-        <div class="col-sm-12">
-          <v-select id="f_ratification" :value.sync="f_ratification"
-                    :options='ratifications' close-on-select clear-button></v-select></div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">处理人：</label>
-        <div class="col-sm-12">
-          <input type="text" class="form-control" v-model="defect.f_ratifiedpeople" maxlength="20">
-          <!--<chooser :userid.sync='f.id' v-model="defect.f_ratifiedpeople" resource-type="user" :width='200' :select-data.sync='chosenOrg'></chooser>-->
-        </div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">处理时间：</label>
-        <div class="col-sm-12"><datepicker id="f_end"
-                      :value.sync="defect.f_ratifieddate"
-                      :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'"></datepicker></div>
-        </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">备注：</label>
-        <div class="col-sm-12"><textarea  class="form-control"  v-model="defect.f_remark" rows="3"></textarea></div>
-      </div>
-      </div>
-    </div>
-    <div slot="modal-footer" class="modal-footer">
-      <button type="button" class="btn btn-default" @click="$parent.todo(defect)" v-if="!defect.flag">保存</button>
-      <button type="button" class="btn btn-default" @click="$parent.undo">取消</button>
-    </div>
-  </modal>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-  import Vue from 'vue'
-  import * as Util from '../Util'
-  import RadioGroup from 'vue-client/src/vue-strap/src/radioGroup'
-  import Radio from 'vue-client/src/vue-strap/src/radioBtn'
-
-  export default {
-        title:'隐患处理',
-        props:['defect','f'],
-    data(){
-          return {
-            model: {},
-            chosenOrg:{id:0},
-            ratifications:[
-                {label: '请选择处理结果', value: null},
-                {label: '未处理', value: '未处理'},
-                {label: '已处理', value: '已处理'},
-              ],
-          }
-    },
-    components: {
-      RadioGroup,
-      Radio
-    },
-    watch:{
-         'f_ratification'(val){
-            if(this.defect.f_ratification)
-              this.defect.f_ratification = this.f_ratification[0]
-          },
-          'defect'(val){
-            this.defect.id = this.defect.defectid
-            this.f_ratification = this.defect.ratification
-            this.defect.f_remark = this.defect.remark
-        }
-     },
-    }
-</script>
-
+<template>
+  <modal :show.sync="$parent.show" v-ref:modal>
+    <div slot="modal-header" class="modal-header">
+      <h4 class="modal-title">
+        隐患处理
+      </h4>
+    </div>
+    <div slot="modal-body" class="modal-body">
+      <div class="row auto">
+      <div class="form-group">
+        <label class="col-sm-12 control-label">隐患级别：</label>
+        <div class="col-sm-12">{{defect.f_defect_level}}</div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label text-left">隐患：</label>
+        <div class="col-sm-12">{{defect.f_defect}}</div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">部位：</label>
+        <div class="col-sm-12">{{defect.f_device_type}}</div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">处理方式：</label>
+        <div class="col-sm-12">
+          <radio-group :value.sync="defect.f_resolve_type" type="success" buttons="false" disabled="disabled">
+          <radio disabled="disabled" v-if="defect.f_resolve_type =='现场处理'" value="现场处理">现场处理</radio>
+          <radio disabled="disabled" v-if="defect.f_resolve_type =='用户处理'" value="用户处理">用户处理</radio>
+          <radio disabled="disabled" v-if="defect.f_resolve_type =='维修处理'"  value="维修处理">维修处理</radio>
+        </radio-group></div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">整改结果：</label>
+        <div class="col-sm-12">
+          <v-select id="f_ratification" :value.sync="f_ratification"
+                    :options='ratifications' close-on-select clear-button></v-select></div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">处理人：</label>
+        <div class="col-sm-12">
+          <input type="text" class="form-control" v-model="defect.f_ratifiedpeople" maxlength="20">
+          <!--<chooser :userid.sync='f.id' v-model="defect.f_ratifiedpeople" resource-type="user" :width='200' :select-data.sync='chosenOrg'></chooser>-->
+        </div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">处理时间：</label>
+        <div class="col-sm-12"><datepicker id="f_end"
+                      :value.sync="defect.f_ratifieddate"
+                      :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'"></datepicker></div>
+        </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">备注：</label>
+        <div class="col-sm-12"><textarea  class="form-control"  v-model="defect.f_remark" rows="3"></textarea></div>
+      </div>
+      </div>
+    </div>
+    <div slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-default" @click="$parent.todo(defect)" v-if="!defect.flag">保存</button>
+      <button type="button" class="btn btn-default" @click="$parent.undo">取消</button>
+    </div>
+  </modal>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  import Vue from 'vue'
+  import * as Util from '../Util'
+  import RadioGroup from 'vue-client/src/vue-strap/src/radioGroup'
+  import Radio from 'vue-client/src/vue-strap/src/radioBtn'
+
+  export default {
+        title:'隐患处理',
+        props:['defect','f'],
+    data(){
+          return {
+            model: {},
+            chosenOrg:{id:0},
+            ratifications:[
+                {label: '请选择处理结果', value: null},
+                {label: '未处理', value: '未处理'},
+                {label: '已处理', value: '已处理'},
+              ],
+          }
+    },
+    components: {
+      RadioGroup,
+      Radio
+    },
+    watch:{
+         'f_ratification'(val){
+            if(this.defect.f_ratification)
+              this.defect.f_ratification = this.f_ratification[0]
+          },
+          'defect'(val){
+            this.defect.id = this.defect.defectid
+            this.f_ratification = this.defect.ratification
+            this.defect.f_remark = this.defect.remark
+        }
+     },
+    }
+</script>
+