safecheck-client 4.0.2-4 → 4.0.2-42

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

@@ -0,0 +1,262 @@
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' class="search_area" @condition-changed='$parent.search' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div :class="{'form-group col-sm-6':$parent.$parent.$parent.showItem,'form-group col-sm-4':!$parent.$parent.$parent.showItem}" style="margin: 0">
+              <role-selector-safe
+                role-name="安检员"
+                role-lable="安&ensp;检&ensp;员"
+                @re-res="$parent.$parent.getRes"
+                :value.sync="model.f_checker_id"
+                v-model="model.f_checker_id">
+              </role-selector-safe>
+            </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">安检起始</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_start_time"
+                placeholder='安检起始' style="width:60%"
+                :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">安检截止</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_end_time"
+                placeholder='安检截止' style="width:60%"
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
+            <div style="width: auto;margin-top:8px;float: right" :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <export-excel   :data="$parent.$parent.searchData"
+                                   :field="$parent.$parent.excelHeaders"
+                                   progress="safeGetExportProgress"
+                                   sqlurl="api/af-safecheck/logic/exportfile" sql-name="planCount" template-name='安检计划明细' ></export-excel>
+              <button type="button" class="button_search button_spacing" @click="search()">查询</button>
+              <div class="button_spacing"
+                   :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
+                   @click="$parent.$parent.hiddenr()"></div>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
+        <template partial='head'>
+          <tr>
+            <th>安检员</th>
+            <th>总入户量</th>
+            <th>总到访不遇量</th>
+            <th>总拒检量</th>
+            <th>安检总量</th>
+            <th>计划总数</th>
+            <th>入户</th>
+            <th>到访不遇</th>
+            <th>拒检</th>
+            <th>剩余户数</th>
+            <th>无计划总数</th>
+            <th>无计划入户</th>
+            <th>无计划到访不遇</th>
+            <th>无计划拒检</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td style="text-align: center">{{row.f_checker}}</td>
+          <td style="text-align: center">{{row.ruhu_total}}</td>
+          <td style="text-align: center">{{row.daofang_total}}</td>
+          <td style="text-align: center">{{row.jujian_total}}</td>
+          <td style="text-align: center">{{row.total_sum}}</td>
+          <td style="text-align: center">{{row.plannum}}</td>
+          <td style="text-align: center">{{row.ruhu}}</td>
+          <td style="text-align: center">{{row.daofang}}</td>
+          <td style="text-align: center">{{row.jujian}}</td>
+          <td style="text-align: center">{{row.remainder}}</td>
+          <td style="text-align: center">{{row.no_plan_num}}</td>
+          <td style="text-align: center">{{row.noruhu}}</td>
+          <td style="text-align: center">{{row.nodaofang}}</td>
+          <td style="text-align: center">{{row.nojujian}}</td>
+        </template>
+        <template partial="foot">
+          <td style="text-align: center"><span><b>合计：</b></span></td>
+          <td style="text-align: center">{{model.sums.ruhu_total}}</td>
+          <td style="text-align: center">{{model.sums.daofang_total}}</td>
+          <td style="text-align: center">{{model.sums.jujian_total}}</td>
+          <td style="text-align: center">{{model.sums.total_sum}}</td>
+          <td style="text-align: center">{{model.sums.plannum}}</td>
+          <td style="text-align: center">{{model.sums.ruhu}}</td>
+          <td style="text-align: center">{{model.sums.daofang}}</td>
+          <td style="text-align: center">{{model.sums.jujian}}</td>
+          <td style="text-align: center">{{model.sums.remainder}}</td>
+          <td style="text-align: center">{{model.sums.no_plan_num}}</td>
+          <td style="text-align: center">{{model.sums.noruhu}}</td>
+          <td style="text-align: center">{{model.sums.nodaofang}}</td>
+          <td style="text-align: center">{{model.sums.nojujian}}</td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+import {PagedList} from 'vue-client'
+
+
+export default {
+  title: '安检计划查询',
+  data() {
+    let options = []
+    let year = (new Date()).getFullYear()
+    for (let i = year - 8; i <= year + 1; i++)
+      options.push({label: i + '', value: i + ''})
+    let model = new PagedList('api/af-safecheck/sql/planCount', 20, {
+      f_filialeids: 'this.f_filialeids',
+      f_start_time: 'this.f_start_time',
+      condition1:'this.condition1',
+      condition2:'this.condition2',
+      condition3:'this.condition3',
+      f_end_time: 'this.f_end_time'
+    }, {plannum: '', ruhu: '', jujian: '', daofang: '',no_plan_num:'',noruhu:'',nodaofang:'',nojujian:'',ruhu_total:'',daofang_total:'',jujian_total:'',total_sum:''})
+    model.f_filialeids = '('+this.$login.f.orgid+')'
+    return {
+      excelHeaders:{
+        'f_checker': '安检员',
+        'plannum': '计划总数',
+        // 'yrj': '计划中已入户',
+        // 'wrj': '计划中未入户',
+        'ruhu': '入户',
+        'jujian': '拒检',
+        'daofang': '到访不遇',
+        'no_plan_num': '无计划总数',
+        'noruhu': '无计划入户',
+        'nojujian': '无计划拒检',
+        'nodaofang': '无计划到访不遇'
+      },
+      searchData:{
+        condition:"1=1",
+        condition1:"1=1",
+        condition2:"1=1",
+        condition3:"and 1=1",
+        f_plan_year:year[0],
+        f_checker:'',
+        f_filialeids:'('+this.$login.f.orgid+')',
+        f_start_time:'',
+        f_end_time:''
+      },
+      checker: this.$login.f,
+      checkers: [],
+      checkersname: [],
+      checkStates: this.$appdata.getParam('安检状态'),
+      f: this.$login.f,
+      criteriaShow: false,
+      model: model,
+      c_year_list: options,
+      f_check_start:'',
+      f_check_end: '',
+      f_start_time:'',
+      f_end_time:''
+    }
+  },
+  methods: {
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    hiddenr() {
+      this.$parent.showItem = !this.$parent.showItem
+    },
+    search(args) {
+      let tempStr = args.condition
+      let condition1 =tempStr
+      let condition2 =tempStr
+      let condition3 = ' and 1=1 '
+      if (this.f_check_start) {
+        condition1 += ` AND f_plan_year >= ${this.f_check_start.substr(0,4)} `
+        condition1 += ` AND f_plan_month >= ${this.f_check_start.substr(5,2)} `
+      }
+      if (this.f_check_end) {
+        condition1 += ` AND f_plan_year <= ${this.f_check_end.substr(0,4)} `
+        condition1 += ` AND f_plan_month <= ${this.f_check_end.substr(5,2)} `
+      }
+      if(this.f_start_time){
+        condition2 += ` AND f_offsite_time >= '${this.f_start_time} 00:00:00'`
+      }
+      if (this.f_end_time){
+        condition2 += ` AND f_offsite_time <= '${this.f_end_time} 23:59:59'`
+      }
+      if (this.$refs.paged.$refs.cri.model.f_checker_id){
+        condition3 += ` AND f_checker = '${this.$refs.paged.$refs.cri.model.f_checker_id}' `
+        condition2 += ` AND f_checker_name = '${this.$refs.paged.$refs.cri.model.f_checker_id}' `
+      }
+      this.model.f_start_time=this.f_start_time
+      this.model.f_end_time=this.f_end_time
+      this.model.condition1=condition1
+      this.model.condition2=condition2
+      this.model.condition3=condition3
+
+      this.searchData.condition1=condition1
+      this.searchData.condition2=condition2
+      this.searchData.condition3=condition3
+
+      this.model.search(args.condition, args.model)
+    },
+    getRes(obj){
+      this.model.f_filialeids = this.$login.convertToIn(obj.resids);
+      //tag
+    }
+  },
+  ready() {
+    this.model.id = this.$login.f.id
+    this.model.f_subcompany = this.$login.f.f_fengongsi
+    this.model.f_filialeid = this.$login.f.orgid
+  },
+
+  watch: {
+    'model.condition'(val) {
+      if(val){
+        this.searchData.condition = val
+      }
+    },
+    'model.f_checker'(val) {
+      if(val){
+        this.searchData.f_checker = val
+      }
+    },
+    'f_start_time'(val) {
+      if(val){
+        this.searchData.f_start_time = val
+      }
+    },
+    'f_end_time'(val) {
+      if(val){
+        this.searchData.f_end_time = val
+      }
+    },
+    'checker'() {
+      // //tag
+      //tag
+      this.model.chosenOrg = this.checker[0]
+    },
+    'model.rows.length'() {
+      // 如果查询无结果，将合计置为0
+      if(this.model.rows.length < 1 &&this. model.sums){
+        this.model.sums.yrj = 0
+        this.model.sums.no_plan_num = 0
+        this.model.sums.wrj = 0
+        this.model.sums.ruhu = 0
+        this.model.sums.jujian = 0
+        this.model.sums.daofang = 0
+        this.model.sums.ruhu_total=0
+        this.model.sums.daofang_total=0
+        this.model.sums.jujian_total=0
+        this.model.sums.total_sum=0
+      }
+    }
+  },
+  computed: {
+    selected() {
+      // //tag
+      // this.$parent.showItem=!this.$parent.showItem
+      return this.$refs.paged.$refs.grid.selected
+    }
+  }
+}
+</script>

package/src/filiale/meihekou/pc.js

@@ -6,7 +6,10 @@ let specialComp = {
   'new-check-paper': (resolve) => { require(['./pc/NewCheckpaper'], resolve) },
   'new-check-paper-new': (resolve) => { require(['./pc/NewCheckpaperNew'], resolve) },
   'new-check-paper-temp': (resolve) => { require(['./pc/NewCheckpaperTemp'], resolve) },
+  'check-plan-area-list': (resolve) => { require(['./pc/CheckPlanAreaList'], resolve) },
   'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
+  'check-plan': (resolve) => { require(['./pc/CheckPlan'], resolve) },
+  'select-check-plan-new ': (resolve) => { require(['./pc/SelectCheckPlan'], resolve) },
 }
 exports.specialComp = specialComp
 

package/src/filiale/qingjian/pc/SecurityCheckCoordinates.vue

@@ -114,9 +114,9 @@ export default {
         this.level3 = []
         this.problems = []
         arr.data.forEach((defect) => {
-          if (defect.f_entry_status == '拒检' ) {
+          if (defect.f_last_check_state == '拒检' ) {
             this.level1.push(defect)
-          } else if (defect.f_entry_status == '到访不遇' ) {
+          } else if (defect.f_last_check_state == '到访不遇' ) {
             this.level3.push(defect)
           } else {
             this.problems.push(defect)

package/src/filiale/xinkang/android/SafecheckDevices.vue

@@ -682,7 +682,7 @@ export default {
         return
       }
       this.f_items[this.f_total_lcd.index].f_is_defect = false
-      if (this.f_items[this.f_table_base.index].f_item_value != this.f_items[this.f_total_lcd.index].f_item_value) {
+      if (Number(this.f_items[this.f_table_base.index].f_item_value) !== Number(this.f_items[this.f_total_lcd.index].f_item_value)) {
         this.f_items[this.f_total_lcd.index].f_is_defect = true
         console.log('有异常')
       }else{

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

@@ -186,7 +186,7 @@ export default {
             "气量异常差值（方）":{"index":15,"type":"number","readonly": true,"checkmust": false,isshow:true},
             "金额异常差值":{"index":15,"type":"number","readonly": true,isshow:true},
             // "是否自闭阀 （状态）":{"index":15,"type":"string","readonly": true,isshow:false},
-            "是否自闭阀":{"index":16,"type":"selector","options":[{"data":"是","isdefault":false},{"data":"否","isdefault":false,"isdefect":true,"level":"一级"}],"checkmust": true,},
+            "是否自闭阀":{"index":16,"type":"selector","options":[{"data":"是","isdefault":true},{"data":"否","isdefault":false,"isdefect":true,"level":"一级"}],"checkmust": false,},
             "现场问题":{"index":17,"type":"string","readonly": false,isshow:true},
             "表箱号":{"index":18,"type":"string","readonly": true,isshow:true}
           }
@@ -1812,7 +1812,7 @@ export default {
                       f_device_id: "",
                       f_is_defect: "",
                       f_item_name: "是否自闭阀",
-                      f_item_value: this.item.f_plan_meters[i].f_whether_zbf,
+                      f_item_value: "是",
                       f_path: "",
                       type: "selector"
                     },
@@ -1893,7 +1893,7 @@ export default {
                       f_device_id: "",
                       f_is_defect: "",
                       f_item_name: "是否自闭阀",
-                      f_item_value: this.item.f_plan_meters[i].f_whether_zbf,
+                      f_item_value: "是",
                       f_path: "",
                       type: "selector"
                     },
@@ -1960,6 +1960,7 @@ export default {
                           f_device_id: "",
                           f_is_defect: "",
                           f_item_name: "机械数总用量（方）",
+                          checkmust: true,
                           f_item_value: this.item.f_plan_meters[i].f_meter_base,
                           f_path: "",
                           type: "number"
@@ -1969,6 +1970,7 @@ export default {
                           f_device_id: "",
                           f_is_defect: "",
                           f_item_name: "液晶总用量（方）",
+                          checkmust: true,
                           f_item_value: this.item.f_plan_meters[i].f_total_lcd,
                           f_path: "",
                           type: "number"
@@ -2063,6 +2065,7 @@ export default {
                           f_device_id: "",
                           f_is_defect: "",
                           f_item_name: "机械数总用量（方）",
+                          checkmust: true,
                           isshow: true,
                           f_item_value: '',
                           f_path: "",
@@ -2171,6 +2174,7 @@ export default {
                           f_device_id: "",
                           f_is_defect: "",
                           f_item_name: "机械数总用量（方）",
+                          checkmust: true,
                           f_item_value: this.item.f_plan_meters[i].f_meter_base,
                           f_path: "",
                           type: "number"
@@ -2180,6 +2184,7 @@ export default {
                           f_device_id: "",
                           f_is_defect: "",
                           f_item_name: "液晶总用量（方）",
+                          checkmust: true,
                           f_item_value: this.item.f_plan_meters[i].f_total_lcd,
                           f_path: "",
                           type: "number"
@@ -2282,6 +2287,7 @@ export default {
                         f_device_id: "",
                         f_is_defect: "",
                         f_item_name: "机械数总用量（方）",
+                        checkmust: true,
                         f_item_value: this.item.f_plan_meters[i].f_meter_base,
                         f_path: "",
                         type: "number"
@@ -2291,6 +2297,7 @@ export default {
                         f_device_id: "",
                         f_is_defect: "",
                         f_item_name: "液晶总用量（方）",
+                        checkmust: true,
                         f_item_value: this.item.f_plan_meters[i].f_total_lcd,
                         f_path: "",
                         type: "number"

package/src/filiale/xinkang/pc/NewCheckpaper.vue

@@ -635,44 +635,20 @@ export default {
             for (let i in this.data[device][item].f_items) {
               let defects = ''
               let items = this.data[device][item].f_items[i]
-              console.log('items.f_item_name', items.f_item_name)
-              console.log('items', items)
-
+              if (!this.item.f_defect_content.includes(items.f_item_name)){
+                continue
+              }
               if ((items.type === 'selector' || items.type === 'radio' || items.type === 'checkbox') && items.f_item_value != null && items.f_item_value instanceof Array) {
                 for (let i in items.f_item_value) {
                   let f_item_value = items.f_item_value[i]
-
-                  //tag)
-                  //tag)
-                  //tag)
-                  //tag)
                   if (!this.config[this.data[device][item].f_device_type].items[items.f_item_name] && (items.isdefect && (items.isdefect=='true' || items.isdefect==true))) {
                     continue
                   }
-                  // if(items.f_is_defect != true && items.f_is_defect != 'true'){
-                  //   continue
-                  // }
                   if (items.f_is_defect == 'true' || items.f_is_defect == true) {
                     checkResult = '有隐患'
                     this.result = '有隐患'
                     defects = `${defects}:${f_item_value}/`
                   }
-                  // let options = this.config[this.data[device][item].f_device_type].items[items.f_item_name].options
-                  // if(items.f_item_name == '是否开放式厨房') {
-                  //   console.log('是否开放式厨房', options)
-                  //   console.log('f_item_value', f_item_value)
-                  // }
-                  // for (let option in options) {
-                  //   if (options[option].data == f_item_value) {
-                  //     if ((options[option].isdefect == 'true' || options[option].isdefect == true) && (items.f_is_defect == 'true' || items.f_is_defect == true)) {
-                  //       checkResult = '有隐患'
-                  //       this.result = '有隐患'
-                  //       defects = `${defects}:${options[option].data}/`
-                  //       // let level = options[option].level
-                  //     }
-                  //   }
-                  // }
-                  //tag)
                 }
                 if (defects != '') {
                   deviceInfos.push(`${items.f_item_name}${defects.substring(0, defects.length - 1)}`)
@@ -752,14 +728,6 @@ export default {
         }
       }
       this.ajresult = JSON.parse(this.data.f_defect_content).result
-      if (this.deviceCollects.length > 0) {
-        this.hasDevice = true
-        for (let i = 0; i < this.deviceCollects.length; i++) {
-          if(this.deviceCollects[i].value==='有隐患'){
-            this.ajresult='有隐患'
-          }
-        }
-      }
       this.showimg3 = this.data.f_noanswer_path
       this.showimg4 = this.data.f_rejectcheck_path
       this.paperdata = this.data
@@ -870,23 +838,26 @@ export default {
       }
     },
     isred(val1, val2) {
-      //tag
       let f_is_defect = false
-      for (let i = 0; i < this.devicesAll.length; i++) {
-        for (let j = 0; j < this.devicesAll[i].length; j++) {
-          if (this.devicesAll[i][j].f_device_type == val1) {
-            for (let k = 0; k < this.devicesAll[i][j].f_items.length; k++) {
-              if (this.devicesAll[i][j].f_items[k].f_item_name == val2) {
-                if (!this.devicesAll[i][j].f_items[k].f_is_defect) {
-                  f_is_defect =  false
-                } else {
-                  f_is_defect =  true
+      if (this.item.f_defect_content.includes(val2)){
+        for (let i = 0; i < this.devicesAll.length; i++) {
+          for (let j = 0; j < this.devicesAll[i].length; j++) {
+            if (this.devicesAll[i][j].f_device_type == val1) {
+              for (let k = 0; k < this.devicesAll[i][j].f_items.length; k++) {
+                if (this.devicesAll[i][j].f_items[k].f_item_name == val2) {
+                  if (!this.devicesAll[i][j].f_items[k].f_is_defect) {
+                    f_is_defect =  false
+                  } else {
+                    f_is_defect =  true
+                  }
                 }
               }
-            }
 
+            }
           }
         }
+      }else {
+        f_is_defect =  false
       }
       // console.log("333",val2)
       if(this.level1.findIndex(item=>item == val2)!=-1 && f_is_defect){