safecheck-client 4.0.2-7 → 4.0.2-71

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/checkplan/CheckDetail.vue

@@ -111,7 +111,7 @@ export default {
     'check' (val) {
       let condition
       //tag
-      condition = `c.f_checker_name='${this.check.f_checker}' and i.f_state!='作废' and c.f_issued='是'`
+      condition = `c.f_checker='${this.check.f_checker}' and i.f_state!='作废' and c.f_issued='是'`
       if(this.checkstatus){
         condition += ` and cp.f_entry_status = '${this.checkstatus}'`
       }

package/src/components/checkplan/SelectCheckPlan.vue

@@ -57,6 +57,18 @@
                 :show-rest-button="reset">
               </datepicker>
             </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">片&emsp;&emsp;区</label>
+              <v-select class="select_list select"
+                        placeholder='片区/管理站' style="width: 60%"
+                        :value.sync="model.f_slice_area" v-model="model.f_slice_area"
+                        :options='$parent.$parent.sliceArea'
+                        filer-key="name"
+                        close-on-select clear-button
+                        condition="f_slice_area='{}'"
+                        :value-single="true">
+              </v-select>
+            </div>
             <!--<div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" v-if="$parent.$parent.criteriaShow">-->
             <!--<label class="font_normal_body">安检起始</label>-->
             <!--<datepicker-->
@@ -148,6 +160,7 @@
 </template>
 <script>
 import {PagedList} from 'vue-client'
+import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
 
 
 export default {
@@ -191,6 +204,7 @@ export default {
         f_start_time:'',
         f_end_time:''
       },
+      sliceArea:[],
       checker: this.$login.f,
       checkers: [],
       checkersname: [],
@@ -206,6 +220,29 @@ export default {
     }
   },
   methods: {
+    Mreadibook(val){
+      if (val){
+        new HttpResetClass().load('POST',`/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
+            items: 'name',
+            tablename: 't_zone',
+            condition: `parentid = '${val}'`,
+            orderitem: 'id'
+          }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          this.sliceArea=[]
+          this.sliceArea.push({
+            label:'全部',
+            value:''
+          })
+          res.data.forEach(ress=>{
+            this.sliceArea.push({
+              label:ress.name,
+              value:ress.name
+            })
+          })
+
+        })
+      }
+    },
     hidden() {
       this.criteriaShow = !this.criteriaShow
     },
@@ -256,6 +293,8 @@ export default {
     this.model.id = this.$login.f.id
     this.model.f_subcompany = this.$login.f.f_fengongsi
     this.model.f_filialeid = this.$login.f.orgid
+    this.Mreadibook(this.$login.f.orgid)
+
   },
 
   watch: {

package/src/components/paper/safetyledger.vue

@@ -0,0 +1,198 @@
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <criteria-paged :model="model" v-ref:paged >
+        <criteria partial='criteria' class="search_area" @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-2"  >
+                <label class="font_normal_body">客户编号</label>
+                <input type="text" class="input_search" v-model="model.f_userinfo_code"
+                       style="width: 60%" placeholder="客户编号" condition="f_userinfo_code='{}'">
+              </div>
+              <div class="form-group col-sm-2"  >
+                <label class="font_normal_body">客户名称</label>
+                <input type="text" class="input_search" v-model="model.f_user_name"
+                       style="width: 60%" placeholder="客户名称" condition="f_user_name like '%{}%'">
+              </div>
+              <div class="form-group col-sm-2"  >
+                <label class="font_normal_body">客户电话</label>
+                <input type="text" class="input_search" v-model="model.f_user_phone"
+                       style="width: 60%" placeholder="客户电话" condition="f_user_phone like '%{}%'">
+              </div>
+              <div class="form-group col-sm-2"  >
+                <label class="font_normal_body">详细地址</label>
+                <input type="text" class="input_search" v-model="model.f_address"
+                       style="width: 60%" placeholder="详细地址" condition="f_address like '%{}%'">
+              </div>
+              <div class="form-group col-sm-2"  >
+                <label class="font_normal_body">整改措施</label>
+                <v-select class="select_list select"
+                          placeholder='请选择' style="width: 60%"
+                          :value.sync="model.f_is_repaired"
+                          v-model="model.f_is_repaired"
+                          :options='$parent.$parent.repaired'
+                          filer-key="name"
+                          close-on-select clear-button
+                          condition="f_is_repaired in {}"
+                          :multiple="true">
+                </v-select>
+              </div>
+              <div class="form-group col-sm-2" style="width: auto;margin-top:8px;float: right">
+                <export-excel :data="$parent.$parent.searchData"
+                              :field="$parent.$parent.excelHeaders"
+                              :choose-col="true"
+                              sqlurl="api/af-safecheck/logic/exportfile" sql-name="safetyledger" template-name='安检台账记录'></export-excel>
+              <button class="button_spacing button_search" @click="search()">查询</button>
+                <div style="float: right" class="button_spacing"
+                     :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                     @click="$parent.$parent.hidden()"></div>
+              </div>
+              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
+                <label class="font_normal_body">开始时间</label>
+                <datepicker
+                  :value.sync="model.f_check_start"
+                  placeholder='开始时间' style="width: 60%"
+                  :disabled-days-of-week="[]"
+                  :format="'yyyy-MM-dd'"
+                  :show-rest-button="reset"
+                  v-model="model.f_check_start"
+                  condition="f_offsite_time > ='{} 00:00:00'">
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
+                <label class="font_normal_body">结束时间</label>
+                <datepicker
+                  :value.sync="model.f_check_end"
+                  placeholder='结束时间' style="width: 60%"
+                  :disabled-days-of-week="[]"
+                  :format="'yyyy-MM-dd'"
+                  :show-rest-button="reset"
+                  v-model="model.f_check_end"
+                  condition="f_offsite_time <=  '{} 23:59:59'">
+                </datepicker>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid class="list_area table_sy" style="overflow: hidden" :model="model" partial='list' v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <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>
+              <th>
+                <nobr>用气类型</nobr>
+              </th>
+              <th>
+                <nobr>隐患类别</nobr>
+              </th>
+              <th>
+                <nobr>隐患描述</nobr>
+              </th>
+              <th>
+                <nobr>整改措施</nobr>
+              </th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <td style="text-align: center">{{row.f_filiale_name}}</td>
+            <td style="text-align: center">{{row.f_offsite_time}}</td>
+            <td style="text-align: center">{{row.f_street}}</td>
+            <td style="text-align: center">{{row.f_address}}</td>
+            <td style="text-align: center">{{row.f_user_name}}</td>
+            <td style="text-align: center">{{row.f_userinfo_code}}</td>
+            <td style="text-align: center">{{row.f_user_type}}</td>
+            <td style="text-align: center">{{ row.f_gas_type }}</td>
+            <td style="text-align: center">{{ row.f_device_type }}</td>
+            <td style="text-align: center">{{ row.f_item_name }}</td>
+            <td style="text-align: center">{{ row.f_is_repaired }}</td>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+import co from 'co'
+import * as Util from '../Util'
+import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
+export default {
+  title: '隐患台账',
+  data() {
+    let model = new PagedList('api/af-safecheck/sql/safetyledger', 20)
+    return {
+      model: model,
+      criteriaShow:false,
+      repaired: [{label: '全部', value: ''}, {label: '用户自行整改', value: '用户自行整改'}, {label: '现场已处理', value: '现场已处理'}, {label: '维修已处理', value: '维修已处理'}, {label: '转维修', value: '转维修'}],
+      excelHeaders: {
+        'f_userinfo_code': '客户编号',
+        'f_user_name': '客户姓名',
+        'f_user_phone':'客户电话',
+        'f_user_type': '客户类型',
+        'f_residential_area': '小区',
+        'f_address': '客户地址',
+        'f_offsite_time': '安检时间',
+        'f_gas_type': '用气类型',
+        'f_device_type': '隐患类别',
+        'f_item_name': '隐患描述',
+        'f_is_repaired': '整改措施',
+        'excel_export_p0':'隐患照片1',
+        'excel_export_p1':'隐患照片2',
+        'excel_export_p2':'隐患照片3',
+        'excel_export_p3':'隐患照片4',
+        'excel_export_repair':'处理照片1',
+        'excel_export_repair1':'处理照片2',
+        'excel_export_other_dealpath1':'处理照片3',
+        'excel_export_other_dealpath2':'处理照片4',
+      },
+    }
+  },
+  ready() {
+    this.$refs.paged.$refs.criteria.model.f_check_start = Util.toStartDateString() + ' 00:00:00'
+    this.$refs.paged.$refs.criteria.model.f_check_end = Util.toEndDateString() + ' 23:59:59'
+    this.search()
+  },
+  methods: {
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    search() {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch(args) {
+      this.model.search(args.condition, args.model, args.condValue)
+    }
+  },
+  computed :{
+    searchData() {
+      return {condition: this.model.condition}
+    }
+  },
+  watch: {
+  },
+  beforeDestroy() {
+
+  }
+}
+</script>