safecheck-client 3.0.35-6 → 3.0.35-61

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

@@ -231,6 +231,15 @@
                         close-on-select
                         condition="f_check_type = '{}'"></v-select>
             </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">隐患等级</label>
+              <v-select :value.sync="model.f_defect_level" v-model='model.f_defect_level'
+                        :value-single="true" style="width: 60%"
+                        class="select_list select"
+                        :options='$parent.$parent.defectlevels' placeholder='隐患等级'
+                        close-on-select
+              ></v-select>
+            </div>
           </div>
 
           <div v-show="$parent.$parent.$parent.showItem" class="row">
@@ -436,7 +445,15 @@
                 style="width:60%">
               </datepicker>
             </div>
-
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">隐患等级</label>
+              <v-select :value.sync="model.f_defect_level" v-model='model.f_defect_level'
+                        :value-single="true" style="width: 60%"
+                        class="select_list select"
+                        :options='$parent.$parent.defectlevels' placeholder='隐患等级'
+                        close-on-select
+              ></v-select>
+            </div>
           </div>
         </div>
       </criteria>
@@ -648,6 +665,7 @@ export default {
     model.f_defect_content = "CASE WHEN CHARINDEX( '\"result\":\"正常\"', f_defect_content ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( f_defect_content, len( f_defect_content ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END"
     return {
       checktype: this.$appdata.getParam('用户类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]:[{label: '全部', value: ''}],
+      defectlevels: [{label: '全部', value: ''},{label: '一级隐患', value: 'f_fist_count'}, {label: '二级隐患', value: 'f_second_count '}, {label: '三级隐患', value: 'f_third_count'}],
       quyus: [{label: '请选择', value: ''}, ...this.$appdata.getParam('区域')],
       bumens: [{label: '请选择', value: ''}],
       teams: [{label: '请选择', value: ''}],
@@ -1127,6 +1145,9 @@ export default {
       if (this.f_check_plan.f_plan_name) {
         args.condition += ` and f_check_plan_id = '${this.f_check_plan.id}'`
       }
+      if (args.model.f_defect_level){
+        args.condition += ` and ${args.model.f_defect_level} > 0 `
+      }
       this.checkes = []
       this.checkAll = false
       this.model.search(args.condition, args.model)

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

@@ -59,13 +59,18 @@
             </div>
             <div :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}">
               <label class="font_normal_body">用户类型</label>
-              <v-select :value.sync="model.f_check_type" v-model='model.f_check_type'
+              <v-select :value.sync="model.f_check_type" v-model='model.f_check_typef_check_type'
                         :value-single="true" style="width: 60%"
                         class="select_list select"
                         :options='$parent.$parent.checktype' placeholder='客户类型'
                         close-on-select
                         condition="f_check_type = '{}'"></v-select>
             </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>
+              <input type="text" class="input_search" v-model="model.f_residential_area"
+                     style="width: 60%" placeholder="小区" condition="f_residential_area like '%{}%'">
+            </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 :value.sync="model.f_quyu" :value-single="true" v-model="model.f_quyu"

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

@@ -0,0 +1,149 @@
+<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

@@ -0,0 +1,149 @@
+<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>

package/src/filiale/bayan/pc.js

@@ -1,22 +1,24 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-//手机特殊目录注册到该文件中
-let specialComp = {
-  // 安检汇总-列表
-  'plan-manage': (resolve) => { require(['./pc/PlanManage'], resolve) },
-  'new-check-paper': (resolve) => { require(['./pc/NewCheckpaper.vue'], resolve) },
-  'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
-  'check-plan-area-list': (resolve) => { require(['./pc/CheckPlanAreaList'], resolve) },
-  'hiddensituation': (resolve) => { require(['./pc/HiddenSituation'], resolve) },
-  'check-search-user': (resolve) => { require(['./pc/CheckSearchUser'], resolve) },
-  'check-plan': (resolve) => { require(['./pc/CheckPlan'], resolve) },
-  'select-check-plan': (resolve) => { require(['./pc/SelectCheckPlan'], resolve) },
-  'defect-main-new2': (resolve) => { require(['./pc/DefectMainNew'], resolve) },
-  'device-change': (resolve) => { require(['./pc/DeviceChange'], resolve) },
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//手机特殊目录注册到该文件中
+let specialComp = {
+  // 安检汇总-列表
+  'plan-manage': (resolve) => { require(['./pc/PlanManage'], resolve) },
+  'new-check-paper': (resolve) => { require(['./pc/NewCheckpaper.vue'], resolve) },
+  'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
+  'check-plan-area-list': (resolve) => { require(['./pc/CheckPlanAreaList'], resolve) },
+  'hiddensituation': (resolve) => { require(['./pc/HiddenSituation'], resolve) },
+  'check-search-user': (resolve) => { require(['./pc/CheckSearchUser'], resolve) },
+  'check-plan': (resolve) => { require(['./pc/CheckPlan'], resolve) },
+  'select-check-plan': (resolve) => { require(['./pc/SelectCheckPlan'], resolve) },
+  'defect-main-new2': (resolve) => { require(['./pc/DefectMainNew'], resolve) },
+  'device-change': (resolve) => { require(['./pc/DeviceChange'], resolve) },
+  'user-gas-history': (resolve) => { require(['./pc/usergashistory'], resolve) },
+  'user-gas-history-nian': (resolve) => { require(['./pc/usergashistorynian'], resolve) },
+}
+exports.specialComp = specialComp
+
+
+
+

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

@@ -2615,17 +2615,13 @@ export default {
         let that = this
         let value = {}
         if (this.role == 'inspect') {
-          if(this.item.f_no_checkplan != '无计划安检' ){
-            if (this.item.f_no_checkplan == '复检') {
-              value = this.$androidUtil.path({
-                alias: 'getUserinfomation',
-                data: {condition: "f_check_item_id = '" + this.item.id + "' and f_no_checkplan in ('无计划安检','复检')"}
-              })
-            } else {
-              value = this.$androidUtil.bzLogic('FetchCheckPaper', {id: this.item.id})
-            }
-          }else {
-            value.data =[]
+          if (this.item.f_no_checkplan == '无计划安检' || this.item.f_no_checkplan == '复检') {
+            value = this.$androidUtil.path({
+              alias: 'getUserinfomation',
+              data: {condition: "f_check_item_id = '" + this.item.id + "' and f_no_checkplan in ('无计划安检','复检')"}
+            })
+          } else {
+            value = this.$androidUtil.bzLogic('FetchCheckPaper', {id: this.item.id})
           }
         } else {
           value = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/path/getUserinfomation`, {data: {condition: `id = '${this.item.f_paper_id}'`}})