safecheck-client 3.1.1-gaomi-7 → 4.0.1

package/src/components/{rongcheng/SafecheckUserInfo.vue → outsideSafecheck/android/safecheckWaitWork/SafecheckUserInfoTS.vue}

@@ -3,41 +3,48 @@
     <div class="panel" style="padding: 10px 10px 5px 10px;">
       <div class="panel-body panel-self">
         <div class="col-xs-12">
-          <p class="panel-title col-xs-4 text-left font" style="width: 21%;float: left"><b>用户编号:</b></p>
-          <a class="panel-title col-xs-8 text-left input-font" style="width: 79%;color: blue;text-decoration:underline" @click="searchHistory(userinfo.f_userinfoid)">{{ userinfo.f_userinfo_code }}</a>
+          <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户编号:</b></p>
+          <a class="panel-title col-xs-7 text-left input-font" style="width: 79%;color: blue;text-decoration:underline" @click="searchHistory(userinfo.f_userinfoid)">{{ userinfo.f_userinfo_code }}</a>
         </div>
-        <div class="col-xs-12">
-          <p class="panel-title col-xs-4 text-left font"><b>用户名称:</b></p>
-          <p class="panel-title col-xs-8 text-left input-font">{{ userinfo.f_user_name }}</p>
+        <div class="col-xs-6">
+          <p class="panel-title col-xs-5 text-left font"><b>用户名称:</b></p>
+          <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_user_name }}</p>
         </div>
-        <div class="col-xs-12">
-          <p class="panel-title col-xs-4 text-left font"><b>用户类型:</b></p>
-          <p class="panel-title col-xs-8 text-left input-font">{{ userinfo.f_check_type }}
+        <div class="col-xs-6">
+          <p class="panel-title col-xs-5 text-left font"><b>用户类型:</b></p>
+          <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_check_type }}
           </p>
         </div>
-        <div class="col-xs-12" style="padding: 2px 0">
+        <div class="col-xs-12">
           <p class="panel-title text-left font" style="width: 23%;float: left"><b>用户电话:</b></p>
           <input class="panel-title text-left input-font" style="width: 67%" value="{{ userinfo.f_user_phone2 ? userinfo.f_user_phone2 : userinfo.f_user_phone }}" v-model="userinfo.f_user_phone"/>
-        </div>
-        <div class="col-xs-12" style="padding: 2px 0">
-          <p class="panel-title text-left font" style="width: 23%;float: left"><b>租户姓名:</b></p>
-          <input class="panel-title text-left input-font" style="width: 67%" value="{{userinfo.f_used_name}}" v-model="userinfo.f_used_name"/>
-        </div>
-        <div class="col-xs-12" style="padding: 2px 0">
-          <p class="panel-title text-left font" style="width: 23%;float: left"><b>租户电话:</b></p>
-          <input class="panel-title text-left input-font" style="width: 67%" value="{{userinfo.f_rent_phone}}" v-model="userinfo.f_rent_phone"/>
+          <!--<p class="panel-title text-left input-font" style="width: 77%">{{ userinfo.f_user_phone2 ? userinfo.f_user_phone2 : userinfo.f_user_phone }}-->
+            <!--<img src="../../../assets/phone.png" style="width: 6%" v-on:click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(userinfo.f_user_phone2 ? userinfo.f_user_phone2 : userinfo.f_user_phone)'></img>-->
+          <!--</p>-->
         </div>
         <div class="col-xs-12">
           <p class="panel-title text-left font" style="width: 21%;float: left"><b>用户地址:</b></p>
           <p class="panel-title text-left input-font" style="width: 79%">{{ userinfo.f_address }}</p>
         </div>
-        <div class="col-xs-12">
+        <div class="col-xs-6">
           <p class="panel-title col-xs-5 text-left font"><b>安检状态:</b></p>
           <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_state }}</p>
         </div>
-        <div class="col-xs-12" style="margin-left: 20px">
-         <!-- <p class="panel-title col-xs-7 text-left input-font"><a @click="searchDevices(userinfo.f_userinfoid)"></a></p>-->
-          <a class="panel-title col-xs-8 text-left input-font" style="width: 79%;color: blue;text-decoration:underline" v-if="userinfo.f_safecheck_type=='送气类型'" @click="searchDevices(userinfo.f_userinfoid)">设备信息维护</a>
+        <div class="col-xs-12">
+          <p class="panel-title col-xs-5 text-left font"><b>开户日期:</b></p>
+          <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_open_date }}</p>
+        </div>
+<!--        <div class="col-xs-12">-->
+<!--          <p class="panel-title col-xs-5 text-left font" style="width: 28%;float: left"><b>进气口铅封号:</b></p>-->
+<!--          <p class="panel-title col-xs-7 text-left input-font" style="width: 72%">{{ userinfo.f_airintake_seal_no }}</p>-->
+<!--        </div>-->
+<!--        <div class="col-xs-12">-->
+<!--          <p class="panel-title col-xs-5 text-left font" style="width: 28%;float: left"><b>出气口铅封号:</b></p>-->
+<!--          <p class="panel-title col-xs-7 text-left input-font" style="width: 72%">{{ userinfo.f_airouttake_seal_no }}</p>-->
+<!--        </div>-->
+        <div class="col-xs-12">
+          <p class="panel-title text-left font" style="width: 21%;float: left"><b>备注:</b></p>
+          <p class="panel-title text-left input-font" style="width: 79%">{{ userinfo.f_remark }}</p>
         </div>
       </div>
       <div class="panel-body">
@@ -58,19 +65,12 @@
 
 
         <div class="form-group" :class="style__">
-          <span class="col-md-3 col-sm-4 col-xs-4  text-left"><img src="../../assets/housestyle.png" style="width: 20px;margin-bottom: 5px;text-align: left" alt="">入户状态:</span>
+          <span class="col-md-3 col-sm-4 col-xs-4  text-left"><img src="../../../../assets/housestyle.png" style="width: 20px;margin-bottom: 5px;text-align: left" alt="">入户状态:</span>
           <div :class="style__" class="col-md-9 col-sm-8 col-xs-8 text-center">
             <input type="radio" name="enterstatus" v-model="f_entry_status" id="nopeople" value="到访不遇">到访不遇
             <input type="radio" name="enterstatus" v-model="f_entry_status" id="rejectchecck" value="拒检">拒检
             <input type="radio" name="enterstatus" v-model="f_entry_status" id="enterhouse" value="入户">入户
           </div>
-          <div class="form-group col-sm-12 col-xs-12" :class="style__" v-show="f_entry_status=='到访不遇'">
-            <div class="auto">
-              <label class="font" style="margin-right: 18px">是否激光检漏：</label>
-              <input type="radio" name="laser_check" v-model="f_laser_check" id="nopeople1" value="是">是
-              <input type="radio" name="laser_check" v-model="f_laser_check" id="rejectchecck1" value="否">否
-            </div>
-          </div>
           <div class="form-group col-sm-12 col-xs-12" :class="style__" v-show="f_entry_status=='到访不遇'">
             <label class="text-left font">到访不遇照片：</label>
             <div class="auto">
@@ -83,26 +83,21 @@
                   </div>
                   <div class="row text-right div-photo" :class="style__">
                     <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_noanswer_path', '到访不遇照片')">拍照</button>
-                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_noanswer_path', this.f_noanswer_path)" style="width: 25%;"></img>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../../../assets/remove.png" :class="style__" @click="delfile('f_noanswer_path', this.f_noanswer_path)" style="width: 25%;"></img>
                   </div>
                 </div>
               </div>
             </div>
-            <div class="auto">
-              <div class="panel" style="padding: 10px 10px 5px 10px;">
-                <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
-                  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
-                    <div class="col-sm-4">
-                      <img-self :src="f_noanswertwo_path" alt="到访不遇照片" width="150" height="200"></img-self>
-                    </div>
-                  </div>
-                  <div class="row text-right div-photo" :class="style__">
-                    <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_noanswertwo_path', '到访不遇照片')">拍照</button>
-                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_noanswertwo_path', this.f_noanswertwo_path)" style="width: 25%;"></img>
-                  </div>
-                </div>
-              </div>
+            <div class="row" style="margin-top: 6px">
+              <label >到访不遇备注:</label>
+            </div>
+            <div class="row" style="margin-top: 6px">
+          <textarea id="el_ca_tx" style="border-radius:4px;width: 100%;"  v-model="f_novisit_reason">
+          </textarea>
             </div>
+<!--            <div class="form-group col-sm-12" :class="style__">
+              <input type="checkbox" v-model="$parent.$parent.backlistisselect" /><label class="text-left font" >限制该用户购气</label>
+            </div>-->
           </div>
           <div class="form-group col-sm-12 col-xs-12" :class="style__" v-show="f_entry_status=='拒检'">
             <label class="text-left font">拒检照片：</label>
@@ -116,11 +111,14 @@
                   </div>
                   <div class="row text-right div-photo">
                     <button type="button" name="button" class="btn btn-primary btn-photo" @click="takePic('f_rejectcheck_path', '拒检照片')">拍照</button>
-                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../assets/remove.png" :class="style__" @click="delfile('f_rejectcheck_path', this.f_rejectcheck_path)" style="width: 25%;"></img>
+                    &nbsp;&nbsp;&nbsp;&nbsp;<img src="../../../../assets/remove.png" :class="style__" @click="delfile('f_rejectcheck_path', this.f_rejectcheck_path)" style="width: 25%;"></img>
                   </div>
                 </div>
               </div>
             </div>
+            <div class="form-group col-sm-12" :class="style__">
+              <input type="checkbox" v-model="$parent.$parent.backlistisselect" /><label class="text-left font" >限制该用户购气</label>
+            </div>
           </div>
         </div>
         <div :class="style__" class="form-group" v-show="f_usegas == '未使用'">
@@ -162,17 +160,38 @@
       </div>
     </div>
   </div>
+  <!--拉黑框-->
+  <modal :show.sync="$parent.$parent.showmodel" v-ref:modal backdrop="false">
+    <div slot="modal-header" class="modal-header">
+      <h4 class="modal-title">
+        限制用户购气
+      </h4>
+    </div>
+    <div slot="modal-body" class="modal-body">
+      <div class="row" style="margin-top: 6px">
+        <label style="color: red;">注:当前页面无法取消对用户的限制购气</label>
+      </div>
+      <div class="row" style="margin-top: 6px">
+          <textarea  v-model.trim="$parent.$parent.cause" style="border-radius:4px;width: 100%;" placeholder="请输入限制用户购气原因" >
+          </textarea>
+      </div>
+    </div>
+    <div slot="modal-footer" class="modal-footer">
+      <button  type="button" name="button" class="col-sm-3 btn btn-primary" @click="backlist()">确认</button>
+      <button  type="button" name="button" class="col-sm-3 btn btn-primary" @click="cancel()">取消</button>
+    </div>
+  </modal>
 </template>
 
 <script>
-  import * as Util from "../Util";
+  import * as Util from "../../../Util";
+  import { HttpResetClass } from 'vue-client'
   import Vue from "vue";
   import RadioGroup from "vue-client/src/vue-strap/src/radioGroup";
   import Radio from "vue-client/src/vue-strap/src/radioBtn";
 
-
   export default {
-    name: "SafecheckUserInfo",
+    title: "SafecheckUserInfo",
     props: ['userinfo'],
     data() {
       return this.$parent.$parent.data
@@ -184,6 +203,59 @@
       this.safecheckStateReady()
     },
     methods: {
+      async backlist(){
+        if(!this.$parent.$parent.cause){
+          this.$showMessage("请填写拉黑原因！")
+          return
+        }
+        this.$parent.$parent.data.f_blocking_cause=this.$parent.$parent.cause
+        console.log("vue.user:-"+JSON.stringify(Vue.user))
+        let http = new HttpResetClass()
+        console.log("即将进行拉黑！")
+        let res1= await http.load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`,{
+          data:{
+            items:"version",
+            tablename:"t_userinfo_ts",
+            condition:"f_userinfo_id="+this.$parent.$parent.data.f_userinfoid,
+            orderitem:"f_userinfo_id"
+          }
+        },{resolveMsg:null, rejectMsg: null})
+        console.log("查询版本号---"+JSON.stringify(res1))
+        console.log("打印参数---"+this.$parent.$parent.data.f_user_name+"-"+this.$parent.$parent.data.f_blocking_cause+"-"+Vue.user.name+"-"+ Vue.user.id+"-"+Vue.user.orgid+"-"+Vue.user.orgs+"-"+Vue.user.depids+"-"+Vue.user.deps+"-"+this.$parent.$parent.data.f_userinfoid)
+        let res2= await http.load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
+          data: {
+            "f_operat_type": "拉黑",
+            "f_state": "有效",
+            "f_user_name": this.$parent.$parent.data.f_user_name,
+            "f_comments": this.$parent.$parent.data.f_blocking_cause,
+            "f_operator": Vue.user.name,
+            "f_operatorid": Vue.user.id,
+            "f_orgid": Vue.user.orgid,
+            "f_orgname": Vue.user.orgs,
+            "f_depid": Vue.user.depids,
+            "f_depname": Vue.user.deps,
+            "f_describe": `${Vue.user.name}对用户${this.$parent.$parent.data.f_user_name}进行拉黑`,
+            "f_userinfo_id": {"f_userinfo_id": this.$parent.$parent.data.f_userinfoid, "f_user_state": "正常", "version": res1.data[0].version}
+          }
+        }, {resolveMsg:null, rejectMsg: null})
+
+        console.log("拉黑结果---"+JSON.stringify(res2))
+        if(res2.data.code==200){
+          this.$parent.$parent.showmodel=false
+          this.$parent.$parent.enabled=true
+          this.$parent.$parent.data.f_blacklist="是"
+          this.$showMessage("将该用户限制购气成功！")
+        }else if(res2.data.msg=='数据增加重复'){
+          this.enabled=true
+          this.$showMessage("该用户已被限制购气，请勿重复提交！")
+        }else{
+          this.$showMessage("网络异常，请稍后再试！")
+        }
+      },
+      cancel(){
+        this.$parent.$parent.backlistisselect=false
+        this.$parent.$parent.showmodel=false
+      },
       searchHistory(f_userinfo_id) {
         this.$dispatch('gotoson', {
           _this: this.$parent.$parent,
@@ -192,14 +264,6 @@
         })
         this.$parent.$parent.$goto('phone-sell-info', {f_userinfo_id: f_userinfo_id})
       },
-      searchDevices(f_userinfo_id) {
-        this.$dispatch('gotoson', {
-          _this: this.$parent.$parent,
-          title: '设备查看',
-          safe: false
-        })
-        this.$parent.$parent.$goto('PhoneDevicesInfo', {f_userinfo_id: f_userinfo_id})
-      },
       cameraCallBack(prop, fileName) {
         HostApp.__this__.$set(prop, fileName + '?' + Math.random())
         console.log('photo file name:' + HostApp.__this__.f_nongasuser_path)
@@ -274,8 +338,6 @@
           this.$set('last_check_result', '')
           this.$set('last_check_data.data', [])
         }
-        console.log('this.$parent.$parent.role', this.$parent.$parent.role)
-        console.log('this.f_complete', this.f_complete)
         if (this.$parent.$parent.role == 'inspect' && this.f_complete != '已完成') {
           this.start()
         }
@@ -304,8 +366,6 @@
           this.$set('f_nongasuser_path', '')
         if (!this.f_noanswer_path)
           this.$set('f_noanswer_path', '')
-        if (!this.f_noanswertwo_path)
-          this.$set('f_noanswertwo_path', '')
         if (!this.f_rejectcheck_path)
           this.$set('f_rejectcheck_path', '')
 
@@ -320,15 +380,12 @@
 
           if (val == '到访不遇') {
             this.f_rejectcheck_path = Vue.nopic
-            this.f_laser_check='是'
-          }else{
-            this.f_laser_check=null
           }
           if (val == '拒检') {
             this.f_noanswer_path = Vue.nopic
-            this.f_noanswertwo_path = Vue.nopic
           }
-          console.log("this.f_laser_check"+this.f_laser_check)
+
+
           if (val != '入户') {
             //清理安检概括
             this.f_no_gas_device = false
@@ -357,6 +414,10 @@
             this.$set('f_cookers', [])
             this.$set('f_heaters', [])
             this.$set('f_furnaces', [])
+          }else{
+            this.f_rejectcheck_path = Vue.nopic
+            this.f_noanswer_path = Vue.nopic
+            this.f_novisit_reason=null
           }
         })
       }

package/src/components/outsideSafecheck/pc/HiddenDangerView/DefectDetailTS.vue

@@ -0,0 +1,177 @@
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' class="search_area" @condition-changed='$parent.search'>
+        <!--<form class="form-inline" partial>-->
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+
+          <div class="col-sm-3 ">
+            <label class="font_normal_body">起始时间</label>
+            <datepicker
+              :value.sync="$parent.$parent.f_check_start"
+              placeholder='起始时间' style="width:60%"
+              :disabled-days-of-week="[]"
+              :format="'yyyy-MM'"
+              :select-month="true"
+              :show-rest-button="reset">
+            </datepicker>
+          </div>
+          <div class="col-sm-3 ">
+            <label class="font_normal_body">结束时间</label>
+            <datepicker
+              :value.sync="$parent.$parent.f_check_end"
+              placeholder='结束时间' style="width:60%"
+              :disabled-days-of-week="[]"
+              :format="'yyyy-MM'"
+              :select-month="true"
+              :show-rest-button="reset">
+            </datepicker>
+          </div>
+          <div class="col-sm-3 ">
+            <label class="font_normal_body">是否有隐患</label>
+            <v-select style="width:60% "
+                      class="select select_list"
+                      :value.sync="model.f_has_defect"
+                      v-model="model.f_has_defect"
+                      :options='$parent.$parent.hasDefectOptions'
+                      placeholder='片区/管理站'
+                      condition="ua.f_slice_area like '%{}%'"
+                      close-on-select>
+            </v-select>
+          </div>
+          <div class="col-sm-4">
+            <role-selector
+              :left-width="'55%'"
+              :right-width="'55%'"
+              role-name="安检员"
+              role-lable="安&nbsp;检&nbsp;员"
+              @re-res="$parent.$parent.getRes"
+              :value.sync="model.f_checker_id"
+              v-model="model.f_checker_id"
+              condition="c.f_checker = '{}'">
+            </role-selector>
+          </div>
+          <div class="col-sm-2 ">
+            <div class="button_spacing" style="float: right; margin-top: 8px;"
+                 :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
+                 @click="$parent.$parent.hiddenr()"></div>
+            <button type="button" style="float: right; margin-top: 8px;" class="button_search button_spacing" @click="search()">查询</button>
+          </div>
+
+          <div>
+            {{$parent.$parent.model.chosenOrg.fullname}}
+          </div>
+          <!--</form>-->
+        </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>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td style="text-align: center">{{row.f_checker}}</td>
+          <td style="text-align: center">{{row.c}}</td>
+          <td style="text-align: center">{{row.checked}}</td>
+          <td style="text-align: center">{{row.unchecked}}</td>
+        </template>
+        <template partial="foot">
+          <td style="text-align: center"><span><b>合计：</b></span></td>
+          <td style="text-align: center">{{model.sums.c}}</td>
+          <td style="text-align: center">{{model.sums.checked}}</td>
+          <td style="text-align: center">{{model.sums.unchecked}}</td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+  import {PagedList} from 'vue-client'
+  import co from 'co'
+  import Vue from 'vue'
+  import * as Util from '../../../Util'
+
+
+  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/planCountTS', 20, {
+        f_plan_year: 'this.f_plan_year[0]',
+        f_checker: 'this.chosenOrg.name',
+        f_filialeids: 'this.f_filialeids '
+      })
+      model.f_plan_year = year + ''
+      model.f_filialeids = '('+this.$login.f.orgid+')'
+      model.chosenOrg = {id: 0, name: ''}
+      return {
+        checker: this.$login.f,
+        checkers: [],
+        checkersname: [],
+        hasDefectOptions:[{lable:'全部',value:''},{lable:'有隐患',value:'有隐患'},{lable:'无隐患',value:'无隐患'}],
+        f: this.$login.f,
+        model: model,
+        c_year_list: options,
+        f_check_start:'',
+        f_check_end: ''
+      }
+    },
+    methods: {
+      hiddenr() {
+        this.$parent.showItem = !this.$parent.showItem
+      },
+      search(args) {
+        if (this.f_check_start) {
+          args.condition += ` AND f_plan_year >= ${this.f_check_start.substr(0,4)} `
+          args.condition += ` AND f_plan_month >= ${this.f_check_start.substr(5,2)} `
+        }
+        if (this.f_check_end) {
+          args.condition += ` AND f_plan_year <= ${this.f_check_end.substr(0,4)} `
+          args.condition += ` AND f_plan_month <= ${this.f_check_end.substr(5,2)} `
+        }
+        this.model.search(args.condition, args.model)
+        console.log('this.model')
+        console.log(this.model.rows.length)
+      },
+      getRes(obj){
+        this.model.f_filialeids = this.$login.convertToIn(obj.resids);
+        console.log(this.model.f_filialeids)
+      }
+    },
+    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: {
+      'checker'() {
+        // console.log('1')
+        console.log("f_checker", this.checker)
+        this.model.chosenOrg = this.checker[0]
+      },
+      'model.rows.length'() {
+        // 如果查询无结果，将合计置为0
+        if(this.model.rows.length < 1){
+          this.model.sums.c = 0
+          this.model.sums.checked = 0
+          this.model.sums.unchecked = 0
+        }
+      }
+    },
+    computed: {
+      selected() {
+        // console.log('2')
+        // this.$parent.showItem=!this.$parent.showItem
+        return this.$refs.paged.$refs.grid.selected
+      }
+    }
+  }
+</script>