safecheck-client 4.0.2-3 → 4.0.2-30

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

@@ -632,9 +632,12 @@ export default {
                   continue
                 }
                 let type = this.config[this.device.device].items[item].type
-                let multiple = this.config[this.device.device].items[item].multiple?this.config[this.device.device].items[item].multiple:false
+                let multiple = false
+                if(this.config[this.device.device].items[item].multiple){
+                  multiple = this.config[this.device.device].items[item].multiple === 'true' || this.config[this.device.device].items[item].multiple === true
+                }
                 let options = this.config[this.device.device].items[item].options
-                if ((this.config[this.device.device].items[item].type == 'selector' || this.config[this.device.device].items[item].type == 'inputSelector') && item == this.f_items[n].f_item_name) {
+                if ((this.config[this.device.device].items[item].type == 'selector' || this.config[this.device.device].items[item].type == 'inputSelector') && this.config[this.device.device].items[item].itemname == this.f_items[n].f_item_name) {
                   for (let i in options) {
                     if(typeof options[i]=='function'){
                       continue
@@ -1043,7 +1046,7 @@ export default {
         verification_text:'',
         verification_state:'',// ai验证是否通过 npass(未通过)/pass(通过)
         f_is_defect: '',
-        multiple:this.config[this.device.device].items[item].multiple == true?this.config[this.device.device].items[item].multiple:false,
+        multiple:this.config[this.device.device].items[item].multiple === 'true' || this.config[this.device.device].items[item].multiple == true?this.config[this.device.device].items[item].multiple:false,
         isshow:this.config[this.device.device].items[item].isshow == false?this.config[this.device.device].items[item].isshow:true,
         readonly: this.config[this.device.device].items[item].readonly == true?true:false,
         remark: this.config[this.device.device].items[item].remark ? this.config[this.device.device].items[item].remark : '',

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

@@ -876,16 +876,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 +990,8 @@ export default {
       if (this.repairDefect.result != '正常') {
         return this.$showMessage('有隐患的处理方式为转维修,请点击转维修')
       }
+      //先临时保存
+      this.save('temp')
       this.save()
     },
     //将数据组装提出
@@ -1328,7 +1326,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 != "") {
@@ -2186,9 +2184,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') {

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

@@ -0,0 +1,208 @@
+<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"  v-if="$parent.$parent.f_state=='未入户'" >
+              <v-select style="width:60% "
+                        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" >
+              <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="planItem"
+                                   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:'未入户'}],
+      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_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_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='拒检')))"
+            }
+
+          }
+
+        }
+        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}'`
+        }
+        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>