safecheck-client 4.0.2-7 → 4.0.2-71

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

@@ -240,36 +240,36 @@ export default {
       repairTypeOptions:this.$appdata.getParam('报修类型'),
       f_security_check_type_id: '',
       config: [
-          {
-            "itemname": "燃气表",
-            "checkmust": true,
-            "index": 1,
-            "items": [
-              {"itemname": "基表编号", "index": 1, "type": "string", "readonly": true},
-              {"itemname": "气表型号", "index": 2, "type": "string", "readonly": true},
-              {"itemname": "气表品牌", "index": 3, "type": "string", "readonly": true},
-              {"itemname": "表向", "index": 4, "type": "string", "readonly": true},
-              {"itemname": "初始表底", "index": 5, "type": "number", "readonly": true},
-              {"itemname": "上期表读数", "index": 6, "type": "number", "readonly": true},
+        {
+          "itemname": "燃气表",
+          "checkmust": true,
+          "index": 1,
+          "items": [
+            {"itemname": "基表编号", "index": 1, "type": "string", "readonly": true},
+            {"itemname": "气表型号", "index": 2, "type": "string", "readonly": true},
+            {"itemname": "气表品牌", "index": 3, "type": "string", "readonly": true},
+            {"itemname": "表向", "index": 4, "type": "string", "readonly": true},
+            {"itemname": "初始表底", "index": 5, "type": "number", "readonly": true},
+            {"itemname": "上期表读数", "index": 6, "type": "number", "readonly": true},
 
-              {"itemname": "累购气量", "index": 7, "type": "number", "readonly": true,unique: true,collectionType:"按气量"},
-              {"itemname": "已用气量", "index": 8, "type": "number", "checkmust": false,unique: true,collectionType:"按气量"},
-              {"itemname": "剩余气量", "index": 9, "type": "number", "checkmust": false,unique: true,collectionType:"按气量"},
-              {"itemname": "气量异常差值", "index": 10, "type": "number", "readonly": true,unique: true,collectionType:"按气量"},
+            {"itemname": "累购气量", "index": 7, "type": "number", "readonly": true,unique: true,collectionType:"按气量"},
+            {"itemname": "已用气量", "index": 8, "type": "number", "checkmust": false,unique: true,collectionType:"按气量"},
+            {"itemname": "剩余气量", "index": 9, "type": "number", "checkmust": false,unique: true,collectionType:"按气量"},
+            {"itemname": "气量异常差值", "index": 10, "type": "number", "readonly": true,unique: true,collectionType:"按气量"},
 
 
-              {"itemname": "累购金额", "index": 7, "type": "number", "readonly": true,unique: true,collectionType:"按金额"},
-              {"itemname": "已用金额", "index": 8, "type": "number", "checkmust": false,unique: true,collectionType:"按金额"},
-              {"itemname": "剩余金额", "index": 9, "type": "number", "checkmust": false,unique: true,collectionType:"按金额"},
-              {"itemname": "金额异常差值", "index": 10, "type": "number", "readonly": true,unique: true,collectionType:"按金额"},
+            {"itemname": "累购金额", "index": 7, "type": "number", "readonly": true,unique: true,collectionType:"按金额"},
+            {"itemname": "已用金额", "index": 8, "type": "number", "checkmust": false,unique: true,collectionType:"按金额"},
+            {"itemname": "剩余金额", "index": 9, "type": "number", "checkmust": false,unique: true,collectionType:"按金额"},
+            {"itemname": "金额异常差值", "index": 10, "type": "number", "readonly": true,unique: true,collectionType:"按金额"},
 
-              {"itemname": "系统余额", "index": 10, "type": "number", "readonly": true},
+            {"itemname": "系统余额", "index": 10, "type": "number", "readonly": true},
 
-              {"itemname": "表封号", "index": 11, "type": "string", "readonly": true},
-              {"itemname": "燃气表照片", "index": 12, "type": "picture", "checkmust": false}
-            ]
-          }
-        ],
+            {"itemname": "表封号", "index": 11, "type": "string", "readonly": true},
+            {"itemname": "燃气表照片", "index": 12, "type": "picture", "checkmust": false}
+          ]
+        }
+      ],
       // 维修项
       isneedDate:'',
       days: this.$appdata.getParam('截止天数'),
@@ -862,6 +862,23 @@ export default {
                       f_is_defect = configItems.options[k].isdefect
                       f_item_value = items.f_item_value[i]
                       f_defect_level = configItems.level
+                      let items_list = {
+                        f_is_defect: f_is_defect,
+                        f_item_value: f_item_value,
+                        f_defect_level: f_defect_level,
+                        f_is_eliminate: null,
+                        f_create_time: Util.toStandardTimeString()
+                      }
+                      if (!items.f_item_lists) {
+                        items.f_item_lists = []
+                        if (JSON.stringify(items_list) !== '{}') {
+                          items.f_item_lists.push(items_list)
+                        }
+                      } else {
+                        if (JSON.stringify(items_list) !== '{}') {
+                          items.f_item_lists.push(items_list)
+                        }
+                      }
                       if (f_is_defect) {
                         if (checkResults.result !== '有隐患') {
                           checkResults.result = '有隐患'
@@ -876,16 +893,12 @@ export default {
                           this.checkResult[f_device_type + '-' + f_item_name] = []
                         }
                         this.checkResult[f_device_type + '-' + f_item_name].push(f_item_value)
-
                       }
-
                       let f_selected = f_item_value
-                      if (!items.f_selected) {
+                      if (!items.f_selected || !(items.f_selected instanceof Array)){
                         items.f_selected = []
-                        items.f_selected.push(f_item_value)
-                      } else {
-                        items.f_selected.push(f_item_value)
                       }
+                      items.f_selected.push(f_item_value)
                     }
                   }
                 }
@@ -994,6 +1007,8 @@ export default {
       if (this.repairDefect.result != '正常') {
         return this.$showMessage('有隐患的处理方式为转维修,请点击转维修')
       }
+      //先临时保存
+      this.save('temp')
       this.save()
     },
     //将数据组装提出
@@ -1013,7 +1028,7 @@ export default {
     save(type) {
       if (type == 'temp' || type == 'finish') {
         this.assemblyCodata()
-        }
+      }
       //禁用事件
       this.saveNoclick()
       if (type == 'temp') {
@@ -1328,7 +1343,7 @@ export default {
       }
       if (jo.state == 'ok') {
         let res = JSON.parse(jo.result)
-        if (res.code == 200) {
+        if (res.code == 200 || res.code == 310 || res.code == 311) {
           this.$set('data.f_paper_id', res.id)
           this.isStrat = false
           if (url != "") {
@@ -1392,7 +1407,7 @@ export default {
                         param = res.data[0]
                         param.f_new_tablebase = _this.data.f_new_tablebase
                         param.tabname="在线抄表",
-                        param.f_result_state="安检回量"
+                          param.f_result_state="安检回量"
                         var pardate = {
                           _this:this,
                           tittle:'抄表单信息',
@@ -1576,18 +1591,13 @@ export default {
             this.refuseinspection = Vue.config.safecheck.ApproveConfig.refuseinspection
           }
         }
-
-        if (this.item.f_security_check_type_id && this.item.f_security_check_type_id != null) {
-          try {
+        try {
+          if (this.item.f_security_check_type_id && this.item.f_security_check_type_id != null) {
             await this.getSecurityCheckType(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getSecurityCheckTypeHistoryById`, {id: this.item.f_security_check_type_id})
             this.f_security_check_type_id = this.serverConfig.data.id
-          } catch (e) {
-            return this.$showMessage('获取配置文件失败，请返回后重新进入！多次失败请联系管理员')
-          }
-          this.config = this.extend(JSON.parse(this.serverConfig.data.f_json), this.config)
-          this.initConfig()
-        } else {
-          try {
+            this.config = this.extend(JSON.parse(this.serverConfig.data.f_json), this.config)
+            this.initConfig()
+          } else {
             await this.getSecurityCheckType(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getSecurityCheckTypeByType`, {
               f_safecheck_type: this.item.f_safecheck_type || '年度普检',
               f_user_type: this.item.f_user_type
@@ -1595,9 +1605,12 @@ export default {
             this.f_security_check_type_id = this.serverConfig.data[0].id
             this.config = this.extend(JSON.parse(this.serverConfig.data[0].f_json), this.config)
             this.initConfig()
-          } catch (e) {
-            return this.$showMessage('获取配置文件失败，请返回后重新进入！多次失败请联系管理员')
           }
+        }catch (e) {
+          this.config = this.extend(JSON.parse(Vue.newConfig.data[0].f_json), this.config)
+          this.initConfig()
+          console.log(('离线'))
+          console.log(e)
         }
       }
     },
@@ -2175,7 +2188,7 @@ export default {
                 if (typeof item.f_items[i] == 'function') {
                   continue
                 }
-               let items = this.config.find(obj => obj.itemname === item.f_device_type).items;
+                let items = this.config.find(obj => obj.itemname === item.f_device_type).items;
                 for (let de in items) {
                   if (typeof items[de] == 'function') {
                     continue
@@ -2186,9 +2199,12 @@ export default {
                     }
                   }
                 }
-                if (item.f_items[i].f_item_value instanceof Array) {
+                if (item.f_items[i].f_selected) {
                   item.f_items[i].f_item_value = JSON.parse(item.f_items[i].f_selected)
                 }
+                if (item.f_items[i].f_item_lists.length > 0){
+                  item.f_items[i].f_item_value = item.f_items[i].f_item_lists[0].f_item_value
+                }
               }
               for (let de in that.devices) {
                 if (typeof that.devices[de] == 'function') {
@@ -2214,15 +2230,15 @@ export default {
           this.init()
         }
         if(this.parentPage && this.parentPage=='CurrentCreate'){
-        let isRecodr = this.$appdata.getSingleValue('无限制录音'); //单值参数，为true则是开启全程录音
-        if (isRecodr) {
-          if (isRecodr == 'true') {
+          let isRecodr = this.$appdata.getSingleValue('无限制录音'); //单值参数，为true则是开启全程录音
+          if (isRecodr) {
+            if (isRecodr == 'true') {
               this.$showMessage("为了保证服务质量，您的电话将会被全程录音！")
-            // 初始化录音
-            let resse = this.record()
+              // 初始化录音
+              let resse = this.record()
+            }
           }
         }
-        }
         this.$goto('safecheck-userinfo', {userinfo:this.data}, 'repair')
       } else {
         let that = this

package/src/filiale/meihekou/android.js

@@ -1,22 +1,22 @@
-// 分公司特殊组件页面注册
-import Vue from "vue";
-
-//手机特殊目录注册到该文件中
-let specialComp = {
-  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
-  'safecheck-devices': (resolve) => { require(['./android/SafecheckDevices'], resolve) },
-  'paper-feedback' : (resolve) => { require(['./android/PaperFeedback'], resolve) },
-  'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserInfo'], resolve) },
-  'PhoneUpUserinfo': (resolve) => { require(['./android/PhoneUpUserinfo.vue'], resolve) },
-  'area-plan': (resolve) => { require(['./android/AreaPlan.vue'], resolve) },
-  'check-plan-list': (resolve) => { require(['./android/CheckPlanList.vue'], resolve) },
-  'phone-insurance-purchase-detail': (resolve) => { require(['./android/PhoneInsurancePurchaseDetail'], resolve) },
-  'check-plan-list-area': (resolve) => { require(['./android/CheckPlanListArea.vue'], resolve) },
-  'current-create': (resolve) => { require(['./android/CurrentCreate.vue'], resolve) },
-
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+import Vue from "vue";
+
+//手机特殊目录注册到该文件中
+let specialComp = {
+  'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
+  'safecheck-devices': (resolve) => { require(['./android/SafecheckDevices'], resolve) },
+  'paper-feedback' : (resolve) => { require(['./android/PaperFeedback'], resolve) },
+  'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserInfo'], resolve) },
+  'PhoneUpUserinfo': (resolve) => { require(['./android/PhoneUpUserinfo.vue'], resolve) },
+  'area-plan': (resolve) => { require(['./android/AreaPlan.vue'], resolve) },
+  'check-plan-list': (resolve) => { require(['./android/CheckPlanList.vue'], resolve) },
+  'phone-insurance-purchase-detail': (resolve) => { require(['./android/PhoneInsurancePurchaseDetail'], resolve) },
+  'check-plan-list-area': (resolve) => { require(['./android/CheckPlanListArea.vue'], resolve) },
+  'current-create': (resolve) => { require(['./android/CurrentCreate.vue'], resolve) },
+
+}
+exports.specialComp = specialComp
+
+
+
+

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

@@ -0,0 +1,217 @@
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <div partial>
+          <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" >
+              <label class="font_normal_body">有无计划</label>
+              <v-select style="width:60% "
+                        class="select select_list"
+                        :value.sync="$parent.$parent.f_no_checkplan"
+                        v-model="$parent.$parent.f_no_checkplan"
+                        :options='$parent.$parent.no_checkplans'
+                        placeholder='有无计划'
+                        close-on-select
+                        value-single
+              >
+              </v-select>
+            </div>
+            <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_last_check_state"
+                        v-model="$parent.$parent.f_last_check_state"
+                        :options='$parent.$parent.entry_status'
+                        placeholder='入户状态'
+                        close-on-select
+                        value-single
+              >
+              </v-select>
+            </div>
+            <div class="form-group col-sm-4" >
+              <label class="font_normal_body">小区</label>
+              <input type="text" class="input_search"
+                     v-model="$parent.$parent.f_residential_area"
+                     style="width: 60%" placeholder="小区"
+                     condition="f_residential_area like '%{}%'">
+            </div>
+            <div class="form-group col-sm-4" >
+              <label class="font_normal_body">楼号</label>
+              <input type="text" class="input_search"
+                     v-model="$parent.$parent.f_building"
+                     style="width: 60%" placeholder="楼号"
+                     condition="f_building like '%{}%'">
+            </div>
+            <div class="form-group col-sm-4 button-range" >
+              <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
+              <export-excel   :data="$parent.$parent.exportParameter"
+                                   :field="$parent.$parent.excelHeaders"
+                                   sqlurl="api/af-safecheck/logic/exportfile" sql-name="planItemNew"
+                                   template-name='安检计划明细' :choose-col="true">
+              </export-excel>
+              <!--<export-excel-->
+              <!--: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>-->
+
+            </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/planItemNew', 20),
+      checkState:[{label:'全部',value:''},{label:'已检',value:'已检'},{label:'未检',value:'未检'}],
+      entry_status: this.$appdata.getParam('安检状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检状态')]:[{label: '全部', value: ''}],
+      no_checkplans: this.$appdata.getParam('有无计划')?[{label: '全部', value: ''}, ...this.$appdata.getParam('有无计划')]:[{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':'安检结果'
+      },
+      area:[{label:'全部',value:''}],
+      f_state:'',
+      f_no_checkplan:'',
+      f_last_check_state:'',
+      f_noruhu:'',
+      f_residential_area:'',
+      f_building:'',
+    }
+  },
+  props: [ 'check','checkstatus','checkstart','checkend' ],
+  watch: {
+    'check' (val) {
+      debugger
+      let condition
+      condition = `f_checker='${this.check.f_checker}'`
+      if(this.checkstart){
+        condition+= `and  f_last_check_date>='${this.checkstart}'`
+      }
+      if (this.checkend){
+        condition += `and f_last_check_date<='${this.f_endcheckend_time}'`
+      }
+      this.f_noruhu=[]
+      this.f_state=''
+      this.model.search(condition, {})
+
+    }
+  },
+
+  ready () {
+    if (this.check) {
+      let condition
+      condition = `f_checker='${this.check.f_checker}'`
+      if(this.checkstart){
+        condition += `and f_last_check_date>='${this.checkstart}'`
+      }
+      if (this.checkend){
+        condition += ` and f_last_check_date<='${this.f_end_tcheckendime}'`
+      }
+      this.model.search(condition, {})
+    }
+  },
+  methods:{
+    selfSearch(args){
+      if (this.check) {
+         args.condition = `f_checker='${this.check.f_checker}'`
+        if(this.checkstart){
+          args.condition+= `and  f_last_check_date>='${this.checkstart}'`
+        }
+        if (this.checkend){
+          args.condition += `and f_last_check_date<='${this.checkend}'`
+        }
+        if (this.f_residential_area){
+          args.condition += ` and i.f_residential_area like'%${this.f_residential_area}%'`
+        }
+        if (this.f_building){
+          args.condition += ` and i.f_building='${this.f_building}'`
+        }
+        if (this.f_state){
+          args.condition += ` and i.f_state='${this.f_state}'`
+        }
+        if (this.f_last_check_state){
+          args.condition += ` and i.f_last_check_state='${this.f_last_check_state}'`
+        }
+        if (this.f_no_checkplan){
+          if (this.f_no_checkplan == '有计划安检'){
+            args.condition += ` and i.f_plan_name != '无计划' `
+          }else {
+            args.condition += ` and i.f_plan_name = '无计划' `
+          }
+        }
+        this.model.search(args.condition, args.model)
+      }
+    }
+  },
+  computed: {
+    // 导出到Excel的条件构造
+    exportParameter() {
+      return {
+        condition: this.$refs.paged.model.condition
+      }
+    }
+  },
+}
+</script>

package/src/filiale/meihekou/pc/CheckPlan.vue

@@ -0,0 +1,52 @@
+<template>
+  <div id="unit" class="flex-row" :class="{'binary':showItem}">
+   <div  :class="{'basic-main':!showItem,'binary-left':showItem}" >
+          <select-check-plan-new @select-changed="selected" :style="style" :style2="style2" v-ref:check></select-check-plan-new>
+        </div>
+    <div  class="binary-right" v-show="showItem">
+      <div class="flex">
+          <check-detail v-if='$refs.check && $refs.check.selected' :check='$refs.check.selected'  :checkstart="$refs.check.f_start_time" :checkend="$refs.check.f_end_time"
+                        v-ref:detail></check-detail>
+        </div>
+    </div>
+  </div>
+</template>
+<script>
+ import SelectCheckPlanNew from '../pc/SelectCheckPlan.vue'
+ import CheckDetail from '../pc/CheckDetail.vue'
+    export default {
+        title: '安检员考核',
+        props: ['f'],
+        components: {SelectCheckPlanNew, CheckDetail},
+        data() {
+            return {
+                showItem: false,
+                checkstatus: null,
+              style:'col-sm-2 form-group',
+              style2:'col-sm-4 form-group'
+            }
+        },
+        methods: {
+          selected(row) {
+            this.showItem = true
+          },
+          checkstatusChange(val){
+            this.checkstatus = val
+          }
+        }
+    }
+</script>
+<style>
+  .form-input-group label {
+    text-align: right;
+    width: auto;
+  }
+
+  .datapanel {
+    color: #333;
+    background-color: white;
+    box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
+    padding: 5px 7px 5px 7px;
+    border-radius: 10px;
+  }
+</style>