safecheck-client 3.0.35-52 → 3.0.35-54

package/src/filiale/weinan/android/SafecheckOrderV.vue

@@ -747,7 +747,9 @@ export default {
       let hasError = this.verifyState()
       if (hasError)
         return hasError
-
+      if(this.data.f_entry_status == '到访不遇' &&  !this.data.f_daofang_status ){
+        return '请选择到访不遇状态！'
+      }
       if (this.data.f_entry_status != '入户' || this.data.f_usegas == '封堵')
         return null
       // hasError = this.verifyUser()
@@ -2153,6 +2155,7 @@ export default {
       // 安检状态
       this.$set('data.f_entry_status', '入户')
       this.$set('data.f_usegas', '已使用')
+      this.$set('data.f_daofang_status', '')
       this.$set('data.f_state', this.item.f_state)
       this.$set('data.f_istoubao', this.item.f_plan_meters[0].f_istoubao)
       this.$set('data.f_toubao_enddate', this.item.f_plan_meters[0].f_toubao_enddate)

package/src/filiale/weinan/android/SafecheckUserInfo.vue

@@ -120,6 +120,19 @@
             <input type="radio" name="enterstatus" v-model="f_entry_status" id="rejectchecck"  style="transform: scale(1.5);" value="拒检">&ensp;拒绝安检
             <input type="radio" name="enterstatus" v-model="f_entry_status" id="enterhouse"  style="transform: scale(1.5);" value="入户">&ensp;正常入户
           </div>
+          <div class="form-group col-sm-12 col-xs-12" :class="style__" v-show="f_entry_status=='到访不遇'" style="margin-top: 6px">
+            <span class="text-left col-md-3 col-sm-4 col-xs-4"> <img src="../../../assets/enterstatus.png" style="width: 20px;margin-bottom: 5px;text-align: left" alt="">到访状态:</span>
+            <div v-if="userinfo.f_check_type=='民用'" :class="style__" class="col-md-9 col-sm-8 col-xs-8 text-center">
+              <input type="radio" name="daofang_status" v-model="f_daofang_status" id="f_daofang_status" style="transform: scale(1.5);" value="长期无人">&ensp;长期无人&ensp;
+              <input type="radio" name="daofang_status" v-model="f_daofang_status" id="f_daofang_status" style="transform: scale(1.5);" value="尚未装修">&ensp;尚未装修&ensp;
+              <input type="radio" name="daofang_status" v-model="f_daofang_status" id="f_daofang_status" style="transform: scale(1.5);" value="无法联系">&ensp;无法联系&ensp;
+              <input type="radio" name="daofang_status" v-model="f_daofang_status" id="f_daofang_status" style="transform: scale(1.5);" value="首访不遇">&ensp;首访不遇
+            </div>
+            <div v-show="userinfo.f_check_type=='非民用'" :class="style__" class="col-md-9 col-sm-8 col-xs-8 text-center">
+              <input type="radio" name="daofang_status" v-model="f_daofang_status" id="f_daofang_status" style="transform: scale(1.5);" value="首访不遇">&ensp;首访不遇&ensp;
+              <input type="radio" name="daofang_status" v-model="f_daofang_status" id="f_daofang_status" style="transform: scale(1.5);" value="暂停营业">&ensp;暂停营业
+            </div>
+          </div>
           <div class="form-group col-sm-12 col-xs-12" :class="style__" v-show="f_entry_status=='到访不遇'">
             <label class="text-left font">到访不遇照片：</label>
             <div class="auto">

package/src/filiale/weinan/pc/PaperList.vue

@@ -210,6 +210,17 @@
                           :search="false"
                           close-on-select clear-button></v-select>
               </div>
+              <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow && model.f_entry == '到访不遇'">
+                <label class="font_normal_body">到访状态</label>
+                <v-select
+                  class="select select_list"
+                  :value.sync="model.f_daofang_status"
+                  v-model="model.f_daofang_status"
+                  :options='$parent.$parent.daofang_status'
+                  placeholder='请选择'
+                  condition="f_daofang_status = '{}'"
+                  close-on-select clear-button></v-select>
+              </div>
             </div>
             <modal :show.sync="$parent.$parent.showModal" v-ref:modal backdrop="false">
               <div slot="modal-header" class="modal-header">
@@ -391,11 +402,13 @@
           'f_entry_status': '安检状态',
           'f_offsite_time': '安检时间',
           'f_no_checkplan': '有无计划',
-          'f_checker_name': '安检员'
+          'f_checker_name': '安检员',
+          'f_daofang_status': '到访不遇状态'
         },
         fun: this.$login.f,
         pcds:[],
         checkersid: [],
+        daofang_status:this.$appdata.getParam('到访不遇状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('到访不遇状态')]:[{label: '全部', value: ''}],
         safetype: this.$appdata.getParam('安检类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检类型')]:[{label: '全部', value: ''}],
         criteriaShow: false,
         showModal: false,

package/src/main.js

@@ -1,33 +1,33 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import { system } from 'system-clients'
-import safecheck from './safecheck'
-import echarts from 'echarts'
-// import safecheck from './rongcheng'
-
-all()
-// 验证码开关赋值
-var Verificationfalg = false
-system(Verificationfalg)
-// system()
-safecheck('bayan')
-// safecheck('rizhao')
-require('./bootstrap/less/bootstrap.less')
-require('./expandcss.less')
-
-Vue.prototype.$echarts = echarts
-Vue.android = false
-
-Vue.url = '/SafeCheck/rs/'
-if(Vue.android)
-  Vue.url = Vue.staticUrl
-Vue.interval = 1*60*1000
-Vue.nopic = 'file:///android_asset/nopic.png'
-Vue.mapSetup = false
-
-/* eslint-disable no-new */
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import { system } from 'system-clients'
+import safecheck from './safecheck'
+import echarts from 'echarts'
+// import safecheck from './rongcheng'
+
+all()
+// 验证码开关赋值
+var Verificationfalg = false
+system(Verificationfalg)
+// system()
+safecheck('siyang')
+// safecheck('rizhao')
+require('./bootstrap/less/bootstrap.less')
+require('./expandcss.less')
+
+Vue.prototype.$echarts = echarts
+Vue.android = false
+
+Vue.url = '/SafeCheck/rs/'
+if(Vue.android)
+  Vue.url = Vue.staticUrl
+Vue.interval = 1*60*1000
+Vue.nopic = 'file:///android_asset/nopic.png'
+Vue.mapSetup = false
+
+/* eslint-disable no-new */
+new Vue({
+  el: 'body',
+  components: { App }
+})

package/src/filiale/bayan/pc/usergashistory.vue

@@ -1,149 +0,0 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main">
-      <criteria-paged :model="model" v-ref:paged @sort="sort">
-        <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="tcp.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="tcp.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="tcp.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_meternumber"
-                       style="width: 60%" placeholder="客户表号" condition="tcp.f_meternumber like '%{}%'">
-              </div>
-              <div class="form-group col-sm-2"  >
-                <label class="font_normal_body">小&emsp;&emsp;区</label>
-                <input type="text" class="input_search" v-model="model.f_residential_area"
-                       style="width: 60%" placeholder="小区" condition="tcp.f_residential_area 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="tcp.f_address like '%{}%'">
-              </div>
-              <div class="form-group col-sm-2" style="width: auto;margin-top:8px;float: right">
-                <export-excel-safe :data="$parent.$parent.searchData"
-                                   :field="$parent.$parent.excelHeaders"
-                                   :choose-col="true"
-                                   sqlurl="rs/logic/SafeExportExcel"
-                                   sql-name="detailhistory"
-                                   template-name='用户安检气量'></export-excel-safe>
-                <button class="button_spacing button_search" @click="search()">查询</button>
-              </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>
-            </tr>
-          </template>
-          <template partial='body'>
-            <td style="text-align: center">{{$index+1}}</td>
-            <td style="text-align: center">{{row.f_orgname}}</td>
-            <td style="text-align: center">{{row.f_userinfo_code}}</td>
-            <td style="text-align: center">{{row.f_user_name}}</td>
-            <td style="text-align: center">{{row.shangcileigouqilaing}}</td>
-            <td style="text-align: center">{{row.leigouqiliang}}</td>
-            <td style="text-align: center">{{row.yiyongqilaing}}</td>
-            <td style="text-align: center">{{ row.shengyuqiliang }}</td>
-            <td style="text-align: center">{{ row.shengyujine }}</td>
-            <td style="text-align: center"></td>
-          </template>
-        </data-grid>
-      </criteria-paged>
-    </div>
-  </div>
-</template>
-
-<script>
-  import {PagedList} from 'vue-client'
-  import Vue from 'vue'
-  import co from 'co'
-  import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
-
-
-export default {
-  title: '用户气量历史记录',
-  data() {
-    let model = new PagedList('rs/sql/detailhistory', 20, {})
-    return {
-      model: model,
-      searchData: {
-        condition: "1=1",
-      },
-      excelHeaders: {
-        'f_orgname':'分公司',
-        'f_userinfo_code': '客户编号',
-        'f_user_name': '客户姓名',
-        'shangcileigouqilaing': '上月安检累计',
-        'leigouqiliang': '本月安检累计',
-        'yiyongqilaing': '实际使用量',
-        'shengyuqiliang': '剩余量',
-        'shengyujine': '剩余金额',
-        ' ': '气量是否正常',
-        }
-      }
-    },
-    methods: {
-      search() {
-        this.$refs.paged.$refs.criteria.search()
-      },
-      selfSearch(args) {
-        this.searchData.condition = args.condition
-        this.model.search(args.condition, args.model, args.condValue)
-      },
-
-    },
-
-    ready() {
-    },
-    watch: {
-    }
-
-  }
-</script>

package/src/filiale/bayan/pc/usergashistorynian.vue

@@ -1,149 +0,0 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main">
-      <criteria-paged :model="model" v-ref:paged @sort="sort">
-        <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_user_name"
-                       style="width: 60%" placeholder="客户名称" condition="tcp.f_user_name like '%{}%'">
-              </div>
-              <div class="form-group col-sm-2" style="width: auto;margin-top:8px;float: right">
-                <export-excel-safe :data="$parent.$parent.searchData"
-                                   :field="$parent.$parent.excelHeaders"
-                                   :choose-col="true"
-                                   sqlurl="rs/logic/SafeExportExcel"
-                                   sql-name="detailhistorynian"
-                                   template-name='用户安检年气量'></export-excel-safe>
-                <button class="button_spacing button_search" @click="search()">查询</button>
-              </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>
-              <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">{{$index+1}}</td>
-            <td style="text-align: center">{{row.f_user_name}}</td>
-            <td style="text-align: center">{{row.yi}}</td>
-            <td style="text-align: center">{{row.er}}</td>
-            <td style="text-align: center">{{row.san}}</td>
-            <td style="text-align: center">{{row.si}}</td>
-            <td style="text-align: center">{{row.wu}}</td>
-            <td style="text-align: center">{{row.liu}}</td>
-            <td style="text-align: center">{{row.qi}}</td>
-            <td style="text-align: center">{{row.ba}}</td>
-            <td style="text-align: center">{{row.jiu}}</td>
-            <td style="text-align: center">{{row.shi}}</td>
-            <td style="text-align: center">{{row.shi1}}</td>
-            <td style="text-align: center">{{row.shi2}}</td>
-            <td style="text-align: center">{{row.nian}}</td>
-          </template>
-        </data-grid>
-      </criteria-paged>
-    </div>
-  </div>
-</template>
-
-<script>
-  import {PagedList} from 'vue-client'
-  import Vue from 'vue'
-  import co from 'co'
-  import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
-
-
-export default {
-  title: '用户年气量历史记录',
-  data() {
-    let model = new PagedList('rs/sql/detailhistorynian', 20, {})
-    return {
-      model: model,
-      searchData: {
-        condition: "1=1",
-      },
-      excelHeaders: {
-        'f_user_name': '客户姓名',
-        'yi': '一月实供',
-        'er': '二月实供',
-        'san': '三月实供',
-        'si': '四月实供',
-        'wu': '五月实供',
-        'liu': '六月实供',
-        'qi': '七月实供',
-        'ba': '八月实供',
-        'jiu': '九月实供',
-        'shi': '十月实供',
-        'shi1': '十一月实供',
-        'shi2': '十二月实供',
-        'nian': '年用气量'
-        }
-      }
-    },
-    methods: {
-      search() {
-        this.$refs.paged.$refs.criteria.search()
-      },
-      selfSearch(args) {
-        this.searchData.condition = args.condition
-        this.model.search(args.condition, args.model, args.condValue)
-      },
-
-    },
-
-    ready() {
-    },
-    watch: {
-    }
-
-  }
-</script>