safecheck-client 3.0.30-62-t4 → 3.0.30-62-t6

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

@@ -332,7 +332,7 @@ export default {
     limitgas(){
       //查询用户是否被限制购气
       let http = new HttpResetClass()
-      http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/tel_singleTable_OrderBy`, {
+      http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
         data: {
           items: '*',
           tablename: 't_userproperties   ts',
@@ -413,7 +413,7 @@ export default {
       //tag)
       //tag
       let http1 = new HttpResetClass()
-      http1.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/tel_singleTable_OrderBy`, {
+      http1.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
         data: {
           items: 'gm.id,gm.f_meter_style',
           tablename: 't_gasbrand gb LEFT JOIN t_gasmodel gm ON gb.id= gm.f_gasbrand_id ',
@@ -466,7 +466,7 @@ export default {
       })
     },
     getPhone() {
-      new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/tel_singleTable_OrderBy`, {
+      new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
         data: {
           items: 'f_user_phone',
           tablename: 't_userinfo',

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

@@ -1,205 +1,205 @@
-<template>
-  <div>
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
-        <div partial>
-          <!--          <p class="text-center" style="padding: 7px;"><b>安检计划项明细</b></p>-->
-          <ul class="nav nav-tabs">
-            <li role="presentation" class="active"><a style="	color: #5ac0d9 !important;">安检计划项明细</a></li>
-          </ul>
-          <div class="row">
-            <div class="form-group col-sm-4" >
-              <label class="font_normal_body">安检状态</label>
-              <v-select style="width:60% "
-                        class="select select_list"
-                        :value.sync="$parent.$parent.f_state"
-                        v-model="$parent.$parent.f_state"
-                        :options='$parent.$parent.checkState'
-                        placeholder='安检状态'
-                        close-on-select
-                        value-single
-              >
-              </v-select>
-            </div>
-            <div class="form-group col-sm-4" >
-              <v-select style="width:60% "
-                        v-if="$parent.$parent.f_state=='未入户'"
-                        class="select select_list"
-                        :value.sync="$parent.$parent.f_noruhu"
-                        v-model="$parent.$parent.f_noruhu"
-                        :options='$parent.$parent.noChecks'
-                        placeholder='请选择状态'
-                        :multiple="true"
-              >
-              </v-select>
-            </div>
-            <div class="form-group col-sm-4 button-range" >
-              <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
-              <export-excel-safe   :data="$parent.$parent.exportParameter"
-                                   :field="$parent.$parent.excelHeaders"
-                                   sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="planItem"
-                                   template-name='安检计划明细' :choose-col="true">
-              </export-excel-safe>
-              <!--<export-excel-safe-->
-              <!--:data="{condition: $parent.$parent.condition}"-->
-              <!--:field="$parent.$parent.getfield"-->
-              <!--sqlurl="api/af-safecheck/logic/saleExport" sql-name="getGasUser" :template-name="$parent.$parent.pricename+'气价使用人'"-->
-              <!--:choose-col="true"></export-excel-safe>-->
-
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <data-grid :model="model" partial='list' class="table_sy">
-
-        <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>
-          </tr>
-        </template>
-        <template partial='body'>
-          <td style="text-align: center"><nobr>{{row.f_plan_name}}</nobr></td>
-          <td style="text-align: center"><nobr>{{row.f_userinfo_code}}</nobr></td>
-          <td style="text-align: center"><nobr>{{row.f_user_name}}</nobr></td>
-          <td style="text-align: center"><nobr>{{row.f_residential_area}}</nobr></td>
-          <td style="text-align: center"><nobr>{{row.f_address}}</nobr></td>
-          <td style="text-align: center"><nobr>{{row.f_last_check_state}}</nobr></td>
-          <td style="text-align: center"><nobr>{{row.f_state}}</nobr></td>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-import { PagedList } from 'vue-client'
-
-export default {
-  title: '安检计划项列表',
-  data () {
-    return {
-      model: new PagedList('api/af-safecheck/sql/planItem', 20),
-      checkState:[{label:'全部',value:''},{label:'入户',value:'入户'},{label:'未入户',value:'未入户'}],
-      noChecks:[{label:'未检',value:'未检'},{label:'到访不遇',value:'到访不遇'},{label:'拒检',value:'拒检'}],
-      excelHeaders: {
-        //用户编号	用户名称	用户电话	安检次数	用户类型	小区名称	地址	安检日期	安检状态	安检结果
-
-        'f_userinfo_code': '用户编号',
-        'f_user_name': '用户名称',
-        'f_user_phone': '用户电话',
-        //'count_item':'安检次数',
-        'f_user_type': '用户类型',
-        'f_residential_area': '小区名称',
-        'f_address':'地址',
-        'f_last_check_date':'安检日期',
-        'f_last_check_state': '安检状态',
-        'f_state':'是否已检',
-        'f_last_check_result':'安检结果'
-      },
-      f_state:'',
-      f_noruhu:''
-    }
-  },
-  props: [ 'check','checkstatus','checkstart','checkend' ],
-  watch: {
-    'check' (val) {
-      let condition
-      //tag
-      condition = `tt.f_checker_name='${this.check.f_checker}' and i.f_state!='作废' and c.f_issued='是'`
-      if(this.checkstatus){
-        condition += ` and cp.f_entry_status = '${this.checkstatus}'`
-      }
-      if (this.checkstart) {
-        condition += ` AND f_plan_year >= ${this.checkstart.substr(0,4)} `
-        condition += ` AND f_plan_month >= ${this.checkstart.substr(5,2)} `
-      }
-      if (this.checkend) {
-        condition += ` AND f_plan_year <= ${this.checkend.substr(0,4)} `
-        condition += ` AND f_plan_month <= ${this.checkend.substr(5,2)} `
-      }
-      this.f_noruhu=[]
-      this.f_state=''
-      this.model.search(condition, {})
-
-    }
-  },
-
-  ready () {
-    //tag
-    if (this.check) {
-      let condition
-      //tag
-      condition = `tt.f_checker_name='${this.check.f_checker}' and i.f_state!='作废' and c.f_issued='是'`
-      if(this.checkstatus){
-        condition += ` and cp.f_entry_status = '${this.checkstatus}'`
-      }
-      if (this.checkstart) {
-        condition += ` AND f_plan_year >= ${this.checkstart.substr(0,4)} `
-        condition += ` AND f_plan_month >= ${this.checkstart.substr(5,2)} `
-      }
-      if (this.checkend) {
-        condition += ` AND f_plan_year <= ${this.checkend.substr(0,4)} `
-        condition += ` AND f_plan_month <= ${this.checkend.substr(5,2)} `
-      }
-
-      this.model.search(condition, {})
-    }
-  },
-  methods:{
-    selfSearch(args){
-      if (this.check) {
-        args.condition = `tt.f_checker_name='${this.check.f_checker}' and i.f_state!='作废' and c.f_issued='是'`
-        if(this.checkstatus){
-          args.condition += ` and cp.f_entry_status = '${this.checkstatus}'`
-        }
-        if (this.checkstart) {
-          args.condition += ` AND f_plan_year >= ${this.checkstart.substr(0,4)} `
-          args.condition += ` AND f_plan_month >= ${this.checkstart.substr(5,2)} `
-        }
-        if (this.checkend) {
-          args.condition += ` AND f_plan_year <= ${this.checkend.substr(0,4)} `
-          args.condition += ` AND f_plan_month <= ${this.checkend.substr(5,2)} `
-        }
-        if( this.f_state){
-          if(this.f_state=='入户'){
-            args.condition=args.condition+" and i.f_state='已检' and f_last_check_state='入户'"
-          }else if(this.f_state=='未入户'){
-            if(this.f_noruhu && this.f_noruhu.length==1){
-              args.condition += this.f_noruhu[0]=='未检'?" and i.f_state='未检'":` and i.f_state='已检' and f_last_check_state='${this.f_noruhu[0]}'`
-            }else if(this.f_noruhu && this.f_noruhu.length==2){
-              if(this.f_noruhu.indexOf('未检')!=-1){
-                if(this.f_noruhu.indexOf('到访不遇')!=-1){
-                  args.condition=args.condition+" and (i.f_state='未检' or (i.f_state='已检' and f_last_check_state='到访不遇'))"
-                }else{
-                  args.condition=args.condition+" and (i.f_state='未检' or (i.f_state='已检' and f_last_check_state='拒检'))"
-                }
-              }else{
-                args.condition=args.condition+" and (i.f_state='已检' and (f_last_check_state='到访不遇' or f_last_check_state='拒检'))"
-              }
-            }else{
-              args.condition=args.condition+" and (i.f_state='未检' or (i.f_state='已检' and (f_last_check_state='到访不遇' or f_last_check_state='拒检')))"
-            }
-
-          }
-
-        }
-        this.model.search(args.condition, args.model)
-      }
-    }
-  },
-  computed: {
-    // 导出到Excel的条件构造
-    exportParameter() {
-      return {
-        condition: this.$refs.paged.model.condition
-      }
-    }
-  },
-}
-</script>
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <div partial>
+          <!--          <p class="text-center" style="padding: 7px;"><b>安检计划项明细</b></p>-->
+          <ul class="nav nav-tabs">
+            <li role="presentation" class="active"><a style="	color: #5ac0d9 !important;">安检计划项明细</a></li>
+          </ul>
+          <div class="row">
+            <div class="form-group col-sm-4" >
+              <label class="font_normal_body">安检状态</label>
+              <v-select style="width:60% "
+                        class="select select_list"
+                        :value.sync="$parent.$parent.f_state"
+                        v-model="$parent.$parent.f_state"
+                        :options='$parent.$parent.checkState'
+                        placeholder='安检状态'
+                        close-on-select
+                        value-single
+              >
+              </v-select>
+            </div>
+            <div class="form-group col-sm-4" >
+              <v-select style="width:60% "
+                        v-if="$parent.$parent.f_state=='未入户'"
+                        class="select select_list"
+                        :value.sync="$parent.$parent.f_noruhu"
+                        v-model="$parent.$parent.f_noruhu"
+                        :options='$parent.$parent.noChecks'
+                        placeholder='请选择状态'
+                        :multiple="true"
+              >
+              </v-select>
+            </div>
+            <div class="form-group col-sm-4 button-range" >
+              <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
+              <export-excel-safe   :data="$parent.$parent.exportParameter"
+                                   :field="$parent.$parent.excelHeaders"
+                                   sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="planItem"
+                                   template-name='安检计划明细' :choose-col="true">
+              </export-excel-safe>
+              <!--<export-excel-safe-->
+              <!--:data="{condition: $parent.$parent.condition}"-->
+              <!--:field="$parent.$parent.getfield"-->
+              <!--sqlurl="api/af-safecheck/logic/saleExport" sql-name="getGasUser" :template-name="$parent.$parent.pricename+'气价使用人'"-->
+              <!--:choose-col="true"></export-excel-safe>-->
+
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' class="table_sy">
+
+        <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>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td style="text-align: center"><nobr>{{row.f_plan_name}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_userinfo_code}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_user_name}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_residential_area}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_address}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_last_check_state}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_state}}</nobr></td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { PagedList } from 'vue-client'
+
+export default {
+  title: '安检计划项列表',
+  data () {
+    return {
+      model: new PagedList('api/af-safecheck/sql/planItem', 20),
+      checkState:[{label:'全部',value:''},{label:'入户',value:'入户'},{label:'未入户',value:'未入户'}],
+      noChecks:[{label:'未检',value:'未检'},{label:'到访不遇',value:'到访不遇'},{label:'拒检',value:'拒检'}],
+      excelHeaders: {
+        //用户编号	用户名称	用户电话	安检次数	用户类型	小区名称	地址	安检日期	安检状态	安检结果
+
+        'f_userinfo_code': '用户编号',
+        'f_user_name': '用户名称',
+        'f_user_phone': '用户电话',
+        //'count_item':'安检次数',
+        'f_user_type': '用户类型',
+        'f_residential_area': '小区名称',
+        'f_address':'地址',
+        'f_last_check_date':'安检日期',
+        'f_last_check_state': '安检状态',
+        'f_state':'是否已检',
+        'f_last_check_result':'安检结果'
+      },
+      f_state:'',
+      f_noruhu:''
+    }
+  },
+  props: [ 'check','checkstatus','checkstart','checkend' ],
+  watch: {
+    'check' (val) {
+      let condition
+      //tag
+      condition = `tt.f_checker_name='${this.check.f_checker}' and i.f_state!='作废' and c.f_issued='是'`
+      if(this.checkstatus){
+        condition += ` and cp.f_entry_status = '${this.checkstatus}'`
+      }
+      if (this.checkstart) {
+        condition += ` AND f_plan_year >= ${this.checkstart.substr(0,4)} `
+        condition += ` AND f_plan_month >= ${this.checkstart.substr(5,2)} `
+      }
+      if (this.checkend) {
+        condition += ` AND f_plan_year <= ${this.checkend.substr(0,4)} `
+        condition += ` AND f_plan_month <= ${this.checkend.substr(5,2)} `
+      }
+      this.f_noruhu=[]
+      this.f_state=''
+      this.model.search(condition, {})
+
+    }
+  },
+
+  ready () {
+    //tag
+    if (this.check) {
+      let condition
+      //tag
+      condition = `tt.f_checker_name='${this.check.f_checker}' and i.f_state!='作废' and c.f_issued='是'`
+      if(this.checkstatus){
+        condition += ` and cp.f_entry_status = '${this.checkstatus}'`
+      }
+      if (this.checkstart) {
+        condition += ` AND f_plan_year >= ${this.checkstart.substr(0,4)} `
+        condition += ` AND f_plan_month >= ${this.checkstart.substr(5,2)} `
+      }
+      if (this.checkend) {
+        condition += ` AND f_plan_year <= ${this.checkend.substr(0,4)} `
+        condition += ` AND f_plan_month <= ${this.checkend.substr(5,2)} `
+      }
+
+      this.model.search(condition, {})
+    }
+  },
+  methods:{
+    selfSearch(args){
+      if (this.check) {
+        args.condition = `tt.f_checker_name='${this.check.f_checker}' and i.f_state!='作废' and c.f_issued='是'`
+        if(this.checkstatus){
+          args.condition += ` and cp.f_entry_status = '${this.checkstatus}'`
+        }
+        if (this.checkstart) {
+          args.condition += ` AND f_plan_year >= ${this.checkstart.substr(0,4)} `
+          args.condition += ` AND f_plan_month >= ${this.checkstart.substr(5,2)} `
+        }
+        if (this.checkend) {
+          args.condition += ` AND f_plan_year <= ${this.checkend.substr(0,4)} `
+          args.condition += ` AND f_plan_month <= ${this.checkend.substr(5,2)} `
+        }
+        if( this.f_state){
+          if(this.f_state=='入户'){
+            args.condition=args.condition+" and i.f_state='已检' and f_last_check_state='入户'"
+          }else if(this.f_state=='未入户'){
+            if(this.f_noruhu && this.f_noruhu.length==1){
+              args.condition += this.f_noruhu[0]=='未检'?" and i.f_state='未检'":` and i.f_state='已检' and f_last_check_state='${this.f_noruhu[0]}'`
+            }else if(this.f_noruhu && this.f_noruhu.length==2){
+              if(this.f_noruhu.indexOf('未检')!=-1){
+                if(this.f_noruhu.indexOf('到访不遇')!=-1){
+                  args.condition=args.condition+" and (i.f_state='未检' or (i.f_state='已检' and f_last_check_state='到访不遇'))"
+                }else{
+                  args.condition=args.condition+" and (i.f_state='未检' or (i.f_state='已检' and f_last_check_state='拒检'))"
+                }
+              }else{
+                args.condition=args.condition+" and (i.f_state='已检' and (f_last_check_state='到访不遇' or f_last_check_state='拒检'))"
+              }
+            }else{
+              args.condition=args.condition+" and (i.f_state='未检' or (i.f_state='已检' and (f_last_check_state='到访不遇' or f_last_check_state='拒检')))"
+            }
+
+          }
+
+        }
+        this.model.search(args.condition, args.model)
+      }
+    }
+  },
+  computed: {
+    // 导出到Excel的条件构造
+    exportParameter() {
+      return {
+        condition: this.$refs.paged.model.condition
+      }
+    }
+  },
+}
+</script>

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

@@ -269,7 +269,7 @@
     },
     methods: {
       getAllChecker() {
-        new HttpResetClass().load('POST', `/api/af-safecheck/sql/tel_singleTable_OrderBy`, {
+        new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: 'name',
             tablename: 't_user',

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

@@ -549,7 +549,7 @@ export default {
   },
   methods: {
     getAllChecker() {
-      new HttpResetClass().load('POST', `/api/af-safecheck/sql/tel_singleTable_OrderBy`, {
+      new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
         data: {
           items: 'name',
           tablename: 't_user',
@@ -680,7 +680,7 @@ export default {
       ////tag
       ////tag
       if (val) {
-        new HttpResetClass().load('POST', `/api/af-safecheck/sql/tel_singleTable_OrderBy`, {
+        new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: 'name',
             tablename: 't_zone',
@@ -983,7 +983,7 @@ export default {
       ////tag
       this.cbcs = []
       if (val) {
-        new HttpResetClass().load('POST', `/api/af-safecheck/sql/tel_singleTable_OrderBy`, {
+        new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: 'f_book_name,f_book_slice_area,id',
             tablename: 't_meter_book',